From 493a3ea4ddab441c70f4b27a03bbe2b7a67af88b Mon Sep 17 00:00:00 2001
From: Joren V <9069536+jorenn92@users.noreply.github.com>
Date: Sat, 27 Jan 2024 14:42:55 +0100
Subject: [PATCH] fix(rules): Fixed an issue where the 'Plex - present in
 amount of other collections' rule wouldn't work with custom collections

* fix(rules): Fixed an issue where the 'Plex - present in amount of other collections' rule wouldn't work with custom collections

* chore: Update import
---
 server/src/modules/api/lib/plexApi.ts                 |  6 +++---
 server/src/modules/api/plex-api/plex-api.service.ts   | 11 +++++++++++
 .../src/modules/rules/getter/plex-getter.service.ts   |  4 ++--
 server/src/modules/rules/rules.service.ts             |  1 +
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/server/src/modules/api/lib/plexApi.ts b/server/src/modules/api/lib/plexApi.ts
index a3f2467a..dc07d5ea 100644
--- a/server/src/modules/api/lib/plexApi.ts
+++ b/server/src/modules/api/lib/plexApi.ts
@@ -13,8 +13,8 @@ class PlexApi extends NodePlexAPI {
     this.cache = cacheManager.getCache('plexguid');
   }
 
-  async query<T>(options): Promise<T> {
-    return this.queryWithCache(options, true);
+  async query<T>(options, docache: boolean = true): Promise<T> {
+    return this.queryWithCache(options, docache);
   }
 
   /**
@@ -68,7 +68,7 @@ class PlexApi extends NodePlexAPI {
     return result as unknown as T;
   }
 
-  async queryWithCache<T>(options, doCache: boolean): Promise<T> {
+  async queryWithCache<T>(options, doCache: boolean = true): Promise<T> {
     if (typeof options === 'string') {
       options = {
         uri: options,
diff --git a/server/src/modules/api/plex-api/plex-api.service.ts b/server/src/modules/api/plex-api/plex-api.service.ts
index 47bf0b7f..52826825 100644
--- a/server/src/modules/api/plex-api/plex-api.service.ts
+++ b/server/src/modules/api/plex-api/plex-api.service.ts
@@ -30,6 +30,7 @@ import { EPlexDataType } from './enums/plex-data-type-enum';
 import axios from 'axios';
 import PlexApi from '../lib/plexApi';
 import PlexTvApi from '../lib/plextvApi';
+import cacheManager from '../../api/lib/cache';
 
 @Injectable()
 export class PlexApiService {
@@ -237,6 +238,7 @@ export class PlexApiService {
   public async getMetadata(
     key: string,
     options: { includeChildren?: boolean } = {},
+    useCache: boolean = true,
   ): Promise<PlexMetadata> {
     try {
       const response = await this.plexClient.query<PlexMetadataResponse>(
@@ -245,6 +247,7 @@ export class PlexApiService {
             ? '?includeChildren=1&includeExternalMedia=1&asyncAugmentMetadata=1&asyncCheckFiles=1&asyncRefreshAnalysis=1'
             : ''
         }`,
+        useCache,
       );
       if (response) {
         return response.MediaContainer.Metadata[0];
@@ -260,6 +263,14 @@ export class PlexApiService {
     }
   }
 
+  public resetMetadataCache(mediaId: string) {
+    cacheManager.getCache('plexguid').data.del(
+      JSON.stringify({
+        uri: `/library/metadata/${mediaId}`,
+      }),
+    );
+  }
+
   public async getDiscoverDataUserState(
     metaDataRatingKey: string,
   ): Promise<any> {
diff --git a/server/src/modules/rules/getter/plex-getter.service.ts b/server/src/modules/rules/getter/plex-getter.service.ts
index f7ec2311..56427c56 100644
--- a/server/src/modules/rules/getter/plex-getter.service.ts
+++ b/server/src/modules/rules/getter/plex-getter.service.ts
@@ -100,8 +100,8 @@ export class PlexGetterService {
             ? metadata.Collection.filter(
                 (el) =>
                   el.tag.toLowerCase().trim() !==
-                  (ruleGroup.manualCollectionName
-                    ? ruleGroup.manualCollectionName
+                  (ruleGroup?.collection?.manualCollection
+                    ? ruleGroup.collection.manualCollectionName
                     : ruleGroup.name
                   )
                     .toLowerCase()
diff --git a/server/src/modules/rules/rules.service.ts b/server/src/modules/rules/rules.service.ts
index 3c5b9fa5..72b310da 100644
--- a/server/src/modules/rules/rules.service.ts
+++ b/server/src/modules/rules/rules.service.ts
@@ -939,6 +939,7 @@ export class RulesService {
     rulegroupId: number,
     mediaId: string,
   ): Promise<any> {
+    this.plexApi.resetMetadataCache(mediaId);
     const mediaResp = await this.plexApi.getMetadata(mediaId);
     const group = await this.getRuleGroupById(rulegroupId);
     if (group && mediaResp) {