chore(release): 1.32.4

Merge branch 'develop'
chore(release): 1.32.3
2023-01-29 11:43:54 +00:00 · 2023-01-29 20:41:54 +09:00 · 2023-01-29 09:56:55 +00:00 · 2023-01-29 18:55:08 +09:00 · 2023-01-27 12:52:28 +00:00 · 2023-01-27 21:50:43 +09:00
93 changed files with 3441 additions and 4514 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -773,114 +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"
-      ]
    }
  ],
  "badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",
@@ -890,6 +782,5 @@
  "repoType": "github",
  "repoHost": "https://github.com",
  "skipCi": false,
-  "commitConvention": "angular",
-  "commitType": "docs"
+  "commitConvention": "angular"
 }
--- a/.github/CODEOWNERS
+++ b/.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
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,6 +9,8 @@ jobs:
  semantic-release:
    name: Tag and release latest version
    runs-on: ubuntu-20.04
+    env:
+      HUSKY: 0
    steps:
      - name: Checkout
        uses: actions/checkout@v3
--- a/.vscode/settings.json
+++ b/.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"
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/README.md
+++ b/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-96-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,22 +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>
-    </tr>
  </tbody>
 </table>

--- a/cypress/e2e/pull-to-refresh.cy.ts
+++ b/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(
--- a/cypress/e2e/settings/discover-customization.cy.ts
+++ b/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)
--- a/next.config.js
+++ b/next.config.js
@@ -19,6 +19,5 @@ module.exports = {
  },
  experimental: {
    scrollRestoration: true,
-    largePageDataBytes: 256000,
  },
 };
--- a/overseerr-api.yml
+++ b/overseerr-api.yml
@@ -3541,8 +3541,6 @@ paths:
                  type: string
                p256dh:
                  type: string
-                userAgent:
-                  type: string
              required:
                - endpoint
                - auth
@@ -3550,88 +3548,6 @@ paths:
      responses:
        '204':
          description: Successfully registered push subscription
-  /user/{userId}/pushSubscriptions:
-    get:
-      summary: Get all web push notification settings for a user
-      description: |
-        Returns all web push notification settings for a user in a JSON object.
-      tags:
-        - users
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: number
-      responses:
-        '200':
-          description: User web push notification settings in JSON
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  endpoint:
-                    type: string
-                  p256dh:
-                    type: string
-                  auth:
-                    type: string
-                  userAgent:
-                    type: string
-  /user/{userId}/pushSubscription/{key}:
-    get:
-      summary: Get web push notification settings for a user
-      description: |
-        Returns web push notification settings for a user in a JSON object.
-      tags:
-        - users
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: number
-        - in: path
-          name: key
-          required: true
-          schema:
-            type: string
-      responses:
-        '200':
-          description: User web push notification settings in JSON
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  endpoint:
-                    type: string
-                  p256dh:
-                    type: string
-                  auth:
-                    type: string
-                  userAgent:
-                    type: string
-    delete:
-      summary: Delete user push subscription by key
-      description: Deletes the user push subscription with the provided key.
-      tags:
-        - users
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: number
-        - in: path
-          name: key
-          required: true
-          schema:
-            type: string
-      responses:
-        '204':
-          description: Successfully removed user push subscription
  /user/{userId}:
    get:
      summary: Get user by ID
@@ -3699,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:
@@ -3795,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:
@@ -4270,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:
@@ -4559,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:
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "overseerr",
-  "version": "0.1.0",
+  "version": "1.32.4",
  "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,18 +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",
-    "@types/ua-parser-js": "^0.7.36",
-    "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",
@@ -48,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",
@@ -64,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",
@@ -88,42 +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",
-    "ua-parser-js": "^1.0.35",
+    "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",
@@ -132,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": {
--- a/server/1684249347630-datasource.ts
+++ b/server/1684249347630-datasource.ts
@@ -1,51 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class datasource1684249347630 implements MigrationInterface {
-  name = 'datasource1684249347630';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `CREATE TABLE "temporary_user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_95f313437ec4a8f8148d74a0ed8" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "user_push_subscription"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_user_push_subscription" RENAME TO "user_push_subscription"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "temporary_user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_95f313437ec4a8f8148d74a0ed8" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "user_push_subscription"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_user_push_subscription" RENAME TO "user_push_subscription"`
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" RENAME TO "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_95f313437ec4a8f8148d74a0ed8" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_user_push_subscription"`);
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" RENAME TO "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_95f313437ec4a8f8148d74a0ed8" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_user_push_subscription"`);
-  }
-}
--- a/server/api/plextv.ts
+++ b/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);

--- a/server/api/rottentomatoes.ts
+++ b/server/api/rottentomatoes.ts
@@ -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
@@ -178,7 +181,7 @@ class RottenTomatoes extends ExternalAPI {

      if (year) {
        tvshow = contentResults.hits.find(
-          (series) => series.releaseYear === year
+          (series) => series.releaseYear === year.toString()
        );
      }

--- a/server/api/servarr/sonarr.ts
+++ b/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', {
--- a/server/api/themoviedb/index.ts
+++ b/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,8 +83,6 @@ interface DiscoverTvOptions {
  withRuntimeLte?: string;
  voteAverageGte?: string;
  voteAverageLte?: string;
-  voteCountGte?: string;
-  voteCountLte?: string;
  includeEmptyReleaseDate?: boolean;
  originalLanguage?: string;
  genre?: string;
@@ -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,
        },
--- a/server/api/themoviedb/interfaces.ts
+++ b/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 {
--- a/server/constants/discover.ts
+++ b/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>[] = [
--- a/server/entity/Media.ts
+++ b/server/entity/Media.ts
@@ -114,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;
@@ -260,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,
@@ -272,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,
@@ -286,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,
@@ -298,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,
--- a/server/entity/MediaRequest.ts
+++ b/server/entity/MediaRequest.ts
@@ -704,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 &&
@@ -764,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
        ) {
@@ -1002,11 +970,7 @@ export class MediaRequest {
        let tags =
          seriesType === 'anime'
            ? sonarrSettings.animeTags
-              ? [...sonarrSettings.animeTags]
-              : []
-            : sonarrSettings.tags
-            ? [...sonarrSettings.tags]
-            : [];
+            : sonarrSettings.tags;

        if (
          this.rootFolder &&
@@ -1058,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,
@@ -1255,5 +1187,3 @@ export class MediaRequest {
    }
  }
 }
-
-export default MediaRequest;
--- a/server/entity/SeasonRequest.ts
+++ b/server/entity/SeasonRequest.ts
@@ -1,7 +1,5 @@
 import { MediaRequestStatus } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
 import {
-  AfterRemove,
  Column,
  CreateDateColumn,
  Entity,
@@ -36,18 +34,6 @@ class SeasonRequest {
  constructor(init?: Partial<SeasonRequest>) {
    Object.assign(this, init);
  }
-
-  @AfterRemove()
-  public async handleRemoveParent(): Promise<void> {
-    const mediaRequestRepository = getRepository(MediaRequest);
-    const requestToBeDeleted = await mediaRequestRepository.findOneOrFail({
-      where: { id: this.request.id },
-    });
-
-    if (requestToBeDeleted.seasons.length === 0) {
-      await mediaRequestRepository.delete({ id: this.request.id });
-    }
-  }
 }

 export default SeasonRequest;
--- a/server/entity/UserPushSubscription.ts
+++ b/server/entity/UserPushSubscription.ts
@@ -1,10 +1,4 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-} from 'typeorm';
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 import { User } from './User';

@Entity()
@@ -24,15 +18,9 @@ export class UserPushSubscription {
  @Column()
  public p256dh: string;

-  @Column()
+  @Column({ unique: true })
  public auth: string;

-  @Column({ nullable: true })
-  public userAgent: string;
-
-  @CreateDateColumn({ nullable: true })
-  public createdAt: Date;
-
  constructor(init?: Partial<UserPushSubscription>) {
    Object.assign(this, init);
  }
--- a/server/index.ts
+++ b/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';
@@ -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(
--- a/server/job/schedule.ts
+++ b/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', {
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -1,725 +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 SeasonRequest from '@server/entity/SeasonRequest';
-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 findMediaStatus(
-    requests: MediaRequest[],
-    is4k: boolean
-  ): MediaStatus {
-    const filteredRequests = requests.filter(
-      (request) => request.is4k === is4k
-    );
-
-    let mediaStatus: MediaStatus;
-
-    if (
-      filteredRequests.some(
-        (request) => request.status === MediaRequestStatus.APPROVED
-      )
-    ) {
-      mediaStatus = MediaStatus.PROCESSING;
-    } else if (
-      filteredRequests.some(
-        (request) => request.status === MediaRequestStatus.PENDING
-      )
-    ) {
-      mediaStatus = MediaStatus.PENDING;
-    } else {
-      mediaStatus = MediaStatus.UNKNOWN;
-    }
-
-    return mediaStatus;
-  }
-
-  private async mediaUpdater(media: Media, is4k: boolean): Promise<void> {
-    const mediaRepository = getRepository(Media);
-    const requestRepository = getRepository(MediaRequest);
-
-    try {
-      // Find all related requests only if
-      // the related media has an available status
-      const requests = await requestRepository
-        .createQueryBuilder('request')
-        .leftJoinAndSelect('request.media', 'media')
-        .where('(media.id = :id)', {
-          id: media.id,
-        })
-        .andWhere(
-          `(request.is4k = :is4k AND media.${
-            is4k ? 'status4k' : 'status'
-          } IN (:...mediaStatus))`,
-          {
-            mediaStatus: [
-              MediaStatus.AVAILABLE,
-              MediaStatus.PARTIALLY_AVAILABLE,
-            ],
-            is4k: is4k,
-          }
-        )
-        .getMany();
-
-      // Check if a season is processing or pending to
-      // make sure we set the media to the correct status
-      let mediaStatus = MediaStatus.UNKNOWN;
-
-      if (media.mediaType === 'tv') {
-        mediaStatus = this.findMediaStatus(requests, is4k);
-      }
-
-      media[is4k ? 'status4k' : 'status'] = mediaStatus;
-      media[is4k ? 'serviceId4k' : 'serviceId'] =
-        mediaStatus === MediaStatus.PROCESSING
-          ? media[is4k ? 'serviceId4k' : 'serviceId']
-          : null;
-      media[is4k ? 'externalServiceId4k' : 'externalServiceId'] =
-        mediaStatus === MediaStatus.PROCESSING
-          ? media[is4k ? 'externalServiceId4k' : 'externalServiceId']
-          : null;
-      media[is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] =
-        mediaStatus === MediaStatus.PROCESSING
-          ? media[is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']
-          : null;
-      media[is4k ? 'ratingKey4k' : 'ratingKey'] =
-        mediaStatus === MediaStatus.PROCESSING
-          ? 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 unknown.`,
-        { label: 'AvailabilitySync' }
-      );
-
-      await mediaRepository.save({ media, ...media });
-
-      // Only delete media request if type is movie.
-      // Type tv request deletion is handled
-      // in the season request entity
-      if (requests.length > 0 && media.mediaType === 'movie') {
-        await requestRepository.remove(requests);
-      }
-    } 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);
-    const seasonRequestRepository = getRepository(SeasonRequest);
-
-    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)
-    );
-    const seasonKeys = [...seasonsPendingRemoval.keys()];
-
-    try {
-      // Need to check and see if there are any related season
-      // requests. If they are, we will need to delete them.
-      const seasonRequests = await seasonRequestRepository
-        .createQueryBuilder('seasonRequest')
-        .leftJoinAndSelect('seasonRequest.request', 'request')
-        .leftJoinAndSelect('request.media', 'media')
-        .where('(media.id = :id)', { id: media.id })
-        .andWhere(
-          '(request.is4k = :is4k AND seasonRequest.seasonNumber IN (:...seasonNumbers))',
-          {
-            seasonNumbers: seasonKeys,
-            is4k: is4k,
-          }
-        )
-        .getMany();
-
-      for (const mediaSeason of media.seasons) {
-        if (seasonsPendingRemoval.has(mediaSeason.seasonNumber)) {
-          mediaSeason[is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
-        }
-      }
-
-      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 });
-
-      if (seasonRequests.length > 0) {
-        await seasonRequestRepository.remove(seasonRequests);
-      }
-
-      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 unknown.`,
-        { 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) {
-      const radarrAPI = new RadarrAPI({
-        apiKey: server.apiKey,
-        url: RadarrAPI.buildUrl(server, '/api/v3'),
-      });
-
-      try {
-        let radarr: RadarrMovie | undefined;
-
-        if (!server.is4k && media.externalServiceId && !is4k) {
-          radarr = await radarrAPI.getMovie({
-            id: media.externalServiceId,
-          });
-        }
-
-        if (server.is4k && 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) {
-      const sonarrAPI = new SonarrAPI({
-        apiKey: server.apiKey,
-        url: SonarrAPI.buildUrl(server, '/api/v3'),
-      });
-
-      try {
-        let sonarr: SonarrSeries | undefined;
-
-        if (!server.is4k && media.externalServiceId && !is4k) {
-          sonarr = await sonarrAPI.getSeriesById(media.externalServiceId);
-          this.sonarrSeasonsCache[`${server.id}-${media.externalServiceId}`] =
-            sonarr.seasons;
-        }
-
-        if (server.is4k && 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;
--- a/server/lib/imageproxy.ts
+++ b/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);
  }
 }

--- a/server/lib/settings.ts
+++ b/server/lib/settings.ts
@@ -61,7 +61,6 @@ export interface DVRSettings {
  externalUrl?: string;
  syncEnabled: boolean;
  preventSearch: boolean;
-  tagRequests: boolean;
 }

 export interface RadarrSettings extends DVRSettings {
@@ -249,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;
@@ -411,9 +409,6 @@ class Settings {
        'sonarr-scan': {
          schedule: '0 30 4 * * *',
        },
-        'availability-sync': {
-          schedule: '0 0 5 * * *',
-        },
        'download-sync': {
          schedule: '0 * * * * *',
        },
@@ -551,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 {
--- a/server/middleware/clearcookies.ts
+++ b/server/middleware/clearcookies.ts
@@ -1,6 +0,0 @@
-const clearCookies: Middleware = (_req, res, next) => {
-  res.removeHeader('Set-Cookie');
-  next();
-};
-
-export default clearCookies;
--- a/server/models/Search.ts
+++ b/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);
    }
--- a/server/routes/discover.ts
+++ b/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,
    });
@@ -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,
    });
@@ -654,8 +647,6 @@ discoverRoutes.get('/trending', async (req, res, next) => {
            )
          : isPerson(result)
          ? mapPersonResult(result)
-          : isCollection(result)
-          ? mapCollectionResult(result)
          : mapTvResult(
              result,
              media.find(
@@ -809,12 +800,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 +829,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,
--- a/server/routes/service.ts
+++ b/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 {
--- a/server/routes/user/index.ts
+++ b/server/routes/user/index.ts
@@ -145,15 +145,13 @@ router.post<
    endpoint: string;
    p256dh: string;
    auth: string;
-    userAgent: string;
  }
 >('/registerPushSubscription', async (req, res, next) => {
  try {
    const userPushSubRepository = getRepository(UserPushSubscription);

    const existingSubs = await userPushSubRepository.find({
-      relations: { user: true },
-      where: { auth: req.body.auth, user: { id: req.user?.id } },
+      where: { auth: req.body.auth },
    });

    if (existingSubs.length > 0) {
@@ -168,7 +166,6 @@ router.post<
      auth: req.body.auth,
      endpoint: req.body.endpoint,
      p256dh: req.body.p256dh,
-      userAgent: req.body.userAgent,
      user: req.user,
    });

@@ -183,79 +180,6 @@ router.post<
  }
 });

-router.get<{ userId: number }>(
-  '/:userId/pushSubscriptions',
-  async (req, res, next) => {
-    try {
-      const userPushSubRepository = getRepository(UserPushSubscription);
-
-      const userPushSubs = await userPushSubRepository.find({
-        relations: { user: true },
-        where: { user: { id: req.params.userId } },
-      });
-
-      return res.status(200).json(userPushSubs);
-    } catch (e) {
-      next({ status: 404, message: 'User subscriptions not found.' });
-    }
-  }
-);
-
-router.get<{ userId: number; key: string }>(
-  '/:userId/pushSubscription/:key',
-  async (req, res, next) => {
-    try {
-      const userPushSubRepository = getRepository(UserPushSubscription);
-
-      const userPushSub = await userPushSubRepository.findOneOrFail({
-        relations: {
-          user: true,
-        },
-        where: {
-          user: { id: req.params.userId },
-          p256dh: req.params.key,
-        },
-      });
-
-      return res.status(200).json(userPushSub);
-    } catch (e) {
-      next({ status: 404, message: 'User subscription not found.' });
-    }
-  }
-);
-
-router.delete<{ userId: number; key: string }>(
-  '/:userId/pushSubscription/:key',
-  async (req, res, next) => {
-    try {
-      const userPushSubRepository = getRepository(UserPushSubscription);
-
-      const userPushSub = await userPushSubRepository.findOneOrFail({
-        relations: {
-          user: true,
-        },
-        where: {
-          user: { id: req.params.userId },
-          p256dh: req.params.key,
-        },
-      });
-
-      await userPushSubRepository.remove(userPushSub);
-      return res.status(204).send();
-    } catch (e) {
-      logger.error('Something went wrong deleting the user push subcription', {
-        label: 'API',
-        key: req.params.key,
-        errorMessage: e.message,
-      });
-      return next({
-        status: 500,
-        message: 'User push subcription not found',
-      });
-    }
-  }
-);
-
 router.get<{ id: string }>('/:id', async (req, res, next) => {
  try {
    const userRepository = getRepository(User);
@@ -457,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());
@@ -690,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 (
@@ -710,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({
@@ -734,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,
--- a/server/utils/typeHelpers.ts
+++ b/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 => {
--- a/src/components/CollectionDetails/index.tsx
+++ b/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>
  );
 };
--- a/src/components/Common/Badge/index.tsx
+++ b/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');
      }
  }

--- a/src/components/Common/ButtonWithDropdown/index.tsx
+++ b/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
--- a/src/components/Common/ListView/index.tsx
+++ b/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
--- a/src/components/Common/Modal/index.tsx
+++ b/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}
--- a/src/components/Common/SlideCheckbox/index.tsx
+++ b/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>
  );
--- a/src/components/Common/SlideOver/index.tsx
+++ b/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()}
              >
--- a/src/components/Discover/CreateSlider/index.tsx
+++ b/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>
--- a/src/components/Discover/DiscoverSliderEdit/index.tsx
+++ b/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 ${
--- a/src/components/Discover/FilterSlideover/index.tsx
+++ b/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>
--- a/src/components/Discover/constants.ts
+++ b/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;
--- a/src/components/Discover/index.tsx
+++ b/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) {
--- a/src/components/IssueDetails/IssueComment/index.tsx
+++ b/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'
            }`}
          />
--- a/src/components/IssueDetails/IssueDescription/index.tsx
+++ b/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
--- a/src/components/IssueDetails/index.tsx
+++ b/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}
--- a/src/components/IssueModal/index.tsx
+++ b/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}
--- a/src/components/Layout/LanguagePicker/index.tsx
+++ b/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"
--- a/src/components/Layout/MobileMenu/index.tsx
+++ b/src/components/Layout/MobileMenu/index.tsx
@@ -131,13 +131,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);
--- a/src/components/Layout/PullToRefresh/index.tsx
+++ b/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;
--- a/src/components/Layout/Sidebar/index.tsx
+++ b/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"
            >
--- a/src/components/Layout/UserDropdown/index.tsx
+++ b/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">
--- a/src/components/Layout/index.tsx
+++ b/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';
--- a/src/components/Login/index.tsx
+++ b/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"
            >
--- a/src/components/ManageSlideOver/index.tsx
+++ b/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>
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -26,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,
@@ -111,13 +110,6 @@ 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<RTRating>(
--- a/src/components/PullToRefresh/index.tsx
+++ b/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;
--- a/src/components/RegionSelector/index.tsx
+++ b/src/components/RegionSelector/index.tsx
@@ -122,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"
--- a/src/components/RequestCard/index.tsx
+++ b/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,
@@ -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({
--- a/src/components/RequestList/RequestItem/index.tsx
+++ b/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,
@@ -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
-      ),
    }
  );

--- a/src/components/RequestModal/AdvancedRequester/index.tsx
+++ b/src/components/RequestModal/AdvancedRequester/index.tsx
@@ -582,10 +582,10 @@ const AdvancedRequester = ({

                    <Transition
                      show={open}
-                      enter="transition-opacity ease-in duration-300"
+                      enter="transition ease-in duration-300"
                      enterFrom="opacity-0"
                      enterTo="opacity-100"
-                      leave="transition-opacity ease-in duration-100"
+                      leave="transition ease-in duration-100"
                      leaveFrom="opacity-100"
                      leaveTo="opacity-0"
                      className="mt-1 w-full rounded-md border border-gray-700 bg-gray-800 shadow-lg"
--- a/src/components/RequestModal/CollectionRequestModal.tsx
+++ b/src/components/RequestModal/CollectionRequestModal.tsx
@@ -324,7 +324,7 @@ const CollectionRequestModal = ({
                          aria-hidden="true"
                          className={`${
                            isAllParts() ? '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>
                    </th>
@@ -389,7 +389,7 @@ const CollectionRequestModal = ({
                                isSelectedPart(part.id)
                                  ? '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>
                        </td>
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -540,7 +540,7 @@ const TvRequestModal = ({
                          aria-hidden="true"
                          className={`${
                            isAllSeasons() ? '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>
                    </th>
@@ -631,7 +631,7 @@ const TvRequestModal = ({
                                  isSelectedSeason(season.seasonNumber)
                                    ? '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>
                          </td>
--- a/src/components/RequestModal/index.tsx
+++ b/src/components/RequestModal/index.tsx
@@ -29,10 +29,10 @@ const RequestModal = ({
  return (
    <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}
--- a/src/components/Selector/index.tsx
+++ b/src/components/Selector/index.tsx
@@ -169,19 +169,15 @@ export const GenreSelector = ({
    loadDefaultGenre();
  }, [defaultValue, type]);

-  const loadGenreOptions = async (inputValue: string) => {
+  const loadGenreOptions = async () => {
    const results = await axios.get<GenreSliderItem[]>(
      `/api/v1/discover/genreslider/${type}`
    );

-    return results.data
-      .map((result) => ({
-        label: result.name,
-        value: result.id,
-      }))
-      .filter(({ label }) =>
-        label.toLowerCase().includes(inputValue.toLowerCase())
-      );
+    return results.data.map((result) => ({
+      label: result.name,
+      value: result.id,
+    }));
  };

  return (
@@ -309,9 +305,7 @@ export const WatchProviderSelector = ({

  useEffect(() => {
    onChange(watchRegion, activeProvider);
-    // removed onChange as a dependency as we only need to call it when the value(s) change
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [activeProvider, watchRegion]);
+  }, [activeProvider, watchRegion, onChange]);

  const orderedData = useMemo(() => {
    if (!data) {
@@ -350,7 +344,7 @@ export const WatchProviderSelector = ({
        <SmallLoadingSpinner />
      ) : (
        <div className="grid">
-          <div className="provider-icons grid gap-2">
+          <div className="grid grid-cols-6 gap-2">
            {initialProviders.map((provider) => {
              const isActive = activeProvider.includes(provider.id);
              return (
@@ -359,7 +353,7 @@ export const WatchProviderSelector = ({
                  key={`prodiver-${provider.id}`}
                >
                  <div
-                    className={`provider-container relative w-full cursor-pointer rounded-lg p-2 ring-1 ${
+                    className={`provider-container relative h-full w-full cursor-pointer rounded-lg p-2 ring-1 ${
                      isActive
                        ? 'bg-gray-600 ring-indigo-500 hover:bg-gray-500'
                        : 'bg-gray-700 ring-gray-500 hover:bg-gray-600'
@@ -392,7 +386,7 @@ export const WatchProviderSelector = ({
            })}
          </div>
          {showMore && otherProviders.length > 0 && (
-            <div className="provider-icons relative top-2 grid gap-2">
+            <div className="relative top-2 grid grid-cols-6 gap-2">
              {otherProviders.map((provider) => {
                const isActive = activeProvider.includes(provider.id);
                return (
@@ -401,7 +395,7 @@ export const WatchProviderSelector = ({
                    key={`prodiver-${provider.id}`}
                  >
                    <div
-                      className={`provider-container relative w-full cursor-pointer rounded-lg p-2 ring-1 transition ${
+                      className={`provider-container relative h-full w-full cursor-pointer rounded-lg p-2 ring-1 transition ${
                        isActive
                          ? 'bg-gray-600 ring-indigo-500 hover:bg-gray-500'
                          : 'bg-gray-700 ring-gray-500 hover:bg-gray-600'
@@ -437,7 +431,6 @@ export const WatchProviderSelector = ({
          {otherProviders.length > 0 && (
            <button
              className="relative top-4 flex items-center justify-center space-x-2 text-sm text-gray-400 transition hover:text-gray-200"
-              type="button"
              onClick={() => setShowMore(!showMore)}
            >
              <div className="h-0.5 flex-1 bg-gray-600" />
--- a/src/components/ServiceWorkerSetup/index.tsx
+++ b/src/components/ServiceWorkerSetup/index.tsx
@@ -1,9 +1,11 @@
 /* eslint-disable no-console */
-
+import useSettings from '@app/hooks/useSettings';
 import { useUser } from '@app/hooks/useUser';
+import axios from 'axios';
 import { useEffect } from 'react';

 const ServiceWorkerSetup = () => {
+  const { currentSettings } = useSettings();
  const { user } = useUser();
  useEffect(() => {
    if ('serviceWorker' in navigator && user?.id) {
@@ -14,12 +16,33 @@ const ServiceWorkerSetup = () => {
            '[SW] Registration successful, scope is:',
            registration.scope
          );
+
+          if (currentSettings.enablePushRegistration) {
+            const sub = await registration.pushManager.subscribe({
+              userVisibleOnly: true,
+              applicationServerKey: currentSettings.vapidPublic,
+            });
+
+            const parsedSub = JSON.parse(JSON.stringify(sub));
+
+            if (parsedSub.keys.p256dh && parsedSub.keys.auth) {
+              await axios.post('/api/v1/user/registerPushSubscription', {
+                endpoint: parsedSub.endpoint,
+                p256dh: parsedSub.keys.p256dh,
+                auth: parsedSub.keys.auth,
+              });
+            }
+          }
        })
        .catch(function (error) {
          console.log('[SW] Service worker registration failed, error:', error);
        });
    }
-  }, [user]);
+  }, [
+    user,
+    currentSettings.vapidPublic,
+    currentSettings.enablePushRegistration,
+  ]);
  return null;
 };

--- a/src/components/Settings/LibraryItem.tsx
+++ b/src/components/Settings/LibraryItem.tsx
@@ -32,7 +32,7 @@ const LibraryItem = ({ isEnabled, name, onToggle }: LibraryItemProps) => {
              aria-hidden="true"
              className={`${
                isEnabled ? 'translate-x-5' : 'translate-x-0'
-              } relative inline-block h-5 w-5 rounded-full bg-white shadow transition duration-200 ease-in-out`}
+              } relative inline-block h-5 w-5 transform rounded-full bg-white shadow transition duration-200 ease-in-out`}
            >
              <span
                className={`${
--- a/src/components/Settings/RadarrModal/index.tsx
+++ b/src/components/Settings/RadarrModal/index.tsx
@@ -57,9 +57,6 @@ const messages = defineMessages({
  testFirstTags: 'Test connection to load tags',
  tags: 'Tags',
  enableSearch: 'Enable Automatic Search',
-  tagRequests: 'Tag Requests',
-  tagRequestsInfo:
-    "Automatically add an additional tag with the requester's user ID & display name",
  validationApplicationUrl: 'You must provide a valid URL',
  validationApplicationUrlTrailingSlash: 'URL must not end in a trailing slash',
  validationBaseUrlLeadingSlash: 'URL base must have a leading slash',
@@ -217,10 +214,10 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
      as="div"
      appear
      show
-      enter="transition-opacity ease-in-out duration-300"
+      enter="transition ease-in-out duration-300 transform opacity-0"
      enterFrom="opacity-0"
-      enterTo="opacity-100"
-      leave="transition-opacity ease-in-out duration-300"
+      enterTo="opacuty-100"
+      leave="transition ease-in-out duration-300 transform opacity-100"
      leaveFrom="opacity-100"
      leaveTo="opacity-0"
    >
@@ -241,7 +238,6 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
          externalUrl: radarr?.externalUrl,
          syncEnabled: radarr?.syncEnabled ?? false,
          enableSearch: !radarr?.preventSearch,
-          tagRequests: radarr?.tagRequests ?? false,
        }}
        validationSchema={RadarrSettingsSchema}
        onSubmit={async (values) => {
@@ -267,7 +263,6 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
              externalUrl: values.externalUrl,
              syncEnabled: values.syncEnabled,
              preventSearch: !values.enableSearch,
-              tagRequests: values.tagRequests,
            };
            if (!radarr) {
              await axios.post('/api/v1/settings/radarr', submission);
@@ -718,21 +713,6 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
                    />
                  </div>
                </div>
-                <div className="form-row">
-                  <label htmlFor="tagRequests" className="checkbox-label">
-                    {intl.formatMessage(messages.tagRequests)}
-                    <span className="label-tip">
-                      {intl.formatMessage(messages.tagRequestsInfo)}
-                    </span>
-                  </label>
-                  <div className="form-input-area">
-                    <Field
-                      type="checkbox"
-                      id="tagRequests"
-                      name="tagRequests"
-                    />
-                  </div>
-                </div>
              </div>
            </Modal>
          );
--- a/src/components/Settings/SettingsAbout/Releases/index.tsx
+++ b/src/components/Settings/SettingsAbout/Releases/index.tsx
@@ -63,10 +63,10 @@ const Release = ({ currentVersion, release, isLatest }: ReleaseProps) => {
    <div className="flex w-full flex-col space-y-3 rounded-md bg-gray-800 px-4 py-2 shadow-md ring-1 ring-gray-700 sm:flex-row sm:space-y-0 sm:space-x-3">
      <Transition
        as={Fragment}
-        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"
        show={isModalOpen}
--- a/src/components/Settings/SettingsJobsCache/index.tsx
+++ b/src/components/Settings/SettingsJobsCache/index.tsx
@@ -53,7 +53,6 @@ const messages: { [messageName: string]: MessageDescriptor } = defineMessages({
  'plex-recently-added-scan': 'Plex Recently Added Scan',
  'plex-full-scan': 'Plex Full Library Scan',
  'plex-watchlist-sync': 'Plex Watchlist Sync',
-  'availability-sync': 'Media Availability Sync',
  'radarr-scan': 'Radarr Scan',
  'sonarr-scan': 'Sonarr Scan',
  'download-sync': 'Download Sync',
@@ -68,8 +67,6 @@ const messages: { [messageName: string]: MessageDescriptor } = defineMessages({
    'Every {jobScheduleHours, plural, one {hour} other {{jobScheduleHours} hours}}',
  editJobScheduleSelectorMinutes:
    'Every {jobScheduleMinutes, plural, one {minute} other {{jobScheduleMinutes} minutes}}',
-  editJobScheduleSelectorSeconds:
-    'Every {jobScheduleSeconds, plural, one {second} other {{jobScheduleSeconds} seconds}}',
  imagecache: 'Image Cache',
  imagecacheDescription:
    'When enabled in settings, Overseerr will proxy and cache images from pre-configured external sources. Cached images are saved into your config folder. You can find the files in <code>{appDataPath}/cache/images</code>.',
@@ -81,7 +78,7 @@ interface Job {
  id: JobId;
  name: string;
  type: 'process' | 'command';
-  interval: 'seconds' | 'minutes' | 'hours' | 'fixed';
+  interval: 'short' | 'long' | 'fixed';
  cronSchedule: string;
  nextExecutionTime: string;
  running: boolean;
@@ -92,11 +89,10 @@ type JobModalState = {
  job?: Job;
  scheduleHours: number;
  scheduleMinutes: number;
-  scheduleSeconds: number;
 };

 type JobModalAction =
-  | { type: 'set'; hours?: number; minutes?: number; seconds?: number }
+  | { type: 'set'; hours?: number; minutes?: number }
  | {
      type: 'close';
    }
@@ -119,7 +115,6 @@ const jobModalReducer = (
        job: action.job,
        scheduleHours: 1,
        scheduleMinutes: 5,
-        scheduleSeconds: 30,
      };

    case 'set':
@@ -127,7 +122,6 @@ const jobModalReducer = (
        ...state,
        scheduleHours: action.hours ?? state.scheduleHours,
        scheduleMinutes: action.minutes ?? state.scheduleMinutes,
-        scheduleSeconds: action.seconds ?? state.scheduleSeconds,
      };
  }
 };
@@ -155,7 +149,6 @@ const SettingsJobs = () => {
    isOpen: false,
    scheduleHours: 1,
    scheduleMinutes: 5,
-    scheduleSeconds: 30,
  });
  const [isSaving, setIsSaving] = useState(false);

@@ -207,11 +200,9 @@ const SettingsJobs = () => {
    const jobScheduleCron = ['0', '0', '*', '*', '*', '*'];

    try {
-      if (jobModalState.job?.interval === 'seconds') {
-        jobScheduleCron.splice(0, 2, `*/${jobModalState.scheduleSeconds}`, '*');
-      } else if (jobModalState.job?.interval === 'minutes') {
+      if (jobModalState.job?.interval === 'short') {
        jobScheduleCron[1] = `*/${jobModalState.scheduleMinutes}`;
-      } else if (jobModalState.job?.interval === 'hours') {
+      } else if (jobModalState.job?.interval === 'long') {
        jobScheduleCron[2] = `*/${jobModalState.scheduleHours}`;
      } else {
        // jobs with interval: fixed should not be editable
@@ -253,10 +244,10 @@ const SettingsJobs = () => {
      />
      <Transition
        as={Fragment}
-        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"
        show={jobModalState.isOpen}
@@ -295,30 +286,7 @@ const SettingsJobs = () => {
                  {intl.formatMessage(messages.editJobSchedulePrompt)}
                </label>
                <div className="form-input-area">
-                  {jobModalState.job?.interval === 'seconds' ? (
-                    <select
-                      name="jobScheduleSeconds"
-                      className="inline"
-                      value={jobModalState.scheduleSeconds}
-                      onChange={(e) =>
-                        dispatch({
-                          type: 'set',
-                          seconds: Number(e.target.value),
-                        })
-                      }
-                    >
-                      {[30, 45, 60].map((v) => (
-                        <option value={v} key={`jobScheduleSeconds-${v}`}>
-                          {intl.formatMessage(
-                            messages.editJobScheduleSelectorSeconds,
-                            {
-                              jobScheduleSeconds: v,
-                            }
-                          )}
-                        </option>
-                      ))}
-                    </select>
-                  ) : jobModalState.job?.interval === 'minutes' ? (
+                  {jobModalState.job?.interval === 'short' ? (
                    <select
                      name="jobScheduleMinutes"
                      className="inline"
--- a/src/components/Settings/SettingsLogs/index.tsx
+++ b/src/components/Settings/SettingsLogs/index.tsx
@@ -143,10 +143,10 @@ const SettingsLogs = () => {
      />
      <Transition
        as={Fragment}
-        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"
        appear
--- a/src/components/Settings/SettingsServices.tsx
+++ b/src/components/Settings/SettingsServices.tsx
@@ -247,10 +247,10 @@ const SettingsServices = () => {
      <Transition
        as={Fragment}
        show={deleteServerModal.open}
-        enter="transition-opacity ease-in-out duration-300"
+        enter="transition ease-in-out duration-300 transform opacity-0"
        enterFrom="opacity-0"
-        enterTo="opacity-100"
-        leave="transition-opacity ease-in-out duration-300"
+        enterTo="opacuty-100"
+        leave="transition ease-in-out duration-300 transform opacity-100"
        leaveFrom="opacity-100"
        leaveTo="opacity-0"
      >
--- a/src/components/Settings/SonarrModal/index.tsx
+++ b/src/components/Settings/SonarrModal/index.tsx
@@ -62,9 +62,6 @@ const messages = defineMessages({
  syncEnabled: 'Enable Scan',
  externalUrl: 'External URL',
  enableSearch: 'Enable Automatic Search',
-  tagRequests: 'Tag Requests',
-  tagRequestsInfo:
-    "Automatically add an additional tag with the requester's user ID & display name",
  validationApplicationUrl: 'You must provide a valid URL',
  validationApplicationUrlTrailingSlash: 'URL must not end in a trailing slash',
  validationBaseUrlLeadingSlash: 'Base URL must have a leading slash',
@@ -226,10 +223,10 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
      as="div"
      appear
      show
-      enter="transition-opacity ease-in-out duration-300"
+      enter="transition ease-in-out duration-300 transform opacity-0"
      enterFrom="opacity-0"
-      enterTo="opacity-100"
-      leave="transition-opacity ease-in-out duration-300"
+      enterTo="opacuty-100"
+      leave="transition ease-in-out duration-300 transform opacity-100"
      leaveFrom="opacity-100"
      leaveTo="opacity-0"
    >
@@ -255,7 +252,6 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
          externalUrl: sonarr?.externalUrl,
          syncEnabled: sonarr?.syncEnabled ?? false,
          enableSearch: !sonarr?.preventSearch,
-          tagRequests: sonarr?.tagRequests ?? false,
        }}
        validationSchema={SonarrSettingsSchema}
        onSubmit={async (values) => {
@@ -296,7 +292,6 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
              externalUrl: values.externalUrl,
              syncEnabled: values.syncEnabled,
              preventSearch: !values.enableSearch,
-              tagRequests: values.tagRequests,
            };
            if (!sonarr) {
              await axios.post('/api/v1/settings/sonarr', submission);
@@ -965,21 +960,6 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                    />
                  </div>
                </div>
-                <div className="form-row">
-                  <label htmlFor="tagRequests" className="checkbox-label">
-                    {intl.formatMessage(messages.tagRequests)}
-                    <span className="label-tip">
-                      {intl.formatMessage(messages.tagRequestsInfo)}
-                    </span>
-                  </label>
-                  <div className="form-input-area">
-                    <Field
-                      type="checkbox"
-                      id="tagRequests"
-                      name="tagRequests"
-                    />
-                  </div>
-                </div>
              </div>
            </Modal>
          );
--- a/src/components/Slider/index.tsx
+++ b/src/components/Slider/index.tsx
@@ -156,7 +156,6 @@ const Slider = ({
          }`}
          onClick={() => slide(Direction.LEFT)}
          disabled={scrollPos.isStart}
-          type="button"
        >
          <ChevronLeftIcon className="h-6 w-6" />
        </button>
@@ -166,7 +165,6 @@ const Slider = ({
          }`}
          onClick={() => slide(Direction.RIGHT)}
          disabled={scrollPos.isEnd}
-          type="button"
        >
          <ChevronRightIcon className="h-6 w-6" />
        </button>
--- a/src/components/StatusBadge/index.tsx
+++ b/src/components/StatusBadge/index.tsx
@@ -166,11 +166,11 @@ const StatusBadge = ({
              </span>
              {inProgress && (
                <>
-                  {mediaType === 'tv' && downloadItem[0].episode && (
+                  {mediaType === 'tv' && (
                    <span className="ml-1">
                      {intl.formatMessage(messages.seasonepisodenumber, {
-                        seasonNumber: downloadItem[0].episode.seasonNumber,
-                        episodeNumber: downloadItem[0].episode.episodeNumber,
+                        seasonNumber: downloadItem[0].episode?.seasonNumber,
+                        episodeNumber: downloadItem[0].episode?.episodeNumber,
                      })}
                    </span>
                  )}
@@ -219,11 +219,11 @@ const StatusBadge = ({
              </span>
              {inProgress && (
                <>
-                  {mediaType === 'tv' && downloadItem[0].episode && (
+                  {mediaType === 'tv' && (
                    <span className="ml-1">
                      {intl.formatMessage(messages.seasonepisodenumber, {
-                        seasonNumber: downloadItem[0].episode.seasonNumber,
-                        episodeNumber: downloadItem[0].episode.episodeNumber,
+                        seasonNumber: downloadItem[0].episode?.seasonNumber,
+                        episodeNumber: downloadItem[0].episode?.episodeNumber,
                      })}
                    </span>
                  )}
@@ -272,11 +272,11 @@ const StatusBadge = ({
              </span>
              {inProgress && (
                <>
-                  {mediaType === 'tv' && downloadItem[0].episode && (
+                  {mediaType === 'tv' && (
                    <span className="ml-1">
                      {intl.formatMessage(messages.seasonepisodenumber, {
-                        seasonNumber: downloadItem[0].episode.seasonNumber,
-                        episodeNumber: downloadItem[0].episode.episodeNumber,
+                        seasonNumber: downloadItem[0].episode?.seasonNumber,
+                        episodeNumber: downloadItem[0].episode?.episodeNumber,
                      })}
                    </span>
                  )}
--- a/src/components/StatusChecker/index.tsx
+++ b/src/components/StatusChecker/index.tsx
@@ -44,10 +44,10 @@ const StatusChecker = () => {
  return (
    <Transition
      as={Fragment}
-      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"
      appear
--- a/src/components/TitleCard/index.tsx
+++ b/src/components/TitleCard/index.tsx
@@ -23,7 +23,7 @@ interface TitleCardProps {
  summary?: string;
  year?: string;
  title: string;
-  userScore?: number;
+  userScore: number;
  mediaType: MediaType;
  status?: MediaStatus;
  canExpand?: boolean;
@@ -73,9 +73,7 @@ const TitleCard = ({
  const showRequestButton = hasPermission(
    [
      Permission.REQUEST,
-      mediaType === 'movie' || mediaType === 'collection'
-        ? Permission.REQUEST_MOVIE
-        : Permission.REQUEST_TV,
+      mediaType === 'movie' ? Permission.REQUEST_MOVIE : Permission.REQUEST_TV,
    ],
    { type: 'or' }
  );
@@ -88,13 +86,7 @@ const TitleCard = ({
      <RequestModal
        tmdbId={id}
        show={showRequestModal}
-        type={
-          mediaType === 'movie'
-            ? 'movie'
-            : mediaType === 'collection'
-            ? 'collection'
-            : 'tv'
-        }
+        type={mediaType === 'movie' ? 'movie' : 'tv'}
        onComplete={requestComplete}
        onUpdating={requestUpdating}
        onCancel={closeModal}
@@ -138,7 +130,7 @@ const TitleCard = ({
          <div className="absolute left-0 right-0 flex items-center justify-between p-2">
            <div
              className={`pointer-events-none z-40 rounded-full border bg-opacity-80 shadow-md ${
-                mediaType === 'movie' || mediaType === 'collection'
+                mediaType === 'movie'
                  ? 'border-blue-500 bg-blue-600'
                  : 'border-purple-600 bg-purple-600'
              }`}
@@ -146,12 +138,10 @@ const TitleCard = ({
              <div className="flex h-4 items-center px-2 py-2 text-center text-xs font-medium uppercase tracking-wider text-white sm:h-5">
                {mediaType === 'movie'
                  ? intl.formatMessage(globalMessages.movie)
-                  : mediaType === 'collection'
-                  ? intl.formatMessage(globalMessages.collection)
                  : intl.formatMessage(globalMessages.tvshow)}
              </div>
            </div>
-            {currentStatus && currentStatus !== MediaStatus.UNKNOWN && (
+            {currentStatus && (
              <div className="pointer-events-none z-40 flex items-center">
                <StatusBadgeMini
                  status={currentStatus}
@@ -164,10 +154,10 @@ const TitleCard = ({
          <Transition
            as={Fragment}
            show={isUpdating}
-            enter="transition-opacity ease-in-out duration-300"
+            enter="transition ease-in-out duration-300 transform opacity-0"
            enterFrom="opacity-0"
            enterTo="opacity-100"
-            leave="transition-opacity ease-in-out duration-300"
+            leave="transition ease-in-out duration-300 transform opacity-100"
            leaveFrom="opacity-100"
            leaveTo="opacity-0"
          >
@@ -179,23 +169,15 @@ const TitleCard = ({
          <Transition
            as={Fragment}
            show={!image || showDetail || showRequestModal}
-            enter="transition-opacity"
+            enter="transition transform opacity-0"
            enterFrom="opacity-0"
            enterTo="opacity-100"
-            leave="transition-opacity"
+            leave="transition transform opacity-100"
            leaveFrom="opacity-100"
            leaveTo="opacity-0"
          >
            <div className="absolute inset-0 overflow-hidden rounded-xl">
-              <Link
-                href={
-                  mediaType === 'movie'
-                    ? `/movie/${id}`
-                    : mediaType === 'collection'
-                    ? `/collection/${id}`
-                    : `/tv/${id}`
-                }
-              >
+              <Link href={mediaType === 'movie' ? `/movie/${id}` : `/tv/${id}`}>
                <a
                  className="absolute inset-0 h-full w-full cursor-pointer overflow-hidden text-left"
                  style={{
--- a/src/components/TvDetails/index.tsx
+++ b/src/components/TvDetails/index.tsx
@@ -30,7 +30,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 { Disclosure, Transition } from '@headlessui/react';
 import {
  ArrowRightCircleIcon,
@@ -110,13 +109,6 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
    mutate: revalidate,
  } = useSWR<TvDetailsType>(`/api/v1/tv/${router.query.tvId}`, {
    fallbackData: tv,
-    refreshInterval: refreshIntervalHelper(
-      {
-        downloadStatus: tv?.mediaInfo?.downloadStatus,
-        downloadStatus4k: tv?.mediaInfo?.downloadStatus4k,
-      },
-      15000
-    ),
  });

  const { data: ratingData } = useSWR<RTRating>(
@@ -735,18 +727,18 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
                            )}
                          <ChevronDownIcon
                            className={`${
-                              open ? 'rotate-180' : ''
+                              open ? 'rotate-180 transform' : ''
                            } h-6 w-6 text-gray-500`}
                          />
                        </Disclosure.Button>
                        <Transition
                          show={open}
-                          enter="transition-opacity duration-100 ease-out"
-                          enterFrom="opacity-0"
-                          enterTo="opacity-100"
-                          leave="transition-opacity duration-75 ease-out"
-                          leaveFrom="opacity-100"
-                          leaveTo="opacity-0"
+                          enter="transition duration-100 ease-out"
+                          enterFrom="transform opacity-0"
+                          enterTo="transform opacity-100"
+                          leave="transition duration-75 ease-out"
+                          leaveFrom="transform opacity-100"
+                          leaveTo="transform opacity-0"
                          // Not sure why this transition is adding a margin without this here
                          style={{ margin: '0px' }}
                        >
--- a/src/components/UserList/PlexImportModal.tsx
+++ b/src/components/UserList/PlexImportModal.tsx
@@ -155,7 +155,7 @@ const PlexImportModal = ({ onCancel, onComplete }: PlexImportProps) => {
                              aria-hidden="true"
                              className={`${
                                isAllUsers() ? '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>
                        </th>
@@ -194,7 +194,7 @@ const PlexImportModal = ({ onCancel, onComplete }: PlexImportProps) => {
                                  isSelectedUser(user.id)
                                    ? '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>
                          </td>
--- a/src/components/UserList/index.tsx
+++ b/src/components/UserList/index.tsx
@@ -228,10 +228,10 @@ const UserList = () => {
      <PageTitle title={intl.formatMessage(messages.users)} />
      <Transition
        as="div"
-        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"
        show={deleteModal.isOpen}
@@ -257,10 +257,10 @@ const UserList = () => {

      <Transition
        as="div"
-        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"
        show={createModal.isOpen}
@@ -440,10 +440,10 @@ const UserList = () => {

      <Transition
        as="div"
-        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"
        show={showBulkEditModal}
@@ -461,10 +461,10 @@ const UserList = () => {

      <Transition
        as="div"
-        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"
        show={showImportModal}
--- a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush.tsx
+++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush.tsx
@@ -0,0 +1,123 @@
+import Button from '@app/components/Common/Button';
+import LoadingSpinner from '@app/components/Common/LoadingSpinner';
+import NotificationTypeSelector, {
+  ALL_NOTIFICATIONS,
+} from '@app/components/NotificationTypeSelector';
+import { useUser } from '@app/hooks/useUser';
+import globalMessages from '@app/i18n/globalMessages';
+import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
+import type { UserSettingsNotificationsResponse } from '@server/interfaces/api/userSettingsInterfaces';
+import axios from 'axios';
+import { Form, Formik } from 'formik';
+import { useRouter } from 'next/router';
+import { defineMessages, useIntl } from 'react-intl';
+import { useToasts } from 'react-toast-notifications';
+import useSWR, { mutate } from 'swr';
+
+const messages = defineMessages({
+  webpushsettingssaved: 'Web push notification settings saved successfully!',
+  webpushsettingsfailed: 'Web push notification settings failed to save.',
+});
+
+const UserWebPushSettings = () => {
+  const intl = useIntl();
+  const { addToast } = useToasts();
+  const router = useRouter();
+  const { user } = useUser({ id: Number(router.query.userId) });
+  const {
+    data,
+    error,
+    mutate: revalidate,
+  } = useSWR<UserSettingsNotificationsResponse>(
+    user ? `/api/v1/user/${user?.id}/settings/notifications` : null
+  );
+
+  if (!data && !error) {
+    return <LoadingSpinner />;
+  }
+
+  return (
+    <Formik
+      initialValues={{
+        types: data?.notificationTypes.webpush ?? ALL_NOTIFICATIONS,
+      }}
+      enableReinitialize
+      onSubmit={async (values) => {
+        try {
+          await axios.post(`/api/v1/user/${user?.id}/settings/notifications`, {
+            pgpKey: data?.pgpKey,
+            discordId: data?.discordId,
+            pushbulletAccessToken: data?.pushbulletAccessToken,
+            pushoverApplicationToken: data?.pushoverApplicationToken,
+            pushoverUserKey: data?.pushoverUserKey,
+            telegramChatId: data?.telegramChatId,
+            telegramSendSilently: data?.telegramSendSilently,
+            notificationTypes: {
+              webpush: values.types,
+            },
+          });
+          mutate('/api/v1/settings/public');
+          addToast(intl.formatMessage(messages.webpushsettingssaved), {
+            appearance: 'success',
+            autoDismiss: true,
+          });
+        } catch (e) {
+          addToast(intl.formatMessage(messages.webpushsettingsfailed), {
+            appearance: 'error',
+            autoDismiss: true,
+          });
+        } finally {
+          revalidate();
+        }
+      }}
+    >
+      {({
+        errors,
+        touched,
+        isSubmitting,
+        isValid,
+        values,
+        setFieldValue,
+        setFieldTouched,
+      }) => {
+        return (
+          <Form className="section">
+            <NotificationTypeSelector
+              user={user}
+              currentTypes={values.types}
+              onUpdate={(newTypes) => {
+                setFieldValue('types', newTypes);
+                setFieldTouched('types');
+              }}
+              error={
+                errors.types && touched.types
+                  ? (errors.types as string)
+                  : undefined
+              }
+            />
+            <div className="actions">
+              <div className="flex justify-end">
+                <span className="ml-3 inline-flex rounded-md shadow-sm">
+                  <Button
+                    buttonType="primary"
+                    type="submit"
+                    disabled={isSubmitting || !isValid}
+                  >
+                    <ArrowDownOnSquareIcon />
+                    <span>
+                      {isSubmitting
+                        ? intl.formatMessage(globalMessages.saving)
+                        : intl.formatMessage(globalMessages.save)}
+                    </span>
+                  </Button>
+                </span>
+              </div>
+            </div>
+          </Form>
+        );
+      }}
+    </Formik>
+  );
+};
+
+export default UserWebPushSettings;
--- a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/DeviceItem.tsx
+++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/DeviceItem.tsx
@@ -1,107 +0,0 @@
-import ConfirmButton from '@app/components/Common/ConfirmButton';
-import globalMessages from '@app/i18n/globalMessages';
-import {
-  ComputerDesktopIcon,
-  DevicePhoneMobileIcon,
-  TrashIcon,
-} from '@heroicons/react/24/solid';
-import { defineMessages, useIntl } from 'react-intl';
-import { UAParser } from 'ua-parser-js';
-
-interface DeviceItemProps {
-  disablePushNotifications: (p256dh: string) => void;
-  device: {
-    endpoint: string;
-    p256dh: string;
-    auth: string;
-    userAgent: string;
-    createdAt: Date;
-  };
-}
-
-const messages = defineMessages({
-  operatingsystem: 'Operating System',
-  browser: 'Browser',
-  engine: 'Engine',
-  deletesubscription: 'Delete Subscription',
-});
-
-const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
-  const intl = useIntl();
-
-  return (
-    <div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-4 text-gray-400 shadow-md ring-1 ring-gray-700 xl:h-28 xl:flex-row">
-      <div className="relative flex w-full flex-col justify-between overflow-hidden sm:flex-row">
-        <div className="relative z-10 flex w-full items-center overflow-hidden pl-4 pr-4 sm:pr-0 xl:w-7/12 2xl:w-2/3">
-          <div className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105">
-            {UAParser(device.userAgent).device.type === 'mobile' ? (
-              <DevicePhoneMobileIcon />
-            ) : (
-              <ComputerDesktopIcon />
-            )}
-          </div>
-          <div className="flex flex-col justify-center overflow-hidden pl-2 xl:pl-4">
-            <div className="pt-0.5 text-xs font-medium text-white sm:pt-1">
-              {device.createdAt
-                ? intl.formatDate(device.createdAt, {
-                    year: 'numeric',
-                    month: 'long',
-                    day: 'numeric',
-                  })
-                : 'Unknown'}
-            </div>
-            <div className="mr-2 min-w-0 truncate text-lg font-bold text-white hover:underline xl:text-xl">
-              {device.userAgent
-                ? UAParser(device.userAgent).device.model
-                : 'Unknown'}
-            </div>
-          </div>
-        </div>
-        <div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
-          <div className="card-field">
-            <span className="card-field-name">
-              {intl.formatMessage(messages.operatingsystem)}
-            </span>
-            <span className="flex truncate text-sm text-gray-300">
-              {device.userAgent
-                ? UAParser(device.userAgent).os.name
-                : 'Unknown'}
-            </span>
-          </div>
-          <div className="card-field">
-            <span className="card-field-name">
-              {intl.formatMessage(messages.browser)}
-            </span>
-            <span className="flex truncate text-sm text-gray-300">
-              {device.userAgent
-                ? UAParser(device.userAgent).browser.name
-                : 'Unknown'}
-            </span>
-          </div>
-          <div className="card-field">
-            <span className="card-field-name">
-              {intl.formatMessage(messages.engine)}
-            </span>
-            <span className="flex truncate text-sm text-gray-300">
-              {device.userAgent
-                ? UAParser(device.userAgent).engine.name
-                : 'Unknown'}
-            </span>
-          </div>
-        </div>
-      </div>
-      <div className="z-10 mt-4 flex w-full flex-col justify-center space-y-2 pl-4 pr-4 xl:mt-0 xl:w-96 xl:items-end xl:pl-0">
-        <ConfirmButton
-          onClick={() => disablePushNotifications(device.p256dh)}
-          confirmText={intl.formatMessage(globalMessages.areyousure)}
-          className="w-full"
-        >
-          <TrashIcon />
-          <span>{intl.formatMessage(messages.deletesubscription)}</span>
-        </ConfirmButton>
-      </div>
-    </div>
-  );
-};
-
-export default DeviceItem;
--- a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/index.tsx
@@ -1,338 +0,0 @@
-import Alert from '@app/components/Common/Alert';
-import Button from '@app/components/Common/Button';
-import LoadingSpinner from '@app/components/Common/LoadingSpinner';
-import NotificationTypeSelector, {
-  ALL_NOTIFICATIONS,
-} from '@app/components/NotificationTypeSelector';
-import DeviceItem from '@app/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/DeviceItem';
-import useSettings from '@app/hooks/useSettings';
-import { useUser } from '@app/hooks/useUser';
-import globalMessages from '@app/i18n/globalMessages';
-import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
-import {
-  CloudArrowDownIcon,
-  CloudArrowUpIcon,
-} from '@heroicons/react/24/solid';
-import type { UserPushSubscription } from '@server/entity/UserPushSubscription';
-import type { UserSettingsNotificationsResponse } from '@server/interfaces/api/userSettingsInterfaces';
-import axios from 'axios';
-import { Form, Formik } from 'formik';
-import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
-import { useToasts } from 'react-toast-notifications';
-import useSWR, { mutate } from 'swr';
-
-const messages = defineMessages({
-  webpushsettingssaved: 'Web push notification settings saved successfully!',
-  webpushsettingsfailed: 'Web push notification settings failed to save.',
-  enablewebpush: 'Enable web push',
-  disablewebpush: 'Disable web push',
-  managedevices: 'Manage Devices',
-  type: 'type',
-  created: 'Created',
-  device: 'Device',
-  subscriptiondeleted: 'Subscription deleted.',
-  subscriptiondeleteerror:
-    'Something went wrong while deleting the user subscription.',
-  nodevicestoshow: 'You have no web push subscriptions to show.',
-  webpushhasbeenenabled: 'Web push has been enabled.',
-  webpushhasbeendisabled: 'Web push has been disabled.',
-  enablingwebpusherror: 'Something went wrong while enable web push.',
-  disablingwebpusherror: 'Something went wrong while disabling web push.',
-});
-
-const UserWebPushSettings = () => {
-  const intl = useIntl();
-  const { addToast } = useToasts();
-  const router = useRouter();
-  const { user } = useUser({ id: Number(router.query.userId) });
-  const { currentSettings } = useSettings();
-  const [webPushEnabled, setWebPushEnabled] = useState(false);
-  const {
-    data,
-    error,
-    mutate: revalidate,
-  } = useSWR<UserSettingsNotificationsResponse>(
-    user ? `/api/v1/user/${user?.id}/settings/notifications` : null
-  );
-  const { data: dataDevices, mutate: revalidateDevices } = useSWR<
-    {
-      endpoint: string;
-      p256dh: string;
-      auth: string;
-      userAgent: string;
-      createdAt: Date;
-    }[]
-  >(`/api/v1/user/${user?.id}/pushSubscriptions`, { revalidateOnMount: true });
-
-  // Subscribes to the push manager
-  // Will only add to the database if subscribing for the first time
-  const enablePushNotifications = () => {
-    if ('serviceWorker' in navigator && user?.id) {
-      navigator.serviceWorker
-        .getRegistration('/sw.js')
-        .then(async (registration) => {
-          if (currentSettings.enablePushRegistration) {
-            const sub = await registration?.pushManager.subscribe({
-              userVisibleOnly: true,
-              applicationServerKey: currentSettings.vapidPublic,
-            });
-            const parsedSub = JSON.parse(JSON.stringify(sub));
-
-            if (parsedSub.keys.p256dh && parsedSub.keys.auth) {
-              await axios.post('/api/v1/user/registerPushSubscription', {
-                endpoint: parsedSub.endpoint,
-                p256dh: parsedSub.keys.p256dh,
-                auth: parsedSub.keys.auth,
-                userAgent: navigator.userAgent,
-              });
-              setWebPushEnabled(true);
-              addToast(intl.formatMessage(messages.webpushhasbeenenabled), {
-                appearance: 'success',
-                autoDismiss: true,
-              });
-            }
-          }
-        })
-        .catch(function () {
-          addToast(intl.formatMessage(messages.enablingwebpusherror), {
-            autoDismiss: true,
-            appearance: 'error',
-          });
-        })
-        .finally(function () {
-          revalidateDevices();
-        });
-    }
-  };
-
-  // Unsubscribes from the push manager
-  // Deletes/disables corresponding push subscription from database
-  const disablePushNotifications = async (p256dh?: string) => {
-    if ('serviceWorker' in navigator && user?.id) {
-      navigator.serviceWorker.getRegistration('/sw.js').then((registration) => {
-        registration?.pushManager
-          .getSubscription()
-          .then(async (subscription) => {
-            const parsedSub = JSON.parse(JSON.stringify(subscription));
-
-            await axios.delete(
-              `/api/v1/user/${user?.id}/pushSubscription/${
-                p256dh ? p256dh : parsedSub.keys.p256dh
-              }`
-            );
-            if (subscription && (p256dh === parsedSub.keys.p256dh || !p256dh)) {
-              subscription.unsubscribe();
-              setWebPushEnabled(false);
-            }
-            addToast(
-              intl.formatMessage(
-                p256dh
-                  ? messages.subscriptiondeleted
-                  : messages.webpushhasbeendisabled
-              ),
-              {
-                autoDismiss: true,
-                appearance: 'success',
-              }
-            );
-          })
-          .catch(function () {
-            addToast(
-              intl.formatMessage(
-                p256dh
-                  ? messages.subscriptiondeleteerror
-                  : messages.disablingwebpusherror
-              ),
-              {
-                autoDismiss: true,
-                appearance: 'error',
-              }
-            );
-          })
-          .finally(function () {
-            revalidateDevices();
-          });
-      });
-    }
-  };
-
-  // Checks our current subscription on page load
-  // Will set the web push state to true if subscribed
-  useEffect(() => {
-    if ('serviceWorker' in navigator && user?.id) {
-      navigator.serviceWorker
-        .getRegistration('/sw.js')
-        .then(async (registration) => {
-          await registration?.pushManager
-            .getSubscription()
-            .then(async (subscription) => {
-              if (subscription) {
-                const parsedKey = JSON.parse(JSON.stringify(subscription));
-                const currentUserPushSub =
-                  await axios.get<UserPushSubscription>(
-                    `/api/v1/user/${user.id}/pushSubscription/${parsedKey.keys.p256dh}`
-                  );
-
-                if (currentUserPushSub.data.p256dh !== parsedKey.keys.p256dh) {
-                  return;
-                }
-                setWebPushEnabled(true);
-              } else {
-                setWebPushEnabled(false);
-              }
-            });
-        })
-        .catch(function (error) {
-          setWebPushEnabled(false);
-          // eslint-disable-next-line no-console
-          console.log(
-            '[SW] Failure retrieving push manager subscription, error:',
-            error
-          );
-        });
-    }
-  }, [user?.id]);
-
-  if (!data && !error) {
-    return <LoadingSpinner />;
-  }
-
-  return (
-    <>
-      <Formik
-        initialValues={{
-          types: data?.notificationTypes.webpush ?? ALL_NOTIFICATIONS,
-        }}
-        enableReinitialize
-        onSubmit={async (values) => {
-          try {
-            await axios.post(
-              `/api/v1/user/${user?.id}/settings/notifications`,
-              {
-                pgpKey: data?.pgpKey,
-                discordId: data?.discordId,
-                pushbulletAccessToken: data?.pushbulletAccessToken,
-                pushoverApplicationToken: data?.pushoverApplicationToken,
-                pushoverUserKey: data?.pushoverUserKey,
-                telegramChatId: data?.telegramChatId,
-                telegramSendSilently: data?.telegramSendSilently,
-                notificationTypes: {
-                  webpush: values.types,
-                },
-              }
-            );
-            mutate('/api/v1/settings/public');
-            addToast(intl.formatMessage(messages.webpushsettingssaved), {
-              appearance: 'success',
-              autoDismiss: true,
-            });
-          } catch (e) {
-            addToast(intl.formatMessage(messages.webpushsettingsfailed), {
-              appearance: 'error',
-              autoDismiss: true,
-            });
-          } finally {
-            revalidate();
-          }
-        }}
-      >
-        {({
-          errors,
-          touched,
-          isSubmitting,
-          isValid,
-          values,
-          setFieldValue,
-          setFieldTouched,
-        }) => {
-          return (
-            <Form className="section">
-              <NotificationTypeSelector
-                user={user}
-                currentTypes={values.types}
-                onUpdate={(newTypes) => {
-                  setFieldValue('types', newTypes);
-                  setFieldTouched('types');
-                }}
-                error={
-                  errors.types && touched.types
-                    ? (errors.types as string)
-                    : undefined
-                }
-              />
-              <div className="actions">
-                <div className="flex justify-end">
-                  <span className="ml-3 inline-flex rounded-md shadow-sm">
-                    <Button
-                      buttonType={`${webPushEnabled ? 'danger' : 'primary'}`}
-                      type="button"
-                      onClick={() =>
-                        webPushEnabled
-                          ? disablePushNotifications()
-                          : enablePushNotifications()
-                      }
-                    >
-                      {webPushEnabled ? (
-                        <CloudArrowDownIcon />
-                      ) : (
-                        <CloudArrowUpIcon />
-                      )}
-                      <span>
-                        {webPushEnabled
-                          ? intl.formatMessage(messages.disablewebpush)
-                          : intl.formatMessage(messages.enablewebpush)}
-                      </span>
-                    </Button>
-                  </span>
-                  <span className="ml-3 inline-flex rounded-md shadow-sm">
-                    <Button
-                      buttonType="primary"
-                      type="submit"
-                      disabled={isSubmitting || !isValid}
-                    >
-                      <ArrowDownOnSquareIcon />
-                      <span>
-                        {isSubmitting
-                          ? intl.formatMessage(globalMessages.saving)
-                          : intl.formatMessage(globalMessages.save)}
-                      </span>
-                    </Button>
-                  </span>
-                </div>
-              </div>
-            </Form>
-          );
-        }}
-      </Formik>
-      <div className="mt-10 mb-6">
-        <h3 className="heading">
-          {intl.formatMessage(messages.managedevices)}
-        </h3>
-        <div className="section">
-          {dataDevices?.length ? (
-            dataDevices?.map((device, index) => (
-              <div className="py-2" key={`device-list-${index}`}>
-                <DeviceItem
-                  key={index}
-                  disablePushNotifications={disablePushNotifications}
-                  device={device}
-                />
-              </div>
-            ))
-          ) : (
-            <>
-              <Alert
-                title={intl.formatMessage(messages.nodevicestoshow)}
-                type="info"
-              />
-            </>
-          )}
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default UserWebPushSettings;
--- a/src/hooks/useLockBodyScroll.ts
+++ b/src/hooks/useLockBodyScroll.ts
@@ -15,20 +15,13 @@ export const useLockBodyScroll = (
  disabled?: boolean
 ): void => {
  useEffect(() => {
-    const originalOverflowStyle = window.getComputedStyle(
-      document.body
-    ).overflow;
-    const originalTouchActionStyle = window.getComputedStyle(
-      document.body
-    ).touchAction;
+    const originalStyle = window.getComputedStyle(document.body).overflow;
    if (isLocked && !disabled) {
      document.body.style.overflow = 'hidden';
-      document.body.style.touchAction = 'none';
    }
    return () => {
      if (!disabled) {
-        document.body.style.overflow = originalOverflowStyle;
-        document.body.style.touchAction = originalTouchActionStyle;
+        document.body.style.overflow = originalStyle;
      }
    };
  }, [isLocked, disabled]);
--- a/src/i18n/globalMessages.ts
+++ b/src/i18n/globalMessages.ts
@@ -16,7 +16,6 @@ const globalMessages = defineMessages({
  approved: 'Approved',
  movie: 'Movie',
  movies: 'Movies',
-  collection: 'Collection',
  tvshow: 'Series',
  tvshows: 'Series',
  cancel: 'Cancel',
--- a/src/i18n/locale/en.json
+++ b/src/i18n/locale/en.json
@@ -76,9 +76,7 @@
  "components.Discover.FilterSlideover.streamingservices": "Streaming Services",
  "components.Discover.FilterSlideover.studio": "Studio",
  "components.Discover.FilterSlideover.tmdbuserscore": "TMDB User Score",
-  "components.Discover.FilterSlideover.tmdbuservotecount": "TMDB User Vote Count",
  "components.Discover.FilterSlideover.to": "To",
-  "components.Discover.FilterSlideover.voteCount": "Number of votes between {minValue} and {maxValue}",
  "components.Discover.MovieGenreList.moviegenres": "Movie Genres",
  "components.Discover.MovieGenreSlider.moviegenres": "Movie Genres",
  "components.Discover.NetworkSlider.networks": "Networks",
@@ -107,13 +105,11 @@
  "components.Discover.studios": "Studios",
  "components.Discover.tmdbmoviegenre": "TMDB Movie Genre",
  "components.Discover.tmdbmoviekeyword": "TMDB Movie Keyword",
-  "components.Discover.tmdbmoviestreamingservices": "TMDB Movie Streaming Services",
  "components.Discover.tmdbnetwork": "TMDB Network",
  "components.Discover.tmdbsearch": "TMDB Search",
  "components.Discover.tmdbstudio": "TMDB Studio",
  "components.Discover.tmdbtvgenre": "TMDB Series Genre",
  "components.Discover.tmdbtvkeyword": "TMDB Series Keyword",
-  "components.Discover.tmdbtvstreamingservices": "TMDB TV Streaming Services",
  "components.Discover.trending": "Trending",
  "components.Discover.tvgenres": "Series Genres",
  "components.Discover.upcoming": "Upcoming Movies",
@@ -684,8 +680,6 @@
  "components.Settings.RadarrModal.servername": "Server Name",
  "components.Settings.RadarrModal.ssl": "Use SSL",
  "components.Settings.RadarrModal.syncEnabled": "Enable Scan",
-  "components.Settings.RadarrModal.tagRequests": "Tag Requests",
-  "components.Settings.RadarrModal.tagRequestsInfo": "Automatically add an additional tag with the requester's user ID & display name",
  "components.Settings.RadarrModal.tags": "Tags",
  "components.Settings.RadarrModal.testFirstQualityProfiles": "Test connection to load quality profiles",
  "components.Settings.RadarrModal.testFirstRootFolders": "Test connection to load root folders",
@@ -727,7 +721,6 @@
  "components.Settings.SettingsAbout.totalrequests": "Total Requests",
  "components.Settings.SettingsAbout.uptodate": "Up to Date",
  "components.Settings.SettingsAbout.version": "Version",
-  "components.Settings.SettingsJobsCache.availability-sync": "Media Availability Sync",
  "components.Settings.SettingsJobsCache.cache": "Cache",
  "components.Settings.SettingsJobsCache.cacheDescription": "Overseerr caches requests to external API endpoints to optimize performance and avoid making unnecessary API calls.",
  "components.Settings.SettingsJobsCache.cacheflushed": "{cachename} cache flushed.",
@@ -746,7 +739,6 @@
  "components.Settings.SettingsJobsCache.editJobSchedulePrompt": "New Frequency",
  "components.Settings.SettingsJobsCache.editJobScheduleSelectorHours": "Every {jobScheduleHours, plural, one {hour} other {{jobScheduleHours} hours}}",
  "components.Settings.SettingsJobsCache.editJobScheduleSelectorMinutes": "Every {jobScheduleMinutes, plural, one {minute} other {{jobScheduleMinutes} minutes}}",
-  "components.Settings.SettingsJobsCache.editJobScheduleSelectorSeconds": "Every {jobScheduleSeconds, plural, one {second} other {{jobScheduleSeconds} seconds}}",
  "components.Settings.SettingsJobsCache.flushcache": "Flush Cache",
  "components.Settings.SettingsJobsCache.image-cache-cleanup": "Image Cache Cleanup",
  "components.Settings.SettingsJobsCache.imagecache": "Image Cache",
@@ -863,8 +855,6 @@
  "components.Settings.SonarrModal.servername": "Server Name",
  "components.Settings.SonarrModal.ssl": "Use SSL",
  "components.Settings.SonarrModal.syncEnabled": "Enable Scan",
-  "components.Settings.SonarrModal.tagRequests": "Tag Requests",
-  "components.Settings.SonarrModal.tagRequestsInfo": "Automatically add an additional tag with the requester's user ID & display name",
  "components.Settings.SonarrModal.tags": "Tags",
  "components.Settings.SonarrModal.testFirstLanguageProfiles": "Test connection to load language profiles",
  "components.Settings.SonarrModal.testFirstQualityProfiles": "Test connection to load quality profiles",
@@ -1101,25 +1091,6 @@
  "components.UserProfile.UserSettings.UserGeneralSettings.toastSettingsSuccess": "Settings saved successfully!",
  "components.UserProfile.UserSettings.UserGeneralSettings.user": "User",
  "components.UserProfile.UserSettings.UserGeneralSettings.validationDiscordId": "You must provide a valid Discord user ID",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.browser": "Browser",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.created": "Created",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.deletesubscription": "Delete Subscription",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.device": "Device",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.disablewebpush": "Disable web push",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.disablingwebpusherror": "Something went wrong while disabling web push.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.enablewebpush": "Enable web push",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.enablingwebpusherror": "Something went wrong while enable web push.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.engine": "Engine",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.managedevices": "Manage Devices",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.nodevicestoshow": "You have no web push subscriptions to show.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.operatingsystem": "Operating System",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.subscriptiondeleted": "Subscription deleted.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.subscriptiondeleteerror": "Something went wrong while deleting the user subscription.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.type": "type",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.webpushhasbeendisabled": "Web push has been disabled.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.webpushhasbeenenabled": "Web push has been enabled.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.webpushsettingsfailed": "Web push notification settings failed to save.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.UserNotificationsWebPush.webpushsettingssaved": "Web push notification settings saved successfully!",
  "components.UserProfile.UserSettings.UserNotificationSettings.discordId": "User ID",
  "components.UserProfile.UserSettings.UserNotificationSettings.discordIdTip": "The <FindDiscordIdLink>multi-digit ID number</FindDiscordIdLink> associated with your user account",
  "components.UserProfile.UserSettings.UserNotificationSettings.discordsettingsfailed": "Discord notification settings failed to save.",
@@ -1154,6 +1125,8 @@
  "components.UserProfile.UserSettings.UserNotificationSettings.validationPushoverUserKey": "You must provide a valid user or group key",
  "components.UserProfile.UserSettings.UserNotificationSettings.validationTelegramChatId": "You must provide a valid chat ID",
  "components.UserProfile.UserSettings.UserNotificationSettings.webpush": "Web Push",
+  "components.UserProfile.UserSettings.UserNotificationSettings.webpushsettingsfailed": "Web push notification settings failed to save.",
+  "components.UserProfile.UserSettings.UserNotificationSettings.webpushsettingssaved": "Web push notification settings saved successfully!",
  "components.UserProfile.UserSettings.UserPasswordChange.confirmpassword": "Confirm Password",
  "components.UserProfile.UserSettings.UserPasswordChange.currentpassword": "Current Password",
  "components.UserProfile.UserSettings.UserPasswordChange.newpassword": "New Password",
@@ -1199,7 +1172,6 @@
  "i18n.cancel": "Cancel",
  "i18n.canceling": "Canceling…",
  "i18n.close": "Close",
-  "i18n.collection": "Collection",
  "i18n.decline": "Decline",
  "i18n.declined": "Declined",
  "i18n.delete": "Delete",
--- a/src/pages/movie/[movieId]/index.tsx
+++ b/src/pages/movie/[movieId]/index.tsx
@@ -1,7 +1,7 @@
 import MovieDetails from '@app/components/MovieDetails';
 import type { MovieDetails as MovieDetailsType } from '@server/models/Movie';
 import axios from 'axios';
-import type { GetServerSideProps, NextPage } from 'next';
+import type { NextPage } from 'next';

 interface MoviePageProps {
  movie?: MovieDetailsType;
@@ -11,25 +11,25 @@ const MoviePage: NextPage<MoviePageProps> = ({ movie }) => {
  return <MovieDetails movie={movie} />;
 };

-export const getServerSideProps: GetServerSideProps<MoviePageProps> = async (
-  ctx
-) => {
-  const response = await axios.get<MovieDetailsType>(
-    `http://localhost:${process.env.PORT || 5055}/api/v1/movie/${
-      ctx.query.movieId
-    }`,
-    {
-      headers: ctx.req?.headers?.cookie
-        ? { cookie: ctx.req.headers.cookie }
-        : undefined,
-    }
-  );
+MoviePage.getInitialProps = async (ctx) => {
+  if (ctx.req) {
+    const response = await axios.get<MovieDetailsType>(
+      `http://localhost:${process.env.PORT || 5055}/api/v1/movie/${
+        ctx.query.movieId
+      }`,
+      {
+        headers: ctx.req?.headers?.cookie
+          ? { cookie: ctx.req.headers.cookie }
+          : undefined,
+      }
+    );

-  return {
-    props: {
+    return {
      movie: response.data,
-    },
-  };
+    };
+  }
+
+  return {};
 };

 export default MoviePage;
--- a/src/pages/tv/[tvId]/index.tsx
+++ b/src/pages/tv/[tvId]/index.tsx
@@ -1,7 +1,7 @@
 import TvDetails from '@app/components/TvDetails';
 import type { TvDetails as TvDetailsType } from '@server/models/Tv';
 import axios from 'axios';
-import type { GetServerSideProps, NextPage } from 'next';
+import type { NextPage } from 'next';

 interface TvPageProps {
  tv?: TvDetailsType;
@@ -11,23 +11,25 @@ const TvPage: NextPage<TvPageProps> = ({ tv }) => {
  return <TvDetails tv={tv} />;
 };

-export const getServerSideProps: GetServerSideProps<TvPageProps> = async (
-  ctx
-) => {
-  const response = await axios.get<TvDetailsType>(
-    `http://localhost:${process.env.PORT || 5055}/api/v1/tv/${ctx.query.tvId}`,
-    {
-      headers: ctx.req?.headers?.cookie
-        ? { cookie: ctx.req.headers.cookie }
-        : undefined,
-    }
-  );
+TvPage.getInitialProps = async (ctx) => {
+  if (ctx.req) {
+    const response = await axios.get<TvDetailsType>(
+      `http://localhost:${process.env.PORT || 5055}/api/v1/tv/${
+        ctx.query.tvId
+      }`,
+      {
+        headers: ctx.req?.headers?.cookie
+          ? { cookie: ctx.req.headers.cookie }
+          : undefined,
+      }
+    );

-  return {
-    props: {
+    return {
      tv: response.data,
-    },
-  };
+    };
+  }
+
+  return {};
 };

 export default TvPage;
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -17,7 +17,7 @@

  body {
    @apply bg-gray-900;
-    -webkit-overflow-scrolling: touch;
+    overscroll-behavior-y: contain;
  }

  code {
@@ -43,8 +43,8 @@
  }

  .slideover {
-    padding-top: calc(0.75rem + env(safe-area-inset-top)) !important;
-    padding-bottom: calc(0.75rem + env(safe-area-inset-top)) !important;
+    padding-top: calc(1rem + env(safe-area-inset-top)) !important;
+    padding-bottom: calc(1rem + env(safe-area-inset-top)) !important;
  }

  .sidebar-close-button {
@@ -73,10 +73,6 @@
    grid-template-columns: repeat(auto-fill, minmax(16.5rem, 1fr));
  }

-  .provider-icons {
-    grid-template-columns: repeat(auto-fill, minmax(3.5rem, 1fr));
-  }
-
  .slider-header {
    @apply relative mt-6 mb-4 flex;
  }
--- a/src/utils/refreshIntervalHelper.ts
+++ b/src/utils/refreshIntervalHelper.ts
@@ -1,18 +0,0 @@
-import type { DownloadingItem } from '@server/lib/downloadtracker';
-
-export const refreshIntervalHelper = (
-  downloadItem: {
-    downloadStatus: DownloadingItem[] | undefined;
-    downloadStatus4k: DownloadingItem[] | undefined;
-  },
-  timer: number
-) => {
-  if (
-    (downloadItem.downloadStatus ?? []).length > 0 ||
-    (downloadItem.downloadStatus4k ?? []).length > 0
-  ) {
-    return timer;
-  } else {
-    return 0;
-  }
-};
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
semantic-release-bot	ef3d428076	chore(release): 1.32.4	2023-01-29 11:43:54 +00:00
sct	2c76b17919	Merge branch 'develop'	2023-01-29 20:41:54 +09:00
semantic-release-bot	e98d93db1a	chore(release): 1.32.3	2023-01-29 09:56:55 +00:00
sct	ba84a32c0d	Merge branch 'develop'	2023-01-29 18:55:08 +09:00
semantic-release-bot	fe5e7cbf4b	chore(release): 1.32.2	2023-01-27 12:52:28 +00:00
sct	45ce57687a	Merge branch 'develop'	2023-01-27 21:50:43 +09:00
semantic-release-bot	4b43747bcc	chore(release): 1.32.1	2023-01-25 09:51:34 +00:00
sct	714f244d6a	Merge branch 'develop'	2023-01-25 18:49:37 +09:00
semantic-release-bot	acfaf7eb45	chore(release): 1.32.0	2023-01-25 02:01:29 +00:00
sct	b83d8c8f5c	Merge branch 'develop'	2023-01-25 10:48:02 +09:00
semantic-release-bot	dd5d2698a6	chore(release): 1.31.0	2022-12-17 01:45:07 +00:00
sct	c5e59616fa	Merge branch 'develop'	2022-12-17 10:42:38 +09:00
semantic-release-bot	fc79fdabf4	chore(release): 1.30.1	2022-10-15 08:59:03 +00:00
sct	7dd683c3d8	Merge branch 'develop'	2022-10-15 17:57:18 +09:00
semantic-release-bot	4a5421a9ba	chore(release): 1.30.0	2022-09-19 07:17:15 +00:00
Ryan Cohen	24b9c00b2a	Merge branch 'develop'	2022-09-19 16:12:44 +09:00
semantic-release-bot	5125abdbf0	chore(release): 1.29.1	2022-04-06 23:34:24 +00:00
Ryan Cohen	724f8bb538	Merge branch 'develop'	2022-04-07 08:33:04 +09:00
semantic-release-bot	512f6e51e4	chore(release): 1.29.0	2022-04-01 09:03:58 +00:00
Ryan Cohen	1b36dded3f	Merge branch 'develop'	2022-04-01 18:02:32 +09:00
Ryan Cohen	77511bf199	ci: disable husky for release ci	2022-04-01 18:01:22 +09:00
Ryan Cohen	26d77af3a4	Merge branch 'develop'	2022-04-01 17:45:51 +09:00
semantic-release-bot	2b111f1c34	chore(release): 1.28.0	2022-01-01 04:20:46 +00:00
Ryan Cohen	a6392cb2db	Merge branch 'develop'	2022-01-01 13:11:57 +09:00
semantic-release-bot	6d55b50e5e	chore(release): 1.27.0	2021-10-19 14:01:17 +00:00
sct	f7dc6256ba	Merge branch 'develop'	2021-10-19 22:54:07 +09:00
semantic-release-bot	f1df1caea5	chore(release): 1.26.1	2021-09-20 00:22:06 +00:00
sct	d23c120dc0	Merge branch 'develop'	2021-09-20 09:14:29 +09:00
semantic-release-bot	353efa39d0	chore(release): 1.26.0	2021-09-19 12:15:52 +00:00
sct	21cdf7d113	Merge branch 'develop'	2021-09-19 21:08:16 +09:00
semantic-release-bot	f858f025fe	chore(release): 1.25.0	2021-06-10 10:25:49 +00:00
sct	c92bb134d4	Merge branch 'develop'	2021-06-10 19:18:12 +09:00
semantic-release-bot	7e0e2a92e3	chore(release): 1.24.0	2021-05-05 08:57:48 +00:00
sct	e840489e57	Merge branch 'develop'	2021-05-05 17:50:27 +09:00
sct	800f4668ec	chore: fix gitattributes for images [skip ci]	2021-05-05 17:49:55 +09:00
semantic-release-bot	f2c37babeb	chore(release): 1.23.2	2021-04-21 12:28:28 +00:00
sct	24095eac03	Merge branch 'develop'	2021-04-21 21:20:07 +09:00
semantic-release-bot	8c782e0c93	chore(release): 1.23.1	2021-04-16 14:19:53 +00:00
sct	08ce7f24b8	Merge branch 'develop'	2021-04-16 23:11:54 +09:00
semantic-release-bot	67e794aca4	chore(release): 1.23.0	2021-04-16 12:38:05 +00:00
sct	c9c429d027	Merge branch 'develop'	2021-04-16 21:30:30 +09:00
semantic-release-bot	31ac11f4eb	chore(release): 1.22.0	2021-04-01 06:33:50 +00:00
sct	f072a4e11d	Merge branch 'develop'	2021-04-01 15:27:10 +09:00
semantic-release-bot	b24c23e549	chore(release): 1.21.1	2021-03-15 08:04:26 +00:00
sct	e602e9f758	Merge branch 'develop'	2021-03-15 07:56:33 +00:00
semantic-release-bot	afd46ebee8	chore(release): 1.21.0	2021-03-15 02:00:59 +00:00
sct	be47d1e56c	Merge branch 'develop'	2021-03-15 01:52:10 +00:00
semantic-release-bot	0e612f01f1	chore(release): 1.20.1	2021-02-28 04:10:48 +00:00
sct	cd9d9ae8d2	Merge branch 'develop'	2021-02-28 04:03:43 +00:00
semantic-release-bot	ea2765f8c7	chore(release): 1.20.0	2021-02-23 12:33:56 +00:00
sct	448e7c3a7d	Merge branch 'develop'	2021-02-23 12:26:58 +00:00
sct	6ab3cd77a7	Merge branch 'develop'	2021-02-23 12:09:08 +00:00
semantic-release-bot	3dfbb0e0a5	chore(release): 1.19.1	2021-02-06 05:14:36 +00:00
TheCatLady	726f62b9b6	fix(ui): Fix webhook URL validation regex (#864 )	2021-02-06 14:08:24 +09:00
sct	81c30347f6	Merge branch 'develop'	2021-02-05 14:15:02 +00:00
semantic-release-bot	a397893217	chore(release): 1.19.0	2021-02-05 10:32:05 +00:00
sct	12c5bbd778	Merge branch 'develop'	2021-02-05 10:25:43 +00:00
sct	06261c1118	ci(snapcraft): remove --unshallow argument from fetch in Prepare step	2021-01-30 06:31:34 +00:00
semantic-release-bot	686fe6fdf8	chore(release): 1.18.0	2021-01-30 06:13:16 +00:00
sct	c80a1fa261	Merge branch 'develop'	2021-01-30 06:06:49 +00:00
semantic-release-bot	6167011ee5	chore(release): 1.17.2	2021-01-20 07:27:33 +00:00
sct	bc399d95a0	Merge branch 'develop'	2021-01-20 07:21:48 +00:00
semantic-release-bot	519dd17d37	chore(release): 1.17.1	2021-01-19 10:24:57 +00:00
sct	0761593411	Merge branch 'develop'	2021-01-19 10:18:51 +00:00
semantic-release-bot	caa45415b1	chore(release): 1.17.0	2021-01-19 07:58:37 +00:00
sct	ed297d9d6c	Merge branch 'develop'	2021-01-19 07:52:47 +00:00
semantic-release-bot	c6486c3643	chore(release): 1.16.0	2021-01-07 09:58:09 +00:00
sct	f9695068a8	Merge branch 'develop'	2021-01-07 09:53:04 +00:00
semantic-release-bot	fd90adba4d	chore(release): 1.15.0	2021-01-04 12:01:25 +00:00
sct	970aa612fe	Merge pull request #570 from sct/release/release-20210104 Release	2021-01-04 20:56:34 +09:00
sct	71169944dc	Merge branch 'develop' into release/release-20210104	2021-01-04 11:54:45 +00:00
semantic-release-bot	d77f9eb44e	chore(release): 1.14.1	2021-01-02 08:57:24 +00:00
sct	22f2037ea6	fix(holiday): remove special holiday slider	2021-01-02 08:33:24 +00:00
semantic-release-bot	2cdf755c20	chore(release): 1.14.0	2020-12-25 11:52:44 +00:00
sct	f99ab47c01	Merge branch 'develop'	2020-12-25 20:47:19 +09:00
semantic-release-bot	7e4175ff21	chore(release): 1.13.0	2020-12-23 12:44:01 +00:00
sct	4157432aa7	Merge branch 'develop'	2020-12-23 21:39:00 +09:00
semantic-release-bot	741b2c4e9f	chore(release): 1.12.1	2020-12-22 03:17:58 +00:00
sct	6dbe9ea814	Merge branch 'develop'	2020-12-22 12:12:25 +09:00
semantic-release-bot	96328ab5c6	chore(release): 1.12.0	2020-12-22 02:26:31 +00:00
sct	c31709681a	Merge branch 'develop'	2020-12-22 11:21:19 +09:00
semantic-release-bot	0a3d7c5915	chore(release): 1.11.0	2020-12-20 01:18:39 +00:00
sct	912c63e562	Merge branch 'develop'	2020-12-20 10:12:59 +09:00
semantic-release-bot	077513151e	chore(release): 1.10.0	2020-12-19 04:54:22 +00:00
sct	191f39e8bd	Merge branch 'develop'	2020-12-19 13:49:05 +09:00
semantic-release-bot	048b6c1d90	chore(release): 1.9.1	2020-12-18 16:08:58 +00:00
sct	a6a065ac0b	Merge branch 'develop'	2020-12-19 01:03:48 +09:00
semantic-release-bot	abb0b2d763	chore(release): 1.9.0	2020-12-18 12:05:35 +00:00
sct	d2668d3f49	Merge branch 'develop'	2020-12-18 21:00:48 +09:00
semantic-release-bot	bee6eb288f	chore(release): 1.8.0	2020-12-17 15:54:40 +00:00
sct	3473aed27e	Merge branch 'develop'	2020-12-17 15:49:18 +00:00
semantic-release-bot	a9144a2167	chore(release): 1.7.0	2020-12-17 14:09:58 +00:00
sct	59822d6e42	Merge branch 'develop'	2020-12-17 14:05:24 +00:00
semantic-release-bot	0bd1bee1fa	chore(release): 1.6.0	2020-12-16 05:56:57 +00:00
sct	46326f9d16	Merge branch 'develop'	2020-12-16 05:52:26 +00:00
semantic-release-bot	54b96cc451	chore(release): 1.5.0	2020-12-15 09:05:37 +00:00
sct	7d2a187865	Merge branch 'develop'	2020-12-15 09:00:44 +00:00
semantic-release-bot	17df5dd072	chore(release): 1.4.0	2020-12-15 00:53:05 +00:00
sct	4b48a36ad3	Merge branch 'develop'	2020-12-15 00:48:28 +00:00
semantic-release-bot	16bd3e9fd5	chore(release): 1.3.2	2020-12-14 13:11:15 +00:00
sct	6360c82898	Merge branch 'develop'	2020-12-14 13:06:22 +00:00
semantic-release-bot	f1df9eeb2f	chore(release): 1.3.1	2020-12-14 08:03:51 +00:00
sct	a3973791fb	Merge branch 'develop'	2020-12-14 07:59:18 +00:00
semantic-release-bot	157ab80be1	chore(release): 1.3.0	2020-12-14 05:32:31 +00:00
sct	ac0f95b773	Merge branch 'develop'	2020-12-14 05:27:01 +00:00
semantic-release-bot	45ebfb937e	chore(release): 1.2.0	2020-12-11 22:55:12 +00:00
sct	85325cda7f	Merge branch 'develop'	2020-12-11 22:50:33 +00:00
semantic-release-bot	5fc02d0d94	chore(release): 1.1.0	2020-12-08 08:21:58 +00:00
sct	16902f85fb	Merge branch 'develop'	2020-12-08 08:16:24 +00:00
semantic-release-bot	17b5a0bf9c	chore(release): 1.0.0	2020-12-06 01:58:28 +00:00