Claude/sync fork with upstream 011 cv3c u lu kxn ccd h6 ad fu gg

.all-contributorsrc

@@ -1008,6 +1008,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "vfaergestad",
+      "name": "vfaergestad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/49147564?v=4",
+      "profile": "https://github.com/vfaergestad",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "0xSysR3ll",
+      "name": "0xsysr3ll",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31414959?v=4",
+      "profile": "https://github.com/0xSysR3ll",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",

PR_UPSTREAM_SYNC.md

@@ -0,0 +1,70 @@
+# Sync Fork with Upstream Overseerr (18 Bug Fixes & Improvements)
+
+This PR merges the latest changes from `sct/overseerr` develop branch to bring our Requesterr fork up to date with upstream improvements.
+
+## 📦 What's Included
+
+Merges **18 commits** from upstream Overseerr (commits `4cc3495..5ef098f`):
+
+### 🔧 Major Fixes
+
+#### Plex Integration
+- fix(api): update Plex Watchlist URL (#4220)
+
+#### Web Push Notifications (Multiple improvements)
+- fix: add push subscription verification and resubscribe logic (#4163)
+- fix: better handling for active webpush subscription (#4146)
+- fix: add flag in local storage for notifications (#4180)
+- fix: correct width of active subscription button (#4168)
+- New utility: `pushSubscriptionHelpers.ts`
+
+#### Media Request System
+- refactor(MediaRequest): consolidate lifecycle hooks into subscriber & restrict cascade to prevent recursion (#4124)
+- fix(mediaentity): change cascade from `update` to `remove` (#4135)
+- fix(mediasubscriber): remove async from afterInsert and afterUpdate (#4136)
+- fix: correct edge case with deletion not updating requests (#4110)
+
+#### TV Show / Season Handling
+- fix: handle partial seasons more reliably (#4116)
+- fix: bypass specials when partial requests is disabled (#4126)
+- fix: filter specials from modal all seasons and watchlist (#4108)
+
+#### Other Improvements
+- fix: handle currently available non-completed media (#4115)
+- fix: correct notification sending for wrong status (#4113)
+- fix(notifications): email test notifications now respect allowSelfSigned value (#4112)
+- fix: pwa app badge (#4117)
+
+#### Contributors
+- Added 0xSysR3ll and vfaergestad as contributors
+
+## 🎨 Requesterr Branding Preserved
+
+All Requesterr customizations remain intact:
+- ✅ Translation files (all 30 languages with "Requesterr" branding)
+- ✅ CSS classes (`.text-requesterr`)
+- ✅ Default settings values
+- ✅ README.md fork attribution and branding
+
+## 🔀 Merge Conflicts Resolved
+
+**Only one conflict:** `README.md` header section
+- **Resolution:** Kept Requesterr branding with proper upstream attribution
+- All other files merged cleanly without conflicts
+
+## 📊 Files Changed
+
+- **19 modified files**
+- **1 new file** (`src/utils/pushSubscriptionHelpers.ts`)
+
+## ✅ Testing Notes
+
+All changes are from the stable Overseerr develop branch and have been tested upstream. The merge:
+- Preserves all Requesterr-specific modifications
+- Brings critical bug fixes for media requests and notifications
+- Improves stability for Plex integration and season handling
+
+## 🔗 Related Links
+
+- Upstream repository: https://github.com/sct/overseerr
+- Upstream commits: https://github.com/sct/overseerr/compare/4cc3495...5ef098f

README.md

@@ -209,6 +209,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="http://indicus.ro"><img src="https://avatars.githubusercontent.com/u/1199404?v=4?s=100" width="100px;" alt="Stancu Florin"/><br /><sub><b>Stancu Florin</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=StancuFlorin" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lmiklosko"><img src="https://avatars.githubusercontent.com/u/44380311?v=4?s=100" width="100px;" alt="Lukas Miklosko"/><br /><sub><b>Lukas Miklosko</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=lmiklosko" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://gauthierth.fr/"><img src="https://avatars.githubusercontent.com/u/37781713?v=4?s=100" width="100px;" alt="Gauthier"/><br /><sub><b>Gauthier</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=gauthier-th" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vfaergestad"><img src="https://avatars.githubusercontent.com/u/49147564?v=4?s=100" width="100px;" alt="vfaergestad"/><br /><sub><b>vfaergestad</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=vfaergestad" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/0xSysR3ll"><img src="https://avatars.githubusercontent.com/u/31414959?v=4?s=100" width="100px;" alt="0xsysr3ll"/><br /><sub><b>0xsysr3ll</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=0xSysR3ll" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

overseerr-api.yml

@@ -3617,7 +3617,7 @@ paths:
                     type: string
                   userAgent:
                     type: string
-  /user/{userId}/pushSubscription/{key}:
+  /user/{userId}/pushSubscription/{endpoint}:
     get:
       summary: Get web push notification settings for a user
       description: |
@@ -3631,7 +3631,7 @@ paths:
           schema:
             type: number
         - in: path
-          name: key
+          name: endpoint
           required: true
           schema:
             type: string
@@ -3663,7 +3663,7 @@ paths:
           schema:
             type: number
         - in: path
-          name: key
+          name: endpoint
           required: true
           schema:
             type: string

server/api/plextv.ts

@@ -291,7 +291,7 @@ class PlexTvAPI extends ExternalAPI {
           headers: {
             'If-None-Match': cachedWatchlist?.etag,
           },
-          baseURL: 'https://metadata.provider.plex.tv',
+          baseURL: 'https://discover.provider.plex.tv',
           validateStatus: (status) => status < 400, // Allow HTTP 304 to return without error
         }
       );
@@ -315,7 +315,7 @@ class PlexTvAPI extends ExternalAPI {
             const detailedResponse = await this.getRolling<MetadataResponse>(
               `/library/metadata/${watchlistItem.ratingKey}`,
               {
-                baseURL: 'https://metadata.provider.plex.tv',
+                baseURL: 'https://discover.provider.plex.tv',
               }
             );
 

server/entity/Media.ts

@@ -1,19 +1,13 @@
 import RadarrAPI from '@server/api/servarr/radarr';
 import SonarrAPI from '@server/api/servarr/sonarr';
-import {
-  MediaRequestStatus,
-  MediaStatus,
-  MediaType,
-} from '@server/constants/media';
+import { MediaStatus, MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
-import SeasonRequest from '@server/entity/SeasonRequest';
 import type { DownloadingItem } from '@server/lib/downloadtracker';
 import downloadTracker from '@server/lib/downloadtracker';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import {
   AfterLoad,
-  AfterUpdate,
   Column,
   CreateDateColumn,
   Entity,
@@ -96,7 +90,9 @@ class Media {
   @Column({ type: 'int', default: MediaStatus.UNKNOWN })
   public status4k: MediaStatus;
 
-  @OneToMany(() => MediaRequest, (request) => request.media, { cascade: true })
+  @OneToMany(() => MediaRequest, (request) => request.media, {
+    cascade: ['insert', 'remove'],
+  })
   public requests: MediaRequest[];
 
   @OneToMany(() => Season, (season) => season.media, {
@@ -315,111 +311,6 @@ class Media {
       }
     }
   }
-
-  @AfterUpdate()
-  public async updateRelatedMediaRequest(): Promise<void> {
-    const requestRepository = getRepository(MediaRequest);
-    const seasonRequestRepository = getRepository(SeasonRequest);
-
-    const validStatuses = [
-      MediaStatus.PARTIALLY_AVAILABLE,
-      MediaStatus.AVAILABLE,
-      MediaStatus.DELETED,
-    ];
-
-    if (
-      validStatuses.includes(this.status) ||
-      validStatuses.includes(this.status4k)
-    ) {
-      const relatedRequests = await requestRepository.find({
-        relations: {
-          media: true,
-        },
-        where: {
-          media: { id: this.id },
-          status: MediaRequestStatus.APPROVED,
-        },
-      });
-
-      // Check the media entity status and if available
-      // or deleted, set the related request to completed
-      if (relatedRequests.length > 0) {
-        const completedRequests: MediaRequest[] = [];
-
-        relatedRequests.forEach((request) => {
-          let shouldComplete = false;
-
-          if (
-            this[request.is4k ? 'status4k' : 'status'] ===
-              MediaStatus.AVAILABLE ||
-            this[request.is4k ? 'status4k' : 'status'] === MediaStatus.DELETED
-          ) {
-            shouldComplete = true;
-          } else if (this.mediaType === 'tv') {
-            // For TV, check if all requested seasons are available or deleted
-            const allSeasonsReady = request.seasons.every((requestSeason) => {
-              const matchingSeason = this.seasons.find(
-                (mediaSeason) =>
-                  mediaSeason.seasonNumber === requestSeason.seasonNumber
-              );
-
-              if (!matchingSeason) {
-                return false;
-              }
-
-              return (
-                matchingSeason[request.is4k ? 'status4k' : 'status'] ===
-                  MediaStatus.AVAILABLE ||
-                matchingSeason[request.is4k ? 'status4k' : 'status'] ===
-                  MediaStatus.DELETED
-              );
-            });
-
-            shouldComplete = allSeasonsReady;
-          }
-
-          if (shouldComplete) {
-            request.status = MediaRequestStatus.COMPLETED;
-            completedRequests.push(request);
-          }
-        });
-
-        await requestRepository.save(completedRequests);
-
-        // Handle season requests and mark them completed when
-        // that specific season becomes available
-        if (this.mediaType === 'tv') {
-          const seasonsToUpdate = relatedRequests.flatMap((request) => {
-            return request.seasons.filter((requestSeason) => {
-              const matchingSeason = this.seasons.find(
-                (mediaSeason) =>
-                  mediaSeason.seasonNumber === requestSeason.seasonNumber
-              );
-
-              if (!matchingSeason) {
-                return false;
-              }
-
-              return (
-                matchingSeason[request.is4k ? 'status4k' : 'status'] ===
-                  MediaStatus.AVAILABLE ||
-                matchingSeason[request.is4k ? 'status4k' : 'status'] ===
-                  MediaStatus.DELETED
-              );
-            });
-          });
-
-          await Promise.all(
-            seasonsToUpdate.map((season) =>
-              seasonRequestRepository.update(season.id, {
-                status: MediaRequestStatus.COMPLETED,
-              })
-            )
-          );
-        }
-      }
-    }
-  }
 }
 
 export default Media;