chore(release): 1.32.0

Release

.all-contributorsrc

@@ -773,141 +773,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "lunks",
-      "name": "Pedro Nascimento",
-      "avatar_url": "https://avatars.githubusercontent.com/u/91118?v=4",
-      "profile": "http://twitter.com/lunks/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "owenvoke",
-      "name": "Owen Voke",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1899334?v=4",
-      "profile": "https://voke.dev",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Nimelrian",
-      "name": "Sebastian K",
-      "avatar_url": "https://avatars.githubusercontent.com/u/8960836?v=4",
-      "profile": "https://github.com/Nimelrian",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "jariz",
-      "name": "jariz",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1415847?v=4",
-      "profile": "https://github.com/jariz",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Alexays",
-      "name": "Alex",
-      "avatar_url": "https://avatars.githubusercontent.com/u/13947260?v=4",
-      "profile": "https://arouillard.fr",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Zebebles",
-      "name": "Zeb Muller",
-      "avatar_url": "https://avatars.githubusercontent.com/u/11425451?v=4",
-      "profile": "https://github.com/Zebebles",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "SMores",
-      "name": "Shane Friedman",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5354254?v=4",
-      "profile": "http://smoores.dev",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "IzaacJ",
-      "name": "Izaac Brånn",
-      "avatar_url": "https://avatars.githubusercontent.com/u/711323?v=4",
-      "profile": "https://izaacj.me",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "SalmanTariq",
-      "name": "Salman Tariq",
-      "avatar_url": "https://avatars.githubusercontent.com/u/13284494?v=4",
-      "profile": "https://github.com/SalmanTariq",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "andrew-kennedy",
-      "name": "Andrew Kennedy",
-      "avatar_url": "https://avatars.githubusercontent.com/u/2387159?v=4",
-      "profile": "https://github.com/andrew-kennedy",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Fallenbagel",
-      "name": "Fallenbagel",
-      "avatar_url": "https://avatars.githubusercontent.com/u/98979876?v=4",
-      "profile": "https://github.com/Fallenbagel",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "scorp200",
-      "name": "Anton K. (ai Doge)",
-      "avatar_url": "https://avatars.githubusercontent.com/u/9427639?v=4",
-      "profile": "http://aidoge.xyz",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "marcofaggian",
-      "name": "Marco Faggian",
-      "avatar_url": "https://avatars.githubusercontent.com/u/19221001?v=4",
-      "profile": "https://marcofaggian.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "nemchik",
-      "name": "Eric Nemchik",
-      "avatar_url": "https://avatars.githubusercontent.com/u/725456?v=4",
-      "profile": "http://nemchik.com/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "RemiRigal",
-      "name": "RemiRigal",
-      "avatar_url": "https://avatars.githubusercontent.com/u/19256051?v=4",
-      "profile": "https://github.com/RemiRigal",
-      "contributions": [
-        "code"
-      ]
     }
   ],
   "badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",
@@ -917,6 +782,5 @@
   "repoType": "github",
   "repoHost": "https://github.com",
   "skipCi": false,
-  "commitConvention": "angular",
-  "commitType": "docs"
+  "commitConvention": "angular"
 }

.gitattributes

@@ -24,24 +24,3 @@
 *.woff binary
 *.pyc binary
 *.pdf binary
-
-#
-## Theses files/directories should be excluded from git archives
-#
-
-.husky export-ignore
-.vscode export-ignore
-docs export-ignore
-
-.git* export-ignore
-*ignore export-ignore
-*.md export-ignore
-
-.all-contributorsrc export-ignore
-.editorconfig export-ignore
-Dockerfile.local export-ignore
-docker-compose.yml export-ignore
-stylelint.config.js export-ignore
-
-public/os_logo_filled.png export-ignore
-public/preview.jpg export-ignore

.github/CODEOWNERS

@@ -1,10 +1,10 @@
 # Global code ownership
-*                               @sct @TheCatLady @danshilm @OwsleyJr
+*                               @sct @TheCatLady @danshilm
 
 # Documentation
-/.all-contributorsrc            @TheCatLady @samwiseg0 @danshilm @OwsleyJr
-/*.md                           @TheCatLady @samwiseg0 @danshilm @OwsleyJr
-/docs/                          @TheCatLady @samwiseg0 @danshilm @OwsleyJr
+/.all-contributorsrc            @TheCatLady @samwiseg0 @danshilm
+/*.md                           @TheCatLady @samwiseg0 @danshilm
+/docs/                          @TheCatLady @samwiseg0 @danshilm
 
 # Snap-related files
 /.github/workflows/snap.yaml    @samwiseg0
@@ -12,4 +12,4 @@
 
 # i18n locale files
 /src/i18n/locale/               @sct @TheCatLady
-/src/i18n/locale/en.json        @sct @TheCatLady @danshilm @OwsleyJr
+/src/i18n/locale/en.json        @sct @TheCatLady @danshilm

.github/workflows/ci.yml

@@ -12,8 +12,8 @@ jobs:
   test:
     name: Lint & Test Build
     if: github.event_name == 'pull_request'
-    runs-on: ubuntu-22.04
-    container: node:18.18-alpine
+    runs-on: ubuntu-20.04
+    container: node:16.17-alpine
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -31,7 +31,7 @@ jobs:
   build_and_push:
     name: Build & Publish Docker Images
     if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -39,6 +39,13 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
         with:
@@ -64,12 +71,21 @@ jobs:
             sctx/overseerr:${{ github.sha }}
             ghcr.io/sct/overseerr:develop
             ghcr.io/sct/overseerr:${{ github.sha }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+      - # Temporary fix
+        # https://github.com/docker/build-push-action/issues/252
+        # https://github.com/moby/buildkit/issues/1896
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
   discord:
     name: Send Discord Notification
     needs: build_and_push
     if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
         uses: technote-space/workflow-conclusion-action@v3
@@ -78,9 +94,9 @@ jobs:
         run: |
           failures=(neutral, skipped, timed_out, action_required)
           if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
-            echo "status=failure" >> $GITHUB_OUTPUT
+            echo ::set-output name=status::failure
           else
-            echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT
+            echo ::set-output name=status::$WORKFLOW_CONCLUSION
           fi
       - name: Post Status to Discord
         uses: sarisia/actions-status-discord@v1

.github/workflows/preview.yml

@@ -8,13 +8,13 @@ on:
 jobs:
   build_and_push:
     name: Build & Publish Docker Preview Images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Get the version
         id: get_version
-        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx

.github/workflows/release.yml

@@ -8,7 +8,9 @@ on:
 jobs:
   semantic-release:
     name: Tag and release latest version
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
+    env:
+      HUSKY: 0
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -45,7 +47,7 @@ jobs:
   build-snap:
     name: Build Snap Package (${{ matrix.architecture }})
     needs: semantic-release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -67,9 +69,9 @@ jobs:
         run: |
           git fetch --prune --tags
           if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
-            echo "RELEASE=stable" >> $GITHUB_OUTPUT
+            echo ::set-output name=RELEASE::stable
           else
-            echo "RELEASE=edge" >> $GITHUB_OUTPUT
+            echo ::set-output name=RELEASE::edge
           fi
       - name: Set Up QEMU
         uses: docker/setup-qemu-action@v2
@@ -91,9 +93,8 @@ jobs:
           snap: ${{ steps.build.outputs.snap }}
       - name: Publish Snap Package
         uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
         with:
+          store_login: ${{ secrets.SNAP_LOGIN }}
           snap: ${{ steps.build.outputs.snap }}
           release: ${{ steps.prepare.outputs.RELEASE }}
 
@@ -101,7 +102,7 @@ jobs:
     name: Send Discord Notification
     needs: semantic-release
     if: always()
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
         uses: technote-space/workflow-conclusion-action@v3
@@ -110,9 +111,9 @@ jobs:
         run: |
           failures=(neutral, skipped, timed_out, action_required)
           if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
-            echo "status=failure" >> $GITHUB_OUTPUT
+            echo ::set-output name=status::failure
           else
-            echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT
+            echo ::set-output name=status::$WORKFLOW_CONCLUSION
           fi
       - name: Post Status to Discord
         uses: sarisia/actions-status-discord@v1

.github/workflows/snap.yaml

@@ -8,7 +8,7 @@ on:
 jobs:
   jobs:
     name: Job Check
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Cancel Previous Runs
@@ -19,7 +19,7 @@ jobs:
   build-snap:
     name: Build Snap Package (${{ matrix.architecture }})
     needs: jobs
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -35,9 +35,9 @@ jobs:
         run: |
           git fetch --prune --unshallow --tags
           if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
-            echo "RELEASE=stable" >> $GITHUB_OUTPUT
+            echo ::set-output name=RELEASE::stable
           else
-            echo "RELEASE=edge" >> $GITHUB_OUTPUT
+            echo ::set-output name=RELEASE::edge
           fi
       - name: Set Up QEMU
         uses: docker/setup-qemu-action@v2
@@ -57,9 +57,8 @@ jobs:
           snap: ${{ steps.build.outputs.snap }}
       - name: Publish Snap Package
         uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
         with:
+          store_login: ${{ secrets.SNAP_LOGIN }}
           snap: ${{ steps.build.outputs.snap }}
           release: ${{ steps.prepare.outputs.RELEASE }}
 
@@ -67,7 +66,7 @@ jobs:
     name: Send Discord Notification
     needs: build-snap
     if: always() && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
         uses: technote-space/workflow-conclusion-action@v3
@@ -76,9 +75,9 @@ jobs:
         run: |
           failures=(neutral, skipped, timed_out, action_required)
           if [[ ${array[@]} =~ $WORKFLOW_CONCLUSION ]]; then
-            echo "status=failure" >> $GITHUB_OUTPUT
+            echo ::set-output name=status::failure
           else
-            echo "status=$WORKFLOW_CONCLUSION" >> $GITHUB_OUTPUT
+            echo ::set-output name=status::$WORKFLOW_CONCLUSION
           fi
       - name: Post Status to Discord
         uses: sarisia/actions-status-discord@v1

.vscode/settings.json

@@ -16,8 +16,5 @@
     }
   ],
   "editor.formatOnSave": true,
-  "typescript.preferences.importModuleSpecifier": "non-relative",
-  "files.associations": {
-    "globals.css": "tailwindcss"
-  }
+  "typescript.preferences.importModuleSpecifier": "non-relative"
 }

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.18-alpine AS BUILD_IMAGE
+FROM node:16.17-alpine AS BUILD_IMAGE
 
 WORKDIR /app
 
@@ -7,11 +7,10 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 
 RUN \
   case "${TARGETPLATFORM}" in \
-  'linux/arm64' | 'linux/arm/v7') \
-  apk update && \
-  apk add --no-cache python3 make g++ gcc libc6-compat bash && \
-  yarn global add node-gyp \
-  ;; \
+    'linux/arm64' | 'linux/arm/v7') \
+      apk add --no-cache python3 make g++ && \
+      ln -s /usr/bin/python3 /usr/bin/python \
+      ;; \
   esac
 
 COPY package.json yarn.lock ./
@@ -34,7 +33,7 @@ RUN touch config/DOCKER
 RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
 
 
-FROM node:18.18-alpine
+FROM node:16.17-alpine
 
 WORKDIR /app
 

Dockerfile.local

@@ -1,4 +1,4 @@
-FROM node:18.18-alpine
+FROM node:16.17-alpine
 
 COPY . /app
 WORKDIR /app

README.md

@@ -11,7 +11,7 @@
 <a href="https://hosted.weblate.org/engage/overseerr/"><img src="https://hosted.weblate.org/widgets/overseerr/-/overseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/sct/overseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/sct/overseerr"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-99-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-84-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 </p>
 
@@ -182,27 +182,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ceptonit"><img src="https://avatars.githubusercontent.com/u/12678743?v=4?s=100" width="100px;" alt="ceptonit"/><br /><sub><b>ceptonit</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=ceptonit" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/aedelbro"><img src="https://avatars.githubusercontent.com/u/36162221?v=4?s=100" width="100px;" alt="aedelbro"/><br /><sub><b>aedelbro</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=aedelbro" title="Code">💻</a></td>
     </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://twitter.com/lunks/"><img src="https://avatars.githubusercontent.com/u/91118?v=4?s=100" width="100px;" alt="Pedro Nascimento"/><br /><sub><b>Pedro Nascimento</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=lunks" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://voke.dev"><img src="https://avatars.githubusercontent.com/u/1899334?v=4?s=100" width="100px;" alt="Owen Voke"/><br /><sub><b>Owen Voke</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=owenvoke" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Nimelrian"><img src="https://avatars.githubusercontent.com/u/8960836?v=4?s=100" width="100px;" alt="Sebastian K"/><br /><sub><b>Sebastian K</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Nimelrian" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jariz"><img src="https://avatars.githubusercontent.com/u/1415847?v=4?s=100" width="100px;" alt="jariz"/><br /><sub><b>jariz</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=jariz" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://arouillard.fr"><img src="https://avatars.githubusercontent.com/u/13947260?v=4?s=100" width="100px;" alt="Alex"/><br /><sub><b>Alex</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Alexays" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Zebebles"><img src="https://avatars.githubusercontent.com/u/11425451?v=4?s=100" width="100px;" alt="Zeb Muller"/><br /><sub><b>Zeb Muller</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Zebebles" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://smoores.dev"><img src="https://avatars.githubusercontent.com/u/5354254?v=4?s=100" width="100px;" alt="Shane Friedman"/><br /><sub><b>Shane Friedman</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=SMores" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://izaacj.me"><img src="https://avatars.githubusercontent.com/u/711323?v=4?s=100" width="100px;" alt="Izaac Brånn"/><br /><sub><b>Izaac Brånn</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=IzaacJ" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SalmanTariq"><img src="https://avatars.githubusercontent.com/u/13284494?v=4?s=100" width="100px;" alt="Salman Tariq"/><br /><sub><b>Salman Tariq</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=SalmanTariq" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andrew-kennedy"><img src="https://avatars.githubusercontent.com/u/2387159?v=4?s=100" width="100px;" alt="Andrew Kennedy"/><br /><sub><b>Andrew Kennedy</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=andrew-kennedy" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fallenbagel"><img src="https://avatars.githubusercontent.com/u/98979876?v=4?s=100" width="100px;" alt="Fallenbagel"/><br /><sub><b>Fallenbagel</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Fallenbagel" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://aidoge.xyz"><img src="https://avatars.githubusercontent.com/u/9427639?v=4?s=100" width="100px;" alt="Anton K. (ai Doge)"/><br /><sub><b>Anton K. (ai Doge)</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=scorp200" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://marcofaggian.com"><img src="https://avatars.githubusercontent.com/u/19221001?v=4?s=100" width="100px;" alt="Marco Faggian"/><br /><sub><b>Marco Faggian</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=marcofaggian" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://nemchik.com/"><img src="https://avatars.githubusercontent.com/u/725456?v=4?s=100" width="100px;" alt="Eric Nemchik"/><br /><sub><b>Eric Nemchik</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=nemchik" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RemiRigal"><img src="https://avatars.githubusercontent.com/u/19256051?v=4?s=100" width="100px;" alt="RemiRigal"/><br /><sub><b>RemiRigal</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=RemiRigal" title="Code">💻</a></td>
-    </tr>
   </tbody>
 </table>
 

cypress/config/settings.cypress.json

@@ -3,147 +3,147 @@
   "vapidPrivate": "tmnslaO8ZWN6bNbSEv_rolPeBTlNxOwCCAHrM9oZz3M",
   "vapidPublic": "BK_EpP8NDm9waor2zn6_S28o3ZYv4kCkJOfYpO3pt3W6jnPmxrgTLANUBNbbyaNatPnSQ12De9CeqSYQrqWzHTs",
   "main": {
-    "apiKey": "testkey",
-    "applicationTitle": "Overseerr",
-    "applicationUrl": "",
-    "csrfProtection": false,
-    "cacheImages": false,
-    "defaultPermissions": 32,
-    "defaultQuotas": {
-      "movie": {},
-      "tv": {}
-    },
-    "hideAvailable": false,
-    "localLogin": true,
-    "newPlexLogin": true,
-    "region": "",
-    "originalLanguage": "",
-    "trustProxy": false,
-    "partialRequestsEnabled": true,
-    "locale": "en"
+   "apiKey": "testkey",
+   "applicationTitle": "Overseerr",
+   "applicationUrl": "",
+   "csrfProtection": false,
+   "cacheImages": false,
+   "defaultPermissions": 32,
+   "defaultQuotas": {
+    "movie": {},
+    "tv": {}
+   },
+   "hideAvailable": false,
+   "localLogin": true,
+   "newPlexLogin": true,
+   "region": "",
+   "originalLanguage": "",
+   "trustProxy": false,
+   "partialRequestsEnabled": true,
+   "locale": "en"
   },
   "plex": {
-    "name": "Seerr",
-    "ip": "192.168.1.1",
-    "port": 32400,
-    "useSsl": false,
-    "libraries": [
-      {
-        "id": "1",
-        "name": "Movies",
-        "enabled": true,
-        "type": "movie"
-      }
-    ],
-    "machineId": "test"
+   "name": "Seerr",
+   "ip": "192.168.1.1",
+   "port": 32400,
+   "useSsl": false,
+   "libraries": [
+    {
+     "id": "1",
+     "name": "Movies",
+     "enabled": true,
+     "type": "movie"
+    }
+   ],
+   "machineId": "test"
   },
   "tautulli": {},
   "radarr": [],
   "sonarr": [],
   "public": {
-    "initialized": true
+   "initialized": true
   },
   "notifications": {
-    "agents": {
-      "email": {
-        "enabled": false,
-        "options": {
-          "emailFrom": "",
-          "smtpHost": "",
-          "smtpPort": 587,
-          "secure": false,
-          "ignoreTls": false,
-          "requireTls": false,
-          "allowSelfSigned": false,
-          "senderName": "Overseerr"
-        }
-      },
-      "discord": {
-        "enabled": false,
-        "types": 0,
-        "options": {
-          "webhookUrl": "",
-          "enableMentions": true
-        }
-      },
-      "lunasea": {
-        "enabled": false,
-        "types": 0,
-        "options": {
-          "webhookUrl": ""
-        }
-      },
-      "slack": {
-        "enabled": false,
-        "types": 0,
-        "options": {
-          "webhookUrl": ""
-        }
-      },
-      "telegram": {
-        "enabled": false,
-        "types": 0,
-        "options": {
-          "botAPI": "",
-          "chatId": "",
-          "sendSilently": false
-        }
-      },
-      "pushbullet": {
-        "enabled": false,
-        "types": 0,
-        "options": {
-          "accessToken": ""
-        }
-      },
-      "pushover": {
-        "enabled": false,
-        "types": 0,
-        "options": {
-          "accessToken": "",
-          "userToken": ""
-        }
-      },
-      "webhook": {
-        "enabled": false,
-        "types": 0,
-        "options": {
-          "webhookUrl": "",
-          "jsonPayload": "IntcbiAgICBcIm5vdGlmaWNhdGlvbl90eXBlXCI6IFwie3tub3RpZmljYXRpb25fdHlwZX19XCIsXG4gICAgXCJldmVudFwiOiBcInt7ZXZlbnR9fVwiLFxuICAgIFwic3ViamVjdFwiOiBcInt7c3ViamVjdH19XCIsXG4gICAgXCJtZXNzYWdlXCI6IFwie3ttZXNzYWdlfX1cIixcbiAgICBcImltYWdlXCI6IFwie3tpbWFnZX19XCIsXG4gICAgXCJ7e21lZGlhfX1cIjoge1xuICAgICAgICBcIm1lZGlhX3R5cGVcIjogXCJ7e21lZGlhX3R5cGV9fVwiLFxuICAgICAgICBcInRtZGJJZFwiOiBcInt7bWVkaWFfdG1kYmlkfX1cIixcbiAgICAgICAgXCJ0dmRiSWRcIjogXCJ7e21lZGlhX3R2ZGJpZH19XCIsXG4gICAgICAgIFwic3RhdHVzXCI6IFwie3ttZWRpYV9zdGF0dXN9fVwiLFxuICAgICAgICBcInN0YXR1czRrXCI6IFwie3ttZWRpYV9zdGF0dXM0a319XCJcbiAgICB9LFxuICAgIFwie3tyZXF1ZXN0fX1cIjoge1xuICAgICAgICBcInJlcXVlc3RfaWRcIjogXCJ7e3JlcXVlc3RfaWR9fVwiLFxuICAgICAgICBcInJlcXVlc3RlZEJ5X2VtYWlsXCI6IFwie3tyZXF1ZXN0ZWRCeV9lbWFpbH19XCIsXG4gICAgICAgIFwicmVxdWVzdGVkQnlfdXNlcm5hbWVcIjogXCJ7e3JlcXVlc3RlZEJ5X3VzZXJuYW1lfX1cIixcbiAgICAgICAgXCJyZXF1ZXN0ZWRCeV9hdmF0YXJcIjogXCJ7e3JlcXVlc3RlZEJ5X2F2YXRhcn19XCJcbiAgICB9LFxuICAgIFwie3tpc3N1ZX19XCI6IHtcbiAgICAgICAgXCJpc3N1ZV9pZFwiOiBcInt7aXNzdWVfaWR9fVwiLFxuICAgICAgICBcImlzc3VlX3R5cGVcIjogXCJ7e2lzc3VlX3R5cGV9fVwiLFxuICAgICAgICBcImlzc3VlX3N0YXR1c1wiOiBcInt7aXNzdWVfc3RhdHVzfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X2VtYWlsXCI6IFwie3tyZXBvcnRlZEJ5X2VtYWlsfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X3VzZXJuYW1lXCI6IFwie3tyZXBvcnRlZEJ5X3VzZXJuYW1lfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X2F2YXRhclwiOiBcInt7cmVwb3J0ZWRCeV9hdmF0YXJ9fVwiXG4gICAgfSxcbiAgICBcInt7Y29tbWVudH19XCI6IHtcbiAgICAgICAgXCJjb21tZW50X21lc3NhZ2VcIjogXCJ7e2NvbW1lbnRfbWVzc2FnZX19XCIsXG4gICAgICAgIFwiY29tbWVudGVkQnlfZW1haWxcIjogXCJ7e2NvbW1lbnRlZEJ5X2VtYWlsfX1cIixcbiAgICAgICAgXCJjb21tZW50ZWRCeV91c2VybmFtZVwiOiBcInt7Y29tbWVudGVkQnlfdXNlcm5hbWV9fVwiLFxuICAgICAgICBcImNvbW1lbnRlZEJ5X2F2YXRhclwiOiBcInt7Y29tbWVudGVkQnlfYXZhdGFyfX1cIlxuICAgIH0sXG4gICAgXCJ7e2V4dHJhfX1cIjogW11cbn0i"
-        }
-      },
-      "webpush": {
-        "enabled": false,
-        "options": {}
-      },
-      "gotify": {
-        "enabled": false,
-        "types": 0,
-        "options": {
-          "url": "",
-          "token": ""
-        }
-      }
+   "agents": {
+    "email": {
+     "enabled": false,
+     "options": {
+      "emailFrom": "",
+      "smtpHost": "",
+      "smtpPort": 587,
+      "secure": false,
+      "ignoreTls": false,
+      "requireTls": false,
+      "allowSelfSigned": false,
+      "senderName": "Overseerr"
+     }
+    },
+    "discord": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "webhookUrl": "",
+      "enableMentions": true
+     }
+    },
+    "lunasea": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "webhookUrl": ""
+     }
+    },
+    "slack": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "webhookUrl": ""
+     }
+    },
+    "telegram": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "botAPI": "",
+      "chatId": "",
+      "sendSilently": false
+     }
+    },
+    "pushbullet": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "accessToken": ""
+     }
+    },
+    "pushover": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "accessToken": "",
+      "userToken": ""
+     }
+    },
+    "webhook": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "webhookUrl": "",
+      "jsonPayload": "IntcbiAgICBcIm5vdGlmaWNhdGlvbl90eXBlXCI6IFwie3tub3RpZmljYXRpb25fdHlwZX19XCIsXG4gICAgXCJldmVudFwiOiBcInt7ZXZlbnR9fVwiLFxuICAgIFwic3ViamVjdFwiOiBcInt7c3ViamVjdH19XCIsXG4gICAgXCJtZXNzYWdlXCI6IFwie3ttZXNzYWdlfX1cIixcbiAgICBcImltYWdlXCI6IFwie3tpbWFnZX19XCIsXG4gICAgXCJ7e21lZGlhfX1cIjoge1xuICAgICAgICBcIm1lZGlhX3R5cGVcIjogXCJ7e21lZGlhX3R5cGV9fVwiLFxuICAgICAgICBcInRtZGJJZFwiOiBcInt7bWVkaWFfdG1kYmlkfX1cIixcbiAgICAgICAgXCJ0dmRiSWRcIjogXCJ7e21lZGlhX3R2ZGJpZH19XCIsXG4gICAgICAgIFwic3RhdHVzXCI6IFwie3ttZWRpYV9zdGF0dXN9fVwiLFxuICAgICAgICBcInN0YXR1czRrXCI6IFwie3ttZWRpYV9zdGF0dXM0a319XCJcbiAgICB9LFxuICAgIFwie3tyZXF1ZXN0fX1cIjoge1xuICAgICAgICBcInJlcXVlc3RfaWRcIjogXCJ7e3JlcXVlc3RfaWR9fVwiLFxuICAgICAgICBcInJlcXVlc3RlZEJ5X2VtYWlsXCI6IFwie3tyZXF1ZXN0ZWRCeV9lbWFpbH19XCIsXG4gICAgICAgIFwicmVxdWVzdGVkQnlfdXNlcm5hbWVcIjogXCJ7e3JlcXVlc3RlZEJ5X3VzZXJuYW1lfX1cIixcbiAgICAgICAgXCJyZXF1ZXN0ZWRCeV9hdmF0YXJcIjogXCJ7e3JlcXVlc3RlZEJ5X2F2YXRhcn19XCJcbiAgICB9LFxuICAgIFwie3tpc3N1ZX19XCI6IHtcbiAgICAgICAgXCJpc3N1ZV9pZFwiOiBcInt7aXNzdWVfaWR9fVwiLFxuICAgICAgICBcImlzc3VlX3R5cGVcIjogXCJ7e2lzc3VlX3R5cGV9fVwiLFxuICAgICAgICBcImlzc3VlX3N0YXR1c1wiOiBcInt7aXNzdWVfc3RhdHVzfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X2VtYWlsXCI6IFwie3tyZXBvcnRlZEJ5X2VtYWlsfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X3VzZXJuYW1lXCI6IFwie3tyZXBvcnRlZEJ5X3VzZXJuYW1lfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X2F2YXRhclwiOiBcInt7cmVwb3J0ZWRCeV9hdmF0YXJ9fVwiXG4gICAgfSxcbiAgICBcInt7Y29tbWVudH19XCI6IHtcbiAgICAgICAgXCJjb21tZW50X21lc3NhZ2VcIjogXCJ7e2NvbW1lbnRfbWVzc2FnZX19XCIsXG4gICAgICAgIFwiY29tbWVudGVkQnlfZW1haWxcIjogXCJ7e2NvbW1lbnRlZEJ5X2VtYWlsfX1cIixcbiAgICAgICAgXCJjb21tZW50ZWRCeV91c2VybmFtZVwiOiBcInt7Y29tbWVudGVkQnlfdXNlcm5hbWV9fVwiLFxuICAgICAgICBcImNvbW1lbnRlZEJ5X2F2YXRhclwiOiBcInt7Y29tbWVudGVkQnlfYXZhdGFyfX1cIlxuICAgIH0sXG4gICAgXCJ7e2V4dHJhfX1cIjogW11cbn0i"
+     }
+    },
+    "webpush": {
+     "enabled": false,
+     "options": {}
+    },
+    "gotify": {
+     "enabled": false,
+     "types": 0,
+     "options": {
+      "url": "",
+      "token": ""
+     }
     }
+   }
   },
   "jobs": {
-    "plex-recently-added-scan": {
-      "schedule": "0 */5 * * * *"
-    },
-    "plex-full-scan": {
-      "schedule": "0 0 3 * * *"
-    },
-    "radarr-scan": {
-      "schedule": "0 0 4 * * *"
-    },
-    "sonarr-scan": {
-      "schedule": "0 30 4 * * *"
-    },
-    "download-sync": {
-      "schedule": "0 * * * * *"
-    },
-    "download-sync-reset": {
-      "schedule": "0 0 1 * * *"
-    }
+   "plex-recently-added-scan": {
+    "schedule": "0 */5 * * * *"
+   },
+   "plex-full-scan": {
+    "schedule": "0 0 3 * * *"
+   },
+   "radarr-scan": {
+    "schedule": "0 0 4 * * *"
+   },
+   "sonarr-scan": {
+    "schedule": "0 30 4 * * *"
+   },
+   "download-sync": {
+    "schedule": "0 * * * * *"
+   },
+   "download-sync-reset": {
+    "schedule": "0 0 1 * * *"
+   }
   }
