Skip to content

Conversation

@ThePharmer
Copy link
Owner

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

Web Push Notifications (Multiple improvements)

Media Request System

TV Show / Season Handling

Other Improvements

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

OwsleyJr and others added 20 commits April 16, 2025 07:54
* docs: update README.md

* docs: update .all-contributorsrc

---------

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
* fix: check media status has changed before modifying request

fix: refactor: code cleanup

* fix: manually load database entity seasons
refactor: remove matchingOldSeason variable
* fix: clear app badge at zero without notification

* fix: correct users check sometimes failing when searching push subs
* fix: filter specials from modal all seasons and watchlist

* fix: skip specials when marking available

* fix: edge case where specials were marked as completed
… restrict cascade to prevent recursion (sct#4124)

* fix(mediarequest entity): narrow cascade to insert & remove to prevent hook recursion

Restrict cascade options on the MediaRequest→Media relation to only `insert` and `remove`to avoid
nested subscriber/AfterUpdate recursion when saving entities.

* fix(mediarequest): move methods modifying MediaRequest to its Subscriber

* fix(mediasubscriber): use event.manager for parent media updates on remove

Replace `getRepository(Media)` calls with `event.manager` in the `afterRemove` hook so that
parent-media status resets run within the same transaction/QueryRunner (important for postgresql.
Doesnt affect sqlite).

* refactor(mediasubscriber): make afterInsert and afterUpdate async and await internal operations

This should prevent unhandled promise rejections and ensure sequential execution of lifecycle
actions

---------

Co-authored-by: Gauthier <[email protected]>
…ct#4136)

Asynchronous operations introduced in commit 3b9e195 caused issues
during media requests: the mediaId was not properly assigned and remained null.
fix: remove yarn from package manager

fix: update openapi yml
* fix: verify webpush through the service worker

* fix: prevent permissions check outside of settings

* fix: do not resubscribe if no subscription exists

refactor: added comments for verification

* fix: prevent multiple backend calls

refactor: rename variable for clarity

* fix: subscriptions deleting properly

refactor: move one line of code

fix: add dependency in serviceworker

* fix: prevent deletion of active subscription

fix: add lock icon for better clarity

fix: add i18n language

* fix: convert subscription to json more reliably

refactor: move from consoles to throws

refactor: add error to throw

refactor: remove unnecessary if statement

* refactor: add push subscription function finder

* fix: push active subscription to the top
* fix: add flag in local storage for notifications

refactor: update comment

* fix: always resubscribe if subscription is not valid
* docs: update README.md

* docs: update .all-contributorsrc

---------

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Syncs fork with upstream Overseerr develop branch, bringing in 18 bug fixes
and improvements from commits 4cc3495..5ef098f.

Key upstream improvements merged:
- fix(api): update Plex Watchlist URL (sct#4220)
- fix: add flag in local storage for notifications (sct#4180)
- fix: add push subscription verification and resubscribe logic (sct#4163)
- fix: better handling for active webpush subscription (sct#4146)
- fix: handle partial seasons more reliably (sct#4116)
- refactor(MediaRequest): consolidate lifecycle hooks (sct#4124)
- Multiple webpush notification improvements
- Media entity cascade fixes
- Various UI and request handling fixes

Conflicts resolved:
- README.md: Preserved Requesterr fork branding and attribution

All Requesterr branding (translations, CSS classes, settings) remains intact.
@ThePharmer ThePharmer merged commit 9b0d792 into develop Nov 12, 2025
5 checks passed
@ThePharmer ThePharmer deleted the claude/sync-fork-with-upstream-011CV3cULuKxnCcdH6ADFuGg branch November 12, 2025 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants