fix: Fixed an issue where Overseerr's 'requested by' rule failed to f…

…etch the Plex user when the user uses a display name
jorenn92 · Aug 26, 2024 · a4422f5 · a4422f5
1 parent f9423ee
commit a4422f5
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 3 deletions.
diff --git a/server/src/modules/api/overseerr-api/overseerr-api.service.ts b/server/src/modules/api/overseerr-api/overseerr-api.service.ts
@@ -52,6 +52,7 @@ interface OverseerrUser {
   email: string;
   username: string;
   plexToken: string;
+  plexId?: number;
   plexUsername: string;
   userType: number;
   permissions: number;
@@ -116,6 +117,31 @@ interface OverseerMedia {
   serviceUrl: string;
 }
 
+interface OverseerrUserResponse {
+  pageInfo: {
+    pages: number;
+    pageSize: number;
+    results: number;
+    page: number;
+  };
+  results: OverseerrUserResponseResult[];
+}
+
+interface OverseerrUserResponseResult {
+  permissions: number;
+  id: number;
+  email: string;
+  plexUsername: string;
+  username: string;
+  userType: number;
+  plexId: number;
+  avatar: string;
+  createdAt: string;
+  updatedAt: string;
+  requestCount: number;
+  displayName: string;
+}
+
 @Injectable()
 export class OverseerrApiService {
   api: OverseerrApi;
@@ -170,6 +196,37 @@ export class OverseerrApiService {
     }
   }
 
+  public async getUsers(): Promise<any> {
+    try {
+      const size = 50;
+      let hasNext = true;
+      let skip = 0;
+
+      let users: OverseerrUserResponseResult[] = [];
+
+      while (hasNext) {
+        let resp: OverseerrUserResponse = await this.api.get(
+          `/user?take=${size}&skip=${skip}`,
+        );
+
+        users.push(...resp.results);
+
+        if (resp?.pageInfo?.page < resp?.pageInfo?.pages) {
+          skip = skip + size;
+        } else {
+          hasNext = false;
+        }
+      }
+      return users;
+    } catch (err) {
+      this.logger.warn(
+        `Couldn't fetch Overseerr users. Is the application running?`,
+      );
+      this.logger.debug(err);
+      return [];
+    }
+  }
+
   public async deleteRequest(requestId: string) {
     try {
       const response: OverseerBasicApiResponse = await this.api.delete(

diff --git a/server/src/modules/rules/getter/overseerr-getter.service.ts b/server/src/modules/rules/getter/overseerr-getter.service.ts
@@ -58,6 +58,7 @@ export class OverseerrGetterService {
 
       const prop = this.appProperties.find((el) => el.id === id);
       const tmdb = await this.tmdbIdHelper.getTmdbIdFromPlexData(libItem);
+      // const overseerrUsers = await this.overseerrApi.getUsers();
 
       let mediaResponse: OverSeerrMediaResponse;
       if (tmdb && tmdb.id) {
@@ -123,8 +124,8 @@ export class OverseerrGetterService {
                           ? request.requestedBy?.username
                           : plexUsers.find(
                               (u) =>
-                                u.username ===
-                                request.requestedBy?.plexUsername,
+                                u.plexId ===
+                                request.requestedBy?.plexId,
                             )?.username,
                       );
                     }
@@ -135,7 +136,7 @@ export class OverseerrGetterService {
                         ? request.requestedBy?.username
                         : plexUsers.find(
                             (u) =>
-                              u.username === request.requestedBy?.plexUsername,
+                              u.plexId === request.requestedBy?.plexId,
                           )?.username,
                     );
                   }