-}
+ }

cypress/e2e/pull-to-refresh.cy.ts

@@ -13,7 +13,7 @@ describe('Pull To Refresh', () => {
       url: '/api/v1/*',
     }).as('apiCall');
 
-    cy.get('.searchbar').swipe('bottom', [190, 500]);
+    cy.get('.searchbar').swipe('bottom', [190, 400]);
 
     cy.wait('@apiCall').then((interception) => {
       assert.isNotNull(

cypress/e2e/settings/discover-customization.cy.ts

@@ -96,7 +96,7 @@ describe('Discover Customization', () => {
       .should('be.disabled');
 
     cy.get('#data').clear();
-    cy.get('#data').type('christmas{enter}', { delay: 100 });
+    cy.get('#data').type('time travel{enter}', { delay: 100 });
 
     // Confirming we have some results
     cy.contains('.slider-header', sliderTitle)

next.config.js

@@ -19,6 +19,5 @@ module.exports = {
   },
   experimental: {
     scrollRestoration: true,
-    largePageDataBytes: 256000,
   },
 };

overseerr-api.yml

@@ -1053,7 +1053,7 @@ components:
         status:
           type: number
           example: 0
-          description: Availability of the media. 1 = `UNKNOWN`, 2 = `PENDING`, 3 = `PROCESSING`, 4 = `PARTIALLY_AVAILABLE`, 5 = `AVAILABLE`, 6 = `DELETED`
+          description: Availability of the media. 1 = `UNKNOWN`, 2 = `PENDING`, 3 = `PROCESSING`, 4 = `PARTIALLY_AVAILABLE`, 5 = `AVAILABLE`
         requests:
           type: array
           readOnly: true
@@ -1273,8 +1273,6 @@ components:
               type: string
             userToken:
               type: string
-            sound:
-              type: string
     GotifySettings:
       type: object
       properties:
@@ -1710,9 +1708,6 @@ components:
         pushoverUserKey:
           type: string
           nullable: true
-        pushoverSound:
-          type: string
-          nullable: true
         telegramEnabled:
           type: boolean
         telegramBotUsername:
@@ -2866,33 +2861,6 @@ paths:
       responses:
         '204':
           description: Test notification attempted
-  /settings/notifications/pushover/sounds:
-    get:
-      summary: Get Pushover sounds
-      description: Returns valid Pushover sound options in a JSON array.
-      tags:
-        - settings
-      parameters:
-        - in: query
-          name: token
-          required: true
-          schema:
-            type: string
-            nullable: false
-      responses:
-        '200':
-          description: Returned Pushover settings
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    name:
-                      type: string
-                    description:
-                      type: string
   /settings/notifications/gotify:
     get:
       summary: Get Gotify notification settings
@@ -3647,7 +3615,7 @@ paths:
                 $ref: '#/components/schemas/User'
   /user/{userId}/requests:
     get:
-      summary: Get requests for a specific user
+      summary: Get user by ID
       description: |
         Retrieves a user's requests in a JSON object.
       tags:
@@ -3743,7 +3711,7 @@ paths:
                         example: false
   /user/{userId}/watchlist:
     get:
-      summary: Get the Plex watchlist for a specific user
+      summary: Get user by ID
       description: |
         Retrieves a user's Plex Watchlist in a JSON object.
       tags:
@@ -4218,16 +4186,6 @@ paths:
           schema:
             type: number
             example: 10
-        - in: query
-          name: voteCountGte
-          schema:
-            type: number
-            example: 7
-        - in: query
-          name: voteCountLte
-          schema:
-            type: number
-            example: 10
         - in: query
           name: watchRegion
           schema:
@@ -4460,7 +4418,7 @@ paths:
         - in: query
           name: genre
           schema:
-            type: string
+            type: number
             example: 18
         - in: query
           name: network
@@ -4507,16 +4465,6 @@ paths:
           schema:
             type: number
             example: 10
-        - in: query
-          name: voteCountGte
-          schema:
-            type: number
-            example: 7
-        - in: query
-          name: voteCountLte
-          schema:
-            type: number
-            example: 10
         - in: query
           name: watchRegion
           schema:
@@ -4955,7 +4903,6 @@ paths:
                 processing,
                 unavailable,
                 failed,
-                deleted,
               ]
         - in: query
           name: sort
@@ -5371,63 +5318,6 @@ paths:
                   audienceRating:
                     type: string
                     enum: ['Spilled', 'Upright']
-  /movie/{movieId}/ratingscombined:
-    get:
-      summary: Get RT and IMDB movie ratings combined
-      description: Returns ratings from RottenTomatoes and IMDB based on the provided movieId in a JSON object.
-      tags:
-        - movies
-      parameters:
-        - in: path
-          name: movieId
-          required: true
-          schema:
-            type: number
-            example: 337401
-      responses:
-        '200':
-          description: Ratings returned
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  rt:
-                    type: object
-                    properties:
-                      title:
-                        type: string
-                        example: Mulan
-                      year:
-                        type: number
-                        example: 2020
-                      url:
-                        type: string
-                        example: 'http://www.rottentomatoes.com/m/mulan_2020/'
-                      criticsScore:
-                        type: number
-                        example: 85
-                      criticsRating:
-                        type: string
-                        enum: ['Rotten', 'Fresh', 'Certified Fresh']
-                      audienceScore:
-                        type: number
-                        example: 65
-                      audienceRating:
-                        type: string
-                        enum: ['Spilled', 'Upright']
-                  imdb:
-                    type: object
-                    properties:
-                      title:
-                        type: string
-                        example: I am Legend
-                      url:
-                        type: string
-                        example: 'https://www.imdb.com/title/tt0480249'
-                      criticsScore:
-                        type: number
-                        example: 6.5
   /tv/{tvId}:
     get:
       summary: Get TV details
@@ -5695,16 +5585,7 @@ paths:
           schema:
             type: string
             nullable: true
-            enum:
-              [
-                all,
-                available,
-                partial,
-                allavailable,
-                processing,
-                pending,
-                deleted,
-              ]
+            enum: [all, available, partial, allavailable, processing, pending]
         - in: query
           name: sort
           schema:
@@ -5763,7 +5644,7 @@ paths:
           example: available
           schema:
             type: string
-            enum: [available, partial, processing, pending, unknown, deleted]
+            enum: [available, partial, processing, pending, unknown]
       requestBody:
         content:
           application/json:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "overseerr",
-  "version": "0.1.0",
+  "version": "1.32.0",
   "private": true,
   "scripts": {
     "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
@@ -29,17 +29,17 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@formatjs/intl-displaynames": "6.2.6",
-    "@formatjs/intl-locale": "3.1.1",
-    "@formatjs/intl-pluralrules": "5.1.10",
+    "@formatjs/intl-displaynames": "6.2.3",
+    "@formatjs/intl-locale": "3.0.11",
+    "@formatjs/intl-pluralrules": "5.1.8",
     "@formatjs/intl-utils": "3.8.4",
-    "@headlessui/react": "1.7.12",
-    "@heroicons/react": "2.0.16",
+    "@headlessui/react": "1.7.7",
+    "@heroicons/react": "2.0.13",
     "@supercharge/request-ip": "1.2.0",
     "@svgr/webpack": "6.5.1",
-    "@tanem/react-nprogress": "5.0.30",
-    "ace-builds": "1.15.2",
-    "axios": "1.3.4",
+    "@tanem/react-nprogress": "5.0.22",
+    "ace-builds": "1.14.0",
+    "axios": "1.2.2",
     "axios-rate-limit": "1.3.0",
     "bcrypt": "5.1.0",
     "bowser": "2.11.0",
@@ -47,7 +47,7 @@
     "cookie-parser": "1.4.6",
     "copy-to-clipboard": "3.3.3",
     "country-flag-icons": "1.5.5",
-    "cronstrue": "2.23.0",
+    "cronstrue": "2.21.0",
     "csurf": "1.11.0",
     "date-fns": "2.29.3",
     "dayjs": "1.11.7",
@@ -63,22 +63,23 @@
     "next": "12.3.4",
     "node-cache": "5.1.2",
     "node-gyp": "9.3.1",
-    "node-schedule": "2.1.1",
-    "nodemailer": "6.9.1",
-    "openpgp": "5.7.0",
+    "node-schedule": "2.1.0",
+    "nodemailer": "6.8.0",
+    "openpgp": "5.5.0",
     "plex-api": "5.3.2",
     "pug": "3.0.2",
+    "pulltorefreshjs": "0.1.22",
     "react": "18.2.0",
     "react-ace": "10.1.0",
     "react-animate-height": "2.1.2",
-    "react-aria": "3.23.0",
+    "react-aria": "3.22.0",
     "react-dom": "18.2.0",
-    "react-intersection-observer": "9.4.3",
-    "react-intl": "6.2.10",
-    "react-markdown": "8.0.5",
+    "react-intersection-observer": "9.4.1",
+    "react-intl": "6.2.5",
+    "react-markdown": "8.0.4",
     "react-popper-tooltip": "4.4.2",
     "react-select": "5.7.0",
-    "react-spring": "9.7.1",
+    "react-spring": "9.6.1",
     "react-tailwindcss-datepicker-sct": "1.3.4",
     "react-toast-notifications": "2.5.1",
     "react-truncate-markup": "5.1.2",
@@ -87,41 +88,42 @@
     "secure-random-password": "0.2.3",
     "semver": "7.3.8",
     "sqlite3": "5.1.4",
-    "swagger-ui-express": "4.6.2",
-    "swr": "2.0.4",
-    "typeorm": "0.3.12",
+    "swagger-ui-express": "4.6.0",
+    "swr": "2.0.0",
+    "typeorm": "0.3.11",
     "web-push": "3.5.0",
     "winston": "3.8.2",
     "winston-daily-rotate-file": "4.7.1",
     "xml2js": "0.4.23",
     "yamljs": "0.3.0",
     "yup": "0.32.11",
-    "zod": "3.20.6"
+    "zod": "3.20.2"
   },
   "devDependencies": {
-    "@babel/cli": "7.21.0",
-    "@commitlint/cli": "17.4.4",
-    "@commitlint/config-conventional": "17.4.4",
+    "@babel/cli": "7.20.7",
+    "@commitlint/cli": "17.4.0",
+    "@commitlint/config-conventional": "17.4.0",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/commit-analyzer": "9.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@tailwindcss/aspect-ratio": "0.4.2",
     "@tailwindcss/forms": "0.5.3",
-    "@tailwindcss/typography": "0.5.9",
+    "@tailwindcss/typography": "0.5.8",
     "@types/bcrypt": "5.0.0",
     "@types/cookie-parser": "1.4.3",
     "@types/country-flag-icons": "1.2.0",
     "@types/csurf": "1.11.2",
     "@types/email-templates": "8.0.4",
-    "@types/express": "4.17.17",
-    "@types/express-session": "1.17.6",
+    "@types/express": "4.17.15",
+    "@types/express-session": "1.17.5",
     "@types/lodash": "4.14.191",
     "@types/node": "17.0.36",
     "@types/node-schedule": "2.1.0",
     "@types/nodemailer": "6.4.7",
-    "@types/react": "18.0.28",
-    "@types/react-dom": "18.0.11",
+    "@types/pulltorefreshjs": "0.1.5",
+    "@types/react": "18.0.26",
+    "@types/react-dom": "18.0.10",
     "@types/react-transition-group": "4.4.5",
     "@types/secure-random-password": "0.2.1",
     "@types/semver": "7.3.13",
@@ -130,46 +132,45 @@
     "@types/xml2js": "0.4.11",
     "@types/yamljs": "0.2.31",
     "@types/yup": "0.29.14",
-    "@typescript-eslint/eslint-plugin": "5.54.0",
-    "@typescript-eslint/parser": "5.54.0",
+    "@typescript-eslint/eslint-plugin": "5.48.0",
+    "@typescript-eslint/parser": "5.48.0",
     "autoprefixer": "10.4.13",
     "babel-plugin-react-intl": "8.2.25",
     "babel-plugin-react-intl-auto": "3.3.0",
-    "commitizen": "4.3.0",
+    "commitizen": "4.2.6",
     "copyfiles": "2.4.1",
     "cy-mobile-commands": "0.3.0",
-    "cypress": "12.7.0",
+    "cypress": "12.3.0",
     "cz-conventional-changelog": "3.3.0",
-    "eslint": "8.35.0",
+    "eslint": "8.31.0",
     "eslint-config-next": "12.3.4",
     "eslint-config-prettier": "8.6.0",
-    "eslint-plugin-formatjs": "4.9.0",
-    "eslint-plugin-jsx-a11y": "6.7.1",
+    "eslint-plugin-formatjs": "4.3.9",
+    "eslint-plugin-jsx-a11y": "6.6.1",
     "eslint-plugin-no-relative-import-paths": "1.5.2",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-react": "7.32.2",
+    "eslint-plugin-react": "7.31.11",
     "eslint-plugin-react-hooks": "4.6.0",
     "extract-react-intl-messages": "4.1.1",
     "husky": "8.0.3",
-    "lint-staged": "13.1.2",
+    "lint-staged": "13.1.0",
     "nodemon": "2.0.20",
-    "postcss": "8.4.21",
-    "prettier": "2.8.4",
-    "prettier-plugin-organize-imports": "3.2.2",
-    "prettier-plugin-tailwindcss": "0.2.3",
+    "postcss": "8.4.20",
+    "prettier": "2.8.1",
+    "prettier-plugin-organize-imports": "3.2.1",
+    "prettier-plugin-tailwindcss": "0.2.1",
     "semantic-release": "19.0.5",
     "semantic-release-docker-buildx": "1.0.1",
-    "tailwindcss": "3.2.7",
+    "tailwindcss": "3.2.4",
     "ts-node": "10.9.1",
     "tsc-alias": "1.8.2",
     "tsconfig-paths": "4.1.2",
-    "typescript": "4.9.5"
+    "typescript": "4.9.4"
   },
   "resolutions": {
     "sqlite3/node-gyp": "8.4.1",
-    "@types/react": "18.0.28",
-    "@types/react-dom": "18.0.11",
-    "@types/express-session": "1.17.6"
+    "@types/react": "18.0.26",
+    "@types/react-dom": "18.0.10"
   },
   "config": {
     "commitizen": {

public/offline.html

@@ -17,7 +17,7 @@
       }
 
       h1 {
-        color: #6366f1;
+        color: #6366F1;
       }
 
       p {
@@ -37,7 +37,7 @@
     <!-- Inline the page's JavaScript file. -->
     <script>
       // Manual reload feature.
-      document.querySelector('button').addEventListener('click', () => {
+      document.querySelector("button").addEventListener("click", () => {
         window.location.reload();
       });
 

public/sw.js

@@ -4,30 +4,30 @@
 // This variable is intentionally declared and unused.
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const OFFLINE_VERSION = 3;
-const CACHE_NAME = 'offline';
+const CACHE_NAME = "offline";
 // Customize this with a different URL if needed.
-const OFFLINE_URL = '/offline.html';
+const OFFLINE_URL = "/offline.html";
 
-self.addEventListener('install', (event) => {
+self.addEventListener("install", (event) => {
   event.waitUntil(
     (async () => {
       const cache = await caches.open(CACHE_NAME);
       // Setting {cache: 'reload'} in the new request will ensure that the
       // response isn't fulfilled from the HTTP cache; i.e., it will be from
       // the network.
-      await cache.add(new Request(OFFLINE_URL, { cache: 'reload' }));
+      await cache.add(new Request(OFFLINE_URL, { cache: "reload" }));
     })()
   );
   // Force the waiting service worker to become the active service worker.
   self.skipWaiting();
 });
 
-self.addEventListener('activate', (event) => {
+self.addEventListener("activate", (event) => {
   event.waitUntil(
     (async () => {
       // Enable navigation preload if it's supported.
       // See https://developers.google.com/web/updates/2017/02/navigation-preload
-      if ('navigationPreload' in self.registration) {
+      if ("navigationPreload" in self.registration) {
         await self.registration.navigationPreload.enable();
       }
     })()
@@ -37,10 +37,10 @@ self.addEventListener('activate', (event) => {
   clients.claim();
 });
 
-self.addEventListener('fetch', (event) => {
+self.addEventListener("fetch", (event) => {
   // We only want to call event.respondWith() if this is a navigation request
   // for an HTML page.
-  if (event.request.mode === 'navigate') {
+  if (event.request.mode === "navigate") {
     event.respondWith(
       (async () => {
         try {
@@ -59,7 +59,7 @@ self.addEventListener('fetch', (event) => {
           // If fetch() returns a valid HTTP response with a response code in
           // the 4xx or 5xx range, the catch() will NOT be called.
           // eslint-disable-next-line no-console
-          console.log('Fetch failed; returning offline page instead.', error);
+          console.log("Fetch failed; returning offline page instead.", error);
 
           const cache = await caches.open(CACHE_NAME);
           const cachedResponse = await cache.match(OFFLINE_URL);
@@ -85,13 +85,15 @@ self.addEventListener('push', (event) => {
       requestId: payload.requestId,
     },
     actions: [],
-  };
+  }
 
-  if (payload.actionUrl) {
-    options.actions.push({
-      action: 'view',
-      title: payload.actionUrlTitle ?? 'View',
-    });
+  if (payload.actionUrl){
+    options.actions.push(
+      {
+        action: 'view',
+        title: payload.actionUrlTitle ?? 'View',
+      }
+    );
   }
 
   if (payload.notificationType === 'MEDIA_PENDING') {
@@ -107,29 +109,27 @@ self.addEventListener('push', (event) => {
     );
   }
 
-  event.waitUntil(self.registration.showNotification(payload.subject, options));
+  event.waitUntil(
+    self.registration.showNotification(payload.subject, options)
+  );
 });
 
-self.addEventListener(
-  'notificationclick',
-  (event) => {
-    const notificationData = event.notification.data;
+self.addEventListener('notificationclick', (event) => {
+  const notificationData = event.notification.data;
 
-    event.notification.close();
+  event.notification.close();
 
-    if (event.action === 'approve') {
-      fetch(`/api/v1/request/${notificationData.requestId}/approve`, {
-        method: 'POST',
-      });
-    } else if (event.action === 'decline') {
-      fetch(`/api/v1/request/${notificationData.requestId}/decline`, {
-        method: 'POST',
-      });
-    }
-
-    if (notificationData.actionUrl) {
-      clients.openWindow(notificationData.actionUrl);
-    }
-  },
-  false
-);
+  if (event.action === 'approve') {
+    fetch(`/api/v1/request/${notificationData.requestId}/approve`, {
+      method: 'POST',
+    });
+  } else if (event.action === 'decline') {
+    fetch(`/api/v1/request/${notificationData.requestId}/decline`, {
+      method: 'POST',
+    });
+  }
+  
+  if (notificationData.actionUrl) {
+    clients.openWindow(notificationData.actionUrl);
+  }
+}, false);

server/api/plexapi.ts

@@ -226,13 +226,12 @@ class PlexAPI {
     id: string,
     options: { addedAt: number } = {
       addedAt: Date.now() - 1000 * 60 * 60,
-    },
-    mediaType: 'movie' | 'show'
+    }
   ): Promise<PlexLibraryItem[]> {
     const response = await this.plexClient.query<PlexLibraryResponse>({
-      uri: `/library/sections/${id}/all?type=${
-        mediaType === 'show' ? '4' : '1'
-      }&sort=addedAt%3Adesc&addedAt>>=${Math.floor(options.addedAt / 1000)}`,
+      uri: `/library/sections/${id}/all?sort=addedAt%3Adesc&addedAt>>=${Math.floor(
+        options.addedAt / 1000
+      )}`,
       extraHeaders: {
         'X-Plex-Container-Start': `0`,
         'X-Plex-Container-Size': `500`,

server/api/plextv.ts

@@ -82,6 +82,21 @@ interface ServerResponse {
   };
 }
 
+interface FriendResponse {
+  MediaContainer: {
+    User: {
+      $: {
+        id: string;
+        title: string;
+        username: string;
+        email: string;
+        thumb: string;
+      };
+      Server?: ServerResponse[];
+    }[];
+  };
+}
+
 interface UsersResponse {
   MediaContainer: {
     User: {
@@ -219,6 +234,19 @@ class PlexTvAPI extends ExternalAPI {
     }
   }
 
+  public async getFriends(): Promise<FriendResponse> {
+    const response = await this.axios.get('/pms/friends/all', {
+      transformResponse: [],
+      responseType: 'text',
+    });
+
+    const parsedXml = (await xml2js.parseStringPromise(
+      response.data
+    )) as FriendResponse;
+
+    return parsedXml;
+  }
+
   public async checkUserAccess(userId: number): Promise<boolean> {
     const settings = getSettings();
 
@@ -227,9 +255,9 @@ class PlexTvAPI extends ExternalAPI {
         throw new Error('Plex is not configured!');
       }
 
-      const usersResponse = await this.getUsers();
+      const friends = await this.getFriends();
 
-      const users = usersResponse.MediaContainer.User;
+      const users = friends.MediaContainer.User;
 
       const user = users.find((u) => parseInt(u.$.id) === userId);
 

server/api/pushover.ts

@@ -1,56 +0,0 @@
-import ExternalAPI from './externalapi';
-
-interface PushoverSoundsResponse {
-  sounds: {
-    [name: string]: string;
-  };
-  status: number;
-  request: string;
-}
-
-export interface PushoverSound {
-  name: string;
-  description: string;
-}
-
-export const mapSounds = (sounds: {
-  [name: string]: string;
-}): PushoverSound[] =>
-  Object.entries(sounds).map(
-    ([name, description]) =>
-      ({
-        name,
-        description,
-      } as PushoverSound)
-  );
-
-class PushoverAPI extends ExternalAPI {
-  constructor() {
-    super(
-      'https://api.pushover.net/1',
-      {},
-      {
-        headers: {
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
-        },
-      }
-    );
-  }
-
-  public async getSounds(appToken: string): Promise<PushoverSound[]> {
-    try {
-      const data = await this.get<PushoverSoundsResponse>('/sounds.json', {
-        params: {
-          token: appToken,
-        },
-      });
-
-      return mapSounds(data.sounds);
-    } catch (e) {
-      throw new Error(`[Pushover] Failed to retrieve sounds: ${e.message}`);
-    }
-  }
-}
-
-export default PushoverAPI;

server/api/rating/imdbRadarrProxy.ts

@@ -1,195 +0,0 @@
-import ExternalAPI from '@server/api/externalapi';
-import cacheManager from '@server/lib/cache';
-
-type IMDBRadarrProxyResponse = IMDBMovie[];
-
-interface IMDBMovie {
-  ImdbId: string;
-  Overview: string;
-  Title: string;
-  OriginalTitle: string;
-  TitleSlug: string;
-  Ratings: Rating[];
-  MovieRatings: MovieRatings;
-  Runtime: number;
-  Images: Image[];
-  Genres: string[];
-  Popularity: number;
-  Premier: string;
-  InCinema: string;
-  PhysicalRelease: any;
-  DigitalRelease: string;
-  Year: number;
-  AlternativeTitles: AlternativeTitle[];
-  Translations: Translation[];
-  Recommendations: Recommendation[];
-  Credits: Credits;
-  Studio: string;
-  YoutubeTrailerId: string;
-  Certifications: Certification[];
-  Status: any;
-  Collection: Collection;
-  OriginalLanguage: string;
-  Homepage: string;
-  TmdbId: number;
-}
-
-interface Rating {
-  Count: number;
-  Value: number;
-  Origin: string;
-  Type: string;
-}
-
-interface MovieRatings {
-  Tmdb: Tmdb;
-  Imdb: Imdb;
-  Metacritic: Metacritic;
-  RottenTomatoes: RottenTomatoes;
-}
-
-interface Tmdb {
-  Count: number;
-  Value: number;
-  Type: string;
-}
-
-interface Imdb {
-  Count: number;
-  Value: number;
-  Type: string;
-}
-
-interface Metacritic {
-  Count: number;
-  Value: number;
-  Type: string;
-}
-
-interface RottenTomatoes {
-  Count: number;
-  Value: number;
-  Type: string;
-}
-
-interface Image {
-  CoverType: string;
-  Url: string;
-}
-
-interface AlternativeTitle {
-  Title: string;
-  Type: string;
-  Language: string;
-}
-
-interface Translation {
-  Title: string;
-  Overview: string;
-  Language: string;
-}
-
-interface Recommendation {
-  TmdbId: number;
-  Title: string;
-}
-
-interface Credits {
-  Cast: Cast[];
-  Crew: Crew[];
-}
-
-interface Cast {
-  Name: string;
-  Order: number;
-  Character: string;
-  TmdbId: number;
-  CreditId: string;
-  Images: Image2[];
-}
-
-interface Image2 {
-  CoverType: string;
-  Url: string;
-}
-
-interface Crew {
-  Name: string;
-  Job: string;
-  Department: string;
-  TmdbId: number;
-  CreditId: string;
-  Images: Image3[];
-}
-
-interface Image3 {
-  CoverType: string;
-  Url: string;
-}
-
-interface Certification {
-  Country: string;
-  Certification: string;
-}
-
-interface Collection {
-  Name: string;
-  Images: any;
-  Overview: any;
-  Translations: any;
-  Parts: any;
-  TmdbId: number;
-}
-
-export interface IMDBRating {
-  title: string;
-  url: string;
-  criticsScore: number;
-}
-
-/**
- * This is a best-effort API. The IMDB API is technically
- * private and getting access costs money/requires approval.
- *
- * Radarr hosts a public proxy that's in use by all Radarr instances.
- */
-class IMDBRadarrProxy extends ExternalAPI {
-  constructor() {
-    super('https://api.radarr.video/v1', {
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-      },
-      nodeCache: cacheManager.getCache('imdb').data,
-    });
-  }
-
-  /**
-   * Ask the Radarr IMDB Proxy for the movie
-   *
-   * @param IMDBid Id of IMDB movie
-   */
-  public async getMovieRatings(IMDBid: string): Promise<IMDBRating | null> {
-    try {
-      const data = await this.get<IMDBRadarrProxyResponse>(
-        `/movie/imdb/${IMDBid}`
-      );
-
-      if (!data?.length || data[0].ImdbId !== IMDBid) {
-        return null;
-      }
-
-      return {
-        title: data[0].Title,
-        url: `https://www.imdb.com/title/${data[0].ImdbId}`,
-        criticsScore: data[0].MovieRatings.Imdb.Value,
-      };
-    } catch (e) {
-      throw new Error(
-        `[IMDB RADARR PROXY API] Failed to retrieve movie ratings: ${e.message}`
-      );
-    }
-  }
-}
-
-export default IMDBRadarrProxy;

server/api/ratings.ts

@@ -1,7 +0,0 @@
-import { type IMDBRating } from '@server/api/rating/imdbRadarrProxy';
-import { type RTRating } from '@server/api/rating/rottentomatoes';
-
-export interface RatingResponse {
-  rt?: RTRating;
-  imdb?: IMDBRating;
-}

server/api/rottentomatoes.ts

@@ -1,6 +1,6 @@
-import ExternalAPI from '@server/api/externalapi';
 import cacheManager from '@server/lib/cache';
 import { getSettings } from '@server/lib/settings';
+import ExternalAPI from './externalapi';
 
 interface RTAlgoliaSearchResponse {
   results: {
@@ -17,7 +17,7 @@ interface RTAlgoliaHit {
   title: string;
   titles: string[];
   description: string;
-  releaseYear: number;
+  releaseYear: string;
   rating: string;
   genres: string[];
   updateDate: string;
@@ -111,19 +111,22 @@ class RottenTomatoes extends ExternalAPI {
 
       // First, attempt to match exact name and year
       let movie = contentResults.hits.find(
-        (movie) => movie.releaseYear === year && movie.title === name
+        (movie) => movie.releaseYear === year.toString() && movie.title === name
       );
 
       // If we don't find a movie, try to match partial name and year
       if (!movie) {
         movie = contentResults.hits.find(
-          (movie) => movie.releaseYear === year && movie.title.includes(name)
+          (movie) =>
+            movie.releaseYear === year.toString() && movie.title.includes(name)
         );
       }
 
       // If we still dont find a movie, try to match just on year
       if (!movie) {
-        movie = contentResults.hits.find((movie) => movie.releaseYear === year);
+        movie = contentResults.hits.find(
+          (movie) => movie.releaseYear === year.toString()
+        );
       }
 
       // One last try, try exact name match only
@@ -144,9 +147,6 @@ class RottenTomatoes extends ExternalAPI {
           ? 'Fresh'
           : 'Rotten',
         criticsScore: movie.rottenTomatoes.criticsScore,
-        audienceRating:
-          movie.rottenTomatoes.audienceScore >= 60 ? 'Upright' : 'Spilled',
-        audienceScore: movie.rottenTomatoes.audienceScore,
         year: Number(movie.releaseYear),
       };
     } catch (e) {
@@ -181,7 +181,7 @@ class RottenTomatoes extends ExternalAPI {
 
       if (year) {
         tvshow = contentResults.hits.find(
-          (series) => series.releaseYear === year
+          (series) => series.releaseYear === year.toString()
         );
       }
 
@@ -195,9 +195,6 @@ class RottenTomatoes extends ExternalAPI {
         criticsRating:
           tvshow.rottenTomatoes.criticsScore >= 60 ? 'Fresh' : 'Rotten',
         criticsScore: tvshow.rottenTomatoes.criticsScore,
-        audienceRating:
-          tvshow.rottenTomatoes.audienceScore >= 60 ? 'Upright' : 'Spilled',
-        audienceScore: tvshow.rottenTomatoes.audienceScore,
         year: Number(tvshow.releaseYear),
       };
     } catch (e) {

server/api/servarr/sonarr.ts

@@ -1,7 +1,7 @@
 import logger from '@server/logger';
 import ServarrBase from './base';
 
-export interface SonarrSeason {
+interface SonarrSeason {
   seasonNumber: number;
   monitored: boolean;
   statistics?: {
@@ -76,15 +76,6 @@ export interface SonarrSeries {
     ignoreEpisodesWithoutFiles?: boolean;
     searchForMissingEpisodes?: boolean;
   };
-  statistics: {
-    seasonCount: number;
-    episodeFileCount: number;
-    episodeCount: number;
-    totalEpisodeCount: number;
-    sizeOnDisk: number;
-    releaseGroups: string[];
-    percentOfEpisodes: number;
-  };
 }
 
 export interface AddSeriesOptions {
@@ -125,16 +116,6 @@ class SonarrAPI extends ServarrBase<{
     }
   }
 
-  public async getSeriesById(id: number): Promise<SonarrSeries> {
-    try {
-      const response = await this.axios.get<SonarrSeries>(`/series/${id}`);
-
-      return response.data;
-    } catch (e) {
-      throw new Error(`[Sonarr] Failed to retrieve series by ID: ${e.message}`);
-    }
-  }
-
   public async getSeriesByTitle(title: string): Promise<SonarrSeries[]> {
     try {
       const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {

server/api/themoviedb/index.ts

@@ -65,8 +65,6 @@ interface DiscoverMovieOptions {
   withRuntimeLte?: string;
   voteAverageGte?: string;
   voteAverageLte?: string;
-  voteCountGte?: string;
-  voteCountLte?: string;
   originalLanguage?: string;
   genre?: string;
   studio?: string;
@@ -85,11 +83,9 @@ interface DiscoverTvOptions {
   withRuntimeLte?: string;
   voteAverageGte?: string;
   voteAverageLte?: string;
-  voteCountGte?: string;
-  voteCountLte?: string;
   includeEmptyReleaseDate?: boolean;
   originalLanguage?: string;
-  genre?: string;
+  genre?: number;
   network?: number;
   keywords?: string;
   sortBy?: SortOptions;
@@ -464,8 +460,6 @@ class TheMovieDb extends ExternalAPI {
     withRuntimeLte,
     voteAverageGte,
     voteAverageLte,
-    voteCountGte,
-    voteCountLte,
     watchProviders,
     watchRegion,
   }: DiscoverMovieOptions = {}): Promise<TmdbSearchMovieResponse> => {
@@ -510,8 +504,6 @@ class TheMovieDb extends ExternalAPI {
           'with_runtime.lte': withRuntimeLte,
           'vote_average.gte': voteAverageGte,
           'vote_average.lte': voteAverageLte,
-          'vote_count.gte': voteCountGte,
-          'vote_count.lte': voteCountLte,
           watch_region: watchRegion,
           with_watch_providers: watchProviders,
         },
@@ -538,8 +530,6 @@ class TheMovieDb extends ExternalAPI {
     withRuntimeLte,
     voteAverageGte,
     voteAverageLte,
-    voteCountGte,
-    voteCountLte,
     watchProviders,
     watchRegion,
   }: DiscoverTvOptions = {}): Promise<TmdbSearchTvResponse> => {
@@ -584,8 +574,6 @@ class TheMovieDb extends ExternalAPI {
           'with_runtime.lte': withRuntimeLte,
           'vote_average.gte': voteAverageGte,
           'vote_average.lte': voteAverageLte,
-          'vote_count.gte': voteCountGte,
-          'vote_count.lte': voteCountLte,
           with_watch_providers: watchProviders,
           watch_region: watchRegion,
         },

server/api/themoviedb/interfaces.ts

@@ -28,18 +28,6 @@ export interface TmdbTvResult extends TmdbMediaResult {
   first_air_date: string;
 }
 
-export interface TmdbCollectionResult {
-  id: number;
-  media_type: 'collection';
-  title: string;
-  original_title: string;
-  adult: boolean;
-  poster_path?: string;
-  backdrop_path?: string;
-  overview: string;
-  original_language: string;
-}
-
 export interface TmdbPersonResult {
   id: number;
   name: string;
@@ -57,12 +45,7 @@ interface TmdbPaginatedResponse {
 }
 
 export interface TmdbSearchMultiResponse extends TmdbPaginatedResponse {
-  results: (
-    | TmdbMovieResult
-    | TmdbTvResult
-    | TmdbPersonResult
-    | TmdbCollectionResult
-  )[];
+  results: (TmdbMovieResult | TmdbTvResult | TmdbPersonResult)[];
 }
 
 export interface TmdbSearchMovieResponse extends TmdbPaginatedResponse {

server/constants/discover.ts

@@ -20,8 +20,6 @@ export enum DiscoverSliderType {
   TMDB_SEARCH,
   TMDB_STUDIO,
   TMDB_NETWORK,
-  TMDB_MOVIE_STREAMING_SERVICES,
-  TMDB_TV_STREAMING_SERVICES,
 }
 
 export const defaultSliders: Partial<DiscoverSlider>[] = [

server/constants/media.ts

@@ -3,7 +3,6 @@ export enum MediaRequestStatus {
   APPROVED,
   DECLINED,
   FAILED,
-  COMPLETED,
 }
 
 export enum MediaType {
@@ -17,5 +16,4 @@ export enum MediaStatus {
   PROCESSING,
   PARTIALLY_AVAILABLE,
   AVAILABLE,
-  DELETED,
 }

server/entity/Media.ts

@@ -1,10 +1,6 @@
 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 type { DownloadingItem } from '@server/lib/downloadtracker';
 import downloadTracker from '@server/lib/downloadtracker';
@@ -12,7 +8,6 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import {
   AfterLoad,
-  AfterUpdate,
   Column,
   CreateDateColumn,
   Entity,
@@ -119,29 +114,29 @@ class Media {
   @Column({ type: 'datetime', nullable: true })
   public mediaAddedAt: Date;
 
-  @Column({ nullable: true, type: 'int' })
-  public serviceId?: number | null;
+  @Column({ nullable: true })
+  public serviceId?: number;
 
-  @Column({ nullable: true, type: 'int' })
-  public serviceId4k?: number | null;
+  @Column({ nullable: true })
+  public serviceId4k?: number;
 
-  @Column({ nullable: true, type: 'int' })
-  public externalServiceId?: number | null;
+  @Column({ nullable: true })
+  public externalServiceId?: number;
 
-  @Column({ nullable: true, type: 'int' })
-  public externalServiceId4k?: number | null;
+  @Column({ nullable: true })
+  public externalServiceId4k?: number;
 
-  @Column({ nullable: true, type: 'varchar' })
-  public externalServiceSlug?: string | null;
+  @Column({ nullable: true })
+  public externalServiceSlug?: string;
 
-  @Column({ nullable: true, type: 'varchar' })
-  public externalServiceSlug4k?: string | null;
+  @Column({ nullable: true })
+  public externalServiceSlug4k?: string;
 
-  @Column({ nullable: true, type: 'varchar' })
-  public ratingKey?: string | null;
+  @Column({ nullable: true })
+  public ratingKey?: string;
 
-  @Column({ nullable: true, type: 'varchar' })
-  public ratingKey4k?: string | null;
+  @Column({ nullable: true })
+  public ratingKey4k?: string;
 
   public serviceUrl?: string;
   public serviceUrl4k?: string;
@@ -265,9 +260,7 @@ class Media {
     if (this.mediaType === MediaType.MOVIE) {
       if (
         this.externalServiceId !== undefined &&
-        this.externalServiceId !== null &&
-        this.serviceId !== undefined &&
-        this.serviceId !== null
+        this.serviceId !== undefined
       ) {
         this.downloadStatus = downloadTracker.getMovieProgress(
           this.serviceId,
@@ -277,9 +270,7 @@ class Media {
 
       if (
         this.externalServiceId4k !== undefined &&
-        this.externalServiceId4k !== null &&
-        this.serviceId4k !== undefined &&
-        this.serviceId4k !== null
+        this.serviceId4k !== undefined
       ) {
         this.downloadStatus4k = downloadTracker.getMovieProgress(
           this.serviceId4k,
@@ -291,9 +282,7 @@ class Media {
     if (this.mediaType === MediaType.TV) {
       if (
         this.externalServiceId !== undefined &&
-        this.externalServiceId !== null &&
-        this.serviceId !== undefined &&
-        this.serviceId !== null
+        this.serviceId !== undefined
       ) {
         this.downloadStatus = downloadTracker.getSeriesProgress(
           this.serviceId,
@@ -303,9 +292,7 @@ class Media {
 
       if (
         this.externalServiceId4k !== undefined &&
-        this.externalServiceId4k !== null &&
-        this.serviceId4k !== undefined &&
-        this.serviceId4k !== null
+        this.serviceId4k !== undefined
       ) {
         this.downloadStatus4k = downloadTracker.getSeriesProgress(
           this.serviceId4k,
@@ -314,37 +301,6 @@ class Media {
       }
     }
   }
-
-  @AfterUpdate()
-  public async updateRelatedMediaRequest(): Promise<void> {
-    const requestRepository = getRepository(MediaRequest);
-
-    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) {
-      relatedRequests.forEach((request) => {
-        if (
-          this[request.is4k ? 'status4k' : 'status'] ===
-            MediaStatus.AVAILABLE ||
-          this[request.is4k ? 'status4k' : 'status'] === MediaStatus.DELETED
-        ) {
-          request.status = MediaRequestStatus.COMPLETED;
-        }
-      });
-      requestRepository.save(relatedRequests);
-    }
-  }
 }
 
 export default Media;

server/entity/MediaRequest.ts

@@ -167,8 +167,7 @@ export class MediaRequest {
       // If there is an existing movie request that isn't declined, don't allow a new one.
       if (
         requestBody.mediaType === MediaType.MOVIE &&
-        existing[0].status !== MediaRequestStatus.DECLINED &&
-        existing[0].status !== MediaRequestStatus.COMPLETED
+        existing[0].status !== MediaRequestStatus.DECLINED
       ) {
         logger.warn('Duplicate request for media blocked', {
           tmdbId: tmdbMedia.id,
@@ -261,8 +260,7 @@ export class MediaRequest {
           .filter(
             (request) =>
               request.is4k === requestBody.is4k &&
-              request.status !== MediaRequestStatus.DECLINED &&
-              request.status !== MediaRequestStatus.COMPLETED
+              request.status !== MediaRequestStatus.DECLINED
           )
           .reduce((seasons, request) => {
             const combinedSeasons = request.seasons.map(
@@ -281,9 +279,7 @@ export class MediaRequest {
             .filter(
               (season) =>
                 season[requestBody.is4k ? 'status4k' : 'status'] !==
-                  MediaStatus.UNKNOWN &&
-                season[requestBody.is4k ? 'status4k' : 'status'] !==
-                  MediaStatus.DELETED
+                MediaStatus.UNKNOWN
             )
             .map((season) => season.seasonNumber),
         ];
@@ -587,8 +583,7 @@ export class MediaRequest {
 
     if (
       media.mediaType === MediaType.MOVIE &&
-      this.status === MediaRequestStatus.DECLINED &&
-      media[this.is4k ? 'status4k' : 'status'] !== MediaStatus.DELETED
+      this.status === MediaRequestStatus.DECLINED
     ) {
       media[this.is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
       mediaRepository.save(media);
@@ -606,8 +601,7 @@ export class MediaRequest {
       media.requests.filter(
         (request) => request.status === MediaRequestStatus.PENDING
       ).length === 0 &&
-      media[this.is4k ? 'status4k' : 'status'] === MediaStatus.PENDING &&
-      media[this.is4k ? 'status4k' : 'status'] !== MediaStatus.DELETED
+      media[this.is4k ? 'status4k' : 'status'] === MediaStatus.PENDING
     ) {
       media[this.is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
       mediaRepository.save(media);
@@ -710,7 +704,7 @@ export class MediaRequest {
 
         let rootFolder = radarrSettings.activeDirectory;
         let qualityProfile = radarrSettings.activeProfileId;
-        let tags = radarrSettings.tags ? [...radarrSettings.tags] : [];
+        let tags = radarrSettings.tags;
 
         if (
           this.rootFolder &&
@@ -770,38 +764,6 @@ export class MediaRequest {
           return;
         }
 
-        if (radarrSettings.tagRequests) {
-          let userTag = (await radarr.getTags()).find((v) =>
-            v.label.startsWith(this.requestedBy.id + ' - ')
-          );
-          if (!userTag) {
-            logger.info(`Requester has no active tag. Creating new`, {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-              userId: this.requestedBy.id,
-              newTag:
-                this.requestedBy.id + ' - ' + this.requestedBy.displayName,
-            });
-            userTag = await radarr.createTag({
-              label: this.requestedBy.id + ' - ' + this.requestedBy.displayName,
-            });
-          }
-          if (userTag.id) {
-            if (!tags?.find((v) => v === userTag?.id)) {
-              tags?.push(userTag.id);
-            }
-          } else {
-            logger.warn(`Requester has no tag and failed to add one`, {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-              userId: this.requestedBy.id,
-              radarrServer: radarrSettings.hostname + ':' + radarrSettings.port,
-            });
-          }
-        }
-
         if (
           media[this.is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
         ) {
@@ -990,7 +952,7 @@ export class MediaRequest {
             (keyword) => keyword.id === ANIME_KEYWORD_ID
           )
         ) {
-          seriesType = sonarrSettings.animeSeriesType ?? 'anime';
+          seriesType = 'anime';
         }
 
         let rootFolder =
@@ -1008,11 +970,7 @@ export class MediaRequest {
         let tags =
           seriesType === 'anime'
             ? sonarrSettings.animeTags
-              ? [...sonarrSettings.animeTags]
-              : []
-            : sonarrSettings.tags
-            ? [...sonarrSettings.tags]
-            : [];
+            : sonarrSettings.tags;
 
         if (
           this.rootFolder &&
@@ -1064,38 +1022,6 @@ export class MediaRequest {
           });
         }
 
-        if (sonarrSettings.tagRequests) {
-          let userTag = (await sonarr.getTags()).find((v) =>
-            v.label.startsWith(this.requestedBy.id + ' - ')
-          );
-          if (!userTag) {
-            logger.info(`Requester has no active tag. Creating new`, {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-              userId: this.requestedBy.id,
-              newTag:
-                this.requestedBy.id + ' - ' + this.requestedBy.displayName,
-            });
-            userTag = await sonarr.createTag({
-              label: this.requestedBy.id + ' - ' + this.requestedBy.displayName,
-            });
-          }
-          if (userTag.id) {
-            if (!tags?.find((v) => v === userTag?.id)) {
-              tags?.push(userTag.id);
-            }
-          } else {
-            logger.warn(`Requester has no tag and failed to add one`, {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-              userId: this.requestedBy.id,
-              sonarrServer: sonarrSettings.hostname + ':' + sonarrSettings.port,
-            });
-          }
-        }
-
         const sonarrSeriesOptions: AddSeriesOptions = {
           profileId: qualityProfile,
           languageProfileId: languageProfile,
@@ -1261,5 +1187,3 @@ export class MediaRequest {
     }
   }
 }
-
-export default MediaRequest;

server/entity/Season.ts

@@ -1,8 +1,5 @@
-import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
-import SeasonRequest from '@server/entity/SeasonRequest';
+import { MediaStatus } from '@server/constants/media';
 import {
-  AfterUpdate,
   Column,
   CreateDateColumn,
   Entity,
@@ -38,37 +35,6 @@ class Season {
   constructor(init?: Partial<Season>) {
     Object.assign(this, init);
   }
-
-  @AfterUpdate()
-  public async updateSeasonRequests(): Promise<void> {
-    const seasonRequestRepository = getRepository(SeasonRequest);
-
-    const relatedSeasonRequests = await seasonRequestRepository.find({
-      relations: {
-        request: true,
-      },
-      where: {
-        request: { media: { id: (await this.media).id } },
-        seasonNumber: this.seasonNumber,
-      },
-    });
-
-    // Check seasons when/if they become available or deleted,
-    // then set the related season request to completed
-    relatedSeasonRequests.forEach((seasonRequest) => {
-      if (
-        this.seasonNumber === seasonRequest.seasonNumber &&
-        ((!seasonRequest.request.is4k &&
-          (this.status === MediaStatus.AVAILABLE ||
-            this.status === MediaStatus.DELETED)) ||
-          (seasonRequest.request.is4k &&
-            this.status4k === MediaStatus.AVAILABLE) ||
-          this.status4k === MediaStatus.DELETED)
-      )
-        seasonRequest.status = MediaRequestStatus.COMPLETED;
-    });
-    seasonRequestRepository.save(relatedSeasonRequests);
-  }
 }
 
 export default Season;

server/entity/SeasonRequest.ts

@@ -1,7 +1,5 @@
 import { MediaRequestStatus } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
 import {
-  AfterUpdate,
   Column,
   CreateDateColumn,
   Entity,
@@ -36,28 +34,6 @@ class SeasonRequest {
   constructor(init?: Partial<SeasonRequest>) {
     Object.assign(this, init);
   }
-
-  @AfterUpdate()
-  public async updateMediaRequests(): Promise<void> {
-    const requestRepository = getRepository(MediaRequest);
-
-    const relatedRequest = await requestRepository.findOne({
-      where: { id: this.request.id },
-    });
-
-    // Check the parent of the season request and
-    // if every season request is complete
-    // set the parent request to complete as well
-    const isRequestComplete = relatedRequest?.seasons.every(
-      (seasonRequest) => seasonRequest.status === MediaRequestStatus.COMPLETED
-    );
-
-    if (isRequestComplete && relatedRequest) {
-      relatedRequest.status = MediaRequestStatus.COMPLETED;
-
-      requestRepository.save(relatedRequest);
-    }
-  }
 }
 
 export default SeasonRequest;

server/entity/UserSettings.ts

@@ -51,9 +51,6 @@ export class UserSettings {
   @Column({ nullable: true })
   public pushoverUserKey?: string;
 
-  @Column({ nullable: true })
-  public pushoverSound?: string;
-
   @Column({ nullable: true })
   public telegramChatId?: string;
 

server/index.ts

@@ -17,7 +17,6 @@ import WebhookAgent from '@server/lib/notifications/agents/webhook';
 import WebPushAgent from '@server/lib/notifications/agents/webpush';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import clearCookies from '@server/middleware/clearcookies';
 import routes from '@server/routes';
 import imageproxy from '@server/routes/imageproxy';
 import { getAppVersion } from '@server/utils/appVersion';
@@ -152,7 +151,7 @@ app
         cookie: {
           maxAge: 1000 * 60 * 60 * 24 * 30,
           httpOnly: true,
-          sameSite: settings.main.csrfProtection ? 'strict' : 'lax',
+          sameSite: true,
           secure: 'auto',
         },
         store: new TypeormStore({
@@ -183,8 +182,7 @@ app
     });
     server.use('/api/v1', routes);
 
-    // Do not set cookies so CDNs can cache them
-    server.use('/imageproxy', clearCookies, imageproxy);
+    server.use('/imageproxy', imageproxy);
 
     server.get('*', (req, res) => handle(req, res));
     server.use(

server/interfaces/api/userSettingsInterfaces.ts

@@ -28,7 +28,6 @@ export interface UserSettingsNotificationsResponse {
   pushbulletAccessToken?: string;
   pushoverApplicationToken?: string;
   pushoverUserKey?: string;
-  pushoverSound?: string;
   telegramEnabled?: boolean;
   telegramBotUsername?: string;
   telegramChatId?: string;

server/job/schedule.ts

@@ -1,4 +1,3 @@
-import availabilitySync from '@server/lib/availabilitySync';
 import downloadTracker from '@server/lib/downloadtracker';
 import ImageProxy from '@server/lib/imageproxy';
 import { plexFullScanner, plexRecentScanner } from '@server/lib/scanners/plex';
@@ -8,7 +7,6 @@ import type { JobId } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import watchlistSync from '@server/lib/watchlistsync';
 import logger from '@server/logger';
-import random from 'lodash/random';
 import schedule from 'node-schedule';
 
 interface ScheduledJob {
@@ -16,7 +14,7 @@ interface ScheduledJob {
   job: schedule.Job;
   name: string;
   type: 'process' | 'command';
-  interval: 'seconds' | 'minutes' | 'hours' | 'fixed';
+  interval: 'short' | 'long' | 'fixed';
   cronSchedule: string;
   running?: () => boolean;
   cancelFn?: () => void;
@@ -32,7 +30,7 @@ export const startJobs = (): void => {
     id: 'plex-recently-added-scan',
     name: 'Plex Recently Added Scan',
     type: 'process',
-    interval: 'minutes',
+    interval: 'short',
     cronSchedule: jobs['plex-recently-added-scan'].schedule,
     job: schedule.scheduleJob(jobs['plex-recently-added-scan'].schedule, () => {
       logger.info('Starting scheduled job: Plex Recently Added Scan', {
@@ -49,7 +47,7 @@ export const startJobs = (): void => {
     id: 'plex-full-scan',
     name: 'Plex Full Library Scan',
     type: 'process',
-    interval: 'hours',
+    interval: 'long',
     cronSchedule: jobs['plex-full-scan'].schedule,
     job: schedule.scheduleJob(jobs['plex-full-scan'].schedule, () => {
       logger.info('Starting scheduled job: Plex Full Library Scan', {
@@ -61,37 +59,27 @@ export const startJobs = (): void => {
     cancelFn: () => plexFullScanner.cancel(),
   });
 
-  // Watchlist Sync
-  const watchlistSyncJob: ScheduledJob = {
+  // Run watchlist sync every 5 minutes
+  scheduledJobs.push({
     id: 'plex-watchlist-sync',
     name: 'Plex Watchlist Sync',
     type: 'process',
-    interval: 'fixed',
+    interval: 'short',
     cronSchedule: jobs['plex-watchlist-sync'].schedule,
-    job: schedule.scheduleJob(new Date(Date.now() + 1000 * 60 * 20), () => {
+    job: schedule.scheduleJob(jobs['plex-watchlist-sync'].schedule, () => {
       logger.info('Starting scheduled job: Plex Watchlist Sync', {
         label: 'Jobs',
       });
       watchlistSync.syncWatchlist();
     }),
-  };
-
-  // To help alleviate load on Plex's servers, we will add some fuzziness to the next schedule
-  // after each run
-  watchlistSyncJob.job.on('run', () => {
-    watchlistSyncJob.job.schedule(
-      new Date(Math.floor(Date.now() + 1000 * 60 * random(14, 24, true)))
-    );
   });
 
-  scheduledJobs.push(watchlistSyncJob);
-
   // Run full radarr scan every 24 hours
   scheduledJobs.push({
     id: 'radarr-scan',
     name: 'Radarr Scan',
     type: 'process',
-    interval: 'hours',
+    interval: 'long',
     cronSchedule: jobs['radarr-scan'].schedule,
     job: schedule.scheduleJob(jobs['radarr-scan'].schedule, () => {
       logger.info('Starting scheduled job: Radarr Scan', { label: 'Jobs' });
@@ -106,7 +94,7 @@ export const startJobs = (): void => {
     id: 'sonarr-scan',
     name: 'Sonarr Scan',
     type: 'process',
-    interval: 'hours',
+    interval: 'long',
     cronSchedule: jobs['sonarr-scan'].schedule,
     job: schedule.scheduleJob(jobs['sonarr-scan'].schedule, () => {
       logger.info('Starting scheduled job: Sonarr Scan', { label: 'Jobs' });
@@ -116,29 +104,12 @@ export const startJobs = (): void => {
     cancelFn: () => sonarrScanner.cancel(),
   });
 
-  // Checks if media is still available in plex/sonarr/radarr libs
-  scheduledJobs.push({
-    id: 'availability-sync',
-    name: 'Media Availability Sync',
-    type: 'process',
-    interval: 'hours',
-    cronSchedule: jobs['availability-sync'].schedule,
-    job: schedule.scheduleJob(jobs['availability-sync'].schedule, () => {
-      logger.info('Starting scheduled job: Media Availability Sync', {
-        label: 'Jobs',
-      });
-      availabilitySync.run();
-    }),
-    running: () => availabilitySync.running,
-    cancelFn: () => availabilitySync.cancel(),
-  });
-
   // Run download sync every minute
   scheduledJobs.push({
     id: 'download-sync',
     name: 'Download Sync',
     type: 'command',
-    interval: 'seconds',
+    interval: 'fixed',
     cronSchedule: jobs['download-sync'].schedule,
     job: schedule.scheduleJob(jobs['download-sync'].schedule, () => {
       logger.debug('Starting scheduled job: Download Sync', {
@@ -153,7 +124,7 @@ export const startJobs = (): void => {
     id: 'download-sync-reset',
     name: 'Download Sync Reset',
     type: 'command',
-    interval: 'hours',
+    interval: 'long',
     cronSchedule: jobs['download-sync-reset'].schedule,
     job: schedule.scheduleJob(jobs['download-sync-reset'].schedule, () => {
       logger.info('Starting scheduled job: Download Sync Reset', {
@@ -163,12 +134,12 @@ export const startJobs = (): void => {
     }),
   });
 
-  // Run image cache cleanup every 24 hours
+  // Run image cache cleanup every 5 minutes
   scheduledJobs.push({
     id: 'image-cache-cleanup',
     name: 'Image Cache Cleanup',
     type: 'process',
-    interval: 'hours',
+    interval: 'long',
     cronSchedule: jobs['image-cache-cleanup'].schedule,
     job: schedule.scheduleJob(jobs['image-cache-cleanup'].schedule, () => {
       logger.info('Starting scheduled job: Image Cache Cleanup', {

server/lib/availabilitySync.ts

@@ -1,673 +0,0 @@
-import type { PlexMetadata } from '@server/api/plexapi';
-import PlexAPI from '@server/api/plexapi';
-import RadarrAPI, { type RadarrMovie } from '@server/api/servarr/radarr';
-import type { SonarrSeason, SonarrSeries } from '@server/api/servarr/sonarr';
-import SonarrAPI from '@server/api/servarr/sonarr';
-import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
-import Media from '@server/entity/Media';
-import MediaRequest from '@server/entity/MediaRequest';
-import type Season from '@server/entity/Season';
-import { User } from '@server/entity/User';
-import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
-import { getSettings } from '@server/lib/settings';
-import logger from '@server/logger';
-
-class AvailabilitySync {
-  public running = false;
-  private plexClient: PlexAPI;
-  private plexSeasonsCache: Record<string, PlexMetadata[]>;
-  private sonarrSeasonsCache: Record<string, SonarrSeason[]>;
-  private radarrServers: RadarrSettings[];
-  private sonarrServers: SonarrSettings[];
-
-  async run() {
-    const settings = getSettings();
-    this.running = true;
-    this.plexSeasonsCache = {};
-    this.sonarrSeasonsCache = {};
-    this.radarrServers = settings.radarr.filter((server) => server.syncEnabled);
-    this.sonarrServers = settings.sonarr.filter((server) => server.syncEnabled);
-
-    try {
-      logger.info(`Starting availability sync...`, {
-        label: 'AvailabilitySync',
-      });
-      const pageSize = 50;
-
-      const userRepository = getRepository(User);
-      const admin = await userRepository.findOne({
-        select: { id: true, plexToken: true },
-        where: { id: 1 },
-      });
-
-      if (admin) {
-        this.plexClient = new PlexAPI({ plexToken: admin.plexToken });
-      } else {
-        logger.error('An admin is not configured.');
-      }
-
-      for await (const media of this.loadAvailableMediaPaginated(pageSize)) {
-        if (!this.running) {
-          throw new Error('Job aborted');
-        }
-
-        // Check plex, radarr, and sonarr for that specific media and
-        // if unavailable, then we change the status accordingly.
-        // If a non-4k or 4k version exists in at least one of the instances, we will only update that specific version
-        if (media.mediaType === 'movie') {
-          let movieExists = false;
-          let movieExists4k = false;
-
-          const { existsInPlex } = await this.mediaExistsInPlex(media, false);
-          const { existsInPlex: existsInPlex4k } = await this.mediaExistsInPlex(
-            media,
-            true
-          );
-
-          const existsInRadarr = await this.mediaExistsInRadarr(media, false);
-          const existsInRadarr4k = await this.mediaExistsInRadarr(media, true);
-
-          if (existsInPlex || existsInRadarr) {
-            movieExists = true;
-            logger.info(
-              `The non-4K movie [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
-              {
-                label: 'AvailabilitySync',
-              }
-            );
-          }
-
-          if (existsInPlex4k || existsInRadarr4k) {
-            movieExists4k = true;
-            logger.info(
-              `The 4K movie [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
-              {
-                label: 'AvailabilitySync',
-              }
-            );
-          }
-
-          if (!movieExists && media.status === MediaStatus.AVAILABLE) {
-            await this.mediaUpdater(media, false);
-          }
-
-          if (!movieExists4k && media.status4k === MediaStatus.AVAILABLE) {
-            await this.mediaUpdater(media, true);
-          }
-        }
-
-        // If both versions still exist in plex, we still need
-        // to check through sonarr to verify season availability
-        if (media.mediaType === 'tv') {
-          let showExists = false;
-          let showExists4k = false;
-
-          const { existsInPlex, seasonsMap: plexSeasonsMap = new Map() } =
-            await this.mediaExistsInPlex(media, false);
-          const {
-            existsInPlex: existsInPlex4k,
-            seasonsMap: plexSeasonsMap4k = new Map(),
-          } = await this.mediaExistsInPlex(media, true);
-
-          const { existsInSonarr, seasonsMap: sonarrSeasonsMap } =
-            await this.mediaExistsInSonarr(media, false);
-          const {
-            existsInSonarr: existsInSonarr4k,
-            seasonsMap: sonarrSeasonsMap4k,
-          } = await this.mediaExistsInSonarr(media, true);
-
-          if (existsInPlex || existsInSonarr) {
-            showExists = true;
-            logger.info(
-              `The non-4K show [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
-              {
-                label: 'AvailabilitySync',
-              }
-            );
-          }
-
-          if (existsInPlex4k || existsInSonarr4k) {
-            showExists4k = true;
-            logger.info(
-              `The 4K show [TMDB ID ${media.tmdbId}] still exists. Preventing removal.`,
-              {
-                label: 'AvailabilitySync',
-              }
-            );
-          }
-
-          // Here we will create a final map that will cross compare
-          // with plex and sonarr. Filtered seasons will go through
-          // each season and assume the season does not exist. If Plex or
-          // Sonarr finds that season, we will change the final seasons value
-          // to true.
-          const filteredSeasonsMap: Map<number, boolean> = new Map();
-
-          media.seasons
-            .filter(
-              (season) =>
-                season.status === MediaStatus.AVAILABLE ||
-                season.status === MediaStatus.PARTIALLY_AVAILABLE
-            )
-            .forEach((season) =>
-              filteredSeasonsMap.set(season.seasonNumber, false)
-            );
-
-          const finalSeasons = new Map([
-            ...filteredSeasonsMap,
-            ...plexSeasonsMap,
-            ...sonarrSeasonsMap,
-          ]);
-
-          const filteredSeasonsMap4k: Map<number, boolean> = new Map();
-
-          media.seasons
-            .filter(
-              (season) =>
-                season.status4k === MediaStatus.AVAILABLE ||
-                season.status4k === MediaStatus.PARTIALLY_AVAILABLE
-            )
-            .forEach((season) =>
-              filteredSeasonsMap4k.set(season.seasonNumber, false)
-            );
-
-          const finalSeasons4k = new Map([
-            ...filteredSeasonsMap4k,
-            ...plexSeasonsMap4k,
-            ...sonarrSeasonsMap4k,
-          ]);
-
-          if ([...finalSeasons.values()].includes(false)) {
-            await this.seasonUpdater(media, finalSeasons, false);
-          }
-
-          if ([...finalSeasons4k.values()].includes(false)) {
-            await this.seasonUpdater(media, finalSeasons4k, true);
-          }
-
-          if (
-            !showExists &&
-            (media.status === MediaStatus.AVAILABLE ||
-              media.status === MediaStatus.PARTIALLY_AVAILABLE)
-          ) {
-            await this.mediaUpdater(media, false);
-          }
-
-          if (
-            !showExists4k &&
-            (media.status4k === MediaStatus.AVAILABLE ||
-              media.status4k === MediaStatus.PARTIALLY_AVAILABLE)
-          ) {
-            await this.mediaUpdater(media, true);
-          }
-        }
-      }
-    } catch (ex) {
-      logger.error('Failed to complete availability sync.', {
-        errorMessage: ex.message,
-        label: 'AvailabilitySync',
-      });
-    } finally {
-      logger.info(`Availability sync complete.`, {
-        label: 'AvailabilitySync',
-      });
-      this.running = false;
-    }
-  }
-
-  public cancel() {
-    this.running = false;
-  }
-
-  private async *loadAvailableMediaPaginated(pageSize: number) {
-    let offset = 0;
-    const mediaRepository = getRepository(Media);
-    const whereOptions = [
-      { status: MediaStatus.AVAILABLE },
-      { status: MediaStatus.PARTIALLY_AVAILABLE },
-      { status4k: MediaStatus.AVAILABLE },
-      { status4k: MediaStatus.PARTIALLY_AVAILABLE },
-    ];
-
-    let mediaPage: Media[];
-
-    do {
-      yield* (mediaPage = await mediaRepository.find({
-        where: whereOptions,
-        skip: offset,
-        take: pageSize,
-      }));
-      offset += pageSize;
-    } while (mediaPage.length > 0);
-  }
-
-  private async mediaUpdater(media: Media, is4k: boolean): Promise<void> {
-    const mediaRepository = getRepository(Media);
-
-    try {
-      // If media type is tv, check if a season is processing
-      //to see if we need to keep the external metadata
-      let isMediaProcessing = false;
-
-      if (media.mediaType === 'tv') {
-        const requestRepository = getRepository(MediaRequest);
-
-        const request = await requestRepository
-          .createQueryBuilder('request')
-          .leftJoinAndSelect('request.media', 'media')
-          .where('(media.id = :id)', {
-            id: media.id,
-          })
-          .andWhere(
-            '(request.is4k = :is4k AND request.status = :requestStatus)',
-            {
-              requestStatus: MediaRequestStatus.APPROVED,
-              is4k: is4k,
-            }
-          )
-          .getOne();
-
-        if (request) {
-          isMediaProcessing = true;
-        }
-      }
-
-      // Set the non-4K or 4K media to deleted
-      // and change related columns to null if media
-      // is not processing
-      media[is4k ? 'status4k' : 'status'] = MediaStatus.DELETED;
-      media[is4k ? 'serviceId4k' : 'serviceId'] = isMediaProcessing
-        ? media[is4k ? 'serviceId4k' : 'serviceId']
-        : null;
-      media[is4k ? 'externalServiceId4k' : 'externalServiceId'] =
-        isMediaProcessing
-          ? media[is4k ? 'externalServiceId4k' : 'externalServiceId']
-          : null;
-      media[is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] =
-        isMediaProcessing
-          ? media[is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']
-          : null;
-      media[is4k ? 'ratingKey4k' : 'ratingKey'] = isMediaProcessing
-        ? media[is4k ? 'ratingKey4k' : 'ratingKey']
-        : null;
-
-      logger.info(
-        `The ${is4k ? '4K' : 'non-4K'} ${
-          media.mediaType === 'movie' ? 'movie' : 'show'
-        } [TMDB ID ${media.tmdbId}] was not found in any ${
-          media.mediaType === 'movie' ? 'Radarr' : 'Sonarr'
-        } and Plex instance. Status will be changed to deleted.`,
-        { label: 'AvailabilitySync' }
-      );
-
-      await mediaRepository.save({ media, ...media });
-    } catch (ex) {
-      logger.debug(
-        `Failure updating the ${is4k ? '4K' : 'non-4K'} ${
-          media.mediaType === 'tv' ? 'show' : 'movie'
-        } [TMDB ID ${media.tmdbId}].`,
-        {
-          errorMessage: ex.message,
-          label: 'AvailabilitySync',
-        }
-      );
-    }
-  }
-
-  private async seasonUpdater(
-    media: Media,
-    seasons: Map<number, boolean>,
-    is4k: boolean
-  ): Promise<void> {
-    const mediaRepository = getRepository(Media);
-
-    // Filter out only the values that are false
-    // (media that should be deleted)
-    const seasonsPendingRemoval = new Map(
-      // Disabled linter as only the value is needed from the filter
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      [...seasons].filter(([_, exists]) => !exists)
-    );
-    // Retrieve the season keys to pass into our log
-    const seasonKeys = [...seasonsPendingRemoval.keys()];
-
-    try {
-      for (const mediaSeason of media.seasons) {
-        if (seasonsPendingRemoval.has(mediaSeason.seasonNumber)) {
-          mediaSeason[is4k ? 'status4k' : 'status'] = MediaStatus.DELETED;
-        }
-      }
-
-      if (media.status === MediaStatus.AVAILABLE) {
-        media.status = MediaStatus.PARTIALLY_AVAILABLE;
-        logger.info(
-          `Marking the non-4K show [TMDB ID ${media.tmdbId}] as PARTIALLY_AVAILABLE because season removal has occurred.`,
-          { label: 'AvailabilitySync' }
-        );
-      }
-
-      if (media.status4k === MediaStatus.AVAILABLE) {
-        media.status4k = MediaStatus.PARTIALLY_AVAILABLE;
-        logger.info(
-          `Marking the 4K show [TMDB ID ${media.tmdbId}] as PARTIALLY_AVAILABLE because season removal has occurred.`,
-          { label: 'AvailabilitySync' }
-        );
-      }
-
-      await mediaRepository.save({ media, ...media });
-
-      logger.info(
-        `The ${is4k ? '4K' : 'non-4K'} season(s) [${seasonKeys}] [TMDB ID ${
-          media.tmdbId
-        }] was not found in any ${
-          media.mediaType === 'tv' ? 'Sonarr' : 'Radarr'
-        } and Plex instance. Status will be changed to deleted.`,
-        { label: 'AvailabilitySync' }
-      );
-    } catch (ex) {
-      logger.debug(
-        `Failure updating the ${
-          is4k ? '4K' : 'non-4K'
-        } season(s) [${seasonKeys}], TMDB ID ${media.tmdbId}.`,
-        {
-          errorMessage: ex.message,
-          label: 'AvailabilitySync',
-        }
-      );
-    }
-  }
-
-  private async mediaExistsInRadarr(
-    media: Media,
-    is4k: boolean
-  ): Promise<boolean> {
-    let existsInRadarr = false;
-
-    // Check for availability in all of the available radarr servers
-    // If any find the media, we will assume the media exists
-    for (const server of this.radarrServers) {
-      if (server.is4k === is4k) {
-        const radarrAPI = new RadarrAPI({
-          apiKey: server.apiKey,
-          url: RadarrAPI.buildUrl(server, '/api/v3'),
-        });
-
-        try {
-          let radarr: RadarrMovie | undefined;
-
-          if (media.externalServiceId && !is4k) {
-            radarr = await radarrAPI.getMovie({
-              id: media.externalServiceId,
-            });
-          }
-
-          if (media.externalServiceId4k && is4k) {
-            radarr = await radarrAPI.getMovie({
-              id: media.externalServiceId4k,
-            });
-          }
-
-          if (radarr && radarr.hasFile) {
-            existsInRadarr = true;
-          }
-        } catch (ex) {
-          if (!ex.message.includes('404')) {
-            existsInRadarr = true;
-            logger.debug(
-              `Failure retrieving the ${
-                is4k ? '4K' : 'non-4K'
-              } movie [TMDB ID ${media.tmdbId}] from Radarr.`,
-              {
-                errorMessage: ex.message,
-                label: 'AvailabilitySync',
-              }
-            );
-          }
-        }
-      }
-    }
-
-    return existsInRadarr;
-  }
-
-  private async mediaExistsInSonarr(
-    media: Media,
-    is4k: boolean
-  ): Promise<{ existsInSonarr: boolean; seasonsMap: Map<number, boolean> }> {
-    let existsInSonarr = false;
-    let preventSeasonSearch = false;
-
-    // Check for availability in all of the available sonarr servers
-    // If any find the media, we will assume the media exists
-    for (const server of this.sonarrServers) {
-      if (server.is4k === is4k) {
-        const sonarrAPI = new SonarrAPI({
-          apiKey: server.apiKey,
-          url: SonarrAPI.buildUrl(server, '/api/v3'),
-        });
-
-        try {
-          let sonarr: SonarrSeries | undefined;
-
-          if (media.externalServiceId && !is4k) {
-            sonarr = await sonarrAPI.getSeriesById(media.externalServiceId);
-            this.sonarrSeasonsCache[`${server.id}-${media.externalServiceId}`] =
-              sonarr.seasons;
-          }
-
-          if (media.externalServiceId4k && is4k) {
-            sonarr = await sonarrAPI.getSeriesById(media.externalServiceId4k);
-            this.sonarrSeasonsCache[
-              `${server.id}-${media.externalServiceId4k}`
-            ] = sonarr.seasons;
-          }
-
-          if (sonarr && sonarr.statistics.episodeFileCount > 0) {
-            existsInSonarr = true;
-          }
-        } catch (ex) {
-          if (!ex.message.includes('404')) {
-            existsInSonarr = true;
-            preventSeasonSearch = true;
-            logger.debug(
-              `Failure retrieving the ${is4k ? '4K' : 'non-4K'} show [TMDB ID ${
-                media.tmdbId
-              }] from Sonarr.`,
-              {
-                errorMessage: ex.message,
-                label: 'AvailabilitySync',
-              }
-            );
-          }
-        }
-      }
-    }
-
-    // Here we check each season for availability
-    // If the API returns an error other than a 404,
-    // we will have to prevent the season check from happening
-    const seasonsMap: Map<number, boolean> = new Map();
-
-    if (!preventSeasonSearch) {
-      const filteredSeasons = media.seasons.filter(
-        (season) =>
-          season[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE ||
-          season[is4k ? 'status4k' : 'status'] ===
-            MediaStatus.PARTIALLY_AVAILABLE
-      );
-
-      for (const season of filteredSeasons) {
-        const seasonExists = await this.seasonExistsInSonarr(
-          media,
-          season,
-          is4k
-        );
-
-        if (seasonExists) {
-          seasonsMap.set(season.seasonNumber, true);
-        }
-      }
-    }
-
-    return { existsInSonarr, seasonsMap };
-  }
-
-  private async seasonExistsInSonarr(
-    media: Media,
-    season: Season,
-    is4k: boolean
-  ): Promise<boolean> {
-    let seasonExists = false;
-
-    // Check each sonarr instance to see if the media still exists
-    // If found, we will assume the media exists and prevent removal
-    // We can use the cache we built when we fetched the series with mediaExistsInSonarr
-    for (const server of this.sonarrServers) {
-      let sonarrSeasons: SonarrSeason[] | undefined;
-
-      if (media.externalServiceId && !is4k) {
-        sonarrSeasons =
-          this.sonarrSeasonsCache[`${server.id}-${media.externalServiceId}`];
-      }
-
-      if (media.externalServiceId4k && is4k) {
-        sonarrSeasons =
-          this.sonarrSeasonsCache[`${server.id}-${media.externalServiceId4k}`];
-      }
-
-      const seasonIsAvailable = sonarrSeasons?.find(
-        ({ seasonNumber, statistics }) =>
-          season.seasonNumber === seasonNumber &&
-          statistics?.episodeFileCount &&
-          statistics?.episodeFileCount > 0
-      );
-
-      if (seasonIsAvailable && sonarrSeasons) {
-        seasonExists = true;
-      }
-    }
-
-    return seasonExists;
-  }
-
-  private async mediaExistsInPlex(
-    media: Media,
-    is4k: boolean
-  ): Promise<{ existsInPlex: boolean; seasonsMap?: Map<number, boolean> }> {
-    const ratingKey = media.ratingKey;
-    const ratingKey4k = media.ratingKey4k;
-    let existsInPlex = false;
-    let preventSeasonSearch = false;
-
-    // Check each plex instance to see if the media still exists
-    // If found, we will assume the media exists and prevent removal
-    // We can use the cache we built when we fetched the series with mediaExistsInPlex
-    try {
-      let plexMedia: PlexMetadata | undefined;
-
-      if (ratingKey && !is4k) {
-        plexMedia = await this.plexClient?.getMetadata(ratingKey);
-
-        if (media.mediaType === 'tv') {
-          this.plexSeasonsCache[ratingKey] =
-            await this.plexClient?.getChildrenMetadata(ratingKey);
-        }
-      }
-
-      if (ratingKey4k && is4k) {
-        plexMedia = await this.plexClient?.getMetadata(ratingKey4k);
-
-        if (media.mediaType === 'tv') {
-          this.plexSeasonsCache[ratingKey4k] =
-            await this.plexClient?.getChildrenMetadata(ratingKey4k);
-        }
-      }
-
-      if (plexMedia) {
-        existsInPlex = true;
-      }
-    } catch (ex) {
-      if (!ex.message.includes('404')) {
-        existsInPlex = true;
-        preventSeasonSearch = true;
-        logger.debug(
-          `Failure retrieving the ${is4k ? '4K' : 'non-4K'} ${
-            media.mediaType === 'tv' ? 'show' : 'movie'
-          } [TMDB ID ${media.tmdbId}] from Plex.`,
-          {
-            errorMessage: ex.message,
-            label: 'AvailabilitySync',
-          }
-        );
-      }
-    }
-
-    // Here we check each season in plex for availability
-    // If the API returns an error other than a 404,
-    // we will have to prevent the season check from happening
-    if (media.mediaType === 'tv') {
-      const seasonsMap: Map<number, boolean> = new Map();
-
-      if (!preventSeasonSearch) {
-        const filteredSeasons = media.seasons.filter(
-          (season) =>
-            season[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE ||
-            season[is4k ? 'status4k' : 'status'] ===
-              MediaStatus.PARTIALLY_AVAILABLE
-        );
-
-        for (const season of filteredSeasons) {
-          const seasonExists = await this.seasonExistsInPlex(
-            media,
-            season,
-            is4k
-          );
-
-          if (seasonExists) {
-            seasonsMap.set(season.seasonNumber, true);
-          }
-        }
-      }
-
-      return { existsInPlex, seasonsMap };
-    }
-
-    return { existsInPlex };
-  }
-
-  private async seasonExistsInPlex(
-    media: Media,
-    season: Season,
-    is4k: boolean
-  ): Promise<boolean> {
-    const ratingKey = media.ratingKey;
-    const ratingKey4k = media.ratingKey4k;
-    let seasonExistsInPlex = false;
-
-    // Check each plex instance to see if the season exists
-    let plexSeasons: PlexMetadata[] | undefined;
-
-    if (ratingKey && !is4k) {
-      plexSeasons = this.plexSeasonsCache[ratingKey];
-    }
-
-    if (ratingKey4k && is4k) {
-      plexSeasons = this.plexSeasonsCache[ratingKey4k];
-    }
-
-    const seasonIsAvailable = plexSeasons?.find(
-      (plexSeason) => plexSeason.index === season.seasonNumber
-    );
-
-    if (seasonIsAvailable) {
-      seasonExistsInPlex = true;
-    }
-
-    return seasonExistsInPlex;
-  }
-}
-
-const availabilitySync = new AvailabilitySync();
-
-export default availabilitySync;

server/lib/cache.ts

@@ -5,7 +5,6 @@ export type AvailableCacheIds =
   | 'radarr'
   | 'sonarr'
   | 'rt'
-  | 'imdb'
   | 'github'
   | 'plexguid'
   | 'plextv';
@@ -52,10 +51,6 @@ class CacheManager {
       stdTtl: 43200,
       checkPeriod: 60 * 30,
     }),
-    imdb: new Cache('imdb', 'IMDB Radarr Proxy', {
-      stdTtl: 43200,
-      checkPeriod: 60 * 30,
-    }),
     github: new Cache('github', 'GitHub API', {
       stdTtl: 21600,
       checkPeriod: 60 * 30,

server/lib/imageproxy.ts

@@ -18,14 +18,14 @@ type ImageResponse = {
   imageBuffer: Buffer;
 };
 
-const baseCacheDirectory = process.env.CONFIG_DIRECTORY
-  ? `${process.env.CONFIG_DIRECTORY}/cache/images`
-  : path.join(__dirname, '../../config/cache/images');
-
 class ImageProxy {
   public static async clearCache(key: string) {
     let deletedImages = 0;
-    const cacheDirectory = path.join(baseCacheDirectory, key);
+    const cacheDirectory = path.join(
+      __dirname,
+      '../../config/cache/images/',
+      key
+    );
 
     const files = await promises.readdir(cacheDirectory);
 
@@ -57,7 +57,11 @@ class ImageProxy {
   public static async getImageStats(
     key: string
   ): Promise<{ size: number; imageCount: number }> {
-    const cacheDirectory = path.join(baseCacheDirectory, key);
+    const cacheDirectory = path.join(
+      __dirname,
+      '../../config/cache/images/',
+      key
+    );
 
     const imageTotalSize = await ImageProxy.getDirectorySize(cacheDirectory);
     const imageCount = await ImageProxy.getImageCount(cacheDirectory);
@@ -259,7 +263,7 @@ class ImageProxy {
   }
 
   private getCacheDirectory() {
-    return path.join(baseCacheDirectory, this.key);
+    return path.join(__dirname, '../../config/cache/images/', this.key);
   }
 }
 

server/lib/notifications/agents/pushover.ts

@@ -14,12 +14,7 @@ import {
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
 
-interface PushoverImagePayload {
-  attachment_base64: string;
-  attachment_type: string;
-}
-
-interface PushoverPayload extends PushoverImagePayload {
+interface PushoverPayload {
   token: string;
   user: string;
   title: string;
@@ -48,36 +43,10 @@ class PushoverAgent
     return true;
   }
 
-  private async getImagePayload(
-    imageUrl: string
-  ): Promise<Partial<PushoverImagePayload>> {
-    try {
-      const response = await axios.get(imageUrl, {
-        responseType: 'arraybuffer',
-      });
-      const base64 = Buffer.from(response.data, 'binary').toString('base64');
-      const contentType = (
-        response.headers['Content-Type'] || response.headers['content-type']
-      )?.toString();
-
-      return {
-        attachment_base64: base64,
-        attachment_type: contentType,
-      };
-    } catch (e) {
-      logger.error('Error getting image payload', {
-        label: 'Notifications',
-        errorMessage: e.message,
-        response: e.response?.data,
-      });
-      return {};
-    }
-  }
-
-  private async getNotificationPayload(
+  private getNotificationPayload(
     type: Notification,
     payload: NotificationPayload
-  ): Promise<Partial<PushoverPayload>> {
+  ): Partial<PushoverPayload> {
     const { applicationUrl, applicationTitle } = getSettings().main;
 
     const title = payload.event ?? payload.subject;
@@ -153,16 +122,6 @@ class PushoverAgent
       ? `View ${payload.issue ? 'Issue' : 'Media'} in ${applicationTitle}`
       : undefined;
 
-    let attachment_base64;
-    let attachment_type;
-    if (payload.image) {
-      const imagePayload = await this.getImagePayload(payload.image);
-      if (imagePayload.attachment_base64 && imagePayload.attachment_type) {
-        attachment_base64 = imagePayload.attachment_base64;
-        attachment_type = imagePayload.attachment_type;
-      }
-    }
-
     return {
       title,
       message,
@@ -170,8 +129,6 @@ class PushoverAgent
       url_title,
       priority,
       html: 1,
-      attachment_base64,
-      attachment_type,
     };
   }
 
@@ -181,10 +138,7 @@ class PushoverAgent
   ): Promise<boolean> {
     const settings = this.getSettings();
     const endpoint = 'https://api.pushover.net/1/messages.json';
-    const notificationPayload = await this.getNotificationPayload(
-      type,
-      payload
-    );
+    const notificationPayload = this.getNotificationPayload(type, payload);
 
     // Send system notification
     if (
@@ -205,7 +159,6 @@ class PushoverAgent
           ...notificationPayload,
           token: settings.options.accessToken,
           user: settings.options.userToken,
-          sound: settings.options.sound,
         } as PushoverPayload);
       } catch (e) {
         logger.error('Error sending Pushover notification', {
@@ -245,7 +198,6 @@ class PushoverAgent
             ...notificationPayload,
             token: payload.notifyUser.settings.pushoverApplicationToken,
             user: payload.notifyUser.settings.pushoverUserKey,
-            sound: payload.notifyUser.settings.pushoverSound,
           } as PushoverPayload);
         } catch (e) {
           logger.error('Error sending Pushover notification', {

server/lib/scanners/baseScanner.ts

@@ -281,9 +281,7 @@ class BaseScanner<T> {
               ? MediaStatus.AVAILABLE
               : season.episodes > 0
               ? MediaStatus.PARTIALLY_AVAILABLE
-              : !season.is4kOverride &&
-                season.processing &&
-                existingSeason.status !== MediaStatus.DELETED
+              : !season.is4kOverride && season.processing
               ? MediaStatus.PROCESSING
               : existingSeason.status;
 
@@ -296,9 +294,7 @@ class BaseScanner<T> {
               ? MediaStatus.AVAILABLE
               : this.enable4kShow && season.episodes4k > 0
               ? MediaStatus.PARTIALLY_AVAILABLE
-              : season.is4kOverride &&
-                season.processing &&
-                existingSeason.status4k !== MediaStatus.DELETED
+              : season.is4kOverride && season.processing
               ? MediaStatus.PROCESSING
               : existingSeason.status4k;
         } else {
@@ -405,18 +401,13 @@ class BaseScanner<T> {
         // the status
         const shouldStayAvailable =
           media.status === MediaStatus.AVAILABLE &&
-          newSeasons.filter(
-            (season) =>
-              season.status !== MediaStatus.UNKNOWN &&
-              season.status !== MediaStatus.DELETED
-          ).length === 0;
+          newSeasons.filter((season) => season.status !== MediaStatus.UNKNOWN)
+            .length === 0;
         const shouldStayAvailable4k =
           media.status4k === MediaStatus.AVAILABLE &&
-          newSeasons.filter(
-            (season) =>
-              season.status4k !== MediaStatus.UNKNOWN &&
-              season.status4k !== MediaStatus.DELETED
-          ).length === 0;
+          newSeasons.filter((season) => season.status4k !== MediaStatus.UNKNOWN)
+            .length === 0;
+
         media.status =
           isAllStandardSeasons || shouldStayAvailable
             ? MediaStatus.AVAILABLE
@@ -426,13 +417,11 @@ class BaseScanner<T> {
                   season.status === MediaStatus.AVAILABLE
               )
             ? MediaStatus.PARTIALLY_AVAILABLE
-            : (!seasons.length && media.status !== MediaStatus.DELETED) ||
+            : !seasons.length ||
               media.seasons.some(
                 (season) => season.status === MediaStatus.PROCESSING
               )
             ? MediaStatus.PROCESSING
-            : media.status === MediaStatus.DELETED
-            ? MediaStatus.DELETED
             : MediaStatus.UNKNOWN;
         media.status4k =
           (isAll4kSeasons || shouldStayAvailable4k) && this.enable4kShow
@@ -444,13 +433,11 @@ class BaseScanner<T> {
                   season.status4k === MediaStatus.AVAILABLE
               )
             ? MediaStatus.PARTIALLY_AVAILABLE
-            : (!seasons.length && media.status4k !== MediaStatus.DELETED) ||
+            : !seasons.length ||
               media.seasons.some(
                 (season) => season.status4k === MediaStatus.PROCESSING
               )
             ? MediaStatus.PROCESSING
-            : media.status4k === MediaStatus.DELETED
-            ? MediaStatus.DELETED
             : MediaStatus.UNKNOWN;
         await mediaRepository.save(media);
         this.log(`Updating existing title: ${title}`);

server/lib/scanners/plex/index.ts

@@ -96,8 +96,7 @@ class PlexScanner
                   // We remove 10 minutes from the last scan as a buffer
                   addedAt: library.lastScan - 1000 * 60 * 10,
                 }
-              : undefined,
-            library.type
+              : undefined
           );
 
           // Bundle items up by rating keys

server/lib/settings.ts

@@ -61,7 +61,6 @@ export interface DVRSettings {
   externalUrl?: string;
   syncEnabled: boolean;
   preventSearch: boolean;
-  tagRequests: boolean;
 }
 
 export interface RadarrSettings extends DVRSettings {
@@ -69,8 +68,6 @@ export interface RadarrSettings extends DVRSettings {
 }
 
 export interface SonarrSettings extends DVRSettings {
-  seriesType: 'standard' | 'daily' | 'anime';
-  animeSeriesType: 'standard' | 'daily' | 'anime';
   activeAnimeProfileId?: number;
   activeAnimeProfileName?: string;
   activeAnimeDirectory?: string;
@@ -192,7 +189,6 @@ export interface NotificationAgentPushover extends NotificationAgentConfig {
   options: {
     accessToken: string;
     userToken: string;
-    sound: string;
   };
 }
 
@@ -252,8 +248,7 @@ export type JobId =
   | 'sonarr-scan'
   | 'download-sync'
   | 'download-sync-reset'
-  | 'image-cache-cleanup'
-  | 'availability-sync';
+  | 'image-cache-cleanup';
 
 interface AllSettings {
   clientId: string;
@@ -373,7 +368,6 @@ class Settings {
             options: {
               accessToken: '',
               userToken: '',
-              sound: '',
             },
           },
           webhook: {
@@ -382,7 +376,7 @@ class Settings {
             options: {
               webhookUrl: '',
               jsonPayload:
-                'IntcbiAgXCJub3RpZmljYXRpb25fdHlwZVwiOiBcInt7bm90aWZpY2F0aW9uX3R5cGV9fVwiLFxuICBcImV2ZW50XCI6IFwie3tldmVudH19XCIsXG4gIFwic3ViamVjdFwiOiBcInt7c3ViamVjdH19XCIsXG4gIFwibWVzc2FnZVwiOiBcInt7bWVzc2FnZX19XCIsXG4gIFwiaW1hZ2VcIjogXCJ7e2ltYWdlfX1cIixcbiAgXCJ7e21lZGlhfX1cIjoge1xuICAgIFwibWVkaWFfdHlwZVwiOiBcInt7bWVkaWFfdHlwZX19XCIsXG4gICAgXCJ0bWRiSWRcIjogXCJ7e21lZGlhX3RtZGJpZH19XCIsXG4gICAgXCJ0dmRiSWRcIjogXCJ7e21lZGlhX3R2ZGJpZH19XCIsXG4gICAgXCJzdGF0dXNcIjogXCJ7e21lZGlhX3N0YXR1c319XCIsXG4gICAgXCJzdGF0dXM0a1wiOiBcInt7bWVkaWFfc3RhdHVzNGt9fVwiXG4gIH0sXG4gIFwie3tyZXF1ZXN0fX1cIjoge1xuICAgIFwicmVxdWVzdF9pZFwiOiBcInt7cmVxdWVzdF9pZH19XCIsXG4gICAgXCJyZXF1ZXN0ZWRCeV9lbWFpbFwiOiBcInt7cmVxdWVzdGVkQnlfZW1haWx9fVwiLFxuICAgIFwicmVxdWVzdGVkQnlfdXNlcm5hbWVcIjogXCJ7e3JlcXVlc3RlZEJ5X3VzZXJuYW1lfX1cIixcbiAgICBcInJlcXVlc3RlZEJ5X2F2YXRhclwiOiBcInt7cmVxdWVzdGVkQnlfYXZhdGFyfX1cIixcbiAgICBcInJlcXVlc3RlZEJ5X3NldHRpbmdzX2Rpc2NvcmRJZFwiOiBcInt7cmVxdWVzdGVkQnlfc2V0dGluZ3NfZGlzY29yZElkfX1cIixcbiAgICBcInJlcXVlc3RlZEJ5X3NldHRpbmdzX3RlbGVncmFtQ2hhdElkXCI6IFwie3tyZXF1ZXN0ZWRCeV9zZXR0aW5nc190ZWxlZ3JhbUNoYXRJZH19XCJcbiAgfSxcbiAgXCJ7e2lzc3VlfX1cIjoge1xuICAgIFwiaXNzdWVfaWRcIjogXCJ7e2lzc3VlX2lkfX1cIixcbiAgICBcImlzc3VlX3R5cGVcIjogXCJ7e2lzc3VlX3R5cGV9fVwiLFxuICAgIFwiaXNzdWVfc3RhdHVzXCI6IFwie3tpc3N1ZV9zdGF0dXN9fVwiLFxuICAgIFwicmVwb3J0ZWRCeV9lbWFpbFwiOiBcInt7cmVwb3J0ZWRCeV9lbWFpbH19XCIsXG4gICAgXCJyZXBvcnRlZEJ5X3VzZXJuYW1lXCI6IFwie3tyZXBvcnRlZEJ5X3VzZXJuYW1lfX1cIixcbiAgICBcInJlcG9ydGVkQnlfYXZhdGFyXCI6IFwie3tyZXBvcnRlZEJ5X2F2YXRhcn19XCIsXG4gICAgXCJyZXBvcnRlZEJ5X3NldHRpbmdzX2Rpc2NvcmRJZFwiOiBcInt7cmVwb3J0ZWRCeV9zZXR0aW5nc19kaXNjb3JkSWR9fVwiLFxuICAgIFwicmVwb3J0ZWRCeV9zZXR0aW5nc190ZWxlZ3JhbUNoYXRJZFwiOiBcInt7cmVwb3J0ZWRCeV9zZXR0aW5nc190ZWxlZ3JhbUNoYXRJZH19XCJcbiAgfSxcbiAgXCJ7e2NvbW1lbnR9fVwiOiB7XG4gICAgXCJjb21tZW50X21lc3NhZ2VcIjogXCJ7e2NvbW1lbnRfbWVzc2FnZX19XCIsXG4gICAgXCJjb21tZW50ZWRCeV9lbWFpbFwiOiBcInt7Y29tbWVudGVkQnlfZW1haWx9fVwiLFxuICAgIFwiY29tbWVudGVkQnlfdXNlcm5hbWVcIjogXCJ7e2NvbW1lbnRlZEJ5X3VzZXJuYW1lfX1cIixcbiAgICBcImNvbW1lbnRlZEJ5X2F2YXRhclwiOiBcInt7Y29tbWVudGVkQnlfYXZhdGFyfX1cIixcbiAgICBcImNvbW1lbnRlZEJ5X3NldHRpbmdzX2Rpc2NvcmRJZFwiOiBcInt7Y29tbWVudGVkQnlfc2V0dGluZ3NfZGlzY29yZElkfX1cIixcbiAgICBcImNvbW1lbnRlZEJ5X3NldHRpbmdzX3RlbGVncmFtQ2hhdElkXCI6IFwie3tjb21tZW50ZWRCeV9zZXR0aW5nc190ZWxlZ3JhbUNoYXRJZH19XCJcbiAgfSxcbiAgXCJ7e2V4dHJhfX1cIjogW11cbn0i',
+                'IntcbiAgICBcIm5vdGlmaWNhdGlvbl90eXBlXCI6IFwie3tub3RpZmljYXRpb25fdHlwZX19XCIsXG4gICAgXCJldmVudFwiOiBcInt7ZXZlbnR9fVwiLFxuICAgIFwic3ViamVjdFwiOiBcInt7c3ViamVjdH19XCIsXG4gICAgXCJtZXNzYWdlXCI6IFwie3ttZXNzYWdlfX1cIixcbiAgICBcImltYWdlXCI6IFwie3tpbWFnZX19XCIsXG4gICAgXCJ7e21lZGlhfX1cIjoge1xuICAgICAgICBcIm1lZGlhX3R5cGVcIjogXCJ7e21lZGlhX3R5cGV9fVwiLFxuICAgICAgICBcInRtZGJJZFwiOiBcInt7bWVkaWFfdG1kYmlkfX1cIixcbiAgICAgICAgXCJ0dmRiSWRcIjogXCJ7e21lZGlhX3R2ZGJpZH19XCIsXG4gICAgICAgIFwic3RhdHVzXCI6IFwie3ttZWRpYV9zdGF0dXN9fVwiLFxuICAgICAgICBcInN0YXR1czRrXCI6IFwie3ttZWRpYV9zdGF0dXM0a319XCJcbiAgICB9LFxuICAgIFwie3tyZXF1ZXN0fX1cIjoge1xuICAgICAgICBcInJlcXVlc3RfaWRcIjogXCJ7e3JlcXVlc3RfaWR9fVwiLFxuICAgICAgICBcInJlcXVlc3RlZEJ5X2VtYWlsXCI6IFwie3tyZXF1ZXN0ZWRCeV9lbWFpbH19XCIsXG4gICAgICAgIFwicmVxdWVzdGVkQnlfdXNlcm5hbWVcIjogXCJ7e3JlcXVlc3RlZEJ5X3VzZXJuYW1lfX1cIixcbiAgICAgICAgXCJyZXF1ZXN0ZWRCeV9hdmF0YXJcIjogXCJ7e3JlcXVlc3RlZEJ5X2F2YXRhcn19XCJcbiAgICB9LFxuICAgIFwie3tpc3N1ZX19XCI6IHtcbiAgICAgICAgXCJpc3N1ZV9pZFwiOiBcInt7aXNzdWVfaWR9fVwiLFxuICAgICAgICBcImlzc3VlX3R5cGVcIjogXCJ7e2lzc3VlX3R5cGV9fVwiLFxuICAgICAgICBcImlzc3VlX3N0YXR1c1wiOiBcInt7aXNzdWVfc3RhdHVzfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X2VtYWlsXCI6IFwie3tyZXBvcnRlZEJ5X2VtYWlsfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X3VzZXJuYW1lXCI6IFwie3tyZXBvcnRlZEJ5X3VzZXJuYW1lfX1cIixcbiAgICAgICAgXCJyZXBvcnRlZEJ5X2F2YXRhclwiOiBcInt7cmVwb3J0ZWRCeV9hdmF0YXJ9fVwiXG4gICAgfSxcbiAgICBcInt7Y29tbWVudH19XCI6IHtcbiAgICAgICAgXCJjb21tZW50X21lc3NhZ2VcIjogXCJ7e2NvbW1lbnRfbWVzc2FnZX19XCIsXG4gICAgICAgIFwiY29tbWVudGVkQnlfZW1haWxcIjogXCJ7e2NvbW1lbnRlZEJ5X2VtYWlsfX1cIixcbiAgICAgICAgXCJjb21tZW50ZWRCeV91c2VybmFtZVwiOiBcInt7Y29tbWVudGVkQnlfdXNlcm5hbWV9fVwiLFxuICAgICAgICBcImNvbW1lbnRlZEJ5X2F2YXRhclwiOiBcInt7Y29tbWVudGVkQnlfYXZhdGFyfX1cIlxuICAgIH0sXG4gICAgXCJ7e2V4dHJhfX1cIjogW11cbn0i',
             },
           },
           webpush: {
@@ -415,9 +409,6 @@ class Settings {
         'sonarr-scan': {
           schedule: '0 30 4 * * *',
         },
-        'availability-sync': {
-          schedule: '0 0 5 * * *',
-        },
         'download-sync': {
           schedule: '0 * * * * *',
         },
@@ -555,7 +546,7 @@ class Settings {
   }
 
   private generateApiKey(): string {
-    return Buffer.from(`${Date.now()}${randomUUID()}`).toString('base64');
+    return Buffer.from(`${Date.now()}${randomUUID()})`).toString('base64');
   }
 
   private generateVapidKeys(force = false): void {

server/lib/watchlistsync.ts

@@ -79,80 +79,82 @@ class WatchlistSync {
         )
     );
 
-    for (const mediaItem of unavailableItems) {
-      try {
-        logger.info("Creating media request from user's Plex Watchlist", {
-          label: 'Watchlist Sync',
-          userId: user.id,
-          mediaTitle: mediaItem.title,
-        });
+    await Promise.all(
+      unavailableItems.map(async (mediaItem) => {
+        try {
+          logger.info("Creating media request from user's Plex Watchlist", {
+            label: 'Watchlist Sync',
+            userId: user.id,
+            mediaTitle: mediaItem.title,
+          });
 
-        if (mediaItem.type === 'show' && !mediaItem.tvdbId) {
-          throw new Error('Missing TVDB ID from Plex Metadata');
-        }
+          if (mediaItem.type === 'show' && !mediaItem.tvdbId) {
+            throw new Error('Missing TVDB ID from Plex Metadata');
+          }
 
-        // Check if they have auto-request permissons and watchlist sync
-        // enabled for the media type
-        if (
-          ((!user.hasPermission(
-            [Permission.AUTO_REQUEST, Permission.AUTO_REQUEST_MOVIE],
-            { type: 'or' }
-          ) ||
-            !user.settings?.watchlistSyncMovies) &&
-            mediaItem.type === 'movie') ||
-          ((!user.hasPermission(
-            [Permission.AUTO_REQUEST, Permission.AUTO_REQUEST_TV],
-            { type: 'or' }
-          ) ||
-            !user.settings?.watchlistSyncTv) &&
-            mediaItem.type === 'show')
-        ) {
-          continue;
-        }
+          // Check if they have auto-request permissons and watchlist sync
+          // enabled for the media type
+          if (
+            ((!user.hasPermission(
+              [Permission.AUTO_REQUEST, Permission.AUTO_REQUEST_MOVIE],
+              { type: 'or' }
+            ) ||
+              !user.settings?.watchlistSyncMovies) &&
+              mediaItem.type === 'movie') ||
+            ((!user.hasPermission(
+              [Permission.AUTO_REQUEST, Permission.AUTO_REQUEST_TV],
+              { type: 'or' }
+            ) ||
+              !user.settings?.watchlistSyncTv) &&
+              mediaItem.type === 'show')
+          ) {
+            return;
+          }
 
-        await MediaRequest.request(
-          {
-            mediaId: mediaItem.tmdbId,
-            mediaType:
-              mediaItem.type === 'show' ? MediaType.TV : MediaType.MOVIE,
-            seasons: mediaItem.type === 'show' ? 'all' : undefined,
-            tvdbId: mediaItem.tvdbId,
-            is4k: false,
-          },
-          user,
-          { isAutoRequest: true }
-        );
-      } catch (e) {
-        if (!(e instanceof Error)) {
-          continue;
-        }
+          await MediaRequest.request(
+            {
+              mediaId: mediaItem.tmdbId,
+              mediaType:
+                mediaItem.type === 'show' ? MediaType.TV : MediaType.MOVIE,
+              seasons: mediaItem.type === 'show' ? 'all' : undefined,
+              tvdbId: mediaItem.tvdbId,
+              is4k: false,
+            },
+            user,
+            { isAutoRequest: true }
+          );
+        } catch (e) {
+          if (!(e instanceof Error)) {
+            return;
+          }
 
-        switch (e.constructor) {
-          // During watchlist sync, these errors aren't necessarily
-          // a problem with Overseerr. Since we are auto syncing these constantly, it's
-          // possible they are unexpectedly at their quota limit, for example. So we'll
-          // instead log these as debug messages.
-          case RequestPermissionError:
-          case DuplicateMediaRequestError:
-          case QuotaRestrictedError:
-          case NoSeasonsAvailableError:
-            logger.debug('Failed to create media request from watchlist', {
-              label: 'Watchlist Sync',
-              userId: user.id,
-              mediaTitle: mediaItem.title,
-              errorMessage: e.message,
-            });
-            break;
-          default:
-            logger.error('Failed to create media request from watchlist', {
-              label: 'Watchlist Sync',
-              userId: user.id,
-              mediaTitle: mediaItem.title,
-              errorMessage: e.message,
-            });
+          switch (e.constructor) {
+            // During watchlist sync, these errors aren't necessarily
+            // a problem with Overseerr. Since we are auto syncing these constantly, it's
+            // possible they are unexpectedly at their quota limit, for example. So we'll
+            // instead log these as debug messages.
+            case RequestPermissionError:
+            case DuplicateMediaRequestError:
+            case QuotaRestrictedError:
+            case NoSeasonsAvailableError:
+              logger.debug('Failed to create media request from watchlist', {
+                label: 'Watchlist Sync',
+                userId: user.id,
+                mediaTitle: mediaItem.title,
+                errorMessage: e.message,
+              });
+              break;
+            default:
+              logger.error('Failed to create media request from watchlist', {
+                label: 'Watchlist Sync',
+                userId: user.id,
+                mediaTitle: mediaItem.title,
+                errorMessage: e.message,
+              });
+          }
         }
-      }
-    }
+      })
+    );
   }
 }
 

server/middleware/clearcookies.ts

@@ -1,6 +0,0 @@
-const clearCookies: Middleware = (_req, res, next) => {
-  res.removeHeader('Set-Cookie');
-  next();
-};
-
-export default clearCookies;

server/migration/1697393491630-AddUserPushoverSound.ts

@@ -1,31 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class AddUserPushoverSound1697393491630 implements MigrationInterface {
-  name = 'AddUserPushoverSound1697393491630';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `CREATE TABLE "temporary_user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "notificationTypes" text, "discordId" varchar, "userId" integer, "region" varchar, "originalLanguage" varchar, "telegramChatId" varchar, "telegramSendSilently" boolean, "pgpKey" varchar, "locale" varchar NOT NULL DEFAULT (''), "pushbulletAccessToken" varchar, "pushoverApplicationToken" varchar, "pushoverUserKey" varchar, "watchlistSyncMovies" boolean, "watchlistSyncTv" boolean, "pushoverSound" varchar, CONSTRAINT "UQ_986a2b6d3c05eb4091bb8066f78" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_user_settings"("id", "notificationTypes", "discordId", "userId", "region", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv") SELECT "id", "notificationTypes", "discordId", "userId", "region", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv" FROM "user_settings"`
-    );
-    await queryRunner.query(`DROP TABLE "user_settings"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_user_settings" RENAME TO "user_settings"`
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "user_settings" RENAME TO "temporary_user_settings"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "notificationTypes" text, "discordId" varchar, "userId" integer, "region" varchar, "originalLanguage" varchar, "telegramChatId" varchar, "telegramSendSilently" boolean, "pgpKey" varchar, "locale" varchar NOT NULL DEFAULT (''), "pushbulletAccessToken" varchar, "pushoverApplicationToken" varchar, "pushoverUserKey" varchar, "watchlistSyncMovies" boolean, "watchlistSyncTv" boolean, CONSTRAINT "UQ_986a2b6d3c05eb4091bb8066f78" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "user_settings"("id", "notificationTypes", "discordId", "userId", "region", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv") SELECT "id", "notificationTypes", "discordId", "userId", "region", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv" FROM "temporary_user_settings"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_user_settings"`);
-  }
-}

server/models/Search.ts

@@ -1,5 +1,4 @@
 import type {
-  TmdbCollectionResult,
   TmdbMovieDetails,
   TmdbMovieResult,
   TmdbPersonDetails,
@@ -10,7 +9,7 @@ import type {
 import { MediaType as MainMediaType } from '@server/constants/media';
 import type Media from '@server/entity/Media';
 
-export type MediaType = 'tv' | 'movie' | 'person' | 'collection';
+export type MediaType = 'tv' | 'movie' | 'person';
 
 interface SearchResult {
   id: number;
@@ -44,18 +43,6 @@ export interface TvResult extends SearchResult {
   firstAirDate: string;
 }
 
-export interface CollectionResult {
-  id: number;
-  mediaType: 'collection';
-  title: string;
-  originalTitle: string;
-  adult: boolean;
-  posterPath?: string;
-  backdropPath?: string;
-  overview: string;
-  originalLanguage: string;
-}
-
 export interface PersonResult {
   id: number;
   name: string;
@@ -66,7 +53,7 @@ export interface PersonResult {
   knownFor: (MovieResult | TvResult)[];
 }
 
-export type Results = MovieResult | TvResult | PersonResult | CollectionResult;
+export type Results = MovieResult | TvResult | PersonResult;
 
 export const mapMovieResult = (
   movieResult: TmdbMovieResult,
@@ -112,20 +99,6 @@ export const mapTvResult = (
   mediaInfo: media,
 });
 
-export const mapCollectionResult = (
-  collectionResult: TmdbCollectionResult
-): CollectionResult => ({
-  id: collectionResult.id,
-  mediaType: collectionResult.media_type || 'collection',
-  adult: collectionResult.adult,
-  originalLanguage: collectionResult.original_language,
-  originalTitle: collectionResult.original_title,
-  title: collectionResult.title,
-  overview: collectionResult.overview,
-  backdropPath: collectionResult.backdrop_path,
-  posterPath: collectionResult.poster_path,
-});
-
 export const mapPersonResult = (
   personResult: TmdbPersonResult
 ): PersonResult => ({
@@ -145,12 +118,7 @@ export const mapPersonResult = (
 });
 
 export const mapSearchResults = (
-  results: (
-    | TmdbMovieResult
-    | TmdbTvResult
-    | TmdbPersonResult
-    | TmdbCollectionResult
-  )[],
+  results: (TmdbMovieResult | TmdbTvResult | TmdbPersonResult)[],
   media?: Media[]
 ): Results[] =>
   results.map((result) => {
@@ -171,8 +139,6 @@ export const mapSearchResults = (
               req.tmdbId === result.id && req.mediaType === MainMediaType.TV
           )
         );
-      case 'collection':
-        return mapCollectionResult(result);
       default:
         return mapPersonResult(result);
     }

server/routes/discover.ts

@@ -14,13 +14,12 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { mapProductionCompany } from '@server/models/Movie';
 import {
-  mapCollectionResult,
   mapMovieResult,
   mapPersonResult,
   mapTvResult,
 } from '@server/models/Search';
 import { mapNetwork } from '@server/models/Tv';
-import { isCollection, isMovie, isPerson } from '@server/utils/typeHelpers';
+import { isMovie, isPerson } from '@server/utils/typeHelpers';
 import { Router } from 'express';
 import { sortBy } from 'lodash';
 import { z } from 'zod';
@@ -65,8 +64,6 @@ const QueryFilterOptions = z.object({
   withRuntimeLte: z.coerce.string().optional(),
   voteAverageGte: z.coerce.string().optional(),
   voteAverageLte: z.coerce.string().optional(),
-  voteCountGte: z.coerce.string().optional(),
-  voteCountLte: z.coerce.string().optional(),
   network: z.coerce.string().optional(),
   watchProviders: z.coerce.string().optional(),
   watchRegion: z.coerce.string().optional(),
@@ -98,8 +95,6 @@ discoverRoutes.get('/movies', async (req, res, next) => {
       withRuntimeLte: query.withRuntimeLte,
       voteAverageGte: query.voteAverageGte,
       voteAverageLte: query.voteAverageLte,
-      voteCountGte: query.voteCountGte,
-      voteCountLte: query.voteCountLte,
       watchProviders: query.watchProviders,
       watchRegion: query.watchRegion,
     });
@@ -361,7 +356,7 @@ discoverRoutes.get('/tv', async (req, res, next) => {
       page: Number(query.page),
       sortBy: query.sortBy as SortOptions,
       language: req.locale ?? query.language,
-      genre: query.genre,
+      genre: query.genre ? Number(query.genre) : undefined,
       network: query.network ? Number(query.network) : undefined,
       firstAirDateLte: query.firstAirDateLte
         ? new Date(query.firstAirDateLte).toISOString().split('T')[0]
@@ -375,8 +370,6 @@ discoverRoutes.get('/tv', async (req, res, next) => {
       withRuntimeLte: query.withRuntimeLte,
       voteAverageGte: query.voteAverageGte,
       voteAverageLte: query.voteAverageLte,
-      voteCountGte: query.voteCountGte,
-      voteCountLte: query.voteCountLte,
       watchProviders: query.watchProviders,
       watchRegion: query.watchRegion,
     });
@@ -498,7 +491,7 @@ discoverRoutes.get<{ genreId: string }>(
       const data = await tmdb.getDiscoverTv({
         page: Number(req.query.page),
         language: req.locale ?? (req.query.language as string),
-        genre: req.params.genreId,
+        genre: Number(req.params.genreId),
       });
 
       const media = await Media.getRelatedMedia(
@@ -654,8 +647,6 @@ discoverRoutes.get('/trending', async (req, res, next) => {
             )
           : isPerson(result)
           ? mapPersonResult(result)
-          : isCollection(result)
-          ? mapCollectionResult(result)
           : mapTvResult(
               result,
               media.find(
@@ -779,9 +770,7 @@ discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
 
       await Promise.all(
         genres.map(async (genre) => {
-          const genreData = await tmdb.getDiscoverTv({
-            genre: genre.id.toString(),
-          });
+          const genreData = await tmdb.getDiscoverTv({ genre: genre.id });
 
           mappedGenres.push({
             id: genre.id,
@@ -809,12 +798,12 @@ discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
   }
 );
 
-discoverRoutes.get<Record<string, unknown>, WatchlistResponse>(
+discoverRoutes.get<{ page?: number }, WatchlistResponse>(
   '/watchlist',
   async (req, res) => {
     const userRepository = getRepository(User);
     const itemsPerPage = 20;
-    const page = Number(req.query.page) ?? 1;
+    const page = req.params.page ?? 1;
     const offset = (page - 1) * itemsPerPage;
 
     const activeUser = await userRepository.findOne({
@@ -838,8 +827,8 @@ discoverRoutes.get<Record<string, unknown>, WatchlistResponse>(
 
     return res.json({
       page,
-      totalPages: Math.ceil(watchlist.totalSize / itemsPerPage),
-      totalResults: watchlist.totalSize,
+      totalPages: Math.ceil(watchlist.size / itemsPerPage),
+      totalResults: watchlist.size,
       results: watchlist.items.map((item) => ({
         ratingKey: item.ratingKey,
         title: item.title,

server/routes/index.ts

@@ -1,5 +1,4 @@
 import GithubAPI from '@server/api/github';
-import PushoverAPI from '@server/api/pushover';
 import TheMovieDb from '@server/api/themoviedb';
 import type {
   TmdbMovieResult,
@@ -113,31 +112,6 @@ router.get('/settings/discover', isAuthenticated(), async (_req, res) => {
 
   return res.json(sliders);
 });
-router.get(
-  '/settings/notifications/pushover/sounds',
-  isAuthenticated(),
-  async (req, res, next) => {
-    const pushoverApi = new PushoverAPI();
-
-    try {
-      if (!req.query.token) {
-        throw new Error('Pushover application token missing from request');
-      }
-
-      const sounds = await pushoverApi.getSounds(req.query.token as string);
-      res.status(200).json(sounds);
-    } catch (e) {
-      logger.debug('Something went wrong retrieving Pushover sounds', {
-        label: 'API',
-        errorMessage: e.message,
-      });
-      return next({
-        status: 500,
-        message: 'Unable to retrieve Pushover sounds.',
-      });
-    }
-  }
-);
 router.use('/settings', isAuthenticated(Permission.ADMIN), settingsRoutes);
 router.use('/search', isAuthenticated(), searchRoutes);
 router.use('/discover', isAuthenticated(), discoverRoutes);

server/routes/media.ts

@@ -1,13 +1,7 @@
 import TautulliAPI from '@server/api/tautulli';
-import {
-  MediaRequestStatus,
-  MediaStatus,
-  MediaType,
-} from '@server/constants/media';
+import { MediaStatus, MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
-import MediaRequest from '@server/entity/MediaRequest';
-import SeasonRequest from '@server/entity/SeasonRequest';
 import { User } from '@server/entity/User';
 import type {
   MediaResultsResponse,
@@ -104,8 +98,6 @@ mediaRoutes.post<
   isAuthenticated(Permission.MANAGE_REQUESTS),
   async (req, res, next) => {
     const mediaRepository = getRepository(Media);
-    const requestRepository = getRepository(MediaRequest);
-    const seasonRequestRepository = getRepository(SeasonRequest);
 
     const media = await mediaRepository.findOne({
       where: { id: Number(req.params.id) },
@@ -146,35 +138,6 @@ mediaRoutes.post<
         media.status = MediaStatus.UNKNOWN;
     }
 
-    if (req.params.status === 'available') {
-      // Here we check all related media requests and
-      // then set to completed if the media is marked
-      // as available
-      const requests = await requestRepository.find({
-        relations: {
-          media: true,
-        },
-        where: { media: { id: media.id }, is4k: is4k },
-      });
-
-      const requestIds = requests.map((request) => request.id);
-
-      if (requestIds.length > 0) {
-        await requestRepository.update(
-          { id: In(requestIds) },
-          { status: MediaRequestStatus.COMPLETED }
-        );
-      }
-
-      requests
-        .flatMap((request) => request.seasons)
-        .forEach(async (season) => {
-          await seasonRequestRepository.update(season.id, {
-            status: MediaRequestStatus.COMPLETED,
-          });
-        });
-    }
-
     await mediaRepository.save(media);
 
     return res.status(200).json(media);

server/routes/movie.ts

@@ -1,6 +1,4 @@
-import IMDBRadarrProxy from '@server/api/rating/imdbRadarrProxy';
-import RottenTomatoes from '@server/api/rating/rottentomatoes';
-import { type RatingResponse } from '@server/api/ratings';
+import RottenTomatoes from '@server/api/rottentomatoes';
 import TheMovieDb from '@server/api/themoviedb';
 import { MediaType } from '@server/constants/media';
 import Media from '@server/entity/Media';
@@ -118,9 +116,6 @@ movieRoutes.get('/:id/similar', async (req, res, next) => {
   }
 });
 
-/**
- * Endpoint backed by RottenTomatoes
- */
 movieRoutes.get('/:id/ratings', async (req, res, next) => {
   const tmdb = new TheMovieDb();
   const rtapi = new RottenTomatoes();
@@ -156,53 +151,4 @@ movieRoutes.get('/:id/ratings', async (req, res, next) => {
   }
 });
 
-/**
- * Endpoint combining RottenTomatoes and IMDB
- */
-movieRoutes.get('/:id/ratingscombined', async (req, res, next) => {
-  const tmdb = new TheMovieDb();
-  const rtapi = new RottenTomatoes();
-  const imdbApi = new IMDBRadarrProxy();
-
-  try {
-    const movie = await tmdb.getMovie({
-      movieId: Number(req.params.id),
-    });
-
-    const rtratings = await rtapi.getMovieRatings(
-      movie.title,
-      Number(movie.release_date.slice(0, 4))
-    );
-
-    let imdbRatings;
-    if (movie.imdb_id) {
-      imdbRatings = await imdbApi.getMovieRatings(movie.imdb_id);
-    }
-
-    if (!rtratings && !imdbRatings) {
-      return next({
-        status: 404,
-        message: 'No ratings found.',
-      });
-    }
-
-    const ratings: RatingResponse = {
-      ...(rtratings ? { rt: rtratings } : {}),
-      ...(imdbRatings ? { imdb: imdbRatings } : {}),
-    };
-
-    return res.status(200).json(ratings);
-  } catch (e) {
-    logger.debug('Something went wrong retrieving movie ratings', {
-      label: 'API',
-      errorMessage: e.message,
-      movieId: req.params.id,
-    });
-    return next({
-      status: 500,
-      message: 'Unable to retrieve movie ratings.',
-    });
-  }
-});
-
 export default movieRoutes;

server/routes/request.ts

@@ -40,6 +40,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
       switch (req.query.filter) {
         case 'approved':
         case 'processing':
+        case 'available':
           statusFilter = [MediaRequestStatus.APPROVED];
           break;
         case 'pending':
@@ -54,18 +55,12 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
         case 'failed':
           statusFilter = [MediaRequestStatus.FAILED];
           break;
-        case 'completed':
-        case 'available':
-        case 'deleted':
-          statusFilter = [MediaRequestStatus.COMPLETED];
-          break;
         default:
           statusFilter = [
             MediaRequestStatus.PENDING,
             MediaRequestStatus.APPROVED,
             MediaRequestStatus.DECLINED,
             MediaRequestStatus.FAILED,
-            MediaRequestStatus.COMPLETED,
           ];
       }
 
@@ -84,9 +79,6 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
             MediaStatus.PARTIALLY_AVAILABLE,
           ];
           break;
-        case 'deleted':
-          mediaStatusFilter = [MediaStatus.DELETED];
-          break;
         default:
           mediaStatusFilter = [
             MediaStatus.UNKNOWN,
@@ -94,7 +86,6 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
             MediaStatus.PROCESSING,
             MediaStatus.PARTIALLY_AVAILABLE,
             MediaStatus.AVAILABLE,
-            MediaStatus.DELETED,
           ];
       }
 
@@ -400,8 +391,7 @@ requestRoutes.put<{ requestId: string }>(
             (r) =>
               r.is4k === request.is4k &&
               r.id !== request.id &&
-              r.status !== MediaRequestStatus.DECLINED &&
-              r.status !== MediaRequestStatus.COMPLETED
+              r.status !== MediaRequestStatus.DECLINED
           )
           .reduce((seasons, r) => {
             const combinedSeasons = r.seasons.map(

server/routes/service.ts

@@ -183,7 +183,9 @@ serviceRoutes.get<{ tmdbId: string }>(
 
     const sonarr = new SonarrAPI({
       apiKey: sonarrSettings.apiKey,
-      url: SonarrAPI.buildUrl(sonarrSettings, '/api/v3'),
+      url: `${sonarrSettings.useSsl ? 'https' : 'http'}://${
+        sonarrSettings.hostname
+      }:${sonarrSettings.port}${sonarrSettings.baseUrl ?? ''}/api`,
     });
 
     try {

server/routes/settings/index.ts

@@ -254,27 +254,25 @@ settingsRoutes.post('/tautulli', async (req, res, next) => {
 
   Object.assign(settings.tautulli, req.body);
 
-  if (settings.tautulli.hostname) {
-    try {
-      const tautulliClient = new TautulliAPI(settings.tautulli);
+  try {
+    const tautulliClient = new TautulliAPI(settings.tautulli);
 
-      const result = await tautulliClient.getInfo();
+    const result = await tautulliClient.getInfo();
 
-      if (!semver.gte(semver.coerce(result?.tautulli_version) ?? '', '2.9.0')) {
-        throw new Error('Tautulli version not supported');
-      }
-
-      settings.save();
-    } catch (e) {
-      logger.error('Something went wrong testing Tautulli connection', {
-        label: 'API',
-        errorMessage: e.message,
-      });
-      return next({
-        status: 500,
-        message: 'Unable to connect to Tautulli.',
-      });
+    if (!semver.gte(semver.coerce(result?.tautulli_version) ?? '', '2.9.0')) {
+      throw new Error('Tautulli version not supported');
     }
+
+    settings.save();
+  } catch (e) {
+    logger.error('Something went wrong testing Tautulli connection', {
+      label: 'API',
+      errorMessage: e.message,
+    });
+    return next({
+      status: 500,
+      message: 'Unable to connect to Tautulli.',
+    });
   }
 
   return res.status(200).json(settings.tautulli);

server/routes/tv.ts

@@ -1,4 +1,4 @@
-import RottenTomatoes from '@server/api/rating/rottentomatoes';
+import RottenTomatoes from '@server/api/rottentomatoes';
 import TheMovieDb from '@server/api/themoviedb';
 import { MediaType } from '@server/constants/media';
 import Media from '@server/entity/Media';

server/routes/user/index.ts

@@ -381,14 +381,7 @@ router.delete<{ id: string }>(
        * we manually remove all requests from the user here so the parent media's
        * properly reflect the change.
        */
-      await requestRepository.remove(user.requests, {
-        /**
-         * Break-up into groups of 1000 requests to be removed at a time.
-         * Necessary for users with >1000 requests, else an SQLite 'Expression tree is too large' error occurs.
-         * https://typeorm.io/repository-api#additional-options
-         */
-        chunk: user.requests.length / 1000,
-      });
+      await requestRepository.remove(user.requests);
 
       await userRepository.delete(user.id);
       return res.status(200).json(user.filter());
@@ -614,7 +607,7 @@ router.get<{ id: string }, UserWatchDataResponse>(
   }
 );
 
-router.get<{ id: string }, WatchlistResponse>(
+router.get<{ id: string; page?: number }, WatchlistResponse>(
   '/:id/watchlist',
   async (req, res, next) => {
     if (
@@ -634,7 +627,7 @@ router.get<{ id: string }, WatchlistResponse>(
     }
 
     const itemsPerPage = 20;
-    const page = Number(req.query.page) ?? 1;
+    const page = req.params.page ?? 1;
     const offset = (page - 1) * itemsPerPage;
 
     const user = await getRepository(User).findOneOrFail({
@@ -658,8 +651,8 @@ router.get<{ id: string }, WatchlistResponse>(
 
     return res.json({
       page,
-      totalPages: Math.ceil(watchlist.totalSize / itemsPerPage),
-      totalResults: watchlist.totalSize,
+      totalPages: Math.ceil(watchlist.size / itemsPerPage),
+      totalResults: watchlist.size,
       results: watchlist.items.map((item) => ({
         ratingKey: item.ratingKey,
         title: item.title,

server/routes/user/usersettings.ts

@@ -262,7 +262,7 @@ userSettingsRoutes.get<{ id: string }, UserSettingsNotificationsResponse>(
       }
 
       return res.status(200).json({
-        emailEnabled: settings.email.enabled,
+        emailEnabled: settings?.email.enabled,
         pgpKey: user.settings?.pgpKey,
         discordEnabled:
           settings?.discord.enabled && settings.discord.options.enableMentions,
@@ -274,12 +274,11 @@ userSettingsRoutes.get<{ id: string }, UserSettingsNotificationsResponse>(
         pushbulletAccessToken: user.settings?.pushbulletAccessToken,
         pushoverApplicationToken: user.settings?.pushoverApplicationToken,
         pushoverUserKey: user.settings?.pushoverUserKey,
-        pushoverSound: user.settings?.pushoverSound,
-        telegramEnabled: settings.telegram.enabled,
-        telegramBotUsername: settings.telegram.options.botUsername,
+        telegramEnabled: settings?.telegram.enabled,
+        telegramBotUsername: settings?.telegram.options.botUsername,
         telegramChatId: user.settings?.telegramChatId,
-        telegramSendSilently: user.settings?.telegramSendSilently,
-        webPushEnabled: settings.webpush.enabled,
+        telegramSendSilently: user?.settings?.telegramSendSilently,
+        webPushEnabled: settings?.webpush.enabled,
         notificationTypes: user.settings?.notificationTypes ?? {},
       });
     } catch (e) {
@@ -330,7 +329,6 @@ userSettingsRoutes.post<{ id: string }, UserSettingsNotificationsResponse>(
         user.settings.pushoverApplicationToken =
           req.body.pushoverApplicationToken;
         user.settings.pushoverUserKey = req.body.pushoverUserKey;
-        user.settings.pushoverSound = req.body.pushoverSound;
         user.settings.telegramChatId = req.body.telegramChatId;
         user.settings.telegramSendSilently = req.body.telegramSendSilently;
         user.settings.notificationTypes = Object.assign(
@@ -343,14 +341,13 @@ userSettingsRoutes.post<{ id: string }, UserSettingsNotificationsResponse>(
       userRepository.save(user);
 
       return res.status(200).json({
-        pgpKey: user.settings.pgpKey,
-        discordId: user.settings.discordId,
-        pushbulletAccessToken: user.settings.pushbulletAccessToken,
-        pushoverApplicationToken: user.settings.pushoverApplicationToken,
-        pushoverUserKey: user.settings.pushoverUserKey,
-        pushoverSound: user.settings.pushoverSound,
-        telegramChatId: user.settings.telegramChatId,
-        telegramSendSilently: user.settings.telegramSendSilently,
+        pgpKey: user.settings?.pgpKey,
+        discordId: user.settings?.discordId,
+        pushbulletAccessToken: user.settings?.pushbulletAccessToken,
+        pushoverApplicationToken: user.settings?.pushoverApplicationToken,
+        pushoverUserKey: user.settings?.pushoverUserKey,
+        telegramChatId: user.settings?.telegramChatId,
+        telegramSendSilently: user?.settings?.telegramSendSilently,
         notificationTypes: user.settings.notificationTypes,
       });
     } catch (e) {

server/subscriber/MediaRequestSubscriber.ts

@@ -1,128 +0,0 @@
-import TheMovieDb from '@server/api/themoviedb';
-import {
-  MediaRequestStatus,
-  MediaStatus,
-  MediaType,
-} from '@server/constants/media';
-import { MediaRequest } from '@server/entity/MediaRequest';
-import notificationManager, { Notification } from '@server/lib/notifications';
-import logger from '@server/logger';
-import { truncate } from 'lodash';
-import type { EntitySubscriberInterface, UpdateEvent } from 'typeorm';
-import { EventSubscriber } from 'typeorm';
-
-@EventSubscriber()
-export class MediaRequestSubscriber
-  implements EntitySubscriberInterface<MediaRequest>
-{
-  private async notifyAvailableMovie(entity: MediaRequest) {
-    if (entity.media.status === MediaStatus.AVAILABLE) {
-      const tmdb = new TheMovieDb();
-
-      try {
-        const movie = await tmdb.getMovie({
-          movieId: entity.media.tmdbId,
-        });
-
-        notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
-          event: `${entity.is4k ? '4K ' : ''}Movie Request Now Available`,
-          notifyAdmin: false,
-          notifySystem: true,
-          notifyUser: entity.requestedBy,
-          subject: `${movie.title}${
-            movie.release_date ? ` (${movie.release_date.slice(0, 4)})` : ''
-          }`,
-          message: truncate(movie.overview, {
-            length: 500,
-            separator: /\s/,
-            omission: '…',
-          }),
-          media: entity.media,
-          image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
-          request: entity,
-        });
-      } catch (e) {
-        logger.error('Something went wrong sending media notification(s)', {
-          label: 'Notifications',
-          errorMessage: e.message,
-          mediaId: entity.id,
-        });
-      }
-    }
-  }
-
-  private async notifyAvailableSeries(entity: MediaRequest) {
-    // Find all seasons in the related media entity
-    // and see if they are available, then we can check
-    // if the request contains the same seasons
-    const isMediaAvailable = entity.media.seasons
-      .filter(
-        (season) =>
-          season[entity.is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
-      )
-      .every((seasonRequest) =>
-        entity.seasons.find(
-          (season) => season.seasonNumber === seasonRequest.seasonNumber
-        )
-      );
-
-    if (entity.media.status === MediaStatus.AVAILABLE || isMediaAvailable) {
-      const tmdb = new TheMovieDb();
-
-      try {
-        const tv = await tmdb.getTvShow({ tvId: entity.media.tmdbId });
-
-        notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
-          event: `${entity.is4k ? '4K ' : ''}Series Request Now Available`,
-          subject: `${tv.name}${
-            tv.first_air_date ? ` (${tv.first_air_date.slice(0, 4)})` : ''
-          }`,
-          message: truncate(tv.overview, {
-            length: 500,
-            separator: /\s/,
-            omission: '…',
-          }),
-          notifyAdmin: false,
-          notifySystem: true,
-          notifyUser: entity.requestedBy,
-          image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${tv.poster_path}`,
-          media: entity.media,
-          extra: [
-            {
-              name: 'Requested Seasons',
-              value: entity.seasons
-                .map((season) => season.seasonNumber)
-                .join(', '),
-            },
-          ],
-          request: entity,
-        });
-      } catch (e) {
-        logger.error('Something went wrong sending media notification(s)', {
-          label: 'Notifications',
-          errorMessage: e.message,
-          mediaId: entity.id,
-        });
-      }
-    }
-  }
-
-  public afterUpdate(event: UpdateEvent<MediaRequest>): void {
-    if (!event.entity) {
-      return;
-    }
-
-    if (event.entity.status === MediaRequestStatus.COMPLETED) {
-      if (event.entity.media.mediaType === MediaType.MOVIE) {
-        this.notifyAvailableMovie(event.entity as MediaRequest);
-      }
-      if (event.entity.media.mediaType === MediaType.TV) {
-        this.notifyAvailableSeries(event.entity as MediaRequest);
-      }
-    }
-  }
-
-  public listenTo(): typeof MediaRequest {
-    return MediaRequest;
-  }
-}

server/subscriber/MediaSubscriber.ts

@@ -1,12 +1,179 @@
-import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
+import TheMovieDb from '@server/api/themoviedb';
+import {
+  MediaRequestStatus,
+  MediaStatus,
+  MediaType,
+} from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import { MediaRequest } from '@server/entity/MediaRequest';
+import Season from '@server/entity/Season';
+import notificationManager, { Notification } from '@server/lib/notifications';
+import logger from '@server/logger';
+import { truncate } from 'lodash';
 import type { EntitySubscriberInterface, UpdateEvent } from 'typeorm';
-import { EventSubscriber } from 'typeorm';
+import { EventSubscriber, In, Not } from 'typeorm';
 
 @EventSubscriber()
 export class MediaSubscriber implements EntitySubscriberInterface<Media> {
+  private async notifyAvailableMovie(
+    entity: Media,
+    dbEntity: Media,
+    is4k: boolean
+  ) {
+    if (
+      entity[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE &&
+      dbEntity[is4k ? 'status4k' : 'status'] !== MediaStatus.AVAILABLE
+    ) {
+      if (entity.mediaType === MediaType.MOVIE) {
+        const requestRepository = getRepository(MediaRequest);
+        const relatedRequests = await requestRepository.find({
+          where: {
+            media: {
+              id: entity.id,
+            },
+            is4k,
+            status: Not(MediaRequestStatus.DECLINED),
+          },
+        });
+
+        if (relatedRequests.length > 0) {
+          const tmdb = new TheMovieDb();
+
+          try {
+            const movie = await tmdb.getMovie({ movieId: entity.tmdbId });
+
+            relatedRequests.forEach((request) => {
+              notificationManager.sendNotification(
+                Notification.MEDIA_AVAILABLE,
+                {
+                  event: `${is4k ? '4K ' : ''}Movie Request Now Available`,
+                  notifyAdmin: false,
+                  notifySystem: true,
+                  notifyUser: request.requestedBy,
+                  subject: `${movie.title}${
+                    movie.release_date
+                      ? ` (${movie.release_date.slice(0, 4)})`
+                      : ''
+                  }`,
+                  message: truncate(movie.overview, {
+                    length: 500,
+                    separator: /\s/,
+                    omission: '…',
+                  }),
+                  media: entity,
+                  image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
+                  request,
+                }
+              );
+            });
+          } catch (e) {
+            logger.error('Something went wrong sending media notification(s)', {
+              label: 'Notifications',
+              errorMessage: e.message,
+              mediaId: entity.id,
+            });
+          }
+        }
+      }
+    }
+  }
+
+  private async notifyAvailableSeries(
+    entity: Media,
+    dbEntity: Media,
+    is4k: boolean
+  ) {
+    const seasonRepository = getRepository(Season);
+    const newAvailableSeasons = entity.seasons
+      .filter(
+        (season) =>
+          season[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
+      )
+      .map((season) => season.seasonNumber);
+    const oldSeasonIds = dbEntity.seasons.map((season) => season.id);
+    const oldSeasons = await seasonRepository.findBy({ id: In(oldSeasonIds) });
+    const oldAvailableSeasons = oldSeasons
+      .filter(
+        (season) =>
+          season[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
+      )
+      .map((season) => season.seasonNumber);
+
+    const changedSeasons = newAvailableSeasons.filter(
+      (seasonNumber) => !oldAvailableSeasons.includes(seasonNumber)
+    );
+
+    if (changedSeasons.length > 0) {
+      const tmdb = new TheMovieDb();
+      const requestRepository = getRepository(MediaRequest);
+      const processedSeasons: number[] = [];
+
+      for (const changedSeasonNumber of changedSeasons) {
+        const requests = await requestRepository.find({
+          where: {
+            media: {
+              id: entity.id,
+            },
+            is4k,
+            status: Not(MediaRequestStatus.DECLINED),
+          },
+        });
+        const request = requests.find(
+          (request) =>
+            // Check if the season is complete AND it contains the current season that was just marked available
+            request.seasons.every((season) =>
+              newAvailableSeasons.includes(season.seasonNumber)
+            ) &&
+            request.seasons.some(
+              (season) => season.seasonNumber === changedSeasonNumber
+            )
+        );
+
+        if (request && !processedSeasons.includes(changedSeasonNumber)) {
+          processedSeasons.push(
+            ...request.seasons.map((season) => season.seasonNumber)
+          );
+
+          try {
+            const tv = await tmdb.getTvShow({ tvId: entity.tmdbId });
+            notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
+              event: `${is4k ? '4K ' : ''}Series Request Now Available`,
+              subject: `${tv.name}${
+                tv.first_air_date ? ` (${tv.first_air_date.slice(0, 4)})` : ''
+              }`,
+              message: truncate(tv.overview, {
+                length: 500,
+                separator: /\s/,
+                omission: '…',
+              }),
+              notifyAdmin: false,
+              notifySystem: true,
+              notifyUser: request.requestedBy,
+              image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${tv.poster_path}`,
+              media: entity,
+              extra: [
+                {
+                  name: 'Requested Seasons',
+                  value: request.seasons
+                    .map((season) => season.seasonNumber)
+                    .join(', '),
+                },
+              ],
+              request,
+            });
+          } catch (e) {
+            logger.error('Something went wrong sending media notification(s)', {
+              label: 'Notifications',
+              errorMessage: e.message,
+              mediaId: entity.id,
+            });
+          }
+        }
+      }
+    }
+  }
+
   private async updateChildRequestStatus(event: Media, is4k: boolean) {
     const requestRepository = getRepository(MediaRequest);
 
@@ -30,6 +197,52 @@ export class MediaSubscriber implements EntitySubscriberInterface<Media> {
       return;
     }
 
+    if (
+      event.entity.mediaType === MediaType.MOVIE &&
+      event.entity.status === MediaStatus.AVAILABLE
+    ) {
+      this.notifyAvailableMovie(
+        event.entity as Media,
+        event.databaseEntity,
+        false
+      );
+    }
+
+    if (
+      event.entity.mediaType === MediaType.MOVIE &&
+      event.entity.status4k === MediaStatus.AVAILABLE
+    ) {
+      this.notifyAvailableMovie(
+        event.entity as Media,
+        event.databaseEntity,
+        true
+      );
+    }
+
+    if (
+      event.entity.mediaType === MediaType.TV &&
+      (event.entity.status === MediaStatus.AVAILABLE ||
+        event.entity.status === MediaStatus.PARTIALLY_AVAILABLE)
+    ) {
+      this.notifyAvailableSeries(
+        event.entity as Media,
+        event.databaseEntity,
+        false
+      );
+    }
+
+    if (
+      event.entity.mediaType === MediaType.TV &&
+      (event.entity.status4k === MediaStatus.AVAILABLE ||
+        event.entity.status4k === MediaStatus.PARTIALLY_AVAILABLE)
+    ) {
+      this.notifyAvailableSeries(
+        event.entity as Media,
+        event.databaseEntity,
+        true
+      );
+    }
+
     if (
       event.entity.status === MediaStatus.AVAILABLE &&
       event.databaseEntity.status === MediaStatus.PENDING

server/utils/typeHelpers.ts

@@ -1,5 +1,4 @@
 import type {
-  TmdbCollectionResult,
   TmdbMovieDetails,
   TmdbMovieResult,
   TmdbPersonDetails,
@@ -9,35 +8,17 @@ import type {
 } from '@server/api/themoviedb/interfaces';
 
 export const isMovie = (
-  movie:
-    | TmdbMovieResult
-    | TmdbTvResult
-    | TmdbPersonResult
-    | TmdbCollectionResult
+  movie: TmdbMovieResult | TmdbTvResult | TmdbPersonResult
 ): movie is TmdbMovieResult => {
   return (movie as TmdbMovieResult).title !== undefined;
 };
 
 export const isPerson = (
-  person:
-    | TmdbMovieResult
-    | TmdbTvResult
-    | TmdbPersonResult
-    | TmdbCollectionResult
+  person: TmdbMovieResult | TmdbTvResult | TmdbPersonResult
 ): person is TmdbPersonResult => {
   return (person as TmdbPersonResult).known_for !== undefined;
 };
 
-export const isCollection = (
-  collection:
-    | TmdbMovieResult
-    | TmdbTvResult
-    | TmdbPersonResult
-    | TmdbCollectionResult
-): collection is TmdbCollectionResult => {
-  return (collection as TmdbCollectionResult).media_type === 'collection';
-};
-
 export const isMovieDetails = (
   movie: TmdbMovieDetails | TmdbTvDetails | TmdbPersonDetails
 ): movie is TmdbMovieDetails => {

snap/snapcraft.yaml

@@ -16,9 +16,9 @@ architectures:
 parts:
   overseerr:
     plugin: nodejs
-    nodejs-version: '18.18.2'
+    nodejs-version: '16.17.0'
     nodejs-package-manager: 'yarn'
-    nodejs-yarn-version: v1.22.19
+    nodejs-yarn-version: v1.22.17
     build-packages:
       - git
       - on arm64:

src/components/AirDateBadge/index.tsx

@@ -37,7 +37,6 @@ const AirDateBadge = ({ airDate }: AirDateBadgeProps) => {
           year: 'numeric',
           month: 'long',
           day: 'numeric',
-          timeZone: 'UTC',
         })}
       </Badge>
       {showRelative && (

src/components/CollectionDetails/index.tsx

@@ -10,7 +10,6 @@ import useSettings from '@app/hooks/useSettings';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
-import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
 import { ArrowDownTrayIcon } from '@heroicons/react/24/outline';
 import { MediaStatus } from '@server/constants/media';
 import type { Collection } from '@server/models/Collection';
@@ -40,19 +39,6 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
   const [requestModal, setRequestModal] = useState(false);
   const [is4k, setIs4k] = useState(false);
 
-  const returnCollectionDownloadItems = (data: Collection | undefined) => {
-    const [downloadStatus, downloadStatus4k] = [
-      data?.parts.flatMap((item) =>
-        item.mediaInfo?.downloadStatus ? item.mediaInfo?.downloadStatus : []
-      ),
-      data?.parts.flatMap((item) =>
-        item.mediaInfo?.downloadStatus4k ? item.mediaInfo?.downloadStatus4k : []
-      ),
-    ];
-
-    return { downloadStatus, downloadStatus4k };
-  };
-
   const {
     data,
     error,
@@ -60,19 +46,21 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
   } = useSWR<Collection>(`/api/v1/collection/${router.query.collectionId}`, {
     fallbackData: collection,
     revalidateOnMount: true,
-    refreshInterval: refreshIntervalHelper(
-      returnCollectionDownloadItems(collection),
-      15000
-    ),
   });
 
   const { data: genres } =
     useSWR<{ id: number; name: string }[]>(`/api/v1/genres/movie`);
 
   const [downloadStatus, downloadStatus4k] = useMemo(() => {
-    const downloadItems = returnCollectionDownloadItems(data);
-    return [downloadItems.downloadStatus, downloadItems.downloadStatus4k];
-  }, [data]);
+    return [
+      data?.parts.flatMap((item) =>
+        item.mediaInfo?.downloadStatus ? item.mediaInfo?.downloadStatus : []
+      ),
+      data?.parts.flatMap((item) =>
+        item.mediaInfo?.downloadStatus4k ? item.mediaInfo?.downloadStatus4k : []
+      ),
+    ];
+  }, [data?.parts]);
 
   const [titles, titles4k] = useMemo(() => {
     return [
@@ -348,7 +336,7 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
           />
         ))}
       />
-      <div className="extra-bottom-space relative" />
+      <div className="pb-8" />
     </div>
   );
 };

src/components/Common/Badge/index.tsx

@@ -71,7 +71,7 @@ const Badge = (
         'bg-indigo-500 bg-opacity-80 border border-indigo-500 !text-indigo-100'
       );
       if (href) {
-        badgeStyle.push('hover:bg-indigo-500 hover:bg-opacity-100');
+        badgeStyle.push('hover:bg-indigo-500 bg-opacity-100');
       }
   }
 

src/components/Common/ButtonWithDropdown/index.tsx

@@ -101,12 +101,12 @@ const ButtonWithDropdown = ({
           <Transition
             as={Fragment}
             show={isOpen}
-            enter="transition ease-out duration-100"
-            enterFrom="opacity-0 scale-95"
-            enterTo="opacity-100 scale-100"
-            leave="transition ease-in duration-75"
-            leaveFrom="opacity-100 scale-100"
-            leaveTo="opacity-0 scale-95"
+            enter="transition ease-out duration-100 opacity-0"
+            enterFrom="transform opacity-0 scale-95"
+            enterTo="transform opacity-100 scale-100"
+            leave="transition ease-in duration-75 opacity-100"
+            leaveFrom="transform opacity-100 scale-100"
+            leaveTo="transform opacity-0 scale-95"
           >
             <div className="absolute right-0 z-40 mt-2 -mr-1 w-56 origin-top-right rounded-md shadow-lg">
               <div

src/components/Common/ListView/index.tsx

@@ -5,7 +5,6 @@ import useVerticalScroll from '@app/hooks/useVerticalScroll';
 import globalMessages from '@app/i18n/globalMessages';
 import type { WatchlistItem } from '@server/interfaces/api/discoverInterfaces';
 import type {
-  CollectionResult,
   MovieResult,
   PersonResult,
   TvResult,
@@ -13,7 +12,7 @@ import type {
 import { useIntl } from 'react-intl';
 
 type ListViewProps = {
-  items?: (TvResult | MovieResult | PersonResult | CollectionResult)[];
+  items?: (TvResult | MovieResult | PersonResult)[];
   plexItems?: WatchlistItem[];
   isEmpty?: boolean;
   isLoading?: boolean;
@@ -91,18 +90,6 @@ const ListView = ({
                 />
               );
               break;
-            case 'collection':
-              titleCard = (
-                <TitleCard
-                  id={title.id}
-                  image={title.posterPath}
-                  summary={title.overview}
-                  title={title.title}
-                  mediaType={title.mediaType}
-                  canExpand
-                />
-              );
-              break;
             case 'person':
               titleCard = (
                 <PersonCard

src/components/Common/Modal/index.tsx

@@ -78,10 +78,10 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
         appear
         as="div"
         className="fixed top-0 bottom-0 left-0 right-0 z-50 flex h-full w-full items-center justify-center bg-gray-800 bg-opacity-70"
-        enter="transition-opacity duration-300"
+        enter="transition opacity-0 duration-300"
         enterFrom="opacity-0"
         enterTo="opacity-100"
-        leave="transition-opacity duration-300"
+        leave="transition opacity-100 duration-300"
         leaveFrom="opacity-100"
         leaveTo="opacity-0"
         ref={parentRef}
@@ -89,10 +89,10 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
         <Transition
           appear
           as={Fragment}
-          enter="transition duration-300"
+          enter="transition opacity-0 duration-300 transform scale-75"
           enterFrom="opacity-0 scale-75"
           enterTo="opacity-100 scale-100"
-          leave="transition-opacity duration-300"
+          leave="transition opacity-100 duration-300"
           leaveFrom="opacity-100"
           leaveTo="opacity-0"
           show={loading}
@@ -102,7 +102,7 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
           </div>
         </Transition>
         <Transition
-          className="hide-scrollbar relative inline-block w-full overflow-auto bg-gray-800 px-4 pt-4 pb-4 text-left align-bottom shadow-xl ring-1 ring-gray-700 transition-all sm:my-8 sm:max-w-3xl sm:rounded-lg sm:align-middle"
+          className="hide-scrollbar relative inline-block w-full transform overflow-auto bg-gray-800 px-4 pt-4 pb-4 text-left align-bottom shadow-xl ring-1 ring-gray-700 transition-all sm:my-8 sm:max-w-3xl sm:rounded-lg sm:align-middle"
           role="dialog"
           aria-modal="true"
           aria-labelledby="modal-headline"
@@ -111,10 +111,10 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
           }}
           appear
           as="div"
-          enter="transition duration-300"
+          enter="transition opacity-0 duration-300 transform scale-75"
           enterFrom="opacity-0 scale-75"
           enterTo="opacity-100 scale-100"
-          leave="transition-opacity duration-300"
+          leave="transition opacity-100 duration-300"
           leaveFrom="opacity-100"
           leaveTo="opacity-0"
           show={!loading}

src/components/Common/SlideCheckbox/index.tsx

@@ -29,7 +29,7 @@ const SlideCheckbox = ({ onClick, checked = false }: SlideCheckboxProps) => {
         aria-hidden="true"
         className={`${
           checked ? 'translate-x-5' : 'translate-x-0'
-        } absolute left-0 inline-block h-5 w-5 rounded-full border border-gray-200 bg-white shadow transition-transform duration-200 ease-in-out group-focus:border-blue-300 group-focus:ring`}
+        } absolute left-0 inline-block h-5 w-5 transform rounded-full border border-gray-200 bg-white shadow transition-transform duration-200 ease-in-out group-focus:border-blue-300 group-focus:ring`}
       ></span>
     </span>
   );

src/components/Common/SlideOver/index.tsx

@@ -37,10 +37,10 @@ const SlideOver = ({
       as={Fragment}
       show={show}
       appear
-      enter="transition-opacity ease-in-out duration-300"
+      enter="opacity-0 transition ease-in-out duration-300"
       enterFrom="opacity-0"
       enterTo="opacity-100"
-      leave="transition-opacity ease-in-out duration-300"
+      leave="opacity-100 transition ease-in-out duration-300"
       leaveFrom="opacity-100"
       leaveTo="opacity-0"
     >
@@ -58,16 +58,16 @@ const SlideOver = ({
           <section className="absolute inset-y-0 right-0 flex max-w-full">
             <Transition.Child
               appear
-              enter="transition-transform ease-in-out duration-500 sm:duration-700"
+              enter="transform transition ease-in-out duration-500 sm:duration-700"
               enterFrom="translate-x-full"
               enterTo="translate-x-0"
-              leave="transition-transform ease-in-out duration-500 sm:duration-700"
+              leave="transform transition ease-in-out duration-500 sm:duration-700"
               leaveFrom="translate-x-0"
               leaveTo="translate-x-full"
             >
               {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
               <div
-                className="slideover relative h-full w-screen max-w-md p-2 sm:p-3"
+                className="slideover relative h-full w-screen max-w-md p-2 sm:p-4"
                 ref={slideoverRef}
                 onClick={(e) => e.stopPropagation()}
               >

src/components/Common/StatusBadgeMini/index.tsx

@@ -1,11 +1,6 @@
 import Spinner from '@app/assets/spinner.svg';
 import { CheckCircleIcon } from '@heroicons/react/20/solid';
-import {
-  BellIcon,
-  ClockIcon,
-  MinusSmallIcon,
-  TrashIcon,
-} from '@heroicons/react/24/solid';
+import { BellIcon, ClockIcon, MinusSmallIcon } from '@heroicons/react/24/solid';
 import { MediaStatus } from '@server/constants/media';
 
 interface StatusBadgeMiniProps {
@@ -55,10 +50,6 @@ const StatusBadgeMini = ({
       );
       indicatorIcon = <MinusSmallIcon />;
       break;
-    case MediaStatus.DELETED:
-      badgeStyle.push('bg-red-500 border-red-400 ring-red-400 text-red-100');
-      indicatorIcon = <TrashIcon />;
-      break;
   }
 
   if (inProgress) {

src/components/Discover/CreateSlider/index.tsx

@@ -2,7 +2,6 @@ import Button from '@app/components/Common/Button';
 import Tooltip from '@app/components/Common/Tooltip';
 import { sliderTitles } from '@app/components/Discover/constants';
 import MediaSlider from '@app/components/MediaSlider';
-import { WatchProviderSelector } from '@app/components/Selector';
 import { encodeURIExtraParams } from '@app/hooks/useDiscover';
 import type {
   TmdbCompanySearchResponse,
@@ -56,7 +55,7 @@ type CreateOption = {
   dataUrl: string;
   params?: string;
   titlePlaceholderText: string;
-  dataPlaceholderText?: string;
+  dataPlaceholderText: string;
 };
 
 const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
@@ -277,20 +276,6 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
       titlePlaceholderText: intl.formatMessage(messages.slidernameplaceholder),
       dataPlaceholderText: intl.formatMessage(messages.providetmdbsearch),
     },
-    {
-      type: DiscoverSliderType.TMDB_MOVIE_STREAMING_SERVICES,
-      title: intl.formatMessage(sliderTitles.tmdbmoviestreamingservices),
-      dataUrl: '/api/v1/discover/movies',
-      params: 'watchRegion=$regionValue&watchProviders=$providersValue',
-      titlePlaceholderText: intl.formatMessage(messages.slidernameplaceholder),
-    },
-    {
-      type: DiscoverSliderType.TMDB_TV_STREAMING_SERVICES,
-      title: intl.formatMessage(sliderTitles.tmdbtvstreamingservices),
-      dataUrl: '/api/v1/discover/tv',
-      params: 'watchRegion=$regionValue&watchProviders=$providersValue',
-      titlePlaceholderText: intl.formatMessage(messages.slidernameplaceholder),
-    },
   ];
 
   return (
@@ -432,40 +417,6 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
               />
             );
             break;
-          case DiscoverSliderType.TMDB_MOVIE_STREAMING_SERVICES:
-            dataInput = (
-              <WatchProviderSelector
-                type={'movie'}
-                region={slider?.data?.split(',')[0]}
-                activeProviders={
-                  slider?.data
-                    ?.split(',')[1]
-                    .split('|')
-                    .map((v) => Number(v)) ?? []
-                }
-                onChange={(region, providers) => {
-                  setFieldValue('data', `${region},${providers.join('|')}`);
-                }}
-              />
-            );
-            break;
-          case DiscoverSliderType.TMDB_TV_STREAMING_SERVICES:
-            dataInput = (
-              <WatchProviderSelector
-                type={'tv'}
-                region={slider?.data?.split(',')[0]}
-                activeProviders={
-                  slider?.data
-                    ?.split(',')[1]
-                    .split('|')
-                    .map((v) => Number(v)) ?? []
-                }
-                onChange={(region, providers) => {
-                  setFieldValue('data', `${region},${providers.join('|')}`);
-                }}
-              />
-            );
-            break;
           default:
             dataInput = (
               <Field
@@ -537,25 +488,10 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
                     '$value',
                     encodeURIExtraParams(values.data)
                   )}
-                  extraParams={
-                    activeOption.type ===
-                      DiscoverSliderType.TMDB_MOVIE_STREAMING_SERVICES ||
-                    activeOption.type ===
-                      DiscoverSliderType.TMDB_TV_STREAMING_SERVICES
-                      ? activeOption.params
-                          ?.replace(
-                            '$regionValue',
-                            encodeURIExtraParams(values?.data.split(',')[0])
-                          )
-                          .replace(
-                            '$providersValue',
-                            encodeURIExtraParams(values?.data.split(',')[1])
-                          )
-                      : activeOption.params?.replace(
-                          '$value',
-                          encodeURIExtraParams(values.data)
-                        )
-                  }
+                  extraParams={activeOption.params?.replace(
+                    '$value',
+                    encodeURIExtraParams(values.data)
+                  )}
                   onNewTitles={updateResultCount}
                 />
               </div>

src/components/Discover/DiscoverSliderEdit/index.tsx

@@ -164,10 +164,6 @@ const DiscoverSliderEdit = ({
         return intl.formatMessage(sliderTitles.tmdbnetwork);
       case DiscoverSliderType.TMDB_SEARCH:
         return intl.formatMessage(sliderTitles.tmdbsearch);
-      case DiscoverSliderType.TMDB_MOVIE_STREAMING_SERVICES:
-        return intl.formatMessage(sliderTitles.tmdbmoviestreamingservices);
-      case DiscoverSliderType.TMDB_TV_STREAMING_SERVICES:
-        return intl.formatMessage(sliderTitles.tmdbtvstreamingservices);
       default:
         return 'Unknown Slider';
     }
@@ -199,9 +195,7 @@ const DiscoverSliderEdit = ({
           className={`${slider.data ? 'mb-4' : 'mb-0'} flex space-x-2 md:mb-0`}
         >
           <Bars3Icon className="h-6 w-6" />
-          <div className="w-7/12 truncate md:w-full">
-            {getSliderTitle(slider)}
-          </div>
+          <div>{getSliderTitle(slider)}</div>
         </div>
         <div
           className={`pointer-events-none ${

src/components/Discover/DiscoverTv/index.tsx

@@ -91,10 +91,10 @@ const DiscoverTv = () => {
               <option value={SortOptions.PopularityAsc}>
                 {intl.formatMessage(messages.sortPopularityAsc)}
               </option>
-              <option value={SortOptions.FirstAirDateDesc}>
+              <option value={SortOptions.ReleaseDateDesc}>
                 {intl.formatMessage(messages.sortFirstAirDateDesc)}
               </option>
-              <option value={SortOptions.FirstAirDateAsc}>
+              <option value={SortOptions.ReleaseDateAsc}>
                 {intl.formatMessage(messages.sortFirstAirDateAsc)}
               </option>
               <option value={SortOptions.TmdbRatingDesc}>

src/components/Discover/FilterSlideover/index.tsx

@@ -35,10 +35,8 @@ const messages = defineMessages({
   ratingText: 'Ratings between {minValue} and {maxValue}',
   clearfilters: 'Clear Active Filters',
   tmdbuserscore: 'TMDB User Score',
-  tmdbuservotecount: 'TMDB User Vote Count',
   runtime: 'Runtime',
   streamingservices: 'Streaming Services',
-  voteCount: 'Number of votes between {minValue} and {maxValue}',
 });
 
 type FilterSlideoverProps = {
@@ -248,45 +246,6 @@ const FilterSlideover = ({
             })}
           />
         </div>
-        <span className="text-lg font-semibold">
-          {intl.formatMessage(messages.tmdbuservotecount)}
-        </span>
-        <div className="relative z-0">
-          <MultiRangeSlider
-            min={0}
-            max={1000}
-            defaultMaxValue={
-              currentFilters.voteCountLte
-                ? Number(currentFilters.voteCountLte)
-                : undefined
-            }
-            defaultMinValue={
-              currentFilters.voteCountGte
-                ? Number(currentFilters.voteCountGte)
-                : undefined
-            }
-            onUpdateMin={(min) => {
-              updateQueryParams(
-                'voteCountGte',
-                min !== 0 && Number(currentFilters.voteCountLte) !== 1000
-                  ? min.toString()
-                  : undefined
-              );
-            }}
-            onUpdateMax={(max) => {
-              updateQueryParams(
-                'voteCountLte',
-                max !== 1000 && Number(currentFilters.voteCountGte) !== 0
-                  ? max.toString()
-                  : undefined
-              );
-            }}
-            subText={intl.formatMessage(messages.voteCount, {
-              minValue: currentFilters.voteCountGte ?? 0,
-              maxValue: currentFilters.voteCountLte ?? 1000,
-            })}
-          />
-        </div>
         <span className="text-lg font-semibold">
           {intl.formatMessage(messages.streamingservices)}
         </span>

src/components/Discover/NetworkSlider/index.tsx

@@ -139,12 +139,6 @@ const networks: Network[] = [
       'https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)/ikZXxg6GnwpzqiZbRPhJGaZapqB.png',
     url: '/discover/tv/network/13',
   },
-  {
-    name: 'Peacock',
-    image:
-      'https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)/gIAcGTjKKr0KOHL5s4O36roJ8p7.png',
-    url: '/discover/tv/network/3353',
-  },
 ];
 
 const NetworkSlider = () => {

src/components/Discover/constants.ts

@@ -86,8 +86,6 @@ export const sliderTitles = defineMessages({
   tmdbnetwork: 'TMDB Network',
   tmdbstudio: 'TMDB Studio',
   tmdbsearch: 'TMDB Search',
-  tmdbmoviestreamingservices: 'TMDB Movie Streaming Services',
-  tmdbtvstreamingservices: 'TMDB TV Streaming Services',
 });
 
 export const QueryFilterOptions = z.object({
@@ -104,8 +102,6 @@ export const QueryFilterOptions = z.object({
   withRuntimeLte: z.string().optional(),
   voteAverageGte: z.string().optional(),
   voteAverageLte: z.string().optional(),
-  voteCountLte: z.string().optional(),
-  voteCountGte: z.string().optional(),
   watchRegion: z.string().optional(),
   watchProviders: z.string().optional(),
 });
@@ -171,14 +167,6 @@ export const prepareFilterValues = (
     filterValues.voteAverageLte = values.voteAverageLte;
   }
 
-  if (values.voteCountGte) {
-    filterValues.voteCountGte = values.voteCountGte;
-  }
-
-  if (values.voteCountLte) {
-    filterValues.voteCountLte = values.voteCountLte;
-  }
-
   if (values.watchProviders) {
     filterValues.watchProviders = values.watchProviders;
   }
@@ -200,12 +188,6 @@ export const countActiveFilters = (filterValues: FilterOptions): number => {
     delete clonedFilters.voteAverageLte;
   }
 
-  if (clonedFilters.voteCountGte || filterValues.voteCountLte) {
-    totalCount += 1;
-    delete clonedFilters.voteCountGte;
-    delete clonedFilters.voteCountLte;
-  }
-
   if (clonedFilters.withRuntimeGte || filterValues.withRuntimeLte) {
     totalCount += 1;
     delete clonedFilters.withRuntimeGte;

src/components/Discover/index.tsx

@@ -165,10 +165,10 @@ const Discover = () => {
           </Transition>
           <Transition
             show={isEditing}
-            enter="transition duration-300"
+            enter="transition transform duration-300"
             enterFrom="opacity-0 translate-y-6"
             enterTo="opacity-100 translate-y-0"
-            leave="transition duration-300"
+            leave="transition duration-300 transform"
             leaveFrom="opacity-100 translate-y-0"
             leaveTo="opacity-0 translate-y-6"
             className="safe-shift-edit-menu fixed right-0 left-0 z-50 flex flex-col items-center justify-end space-x-0 space-y-2 border-t border-gray-700 bg-gray-800 bg-opacity-80 p-4 backdrop-blur sm:bottom-0 sm:flex-row sm:space-y-0 sm:space-x-3"
@@ -365,36 +365,6 @@ const Discover = () => {
               />
             );
             break;
-          case DiscoverSliderType.TMDB_MOVIE_STREAMING_SERVICES:
-            sliderComponent = (
-              <MediaSlider
-                sliderKey={`custom-slider-${slider.id}`}
-                title={slider.title ?? ''}
-                url="/api/v1/discover/movies"
-                extraParams={`watchRegion=${
-                  slider.data?.split(',')[0]
-                }&watchProviders=${slider.data?.split(',')[1]}`}
-                linkUrl={`/discover/movies?watchRegion=${
-                  slider.data?.split(',')[0]
-                }&watchProviders=${slider.data?.split(',')[1]}`}
-              />
-            );
-            break;
-          case DiscoverSliderType.TMDB_TV_STREAMING_SERVICES:
-            sliderComponent = (
-              <MediaSlider
-                sliderKey={`custom-slider-${slider.id}`}
-                title={slider.title ?? ''}
-                url="/api/v1/discover/tv"
-                extraParams={`watchRegion=${
-                  slider.data?.split(',')[0]
-                }&watchProviders=${slider.data?.split(',')[1]}`}
-                linkUrl={`/discover/tv?watchRegion=${
-                  slider.data?.split(',')[0]
-                }&watchProviders=${slider.data?.split(',')[1]}`}
-              />
-            );
-            break;
         }
 
         if (isEditing) {

src/components/IssueDetails/IssueComment/index.tsx

@@ -65,10 +65,10 @@ const IssueComment = ({
     >
       <Transition
         as={Fragment}
-        enter="transition-opacity duration-300"
+        enter="transition opacity-0 duration-300"
         enterFrom="opacity-0"
         enterTo="opacity-100"
-        leave="transition-opacity duration-300"
+        leave="transition opacity-100 duration-300"
         leaveFrom="opacity-100"
         leaveTo="opacity-0"
         show={showDeleteModal}
@@ -115,11 +115,11 @@ const IssueComment = ({
                     as={Fragment}
                     show={open}
                     enter="transition ease-out duration-100"
-                    enterFrom="opacity-0 scale-95"
-                    enterTo="opacity-100 scale-100"
+                    enterFrom="transform opacity-0 scale-95"
+                    enterTo="transform opacity-100 scale-100"
                     leave="transition ease-in duration-75"
-                    leaveFrom="opacity-100 scale-100"
-                    leaveTo="opacity-0 scale-95"
+                    leaveFrom="transform opacity-100 scale-100"
+                    leaveTo="transform opacity-0 scale-95"
                   >
                     <Menu.Items
                       static
@@ -164,7 +164,7 @@ const IssueComment = ({
             </Menu>
           )}
           <div
-            className={`absolute top-3 z-10 h-3 w-3 rotate-45 bg-gray-800 shadow ring-1 ring-gray-500 ${
+            className={`absolute top-3 z-10 h-3 w-3 rotate-45 transform bg-gray-800 shadow ring-1 ring-gray-500 ${
               isReversed ? '-left-1' : '-right-1'
             }`}
           />

src/components/IssueDetails/IssueDescription/index.tsx

@@ -57,11 +57,11 @@ const IssueDescription = ({
                   show={open}
                   as="div"
                   enter="transition ease-out duration-100"
-                  enterFrom="opacity-0 scale-95"
-                  enterTo="opacity-100 scale-100"
+                  enterFrom="transform opacity-0 scale-95"
+                  enterTo="transform opacity-100 scale-100"
                   leave="transition ease-in duration-75"
-                  leaveFrom="opacity-100 scale-100"
-                  leaveTo="opacity-0 scale-95"
+                  leaveFrom="transform opacity-100 scale-100"
+                  leaveTo="transform opacity-0 scale-95"
                 >
                   <Menu.Items
                     static

src/components/IssueDetails/index.tsx

@@ -182,10 +182,10 @@ const IssueDetails = () => {
       <PageTitle title={[intl.formatMessage(messages.issuepagetitle), title]} />
       <Transition
         as="div"
-        enter="transition-opacity duration-300"
+        enter="transition opacity-0 duration-300"
         enterFrom="opacity-0"
         enterTo="opacity-100"
-        leave="transition-opacity duration-300"
+        leave="transition opacity-100 duration-300"
         leaveFrom="opacity-100"
         leaveTo="opacity-0"
         show={showDeleteModal}

src/components/IssueModal/index.tsx

@@ -12,10 +12,10 @@ interface IssueModalProps {
 const IssueModal = ({ show, mediaType, onCancel, tmdbId }: IssueModalProps) => (
   <Transition
     as="div"
-    enter="transition-opacity duration-300"
+    enter="transition opacity-0 duration-300"
     enterFrom="opacity-0"
     enterTo="opacity-100"
-    leave="transition-opacity duration-300"
+    leave="transition opacity-100 duration-300"
     leaveFrom="opacity-100"
     leaveTo="opacity-0"
     show={show}

src/components/Layout/LanguagePicker/index.tsx

@@ -34,12 +34,12 @@ const LanguagePicker = () => {
       <Transition
         as="div"
         show={isDropdownOpen}
-        enter="transition ease-out duration-100"
-        enterFrom="opacity-0 scale-95"
-        enterTo="opacity-100 scale-100"
-        leave="transition ease-in duration-75"
-        leaveFrom="opacity-100 scale-100"
-        leaveTo="opacity-0 scale-95"
+        enter="transition ease-out duration-100 opacity-0"
+        enterFrom="transform opacity-0 scale-95"
+        enterTo="transform opacity-100 scale-100"
+        leave="transition ease-in duration-75 opacity-100"
+        leaveFrom="transform opacity-100 scale-100"
+        leaveTo="transform opacity-0 scale-95"
       >
         <div
           className="absolute right-0 mt-2 w-56 origin-top-right rounded-md shadow-lg"

src/components/Layout/MobileMenu/index.tsx

@@ -118,11 +118,7 @@ const MobileMenu = () => {
   ];
 
   const filteredLinks = menuLinks.filter(
-    (link) =>
-      !link.requiredPermission ||
-      hasPermission(link.requiredPermission, {
-        type: link.permissionType ?? 'and',
-      })
+    (link) => !link.requiredPermission || hasPermission(link.requiredPermission)
   );
 
   return (
@@ -131,13 +127,13 @@ const MobileMenu = () => {
         show={isOpen}
         as="div"
         ref={ref}
-        enter="transition duration-500"
+        enter="transition transform duration-500"
         enterFrom="opacity-0 translate-y-0"
         enterTo="opacity-100 -translate-y-full"
-        leave="transition duration-500"
+        leave="transition duration-500 transform"
         leaveFrom="opacity-100 -translate-y-full"
         leaveTo="opacity-0 translate-y-0"
-        className="absolute top-0 left-0 right-0 flex w-full -translate-y-full flex-col space-y-6 border-t border-gray-600 bg-gray-900 bg-opacity-90 px-6 py-6 font-semibold text-gray-100 backdrop-blur"
+        className="absolute top-0 left-0 right-0 flex w-full -translate-y-full transform flex-col space-y-6 border-t border-gray-600 bg-gray-900 bg-opacity-90 px-6 py-6 font-semibold text-gray-100 backdrop-blur"
       >
         {filteredLinks.map((link) => {
           const isActive = router.pathname.match(link.activeRegExp);
@@ -167,29 +163,27 @@ const MobileMenu = () => {
       </Transition>
       <div className="padding-bottom-safe border-t border-gray-600 bg-gray-800 bg-opacity-90 backdrop-blur">
         <div className="flex h-full items-center justify-between px-6 py-4 text-gray-100">
-          {filteredLinks
-            .slice(0, filteredLinks.length === 5 ? 5 : 4)
-            .map((link) => {
-              const isActive =
-                router.pathname.match(link.activeRegExp) && !isOpen;
-              return (
-                <Link key={`mobile-menu-link-${link.href}`} href={link.href}>
-                  <a
-                    className={`flex flex-col items-center space-y-1 ${
-                      isActive ? 'text-indigo-500' : ''
-                    }`}
-                  >
-                    {cloneElement(
-                      isActive ? link.svgIconSelected : link.svgIcon,
-                      {
-                        className: 'h-6 w-6',
-                      }
-                    )}
-                  </a>
-                </Link>
-              );
-            })}
-          {filteredLinks.length > 4 && filteredLinks.length !== 5 && (
+          {filteredLinks.slice(0, 4).map((link) => {
+            const isActive =
+              router.pathname.match(link.activeRegExp) && !isOpen;
+            return (
+              <Link key={`mobile-menu-link-${link.href}`} href={link.href}>
+                <a
+                  className={`flex flex-col items-center space-y-1 ${
+                    isActive ? 'text-indigo-500' : ''
+                  }`}
+                >
+                  {cloneElement(
+                    isActive ? link.svgIconSelected : link.svgIcon,
+                    {
+                      className: 'h-6 w-6',
+                    }
+                  )}
+                </a>
+              </Link>
+            );
+          })}
+          {filteredLinks.length > 4 && (
             <button
               className={`flex flex-col items-center space-y-1 ${
                 isOpen ? 'text-indigo-500' : ''

src/components/Layout/PullToRefresh/index.tsx

@@ -1,118 +0,0 @@
-import { ArrowPathIcon } from '@heroicons/react/24/outline';
-import { useRouter } from 'next/router';
-import { useEffect, useRef, useState } from 'react';
-
-const PullToRefresh = () => {
-  const router = useRouter();
-
-  const [pullStartPoint, setPullStartPoint] = useState(0);
-  const [pullChange, setPullChange] = useState(0);
-  const refreshDiv = useRef<HTMLDivElement>(null);
-
-  // Various pull down thresholds that determine icon location
-  const pullDownInitThreshold = pullChange > 20;
-  const pullDownStopThreshold = 120;
-  const pullDownReloadThreshold = pullChange > 340;
-  const pullDownIconLocation = pullChange / 3;
-
-  useEffect(() => {
-    // Reload function that is called when reload threshold has been hit
-    // Add loading class to determine when to add spin animation
-    const forceReload = () => {
-      refreshDiv.current?.classList.add('loading');
-      setTimeout(() => {
-        router.reload();
-      }, 1000);
-    };
-
-    const html = document.querySelector('html');
-
-    // Determines if we are at the top of the page
-    // Locks or unlocks page when pulling down to refresh
-    const pullStart = (e: TouchEvent) => {
-      setPullStartPoint(e.targetTouches[0].screenY);
-
-      if (window.scrollY === 0 && window.scrollX === 0) {
-        refreshDiv.current?.classList.add('block');
-        refreshDiv.current?.classList.remove('hidden');
-        document.body.style.touchAction = 'none';
-        document.body.style.overscrollBehavior = 'none';
-        if (html) {
-          html.style.overscrollBehaviorY = 'none';
-        }
-      } else {
-        refreshDiv.current?.classList.remove('block');
-        refreshDiv.current?.classList.add('hidden');
-      }
-    };
-
-    // Tracks how far we have pulled down the refresh icon
-    const pullDown = async (e: TouchEvent) => {
-      const screenY = e.targetTouches[0].screenY;
-
-      const pullLength =
-        pullStartPoint < screenY ? Math.abs(screenY - pullStartPoint) : 0;
-
-      setPullChange(pullLength);
-    };
-
-    // Will reload the page if we are past the threshold
-    // Otherwise, we reset the pull
-    const pullFinish = () => {
-      setPullStartPoint(0);
-
-      if (pullDownReloadThreshold) {
-        forceReload();
-      } else {
-        setPullChange(0);
-      }
-
-      document.body.style.touchAction = 'auto';
-      document.body.style.overscrollBehaviorY = 'auto';
-      if (html) {
-        html.style.overscrollBehaviorY = 'auto';
-      }
-    };
-
-    window.addEventListener('touchstart', pullStart, { passive: false });
-    window.addEventListener('touchmove', pullDown, { passive: false });
-    window.addEventListener('touchend', pullFinish, { passive: false });
-
-    return () => {
-      window.removeEventListener('touchstart', pullStart);
-      window.removeEventListener('touchmove', pullDown);
-      window.removeEventListener('touchend', pullFinish);
-    };
-  }, [pullDownInitThreshold, pullDownReloadThreshold, pullStartPoint, router]);
-
-  return (
-    <div
-      ref={refreshDiv}
-      className="absolute left-0 right-0 top-0 z-50 m-auto w-fit transition-all ease-out"
-      id="refreshIcon"
-      style={{
-        top:
-          pullDownIconLocation < pullDownStopThreshold && pullDownInitThreshold
-            ? pullDownIconLocation
-            : pullDownInitThreshold
-            ? pullDownStopThreshold
-            : '',
-      }}
-    >
-      <div
-        className={`${
-          refreshDiv.current?.classList.contains('loading') && 'animate-spin'
-        } relative -top-24 h-9 w-9 rounded-full border-4 border-gray-800 bg-gray-800 shadow-md shadow-black ring-1 ring-gray-700`}
-        style={{ animationDirection: 'reverse' }}
-      >
-        <ArrowPathIcon
-          className={`rounded-full ${
-            pullDownReloadThreshold && 'rotate-180'
-          } text-indigo-500 transition-all duration-300`}
-        />
-      </div>
-    </div>
-  );
-};
-
-export default PullToRefresh;

src/components/Layout/Sidebar/index.tsx

@@ -71,7 +71,9 @@ const SidebarLinks: SidebarLinkProps[] = [
   {
     href: '/issues',
     messagesKey: 'issues',
-    svgIcon: <ExclamationTriangleIcon className="mr-3 h-6 w-6" />,
+    svgIcon: (
+      <ExclamationTriangleIcon className="mr-3 h-6 w-6 text-gray-300 transition duration-150 ease-in-out group-hover:text-gray-100 group-focus:text-gray-300" />
+    ),
     activeRegExp: /^\/issues/,
     requiredPermission: [
       Permission.MANAGE_ISSUES,
@@ -125,10 +127,10 @@ const Sidebar = ({ open, setClosed }: SidebarProps) => {
             </Transition.Child>
             <Transition.Child
               as="div"
-              enter="transition-transform ease-in-out duration-300"
+              enter="transition ease-in-out duration-300 transform"
               enterFrom="-translate-x-full"
               enterTo="translate-x-0"
-              leave="transition-transform ease-in-out duration-300"
+              leave="transition ease-in-out duration-300 transform"
               leaveFrom="translate-x-0"
               leaveTo="-translate-x-full"
             >

src/components/Layout/UserDropdown/index.tsx

@@ -63,11 +63,11 @@ const UserDropdown = () => {
       <Transition
         as={Fragment}
         enter="transition ease-out duration-100"
-        enterFrom="opacity-0 scale-95"
-        enterTo="opacity-100 scale-100"
+        enterFrom="transform opacity-0 scale-95"
+        enterTo="transform opacity-100 scale-100"
         leave="transition ease-in duration-75"
-        leaveFrom="opacity-100 scale-100"
-        leaveTo="opacity-0 scale-95"
+        leaveFrom="transform opacity-100 scale-100"
+        leaveTo="transform opacity-0 scale-95"
         appear
       >
         <Menu.Items className="absolute right-0 mt-2 w-72 origin-top-right rounded-md shadow-lg">

src/components/Layout/index.tsx

@@ -1,8 +1,8 @@
 import MobileMenu from '@app/components/Layout/MobileMenu';
-import PullToRefresh from '@app/components/Layout/PullToRefresh';
 import SearchInput from '@app/components/Layout/SearchInput';
 import Sidebar from '@app/components/Layout/Sidebar';
 import UserDropdown from '@app/components/Layout/UserDropdown';
+import PullToRefresh from '@app/components/PullToRefresh';
 import type { AvailableLocale } from '@app/context/LanguageContext';
 import useLocale from '@app/hooks/useLocale';
 import useSettings from '@app/hooks/useSettings';

src/components/Login/index.tsx

@@ -95,10 +95,10 @@ const Login = () => {
             <Transition
               as="div"
               show={!!error}
-              enter="transition-opacity duration-300"
+              enter="opacity-0 transition duration-300"
               enterFrom="opacity-0"
               enterTo="opacity-100"
-              leave="transition-opacity duration-300"
+              leave="opacity-100 transition duration-300"
               leaveFrom="opacity-100"
               leaveTo="opacity-0"
             >

src/components/ManageSlideOver/index.tsx

@@ -1,7 +1,6 @@
 import Button from '@app/components/Common/Button';
 import ConfirmButton from '@app/components/Common/ConfirmButton';
 import SlideOver from '@app/components/Common/SlideOver';
-import Tooltip from '@app/components/Common/Tooltip';
 import DownloadBlock from '@app/components/DownloadBlock';
 import IssueBlock from '@app/components/IssueBlock';
 import RequestBlock from '@app/components/RequestBlock';
@@ -145,24 +144,20 @@ const ManageSlideOver = ({
             <div className="overflow-hidden rounded-md border border-gray-700 shadow">
               <ul>
                 {data.mediaInfo?.downloadStatus?.map((status, index) => (
-                  <Tooltip
+                  <li
                     key={`dl-status-${status.externalId}-${index}`}
-                    content={status.title}
+                    className="border-b border-gray-700 last:border-b-0"
                   >
-                    <li className="border-b border-gray-700 last:border-b-0">
-                      <DownloadBlock downloadItem={status} />
-                    </li>
-                  </Tooltip>
+                    <DownloadBlock downloadItem={status} />
+                  </li>
                 ))}
                 {data.mediaInfo?.downloadStatus4k?.map((status, index) => (
-                  <Tooltip
+                  <li
                     key={`dl-status-${status.externalId}-${index}`}
-                    content={status.title}
+                    className="border-b border-gray-700 last:border-b-0"
                   >
-                    <li className="border-b border-gray-700 last:border-b-0">
-                      <DownloadBlock downloadItem={status} is4k />
-                    </li>
-                  </Tooltip>
+                    <DownloadBlock downloadItem={status} is4k />
+                  </li>
                 ))}
               </ul>
             </div>
@@ -277,16 +272,11 @@ const ManageSlideOver = ({
                                   key={`watch-user-${user.id}`}
                                 >
                                   <a className="z-0 mb-1 -mr-2 shrink-0 hover:z-50">
-                                    <Tooltip
-                                      key={`watch-user-${user.id}`}
-                                      content={user.displayName}
-                                    >
-                                      <img
-                                        src={user.avatar}
-                                        alt={user.displayName}
-                                        className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
-                                      />
-                                    </Tooltip>
+                                    <img
+                                      src={user.avatar}
+                                      alt={user.displayName}
+                                      className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
+                                    />
                                   </a>
                                 </Link>
                               ))}
@@ -403,16 +393,11 @@ const ManageSlideOver = ({
                                   key={`watch-user-${user.id}`}
                                 >
                                   <a className="z-0 mb-1 -mr-2 shrink-0 hover:z-50">
-                                    <Tooltip
-                                      key={`watch-user-${user.id}`}
-                                      content={user.displayName}
-                                    >
-                                      <img
-                                        src={user.avatar}
-                                        alt={user.displayName}
-                                        className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
-                                      />
-                                    </Tooltip>
+                                    <img
+                                      src={user.avatar}
+                                      alt={user.displayName}
+                                      className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
+                                    />
                                   </a>
                                 </Link>
                               ))}

src/components/MovieDetails/index.tsx

@@ -2,7 +2,6 @@ import RTAudFresh from '@app/assets/rt_aud_fresh.svg';
 import RTAudRotten from '@app/assets/rt_aud_rotten.svg';
 import RTFresh from '@app/assets/rt_fresh.svg';
 import RTRotten from '@app/assets/rt_rotten.svg';
-import ImdbLogo from '@app/assets/services/imdb.svg';
 import TmdbLogo from '@app/assets/tmdb_logo.svg';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
@@ -27,7 +26,6 @@ import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
 import { sortCrewPriority } from '@app/utils/creditHelpers';
-import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
 import {
   ArrowRightCircleIcon,
   CloudIcon,
@@ -41,7 +39,7 @@ import {
   ChevronDoubleDownIcon,
   ChevronDoubleUpIcon,
 } from '@heroicons/react/24/solid';
-import { type RatingResponse } from '@server/api/ratings';
+import type { RTRating } from '@server/api/rottentomatoes';
 import { IssueStatus } from '@server/constants/issue';
 import { MediaStatus } from '@server/constants/media';
 import type { MovieDetails as MovieDetailsType } from '@server/models/Movie';
@@ -87,7 +85,6 @@ const messages = defineMessages({
   rtcriticsscore: 'Rotten Tomatoes Tomatometer',
   rtaudiencescore: 'Rotten Tomatoes Audience Score',
   tmdbuserscore: 'TMDB User Score',
-  imdbuserscore: 'IMDB User Score',
 });
 
 interface MovieDetailsProps {
@@ -113,17 +110,10 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
     mutate: revalidate,
   } = useSWR<MovieDetailsType>(`/api/v1/movie/${router.query.movieId}`, {
     fallbackData: movie,
-    refreshInterval: refreshIntervalHelper(
-      {
-        downloadStatus: movie?.mediaInfo?.downloadStatus,
-        downloadStatus4k: movie?.mediaInfo?.downloadStatus4k,
-      },
-      15000
-    ),
   });
 
-  const { data: ratingData } = useSWR<RatingResponse>(
-    `/api/v1/movie/${router.query.movieId}/ratingscombined`
+  const { data: ratingData } = useSWR<RTRating>(
+    `/api/v1/movie/${router.query.movieId}/ratings`
   );
 
   const sortedCrew = useMemo(
@@ -513,62 +503,44 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
           )}
           <div className="media-facts">
             {(!!data.voteCount ||
-              (ratingData?.rt?.criticsRating &&
-                !!ratingData?.rt?.criticsScore) ||
-              (ratingData?.rt?.audienceRating &&
-                !!ratingData?.rt?.audienceScore) ||
-              ratingData?.imdb?.criticsScore) && (
+              (ratingData?.criticsRating && !!ratingData?.criticsScore) ||
+              (ratingData?.audienceRating && !!ratingData?.audienceScore)) && (
               <div className="media-ratings">
-                {ratingData?.rt?.criticsRating &&
-                  !!ratingData?.rt?.criticsScore && (
-                    <Tooltip
-                      content={intl.formatMessage(messages.rtcriticsscore)}
-                    >
-                      <a
-                        href={ratingData.rt.url}
-                        className="media-rating"
-                        target="_blank"
-                        rel="noreferrer"
-                      >
-                        {ratingData.rt.criticsRating === 'Rotten' ? (
-                          <RTRotten className="w-6" />
-                        ) : (
-                          <RTFresh className="w-6" />
-                        )}
-                        <span>{ratingData.rt.criticsScore}%</span>
-                      </a>
-                    </Tooltip>
-                  )}
-                {ratingData?.rt?.audienceRating &&
-                  !!ratingData?.rt?.audienceScore && (
-                    <Tooltip
-                      content={intl.formatMessage(messages.rtaudiencescore)}
-                    >
-                      <a
-                        href={ratingData.rt.url}
-                        className="media-rating"
-                        target="_blank"
-                        rel="noreferrer"
-                      >
-                        {ratingData.rt.audienceRating === 'Spilled' ? (
-                          <RTAudRotten className="w-6" />
-                        ) : (
-                          <RTAudFresh className="w-6" />
-                        )}
-                        <span>{ratingData.rt.audienceScore}%</span>
-                      </a>
-                    </Tooltip>
-                  )}
-                {ratingData?.imdb?.criticsScore && (
-                  <Tooltip content={intl.formatMessage(messages.imdbuserscore)}>
+                {ratingData?.criticsRating && !!ratingData?.criticsScore && (
+                  <Tooltip
+                    content={intl.formatMessage(messages.rtcriticsscore)}
+                  >
                     <a
-                      href={ratingData.imdb.url}
+                      href={ratingData.url}
                       className="media-rating"
                       target="_blank"
                       rel="noreferrer"
                     >
-                      <ImdbLogo className="mr-1 w-6" />
-                      <span>{ratingData.imdb.criticsScore}</span>
+                      {ratingData.criticsRating === 'Rotten' ? (
+                        <RTRotten className="w-6" />
+                      ) : (
+                        <RTFresh className="w-6" />
+                      )}
+                      <span>{ratingData.criticsScore}%</span>
+                    </a>
+                  </Tooltip>
+                )}
+                {ratingData?.audienceRating && !!ratingData?.audienceScore && (
+                  <Tooltip
+                    content={intl.formatMessage(messages.rtaudiencescore)}
+                  >
+                    <a
+                      href={ratingData.url}
+                      className="media-rating"
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      {ratingData.audienceRating === 'Spilled' ? (
+                        <RTAudRotten className="w-6" />
+                      ) : (
+                        <RTAudFresh className="w-6" />
+                      )}
+                      <span>{ratingData.audienceScore}%</span>
                     </a>
                   </Tooltip>
                 )}
@@ -649,7 +621,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                           year: 'numeric',
                           month: 'long',
                           day: 'numeric',
-                          timeZone: 'UTC',
                         })}
                       </span>
                     </span>
@@ -669,7 +640,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                       year: 'numeric',
                       month: 'long',
                       day: 'numeric',
-                      timeZone: 'UTC',
                     })}
                   </span>
                 </div>
@@ -817,7 +787,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                 tmdbId={data.id}
                 tvdbId={data.externalIds.tvdbId}
                 imdbId={data.externalIds.imdbId}
-                rtUrl={ratingData?.rt?.url}
+                rtUrl={ratingData?.url}
                 plexUrl={data.mediaInfo?.plexUrl ?? data.mediaInfo?.plexUrl4k}
               />
             </div>

src/components/PersonDetails/index.tsx

@@ -91,13 +91,11 @@ const PersonDetails = () => {
             year: 'numeric',
             month: 'long',
             day: 'numeric',
-            timeZone: 'UTC',
           }),
           deathdate: intl.formatDate(data.deathday, {
             year: 'numeric',
             month: 'long',
             day: 'numeric',
-            timeZone: 'UTC',
           }),
         })
       );
@@ -108,7 +106,6 @@ const PersonDetails = () => {
             year: 'numeric',
             month: 'long',
             day: 'numeric',
-            timeZone: 'UTC',
           }),
         })
       );

src/components/PullToRefresh/index.tsx

@@ -0,0 +1,45 @@
+import { ArrowPathIcon } from '@heroicons/react/24/outline';
+import { useRouter } from 'next/router';
+import PR from 'pulltorefreshjs';
+import { useEffect } from 'react';
+import ReactDOMServer from 'react-dom/server';
+
+const PullToRefresh = () => {
+  const router = useRouter();
+
+  useEffect(() => {
+    PR.init({
+      mainElement: '#pull-to-refresh',
+      onRefresh() {
+        router.reload();
+      },
+      iconArrow: ReactDOMServer.renderToString(
+        <div className="p-2">
+          <ArrowPathIcon className="z-50 m-auto h-9 w-9 rounded-full border-4 border-gray-800 bg-gray-800 text-indigo-500 ring-1 ring-gray-700" />
+        </div>
+      ),
+      iconRefreshing: ReactDOMServer.renderToString(
+        <div
+          className="animate-spin p-2"
+          style={{ animationDirection: 'reverse' }}
+        >
+          <ArrowPathIcon className="z-50 m-auto h-9 w-9 rounded-full border-4 border-gray-800 bg-gray-800 text-indigo-500 ring-1 ring-gray-700" />
+        </div>
+      ),
+      instructionsPullToRefresh: ReactDOMServer.renderToString(<div />),
+      instructionsReleaseToRefresh: ReactDOMServer.renderToString(<div />),
+      instructionsRefreshing: ReactDOMServer.renderToString(<div />),
+      distReload: 60,
+      distIgnore: 15,
+      shouldPullToRefresh: () =>
+        !window.scrollY && document.body.style.overflow !== 'hidden',
+    });
+    return () => {
+      PR.destroyAll();
+    };
+  }, [router]);
+
+  return <div id="pull-to-refresh"></div>;
+};
+
+export default PullToRefresh;

src/components/RegionSelector/index.tsx

@@ -76,12 +76,8 @@ const RegionSelector = ({
   }, [value, regions, allRegion]);
 
   useEffect(() => {
-    if (onChange && regions) {
-      if (selectedRegion) {
-        onChange(name, selectedRegion.iso_3166_1);
-      } else {
-        onChange(name, '');
-      }
+    if (onChange && regions && selectedRegion) {
+      onChange(name, selectedRegion.iso_3166_1);
     }
   }, [onChange, selectedRegion, name, regions]);
 
@@ -126,7 +122,7 @@ const RegionSelector = ({
 
             <Transition
               show={open}
-              leave="transition-opacity ease-in duration-100"
+              leave="transition ease-in duration-100"
               leaveFrom="opacity-100"
               leaveTo="opacity-0"
               className="absolute mt-1 w-full rounded-md bg-gray-800 shadow-lg"

src/components/RequestBlock/index.tsx

@@ -204,11 +204,6 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {
                   {intl.formatMessage(globalMessages.failed)}
                 </Badge>
               )}
-              {request.status === MediaRequestStatus.COMPLETED && (
-                <Badge badgeType="success">
-                  {intl.formatMessage(globalMessages.completed)}
-                </Badge>
-              )}
             </div>
           </div>
           <div className="mt-2 flex items-center text-sm leading-5 sm:mt-0">

src/components/RequestButton/index.tsx

@@ -264,9 +264,7 @@ const RequestButton = ({
 
   // Standard request button
   if (
-    (!media ||
-      media.status === MediaStatus.UNKNOWN ||
-      (media.status === MediaStatus.DELETED && !activeRequest)) &&
+    (!media || media.status === MediaStatus.UNKNOWN) &&
     hasPermission(
       [
         Permission.REQUEST,
@@ -309,9 +307,7 @@ const RequestButton = ({
 
   // 4K request button
   if (
-    (!media ||
-      media.status4k === MediaStatus.UNKNOWN ||
-      (media.status4k === MediaStatus.DELETED && !active4kRequest)) &&
+    (!media || media.status4k === MediaStatus.UNKNOWN) &&
     hasPermission(
       [
         Permission.REQUEST_4K,

src/components/RequestCard/index.tsx

@@ -7,7 +7,6 @@ import StatusBadge from '@app/components/StatusBadge';
 import useDeepLinks from '@app/hooks/useDeepLinks';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
-import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
 import { withProperties } from '@app/utils/typeHelpers';
 import {
   ArrowPathIcon,
@@ -16,7 +15,7 @@ import {
   TrashIcon,
   XMarkIcon,
 } from '@heroicons/react/24/solid';
-import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
+import { MediaRequestStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
@@ -221,7 +220,6 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
     request.type === 'movie'
       ? `/api/v1/movie/${request.media.tmdbId}`
       : `/api/v1/tv/${request.media.tmdbId}`;
-
   const { data: title, error } = useSWR<MovieDetails | TvDetails>(
     inView ? `${url}` : null
   );
@@ -231,13 +229,6 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
     mutate: revalidate,
   } = useSWR<MediaRequest>(`/api/v1/request/${request.id}`, {
     fallbackData: request,
-    refreshInterval: refreshIntervalHelper(
-      {
-        downloadStatus: request.media.downloadStatus,
-        downloadStatus4k: request.media.downloadStatus4k,
-      },
-      15000
-    ),
   });
 
   const { plexUrl, plexUrl4k } = useDeepLinks({
@@ -411,15 +402,6 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
               >
                 {intl.formatMessage(globalMessages.failed)}
               </Badge>
-            ) : requestData.status === MediaRequestStatus.PENDING &&
-              requestData.media[requestData.is4k ? 'status4k' : 'status'] ===
-                MediaStatus.DELETED ? (
-              <Badge
-                badgeType="warning"
-                href={`/${requestData.type}/${requestData.media.tmdbId}?manage=1`}
-              >
-                {intl.formatMessage(globalMessages.pending)}
-              </Badge>
             ) : (
               <StatusBadge
                 status={

src/components/RequestList/RequestItem/index.tsx

@@ -7,7 +7,6 @@ import StatusBadge from '@app/components/StatusBadge';
 import useDeepLinks from '@app/hooks/useDeepLinks';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
-import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
 import {
   ArrowPathIcon,
   CheckIcon,
@@ -15,7 +14,7 @@ import {
   TrashIcon,
   XMarkIcon,
 } from '@heroicons/react/24/solid';
-import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
+import { MediaRequestStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
@@ -294,13 +293,6 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
     `/api/v1/request/${request.id}`,
     {
       fallbackData: request,
-      refreshInterval: refreshIntervalHelper(
-        {
-          downloadStatus: request.media.downloadStatus,
-          downloadStatus4k: request.media.downloadStatus4k,
-        },
-        15000
-      ),
     }
   );
 
@@ -474,15 +466,6 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                 >
                   {intl.formatMessage(globalMessages.failed)}
                 </Badge>
-              ) : requestData.status === MediaRequestStatus.PENDING &&
-                requestData.media[requestData.is4k ? 'status4k' : 'status'] ===
-                  MediaStatus.DELETED ? (
-                <Badge
-                  badgeType="warning"
-                  href={`/${requestData.type}/${requestData.media.tmdbId}?manage=1`}
-                >
-                  {intl.formatMessage(globalMessages.pending)}
-                </Badge>
               ) : (
                 <StatusBadge
                   status={