fix: resolve plex user mismatch due to caching issues

This commit addresses an issue where cached responses for PlexTV API
requests could return incorrect user data when multiple users were logged in.
This was caused by a shared cache key that did not account for differences
in auth tokens, i.e `X-Plex-Token`. The `serializeCacheKey` method should
now include headers in the cache key generation to ensure unique cache keys.
This should fix the plex user mismatch that occurred due to the same
cache key being used without accounting for the difference in auth
token.

fix #1227

.all-contributorsrc

@@ -448,6 +448,114 @@
       "contributions": [
         "security"
       ]
+    },
+    {
+      "login": "j0srisk",
+      "name": "Joseph Risk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18372584?v=4",
+      "profile": "http://josephrisk.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Loetwiek",
+      "name": "Loetwiek",
+      "avatar_url": "https://avatars.githubusercontent.com/u/79059734?v=4",
+      "profile": "https://github.com/Loetwiek",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Fuochi",
+      "name": "Fuochi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4720478?v=4",
+      "profile": "https://github.com/Fuochi",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "demrich",
+      "name": "David Emrich",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30092389?v=4",
+      "profile": "https://github.com/demrich",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "maxnatamo",
+      "name": "Max T. Kristiansen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5898152?v=4",
+      "profile": "https://maxtrier.dk",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DamsDev1",
+      "name": "Damien Fajole",
+      "avatar_url": "https://avatars.githubusercontent.com/u/60252259?v=4",
+      "profile": "https://damsdev.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AhmedNSidd",
+      "name": "Ahmed Siddiqui",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36286128?v=4",
+      "profile": "https://github.com/AhmedNSidd",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Zariel",
+      "name": "Chris Bannister",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2213?v=4",
+      "profile": "https://github.com/Zariel",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "C4J3",
+      "name": "Joe",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13005453?v=4",
+      "profile": "https://github.com/C4J3",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "guillaumearnx",
+      "name": "Guillaume ARNOUX",
+      "avatar_url": "https://avatars.githubusercontent.com/u/37373941?v=4",
+      "profile": "https://me.garnx.fr",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dr-carrot",
+      "name": "dr-carrot",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17272571?v=4",
+      "profile": "https://github.com/dr-carrot",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gageorsburn",
+      "name": "Gage Orsburn",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4692734?v=4",
+      "profile": "https://github.com/gageorsburn",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

.github/ISSUE_TEMPLATE/bug.yml

@@ -55,6 +55,14 @@ body:
         - tablet
     validations:
       required: true
+  - type: dropdown
+    id: database
+    attributes:
+      options:
+        - SQLite (default)
+        - PostgreSQL
+      label: Database
+      description: Which database backend are you using?
   - type: input
     id: device
     attributes:

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     name: Lint & Test Build
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-22.04
-    container: node:20-alpine
+    container: node:22-alpine
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/cypress.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
       - name: Pnpm Setup
         uses: pnpm/action-setup@v4
         with:

.github/workflows/lint-helm-charts.yml

@@ -0,0 +1,33 @@
+name: Lint and Test Charts
+
+on:
+  pull_request:
+    branches:
+      - develop
+    paths:
+      - '.github/workflows/lint-helm-charts.yml'
+      - 'charts/**'
+jobs:
+  lint-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Helm
+        uses: azure/setup-helm@v4.2.0
+      - name: Ensure documentation is updated
+        uses: docker://jnorwood/helm-docs:v1.14.2
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.6.1
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
+          if [[ -n "$changed" ]]; then
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          fi
+      - name: Run chart-testing
+        if: steps.list-changed.outputs.changed == 'true'
+        run: ct lint --target-branch ${{ github.event.repository.default_branch }} --validate-maintainers=false

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx

.github/workflows/test-docs-deploy.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - develop
-    path:
+    paths:
       - 'docs/**'
       - 'gen-docs/**'
 

.prettierignore

@@ -8,3 +8,7 @@ pnpm-lock.yaml
 # assets
 src/assets/
 public/
+docs/
+
+# helm charts
+**/charts

.prettierrc.js

@@ -3,11 +3,23 @@ module.exports = {
   singleQuote: true,
   trailingComma: 'es5',
   overrides: [
+    {
+      files: 'pnpm-lock.yaml',
+      options: {
+        rangeEnd: 0, // default: Infinity
+      },
+    },
     {
       files: 'gen-docs/pnpm-lock.yaml',
       options: {
         rangeEnd: 0, // default: Infinity
       },
     },
+    {
+      files: 'charts/**',
+      options: {
+        rangeEnd: 0, // default: Infinity
+      },
+    },
   ],
 };

CONTRIBUTING.md

@@ -8,7 +8,7 @@ All help is welcome and greatly appreciated! If you would like to contribute to
 
 - HTML/Typescript/Javascript editor
 - [VSCode](https://code.visualstudio.com/) is recommended. Upon opening the project, a few extensions will be automatically recommended for install.
-- [NodeJS](https://nodejs.org/en/download/) (Node 20.x)
+- [NodeJS](https://nodejs.org/en/download/) (Node 22.x)
 - [Pnpm](https://pnpm.io/cli/install)
 - [Git](https://git-scm.com/downloads)
 
@@ -48,7 +48,7 @@ All help is welcome and greatly appreciated! If you would like to contribute to
 4. Run the development environment:
 
    ```bash
-   pnpm
+   pnpm install
    pnpm dev
    ```
 
@@ -101,6 +101,46 @@ We use [Weblate](https://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-f
 
 <a href="https://jellyseerr.borgcube.de/engage/jellysseerr/"><img src="https://jellyseerr.borgcube.de/widget/jellyseerr/multi-auto.svg" alt="Translation status" /></a>
 
+## Migrations
+
+If you are adding a new feature that requires a database migration, you will need to create 2 migrations: one for SQLite and one for PostgreSQL. Here is how you could do it:
+
+1. Create a PostgreSQL database or use an existing one:
+
+```bash
+sudo docker run --name postgres-jellyseerr -e POSTGRES_PASSWORD=postgres -d -p 127.0.0.1:5432:5432/tcp postgres:latest
+```
+
+2. Reset the SQLite database and the PostgreSQL database:
+
+```bash
+rm config/db/db.*
+rm config/settings.*
+PGPASSWORD=postgres sudo docker exec -it postgres-jellyseerr /usr/bin/psql -h 127.0.0.1 -U postgres -c "DROP DATABASE IF EXISTS jellyseerr;"
+PGPASSWORD=postgres sudo docker exec -it postgres-jellyseerr /usr/bin/psql -h 127.0.0.1 -U postgres -c "CREATE DATABASE jellyseerr;"
+```
+
+3. Checkout the `develop` branch and create the original database for SQLite and PostgreSQL so that TypeORM can automatically generate the migrations:
+
+```bash
+git checkout develop
+pnpm i
+rm -r .next dist; pnpm build
+pnpm start
+DB_TYPE="postgres" DB_USER=postgres DB_PASS=postgres pnpm start
+```
+
+(You can shutdown the server once the message "Server ready on 5055" appears)
+
+4. Let TypeORM generate the migrations:
+
+```bash
+git checkout -b your-feature-branch
+pnpm i
+pnpm migration:generate server/migration/sqlite/YourMigrationName
+DB_TYPE="postgres" DB_USER=postgres DB_PASS=postgres pnpm migration:generate server/migration/postgres/YourMigrationName
+```
+
 ## Attribution
 
 This contribution guide was inspired by the [Next.js](https://github.com/vercel/next.js), [Radarr](https://github.com/Radarr/Radarr), and [Overseerr](https://github.com/sct/Overseerr) contribution guides.

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine AS BUILD_IMAGE
+FROM node:22-alpine AS BUILD_IMAGE
 
 WORKDIR /app
 
@@ -36,7 +36,7 @@ RUN touch config/DOCKER
 RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
 
 
-FROM node:20-alpine
+FROM node:22-alpine
 
 # Metadata for Github Package Registry
 LABEL org.opencontainers.image.source="https://github.com/Fallenbagel/jellyseerr"

Dockerfile.local

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:22-alpine
 
 COPY . /app
 WORKDIR /app

README.md

@@ -11,11 +11,11 @@
 <a href="http://translate.jellyseerr.dev/engage/jellyseerr/"><img src="http://translate.jellyseerr.dev/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></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-48-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-60-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 **Jellyseerr** is a free and open source software application for managing requests for your media library.
-It is a fork of [Overseerr](https://github.com/sct/overseerr) built to bring support for [Jellyfin](https://github.com/jellyfin/jellyfin) & [Emby](https://github.com/MediaBrowser/Emby) media servers!
+It is a fork of [Overseerr](https://github.com/sct/overseerr) built to bring additional support for [Jellyfin](https://github.com/jellyfin/jellyfin) & [Emby](https://github.com/MediaBrowser/Emby) media servers!
 
 ## Current Features
 
@@ -147,6 +147,22 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/franciscofsales"><img src="https://avatars.githubusercontent.com/u/7977645?v=4?s=100" width="100px;" alt="Francisco Sales"/><br /><sub><b>Francisco Sales</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=franciscofsales" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/myselfolli"><img src="https://avatars.githubusercontent.com/u/37535998?v=4?s=100" width="100px;" alt="Oliver Laing"/><br /><sub><b>Oliver Laing</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=myselfolli" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/M0NsTeRRR"><img src="https://avatars.githubusercontent.com/u/37785089?v=4?s=100" width="100px;" alt="Ludovic Ortega"/><br /><sub><b>Ludovic Ortega</b></sub></a><br /><a href="#security-M0NsTeRRR" title="Security">🛡️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://josephrisk.com"><img src="https://avatars.githubusercontent.com/u/18372584?v=4?s=100" width="100px;" alt="Joseph Risk"/><br /><sub><b>Joseph Risk</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=j0srisk" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Loetwiek"><img src="https://avatars.githubusercontent.com/u/79059734?v=4?s=100" width="100px;" alt="Loetwiek"/><br /><sub><b>Loetwiek</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Loetwiek" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuochi"><img src="https://avatars.githubusercontent.com/u/4720478?v=4?s=100" width="100px;" alt="Fuochi"/><br /><sub><b>Fuochi</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Fuochi" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/demrich"><img src="https://avatars.githubusercontent.com/u/30092389?v=4?s=100" width="100px;" alt="David Emrich"/><br /><sub><b>David Emrich</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=demrich" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://maxtrier.dk"><img src="https://avatars.githubusercontent.com/u/5898152?v=4?s=100" width="100px;" alt="Max T. Kristiansen"/><br /><sub><b>Max T. Kristiansen</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=maxnatamo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://damsdev.me"><img src="https://avatars.githubusercontent.com/u/60252259?v=4?s=100" width="100px;" alt="Damien Fajole"/><br /><sub><b>Damien Fajole</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=DamsDev1" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AhmedNSidd"><img src="https://avatars.githubusercontent.com/u/36286128?v=4?s=100" width="100px;" alt="Ahmed Siddiqui"/><br /><sub><b>Ahmed Siddiqui</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=AhmedNSidd" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Zariel"><img src="https://avatars.githubusercontent.com/u/2213?v=4?s=100" width="100px;" alt="Chris Bannister"/><br /><sub><b>Chris Bannister</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Zariel" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/C4J3"><img src="https://avatars.githubusercontent.com/u/13005453?v=4?s=100" width="100px;" alt="Joe"/><br /><sub><b>Joe</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=C4J3" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://me.garnx.fr"><img src="https://avatars.githubusercontent.com/u/37373941?v=4?s=100" width="100px;" alt="Guillaume ARNOUX"/><br /><sub><b>Guillaume ARNOUX</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=guillaumearnx" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dr-carrot"><img src="https://avatars.githubusercontent.com/u/17272571?v=4?s=100" width="100px;" alt="dr-carrot"/><br /><sub><b>dr-carrot</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=dr-carrot" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gageorsburn"><img src="https://avatars.githubusercontent.com/u/4692734?v=4?s=100" width="100px;" alt="Gage Orsburn"/><br /><sub><b>Gage Orsburn</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=gageorsburn" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>
@@ -291,6 +307,12 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
       <td align="center" valign="top" width="14.28%"><a href="http://josephrisk.com"><img src="https://avatars.githubusercontent.com/u/18372584?v=4?s=100" width="100px;" alt="Joseph Risk"/><br /><sub><b>Joseph Risk</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=j0srisk" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Loetwiek"><img src="https://avatars.githubusercontent.com/u/79059734?v=4?s=100" width="100px;" alt="Loetwiek"/><br /><sub><b>Loetwiek</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Loetwiek" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuochi"><img src="https://avatars.githubusercontent.com/u/4720478?v=4?s=100" width="100px;" alt="Fuochi"/><br /><sub><b>Fuochi</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Fuochi" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/demrich"><img src="https://avatars.githubusercontent.com/u/30092389?v=4?s=100" width="100px;" alt="David Emrich"/><br /><sub><b>David Emrich</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=demrich" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://maxtrier.dk"><img src="https://avatars.githubusercontent.com/u/5898152?v=4?s=100" width="100px;" alt="Max T. Kristiansen"/><br /><sub><b>Max T. Kristiansen</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=maxnatamo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://damsdev.me"><img src="https://avatars.githubusercontent.com/u/60252259?v=4?s=100" width="100px;" alt="Damien Fajole"/><br /><sub><b>Damien Fajole</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=DamsDev1" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AhmedNSidd"><img src="https://avatars.githubusercontent.com/u/36286128?v=4?s=100" width="100px;" alt="Ahmed Siddiqui"/><br /><sub><b>Ahmed Siddiqui</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=AhmedNSidd" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

charts/jellyseerr/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/jellyseerr/Chart.yaml

@@ -0,0 +1,13 @@
+apiVersion: v2
+kubeVersion: ">=1.23.0-0"
+name: Jellyseerr
+description: Jellyseerr helm chart for Kubernetes
+type: application
+version: 1.1.0
+appVersion: "2.1.0"
+maintainers:
+  - name: Jellyseerr
+    url: https://github.com/Fallenbagel/jellyseerr
+sources:
+  - https://github.com/Fallenbagel/jellyseerr/tree/main/charts/jellyseerr
+home: https://github.com/Fallenbagel/jellyseerr

charts/jellyseerr/README.md

@@ -0,0 +1,69 @@
+# Jellyseerr
+
+![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square)
+
+Jellyseerr helm chart for Kubernetes
+
+**Homepage:** <https://github.com/Fallenbagel/jellyseerr>
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| Jellyseerr |  | <https://github.com/Fallenbagel/jellyseerr> |
+
+## Source Code
+
+* <https://github.com/Fallenbagel/jellyseerr/tree/main/charts/jellyseerr>
+
+## Requirements
+
+Kubernetes: `>=1.23.0-0`
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| affinity | object | `{}` |  |
+| autoscaling.enabled | bool | `false` |  |
+| autoscaling.maxReplicas | int | `100` |  |
+| autoscaling.minReplicas | int | `1` |  |
+| autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
+| config | object | `{"persistence":{"accessModes":["ReadWriteOnce"],"annotations":{},"name":"","size":"5Gi","volumeName":""}}` | Creating PVC to store configuration |
+| config.persistence.accessModes | list | `["ReadWriteOnce"]` | Access modes of persistent disk |
+| config.persistence.annotations | object | `{}` | Annotations for PVCs |
+| config.persistence.name | string | `""` | Config name |
+| config.persistence.size | string | `"5Gi"` | Size of persistent disk |
+| config.persistence.volumeName | string | `""` | Name of the permanent volume to reference in the claim. Can be used to bind to existing volumes. |
+| extraEnv | list | `[]` | Environment variables to add to the jellyseerr pods |
+| extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the jellyseerr pods |
+| fullnameOverride | string | `""` |  |
+| image.pullPolicy | string | `"IfNotPresent"` |  |
+| image.registry | string | `"docker.io"` |  |
+| image.repository | string | `"fallenbagel/jellyseerr"` |  |
+| image.sha | string | `""` |  |
+| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
+| imagePullSecrets | list | `[]` |  |
+| ingress.annotations | object | `{}` |  |
+| ingress.enabled | bool | `false` |  |
+| ingress.hosts[0].host | string | `"chart-example.local"` |  |
+| ingress.hosts[0].paths[0].path | string | `"/"` |  |
+| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
+| ingress.ingressClassName | string | `""` |  |
+| ingress.tls | list | `[]` |  |
+| nameOverride | string | `""` |  |
+| nodeSelector | object | `{}` |  |
+| podAnnotations | object | `{}` |  |
+| podLabels | object | `{}` |  |
+| podSecurityContext | object | `{}` |  |
+| replicaCount | int | `1` |  |
+| resources | object | `{}` |  |
+| securityContext | object | `{}` |  |
+| service.port | int | `80` |  |
+| service.type | string | `"ClusterIP"` |  |
+| serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
+| serviceAccount.automount | bool | `true` | Automatically mount a ServiceAccount's API credentials? |
+| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
+| serviceAccount.name | string | `""` | If not set and create is true, a name is generated using the fullname template |
+| strategy | object | `{"type":"Recreate"}` | Deployment strategy |
+| tolerations | list | `[]` |  |

charts/jellyseerr/README.md.gotmpl

@@ -0,0 +1,17 @@
+{{ template "chart.header" . }}
+
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}

charts/jellyseerr/templates/NOTES.txt

@@ -0,0 +1,5 @@
+***********************************************************************
+ Welcome to {{ .Chart.Name }}
+ Chart version: {{ .Chart.Version }}
+ App   version: {{ .Chart.AppVersion }}
+***********************************************************************

charts/jellyseerr/templates/_helpers.tpl

@@ -0,0 +1,70 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "jellyseerr.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "jellyseerr.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "jellyseerr.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "jellyseerr.labels" -}}
+helm.sh/chart: {{ include "jellyseerr.chart" . }}
+{{ include "jellyseerr.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/part-of: {{ .Chart.Name }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "jellyseerr.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "jellyseerr.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "jellyseerr.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "jellyseerr.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the pvc config to use
+*/}}
+{{- define "jellyseerr.configPersistenceName" -}}
+{{- default (printf "%s-config" (include "jellyseerr.fullname" .)) .Values.config.persistence.name }}
+{{- end }}

charts/jellyseerr/templates/deployment.yaml

@@ -0,0 +1,85 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "jellyseerr.fullname" . }}
+  labels:
+    {{- include "jellyseerr.labels" . | nindent 4 }}
+spec:
+  {{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+  {{- end }}
+  strategy:
+    type: {{ .Values.strategy.type }}
+  selector:
+    matchLabels:
+      {{- include "jellyseerr.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "jellyseerr.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "jellyseerr.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          {{- if .Values.image.sha }}
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}@sha256:{{ .Values.image.sha }}"
+          {{- else }}
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          {{- end }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 5055
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.extraEnv }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.extraEnvFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          volumeMounts:
+            - name: config
+              mountPath: /app/config
+      volumes:
+        - name: config
+          persistentVolumeClaim:
+            claimName: {{ include "jellyseerr.configPersistenceName" . }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

charts/jellyseerr/templates/hpa.yaml

@@ -0,0 +1,32 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "jellyseerr.fullname" . }}
+  labels:
+    {{- include "jellyseerr.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "jellyseerr.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+    {{- end }}
+    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- end }}
+{{- end }}

charts/jellyseerr/templates/ingress.yaml

@@ -0,0 +1,41 @@
+{{- if .Values.ingress.enabled -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "jellyseerr.fullname" . }}
+  labels:
+    {{- include "jellyseerr.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ include "jellyseerr.fullname" $ }}
+                port:
+                  number: {{ $.Values.service.port }}
+          {{- end }}
+    {{- end }}
+{{- end }}

charts/jellyseerr/templates/persistentvolumeclaim.yaml

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ include "jellyseerr.configPersistenceName" . }}
+  labels:
+    {{- include "jellyseerr.labels" . | nindent 4 }}
+spec:
+  {{- with .Values.config.persistence.accessModes }}
+  accessModes:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if .Values.config.persistence.volumeName }}
+  volumeName: {{ .Values.config.persistence.volumeName }}
+  {{- end }}
+  {{- with .Values.config.persistence.storageClass }}
+  storageClassName: {{ if (eq "-" .) }}""{{ else }}{{ . }}{{ end }}
+  {{- end }}
+  resources:
+    requests:
+      storage: "{{ .Values.config.persistence.size }}"

charts/jellyseerr/templates/service.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "jellyseerr.fullname" . }}
+  labels:
+    {{- include "jellyseerr.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "jellyseerr.selectorLabels" . | nindent 4 }}
+  ipFamilyPolicy: PreferDualStack

charts/jellyseerr/templates/serviceaccount.yaml

@@ -0,0 +1,13 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "jellyseerr.serviceAccountName" . }}
+  labels:
+    {{- include "jellyseerr.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
+{{- end }}

charts/jellyseerr/templates/tests/test-connection.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "jellyseerr.fullname" . }}-test-connection"
+  labels:
+    {{- include "jellyseerr.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "jellyseerr.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never

charts/jellyseerr/values.yaml

@@ -0,0 +1,108 @@
+replicaCount: 1
+
+image:
+  registry: docker.io
+  repository: fallenbagel/jellyseerr
+  pullPolicy: IfNotPresent
+  # -- Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+  sha: ""
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+# -- Deployment strategy
+strategy:
+  type: Recreate
+
+# -- Environment variables to add to the jellyseerr pods
+extraEnv: []
+# -- Environment variables from secrets or configmaps to add to the jellyseerr pods
+extraEnvFrom: []
+
+serviceAccount:
+  # -- Specifies whether a service account should be created
+  create: true
+  # -- Automatically mount a ServiceAccount's API credentials?
+  automount: true
+  # -- Annotations to add to the service account
+  annotations: {}
+  # -- The name of the service account to use.
+  # -- If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+podLabels: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
+
+# -- Creating PVC to store configuration
+config:
+  persistence:
+    # -- Size of persistent disk
+    size: 5Gi
+    # -- Annotations for PVCs
+    annotations: {}
+    # -- Access modes of persistent disk
+    accessModes:
+      - ReadWriteOnce
+    # -- Config name
+    name: ""
+    # -- Name of the permanent volume to reference in the claim.
+    # Can be used to bind to existing volumes.
+    volumeName: ""
+
+ingress:
+  enabled: false
+  ingressClassName: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}

cypress/config/settings.cypress.json

@@ -16,11 +16,13 @@
     "hideAvailable": false,
     "localLogin": true,
     "newPlexLogin": true,
-    "region": "",
+    "discoverRegion": "",
+    "streamingRegion": "",
     "originalLanguage": "",
     "trustProxy": false,
     "mediaServerType": 1,
     "partialRequestsEnabled": true,
+    "enableSpecialEpisodes": false,
     "locale": "en"
   },
   "plex": {
@@ -75,6 +77,7 @@
         "types": 0,
         "options": {
           "webhookUrl": "",
+          "webhookRoleId": "",
           "enableMentions": true
         }
       },
@@ -98,6 +101,7 @@
         "options": {
           "botAPI": "",
           "chatId": "",
+          "messageThreadId": "",
           "sendSilently": false
         }
       },

docker-compose.postgres.yaml

@@ -0,0 +1,38 @@
+---
+version: '3.8'
+services:
+  jellyseerr:
+    build:
+      context: .
+      dockerfile: Dockerfile.local
+    ports:
+      - '5055:5055'
+    environment:
+      DB_TYPE: 'postgres' # Which DB engine to use. The default is "sqlite". To use postgres, this needs to be set to "postgres"
+      DB_HOST: 'postgres' # The host (url) of the database
+      DB_PORT: '5432' # The port to connect to
+      DB_USER: 'jellyseerr' # Username used to connect to the database
+      DB_PASS: 'jellyseerr' # Password of the user used to connect to the database
+      DB_NAME: 'jellyseerr' # The name of the database to connect to
+      DB_LOG_QUERIES: 'false' # Whether to log the DB queries for debugging
+      DB_USE_SSL: 'false' # Whether to enable ssl for database connection
+    volumes:
+      - .:/app:rw,cached
+      - /app/node_modules
+      - /app/.next
+    depends_on:
+      - postgres
+    links:
+      - postgres
+  postgres:
+    image: postgres
+    environment:
+      POSTGRES_USER: jellyseerr
+      POSTGRES_PASSWORD: jellyseerr
+      POSTGRES_DB: jellyseerr
+    ports:
+      - '5432:5432'
+    volumes:
+      - postgres:/var/lib/postgresql/data
+volumes:
+  postgres:

docs/README.md

@@ -17,6 +17,7 @@ Welcome to the Jellyseerr Documentation.
 - **Mobile-friendly design**, for when you need to approve requests on the go.
 - Granular permission system.
 - Localization into other languages.
+- Support for PostgreSQL and SQLite databases.
 - More features to come!
 
 ## Motivation

docs/extending-jellyseerr/database-config.mdx

@@ -0,0 +1,61 @@
+---
+title: Configuring the Database (Advanced)
+description: Configure the database for Jellyseerr
+sidebar_position: 2
+---
+# Configuring the Database
+
+Jellyseerr supports SQLite and PostgreSQL. The database connection can be configured using the following environment variables:
+
+## SQLite Options
+
+```dotenv
+DB_TYPE="sqlite" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite".
+CONFIG_DIRECTORY="config" # (optional) The path to the config directory where the db file is stored. The default is "config".
+DB_LOG_QUERIES="false" # (optional) Whether to log the DB queries for debugging. The default is "false".
+```
+
+## PostgreSQL Options
+
+```dotenv
+DB_TYPE="postgres" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite". To use postgres, this needs to be set to "postgres"
+DB_HOST="localhost" # (optional) The host (url) of the database. The default is "localhost".
+DB_PORT="5432" # (optional) The port to connect to. The default is "5432".
+DB_USER= # (required) Username used to connect to the database
+DB_PASS= # (required) Password of the user used to connect to the database
+DB_NAME="jellyseerr" # (optional) The name of the database to connect to. The default is "jellyseerr".
+DB_LOG_QUERIES="false" # (optional) Whether to log the DB queries for debugging. The default is "false".
+```
+
+### SSL configuration
+The following options can be used to further configure ssl. Certificates can be provided as a string or a file path, with the string version taking precedence.
+
+```dotenv
+DB_USE_SSL="false" # (optional) Whether to enable ssl for database connection. This must be "true" to use the other ssl options. The default is "false".
+DB_SSL_REJECT_UNAUTHORIZED="true" # (optional) Whether to reject ssl connections with unverifiable certificates i.e. self-signed certificates without providing the below settings. The default is "true".
+DB_SSL_CA= # (optional) The CA certificate to verify the connection, provided as a string. The default is "".
+DB_SSL_CA_FILE= # (optional) The path to a CA certificate to verify the connection. The default is "".
+DB_SSL_KEY= # (optional) The private key for the connection in PEM format, provided as a string. The default is "".
+DB_SSL_KEY_FILE= # (optinal) Path to the private key for the connection in PEM format. The default is "".
+DB_SSL_CERT= # (optional) Certificate chain in pem format for the private key, provided as a string. The default is "".
+DB_SSL_CERT_FILE= # (optional) Path to certificate chain in pem format for the private key. The default is "".
+```
+
+### Migrating from SQLite to PostgreSQL
+
+1. Set up your PostgreSQL database and configure Jellyseerr to use it
+2. Run Jellyseerr to create the tables in the PostgreSQL database
+3. Stop Jellyseerr
+4. Run the following command to export the data from the SQLite database and import it into the PostgreSQL database:
+:::info
+Edit the postgres connection string to match your setup
+
+If you don't have or don't want to use docker, you can build the working pgloader version [in this PR](https://github.com/dimitri/pgloader/pull/1531) from source and use the same options as below.
+:::
+:::caution
+The most recent release of pgloader has an issue quoting the table columns. Use the version in the docker container to avoid this issue.
+:::
+```bash
+docker run --rm -v config/db.sqlite3:/db.sqlite3:ro ghcr.io/ralgar/pgloader:pr-1531 pgloader --with "quote identifiers" --with "data only" /db.sqlite3 postgresql://{{DB_USER}}:{{DB_PASS}}@{{DB_HOST}}:{{DB_PORT}}/{{DB_NAME}}
+   ```
+5. Start Jellyseerr

docs/extending-jellyseerr/reverse-proxy.mdx

@@ -95,6 +95,8 @@ location ^~ /jellyseerr {
     sub_filter '/api/v1' '/$app/api/v1';
     sub_filter '/login/plex/loading' '/$app/login/plex/loading';
     sub_filter '/images/' '/$app/images/';
+    sub_filter '/imageproxy/' '/$app/imageproxy/';
+    sub_filter '/avatarproxy/' '/$app/avatarproxy/';
     sub_filter '/android-' '/$app/android-';
     sub_filter '/apple-' '/$app/apple-';
     sub_filter '/favicon' '/$app/favicon';

docs/getting-started/buildfromsource.mdx

@@ -3,9 +3,7 @@ title: Build From Source (Advanced)
 description: Install Jellyseerr by building from source
 sidebar_position: 2
 ---
-
 # Build from Source (Advanced)
-
 :::warning
 This method is not recommended for most users. It is intended for advanced users who are familiar with managing their own server infrastructure.
 :::
@@ -14,43 +12,31 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
 ### Prerequisites
-
-    - [Node.js 20.x](https://nodejs.org/en/download/)
+    - [Node.js 22.x](https://nodejs.org/en/download/)
     - [Pnpm 9.x](https://pnpm.io/installation)
     - [Git](https://git-scm.com/downloads)
 
 ## Unix (Linux, macOS)
-
 ### Installation
-
 1. Assuming you want the working directory to be `/opt/jellyseerr`, create the directory and navigate to it:
-
 ```bash
 sudo mkdir -p /opt/jellyseerr && cd /opt/jellyseerr
 ```
-
 2. Clone the Jellyseerr repository and checkout the develop branch:
-
 ```bash
 git clone https://github.com/Fallenbagel/jellyseerr.git
 cd jellyseerr
-git checkout develop # by default, you are on the develop branch so this step is not necessary
+git checkout main
 ```
-
 3. Install the dependencies:
-
 ```bash
 CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile
 ```
-
 4. Build the project:
-
 ```bash
 pnpm build
 ```
-
 5. Start Jellyseerr:
-
 ```bash
 pnpm start
 ```
@@ -60,7 +46,6 @@ You can now access Jellyseerr by visiting `http://localhost:5055` in your web br
 :::
 
 #### Extending the installation
-
 <Tabs groupId="unix-extensions" queryString>
   <TabItem value="linux" label="Linux">
 To run jellyseerr as a systemd service:
@@ -71,23 +56,18 @@ To run jellyseerr as a systemd service:
 PORT=5055
 
 ## specify on which interface to listen, by default jellyseerr listens on all interfaces
-
 #HOST=127.0.0.1
 
-## Uncomment if your media server is emby instead of jellyfin.
-
-# JELLYFIN_TYPE=emby
-
-````
+## Uncomment if you want to force Node.js to resolve IPv4 before IPv6 (advanced users only)
+# FORCE_IPV4_FIRST=true
+```
 2. Then run the following commands:
 ```bash
 which node
-````
-
+```
 Copy the path to node, it should be something like `/usr/bin/node`.
 
 3. Create the systemd service file at `/etc/systemd/system/jellyseerr.service`, using either `sudo systemctl edit jellyseerr` or `sudo nano /etc/systemd/system/jellyseerr.service`:
-
 ```bash
 [Unit]
 Description=Jellyseerr Service
@@ -105,18 +85,15 @@ ExecStart=/usr/bin/node dist/index.js
 [Install]
 WantedBy=multi-user.target
 ```
-
 :::note
 If you are using a different path to node, replace `/usr/bin/node` with the path to node.
 :::
 
 4. Enable and start the service:
-
 ```bash
 sudo systemctl enable jellyseerr
 sudo systemctl start jellyseerr
 ```
-
   </TabItem>
   <TabItem value="macos" label="macOS">
 To run jellyseerr as a launchd service:
@@ -127,7 +104,6 @@ which node
 Copy the path to node, it should be something like `/usr/local/bin/node`.
 
 2. Create a launchd plist file at `~/Library/LaunchAgents/com.jellyseerr.plist`:
-
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -156,27 +132,21 @@ Copy the path to node, it should be something like `/usr/local/bin/node`.
 </dict>
 </plist>
 ```
-
 :::note
 If you are using a different path to node, replace `/usr/local/bin/node` with the path to node.
-::: 3. Load the service:
-
+:::
+3. Load the service:
 ```bash
 sudo launchctl load ~/Library/LaunchAgents/com.jellyseerr.plist
 ```
-
 3. Start the service:
-
 ```bash
 sudo launchctl start com.jellyseerr
 ```
-
 4. To ensure the service starts on boot, run the following command:
-
 ```bash
 sudo lauchctl load
 ```
-
   </TabItem>
   <TabItem value="pm2" label="PM2">
 To run jellyseerr as a PM2 service:
@@ -221,38 +191,27 @@ pm2 status jellyseerr
 </Tabs>
 
 ## Windows
-
 ### Installation
-
 1. Assuming you want the working directory to be `C:\jellyseerr`, create the directory and navigate to it:
-
 ```powershell
 mkdir C:\jellyseerr
 cd C:\jellyseerr
 ```
-
 2. Clone the Jellyseerr repository and checkout the develop branch:
-
 ```powershell
 git clone https://github.com/Fallenbagel/jellyseerr.git .
-git checkout develop # by default, you are on the develop branch so this step is not necessary
+git checkout main
 ```
-
 3. Install the dependencies:
-
 ```powershell
 npm install -g win-node-env
 set CYPRESS_INSTALL_BINARY=0 && pnpm install --frozen-lockfile
 ```
-
 4. Build the project:
-
 ```powershell
 pnpm build
 ```
-
 5. Start Jellyseerr:
-
 ```powershell
 pnpm start
 ```
@@ -266,7 +225,6 @@ You can now access Jellyseerr by visiting `http://localhost:5055` in your web br
 :::
 
 #### Extending the installation
-
 <Tabs groupId="windows-extensions" queryString>
   <TabItem value="task-scheduler" label="Task Scheduler">
 To run jellyseerr as a bat script:
@@ -288,7 +246,6 @@ node dist/index.js
 - Click "Finish"
 
 Now, Jellyseerr will start when the computer boots up in the background.
-
   </TabItem>
 
   <TabItem value="nssm" label="NSSM">
@@ -351,11 +308,9 @@ pm2 status jellyseerr
 </Tabs>
 
 ### Updating
-
 To update Jellyseerr, navigate to the Jellyseerr directory and run the following commands:
-
 ```bash
 git pull
 ```
-
 Then, follow the steps in the installation section to rebuild and restart Jellyseerr.
+

docs/getting-started/docker.mdx

@@ -145,6 +145,16 @@ Then, create and start the Jellyseerr container:
   <TabItem value="docker-cli" label="Docker CLI">
 ```bash
 docker run -d --name jellyseerr -e LOG_LEVEL=debug -e TZ=Asia/Tashkent -p 5055:5055 -v "jellyseerr-data:/app/config" --restart unless-stopped fallenbagel/jellyseerr:latest
+```
+
+#### Updating:
+Pull the latest image:
+```bash
+docker compose pull jellyseerr
+```
+Then, restart all services defined in the Compose file:
+```bash
+docker compose up -d
 ```
   </TabItem>
 
@@ -167,6 +177,16 @@ services:
 volumes:
   jellyseerr-data:
     external: true
+```
+
+#### Updating:
+Pull the latest image:
+```bash
+docker compose pull jellyseerr
+```
+Then, restart all services defined in the Compose file:
+```bash
+docker compose up -d
 ```
   </TabItem>
 </Tabs>
@@ -185,3 +205,6 @@ Docker on Windows works differently than it does on Linux; it runs Docker inside
 **If you must run Docker on Windows, you should put the `/app/config` directory mount inside the VM and not on the Windows host.** (This also applies to other containers with SQLite databases.)
 
 Named volumes, like in the example commands above, are automatically mounted inside the VM. Therefore the warning on the setup about the `/app/config` folder being incorrectly mounted page should be ignored.
+:::
+
+

docs/troubleshooting.mdx

@@ -0,0 +1,158 @@
+---
+title: Troubleshooting
+---
+
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+## [TMDB] failed to retrieve/fetch XXX
+
+### Option 1: Change your DNS servers
+
+This error often comes from your Internet Service Provider (ISP) blocking TMDB API. The ISP may block the DNS resolution to the TMDB API hostname.
+
+To fix this, you can change your DNS servers to a public DNS service like Google's DNS or Cloudflare's DNS:
+
+<Tabs groupId="methods" queryString>
+  <TabItem value="docker-cli" label="Docker CLI">
+
+Add the following to your `docker run` command to use Google's DNS:
+```bash
+--dns=8.8.8.8
+```
+or for Cloudflare's DNS:
+```bash
+--dns=1.1.1.1
+```
+
+  </TabItem>
+
+  <TabItem value="docker-compose" label="Docker Compose">
+
+Add the following to your `compose.yaml` to use Google's DNS:
+```yaml
+---
+services:
+  jellyseerr:
+    dns:
+      - 8.8.8.8
+```
+or for Cloudflare's DNS:
+```yaml
+---
+services:
+  jellyseerr:
+    dns:
+      - 1.1.1.1
+```
+
+  </TabItem>
+
+  <TabItem value="windows" label="Windows">
+
+1. Open the Control Panel.
+2. Click on Network and Internet.
+3. Click on Network and Sharing Center.
+4. Click on Change adapter settings.
+5. Right-click the network interface connected to the internet and select Properties.
+6. Select Internet Protocol Version 4 (TCP/IPv4) and click Properties.
+7. Select Use the following DNS server addresses and enter `8.8.8.8` for Google's DNS or `1.1.1.1` for Cloudflare's DNS.
+
+  </TabItem>
+
+  <TabItem value="linux" label="Linux">
+
+1. Open a terminal.
+2. Edit the `/etc/resolv.conf` file with your favorite text editor.
+3. Add the following line to use Google's DNS:
+    ```bash
+    nameserver 8.8.8.8
+    ```
+    or for Cloudflare's DNS:
+
+    ```bash
+    nameserver 1.1.1.1
+    ```
+
+  </TabItem>
+</Tabs>
+
+### Option 2: Force IPV4 resolution first
+
+Sometimes there are configuration issues with IPV6 that prevent the hostname resolution from working correctly.
+
+You can try to force the resolution to use IPV4 first by setting the `FORCE_IPV4_FIRST` environment variable to `true`:
+
+<Tabs groupId="methods" queryString>
+  <TabItem value="docker-cli" label="Docker CLI">
+
+Add the following to your `docker run` command:
+```bash
+-e "FORCE_IPV4_FIRST=true"
+```
+
+  </TabItem>
+
+  <TabItem value="docker-compose" label="Docker Compose">
+
+Add the following to your `compose.yaml`:
+```yaml
+---
+services:
+  jellyseerr:
+    environment:
+      - FORCE_IPV4_FIRST=true
+```
+
+  </TabItem>
+</Tabs>
+
+### Option 3: Use Jellyseerr through a proxy
+
+If you can't change your DNS servers or force IPV4 resolution, you can use Jellyseerr through a proxy.
+
+In some places (like China), the ISP blocks not only the DNS resolution but also the connection to the TMDB API.
+
+You can configure Jellyseerr to use a proxy with the [HTTP(S) Proxy](/using-jellyseerr/settings/general#https-proxy) setting.
+
+### Option 4: Check that your server can reach TMDB API
+
+Make sure that your server can reach the TMDB API by running the following command:
+
+<Tabs groupId="methods" queryString>
+  <TabItem value="docker-cli" label="Docker CLI">
+
+```bash
+docker exec -it jellyseerr sh -c "apk update && apk add curl && curl -L https://api.themoviedb.org"
+```
+
+  </TabItem>
+
+  <TabItem value="docker-compose" label="Docker Compose">
+
+```bash
+docker compose exec jellyseerr sh -c "apk update && apk add curl && curl -L https://api.themoviedb.org"
+```
+
+  </TabItem>
+  <TabItem value="linux" label="Linux">
+
+In a terminal:
+```bash
+curl -L https://api.themoviedb.org
+```
+
+  </TabItem>
+  <TabItem value="windows" label="Windows">
+
+In a PowerShell window:
+```powershell
+(Invoke-WebRequest -Uri "https://api.themoviedb.org" -Method Get).Content
+```
+
+  </TabItem>
+
+</Tabs>
+
+If you can't get a response, then your server can't reach the TMDB API.
+This is usually due to a network configuration issue or a firewall blocking the connection.

docs/using-jellyseerr/notifications/discord.md

@@ -18,6 +18,10 @@ Users can optionally opt-in to being mentioned in Discord notifications by confi
 
 You can find the webhook URL in the Discord application, at **Server Settings → Integrations → Webhooks**.
 
+### Notification Role ID (optional)
+
+If a role ID is specified, it will be included in the webhook message. See [Discord role ID](https://support.discord.com/hc/en-us/articles/206346498-Where-can-I-find-my-User-Server-Message-ID).
+
 ### Bot Username (optional)
 
 If you would like to override the name you configured for your bot in Discord, you may set this value to whatever you like!

docs/using-jellyseerr/settings/general.md

@@ -58,9 +58,9 @@ You should enable this if you are having issues with loading images directly fro
 
 Set the default display language for Jellyseerr. Users can override this setting in their user settings.
 
-## Discover Region & Discover Language
+## Discover Region, Discover Language & Streaming Region
 
-These settings filter content shown on the "Discover" home page based on regional availability and original language, respectively. Users can override these global settings by configuring these same options in their user settings.
+These settings filter content shown on the "Discover" home page based on regional availability and original language, respectively. The Streaming Region filters the available streaming providers on the media page. Users can override these global settings by configuring these same options in their user settings.
 
 ## Hide Available Media
 

docs/using-jellyseerr/users/editing-users.md

@@ -35,7 +35,7 @@ Users can override the [global display language](/using-jellyseerr/settings/gene
 
 ### Discover Region & Discover Language
 
-Users can override the [global filter settings](/using-jellyseerr/settings/general#discover-region--discover-language) to suit their own preferences.
+Users can override the [global filter settings](/using-jellyseerr/settings/general#discover-region-discover-language--streaming-region) to suit their own preferences.
 
 ### Movie Request Limit & Series Request Limit
 

gen-docs/package.json

@@ -47,6 +47,6 @@
     ]
   },
   "engines": {
-    "node": ">=18.0"
+    "node": ">=22.0"
   }
 }

next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/basic-features/typescript for more information.

next.config.js

@@ -4,11 +4,13 @@
 module.exports = {
   env: {
     commitTag: process.env.COMMIT_TAG || 'local',
+    forceIpv4First: process.env.FORCE_IPV4_FIRST === 'true' ? 'true' : 'false',
   },
   images: {
     remotePatterns: [
       { hostname: 'gravatar.com' },
       { hostname: 'image.tmdb.org' },
+      { hostname: 'artworks.thetvdb.com' },
     ],
   },
   webpack(config) {

overseerr-api.yml

@@ -143,10 +143,12 @@ components:
       properties:
         locale:
           type: string
-        region:
+        discoverRegion:
           type: string
         originalLanguage:
           type: string
+        streamingRegion:
+          type: string
     MainSettings:
       type: object
       properties:
@@ -186,6 +188,9 @@ components:
         defaultPermissions:
           type: number
           example: 32
+        enableSpecialEpisodes:
+          type: boolean
+          example: false
     PlexLibrary:
       type: object
       properties:
@@ -1273,6 +1278,8 @@ components:
               type: string
             webhookUrl:
               type: string
+            webhookRoleId:
+              type: string
             enableMentions:
               type: boolean
     SlackSettings:
@@ -1334,6 +1341,8 @@ components:
               type: string
             chatId:
               type: string
+            messageThreadId:
+              type: string
             sendSilently:
               type: boolean
     PushbulletSettings:
@@ -1817,6 +1826,9 @@ components:
         telegramChatId:
           type: string
           nullable: true
+        telegramMessageThreadId:
+          type: string
+          nullable: true
         telegramSendSilently:
           type: boolean
           nullable: true
@@ -1930,6 +1942,11 @@ components:
           type: string
         native_name:
           type: string
+    OverrideRule:
+      type: object
+      properties:
+        id:
+          type: string
   securitySchemes:
     cookieAuth:
       type: apiKey
@@ -3753,6 +3770,11 @@ paths:
             type: string
             enum: [created, updated, requests, displayname]
             default: created
+        - in: query
+          name: q
+          required: false
+          schema:
+            type: string
       responses:
         '200':
           description: A JSON array of all users
@@ -3869,7 +3891,7 @@ paths:
             schema:
               type: object
               properties:
-                jellyfinIds:
+                jellyfinUserIds:
                   type: array
                   items:
                     type: string
@@ -4142,6 +4164,21 @@ paths:
         '412':
           description: Item has already been blacklisted
   /blacklist/{tmdbId}:
+    get:
+      summary: Get media from blacklist
+      tags:
+        - blacklist
+      parameters:
+        - in: path
+          name: tmdbId
+          description: tmdbId ID
+          required: true
+          example: '1'
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Blacklist details in JSON
     delete:
       summary: Remove media from blacklist
       tags:
@@ -5419,6 +5456,13 @@ paths:
             type: string
             enum: [added, modified]
             default: added
+        - in: query
+          name: sortDirection
+          schema:
+            type: string
+            enum: [asc, desc]
+            nullable: true
+            default: desc
         - in: query
           name: requestedBy
           schema:
@@ -5469,7 +5513,7 @@ paths:
                     - type: array
                       items:
                         type: number
-                        minimum: 1
+                        minimum: 0
                     - type: string
                       enum: [all]
                 is4k:
@@ -5575,7 +5619,7 @@ paths:
                   type: array
                   items:
                     type: number
-                    minimum: 1
+                    minimum: 0
                 is4k:
                   type: boolean
                   example: false
@@ -6939,6 +6983,68 @@ paths:
                 type: array
                 items:
                   $ref: '#/components/schemas/WatchProviderDetails'
+  /overrideRule:
+    get:
+      summary: Get override rules
+      description: Returns a list of all override rules with their conditions and settings
+      tags:
+        - overriderule
+      responses:
+        '200':
+          description: Override rules returned
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/OverrideRule'
+    post:
+      summary: Create override rule
+      description: Creates a new Override Rule from the request body.
+      tags:
+        - overriderule
+      responses:
+        '200':
+          description: 'Values were successfully created'
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/OverrideRule'
+  /overrideRule/{ruleId}:
+    put:
+      summary: Update override rule
+      description: Updates an Override Rule from the request body.
+      tags:
+        - overriderule
+      responses:
+        '200':
+          description: 'Values were successfully updated'
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/OverrideRule'
+    delete:
+      summary: Delete override rule by ID
+      description: Deletes the override rule with the provided ruleId.
+      tags:
+        - overriderule
+      parameters:
+        - in: path
+          name: ruleId
+          required: true
+          schema:
+            type: number
+      responses:
+        '200':
+          description: Override rule successfully deleted
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OverrideRule'
 security:
   - cookieAuth: []
   - apiKey: []

package.json

@@ -43,8 +43,6 @@
     "@svgr/webpack": "6.5.1",
     "@tanem/react-nprogress": "5.0.30",
     "ace-builds": "1.15.2",
-    "axios": "1.3.4",
-    "axios-rate-limit": "1.3.0",
     "bcrypt": "5.1.0",
     "bowser": "2.11.0",
     "connect-typeorm": "1.1.4",
@@ -62,7 +60,6 @@
     "express-rate-limit": "6.7.0",
     "express-session": "1.17.3",
     "formik": "^2.4.6",
-    "global-agent": "^3.0.0",
     "gravatar-url": "3.1.0",
     "lodash": "4.17.21",
     "mime": "3",
@@ -72,6 +69,7 @@
     "node-schedule": "2.1.1",
     "nodemailer": "6.9.1",
     "openpgp": "5.7.0",
+    "pg": "8.11.0",
     "plex-api": "5.3.2",
     "pug": "3.0.2",
     "react": "^18.3.1",
@@ -125,7 +123,7 @@
     "@types/express-session": "1.17.6",
     "@types/lodash": "4.14.191",
     "@types/mime": "3",
-    "@types/node": "20.14.8",
+    "@types/node": "22.10.5",
     "@types/node-schedule": "2.1.0",
     "@types/nodemailer": "6.4.7",
     "@types/react": "^18.3.3",
@@ -171,7 +169,7 @@
     "typescript": "4.9.5"
   },
   "engines": {
-    "node": "^20.0.0",
+    "node": "^22.0.0",
     "pnpm": "^9.0.0"
   },
   "overrides": {

server/api/animelist.ts

@@ -1,7 +1,8 @@
 import logger from '@server/logger';
-import axios from 'axios';
-import fs, { promises as fsp } from 'fs';
-import path from 'path';
+import fs, { promises as fsp } from 'node:fs';
+import path from 'node:path';
+import { Readable } from 'node:stream';
+import type { ReadableStream } from 'node:stream/web';
 import xml2js from 'xml2js';
 
 const UPDATE_INTERVAL_MSEC = 24 * 3600 * 1000; // how often to download new mapping in milliseconds
@@ -161,13 +162,18 @@ class AnimeListMapping {
       label: 'Anime-List Sync',
     });
     try {
-      const response = await axios.get(MAPPING_URL, {
-        responseType: 'stream',
-      });
-      await new Promise<void>((resolve) => {
+      const response = await fetch(MAPPING_URL);
+      if (!response.ok) {
+        throw new Error(`Failed to fetch: ${response.statusText}`);
+      }
+      await new Promise<void>((resolve, reject) => {
         const writer = fs.createWriteStream(LOCAL_PATH);
         writer.on('finish', resolve);
-        response.data.pipe(writer);
+        writer.on('error', reject);
+        if (!response.body) return reject();
+        Readable.fromWeb(response.body as ReadableStream<Uint8Array>).pipe(
+          writer
+        );
       });
     } catch (e) {
       throw new Error(`Failed to download Anime-List mapping: ${e.message}`);

server/api/externalapi.ts

@@ -1,6 +1,7 @@
-import type { AxiosInstance, AxiosRequestConfig } from 'axios';
-import axios from 'axios';
-import rateLimit from 'axios-rate-limit';
+import { MediaServerType } from '@server/constants/server';
+import { getSettings } from '@server/lib/settings';
+import type { RateLimitOptions } from '@server/utils/rateLimit';
+import rateLimit from '@server/utils/rateLimit';
 import type NodeCache from 'node-cache';
 
 // 5 minute default TTL (in seconds)
@@ -12,71 +13,109 @@ const DEFAULT_ROLLING_BUFFER = 10000;
 interface ExternalAPIOptions {
   nodeCache?: NodeCache;
   headers?: Record<string, unknown>;
-  rateLimit?: {
-    maxRPS: number;
-    maxRequests: number;
-  };
+  rateLimit?: RateLimitOptions;
+}
+
+interface CustomRequestConfig extends RequestInit {
+  params?: Record<string, unknown>;
 }
 
 class ExternalAPI {
-  protected axios: AxiosInstance;
+  protected fetch: typeof fetch;
+  protected params: Record<string, string>;
+  protected defaultHeaders: { [key: string]: string };
   private baseUrl: string;
   private cache?: NodeCache;
 
   constructor(
     baseUrl: string,
-    params: Record<string, unknown>,
+    params: Record<string, string> = {},
     options: ExternalAPIOptions = {}
   ) {
-    this.axios = axios.create({
-      baseURL: baseUrl,
-      params,
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-        ...options.headers,
-      },
-    });
-
     if (options.rateLimit) {
-      this.axios = rateLimit(this.axios, {
-        maxRequests: options.rateLimit.maxRequests,
-        maxRPS: options.rateLimit.maxRPS,
-      });
+      this.fetch = rateLimit(fetch, options.rateLimit);
+    } else {
+      this.fetch = fetch;
+    }
+
+    const url = new URL(baseUrl);
+
+    const settings = getSettings();
+
+    this.defaultHeaders = {
+      'Content-Type': 'application/json',
+      Accept: 'application/json',
+      ...((url.username || url.password) && {
+        Authorization: `Basic ${Buffer.from(
+          `${url.username}:${url.password}`
+        ).toString('base64')}`,
+      }),
+      ...(settings.main.mediaServerType === MediaServerType.EMBY && {
+        'Accept-Encoding': 'gzip',
+      }),
+      ...options.headers,
+    };
+
+    if (url.username || url.password) {
+      url.username = '';
+      url.password = '';
+      baseUrl = url.toString();
     }
 
     this.baseUrl = baseUrl;
+    this.params = params;
     this.cache = options.nodeCache;
   }
 
   protected async get<T>(
     endpoint: string,
-    config?: AxiosRequestConfig,
-    ttl?: number
+    params?: Record<string, string>,
+    ttl?: number,
+    config?: CustomRequestConfig
   ): Promise<T> {
-    const cacheKey = this.serializeCacheKey(endpoint, config?.params);
+    const headers = { ...this.defaultHeaders, ...config?.headers };
+    const cacheKey = this.serializeCacheKey(endpoint, config?.params, headers);
+
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
     }
 
-    const response = await this.axios.get<T>(endpoint, config);
+    const url = this.formatUrl(endpoint, params);
+    const response = await this.fetch(url, {
+      ...config,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
+        {
+          cause: response,
+        }
+      );
+    }
+    const data = await this.getDataFromResponse(response);
 
-    if (this.cache) {
-      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
+    if (this.cache && ttl !== 0) {
+      this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
     }
 
-    return response.data;
+    return data;
   }
 
   protected async post<T>(
     endpoint: string,
     data?: Record<string, unknown>,
-    config?: AxiosRequestConfig,
-    ttl?: number
+    params?: Record<string, string>,
+    ttl?: number,
+    config?: RequestInit
   ): Promise<T> {
     const cacheKey = this.serializeCacheKey(endpoint, {
-      config: config?.params,
+      config: { ...this.params, ...params },
       data,
     });
     const cachedItem = this.cache?.get<T>(cacheKey);
@@ -84,21 +123,117 @@ class ExternalAPI {
       return cachedItem;
     }
 
-    const response = await this.axios.post<T>(endpoint, data, config);
+    const url = this.formatUrl(endpoint, params);
+    const response = await this.fetch(url, {
+      method: 'POST',
+      ...config,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
+      body: data ? JSON.stringify(data) : undefined,
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
+        {
+          cause: response,
+        }
+      );
+    }
+    const resData = await this.getDataFromResponse(response);
 
-    if (this.cache) {
-      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
+    if (this.cache && ttl !== 0) {
+      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
     }
 
-    return response.data;
+    return resData;
+  }
+
+  protected async put<T>(
+    endpoint: string,
+    data: Record<string, unknown>,
+    params?: Record<string, string>,
+    ttl?: number,
+    config?: RequestInit
+  ): Promise<T> {
+    const cacheKey = this.serializeCacheKey(endpoint, {
+      config: { ...this.params, ...params },
+      data,
+    });
+    const cachedItem = this.cache?.get<T>(cacheKey);
+    if (cachedItem) {
+      return cachedItem;
+    }
+
+    const url = this.formatUrl(endpoint, params);
+    const response = await this.fetch(url, {
+      method: 'PUT',
+      ...config,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
+      body: JSON.stringify(data),
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
+        {
+          cause: response,
+        }
+      );
+    }
+    const resData = await this.getDataFromResponse(response);
+
+    if (this.cache && ttl !== 0) {
+      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
+    }
+
+    return resData;
+  }
+
+  protected async delete<T>(
+    endpoint: string,
+    params?: Record<string, string>,
+    config?: RequestInit
+  ): Promise<T> {
+    const url = this.formatUrl(endpoint, params);
+    const response = await this.fetch(url, {
+      method: 'DELETE',
+      ...config,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
+        {
+          cause: response,
+        }
+      );
+    }
+    const data = await this.getDataFromResponse(response);
+
+    return data;
   }
 
   protected async getRolling<T>(
     endpoint: string,
-    config?: AxiosRequestConfig,
-    ttl?: number
+    params?: Record<string, string>,
+    ttl?: number,
+    config?: RequestInit,
+    overwriteBaseUrl?: string
   ): Promise<T> {
-    const cacheKey = this.serializeCacheKey(endpoint, config?.params);
+    const cacheKey = this.serializeCacheKey(endpoint, {
+      ...this.params,
+      ...params,
+    });
     const cachedItem = this.cache?.get<T>(cacheKey);
 
     if (cachedItem) {
@@ -109,31 +244,122 @@ class ExternalAPI {
         keyTtl - (ttl ?? DEFAULT_TTL) * 1000 <
         Date.now() - DEFAULT_ROLLING_BUFFER
       ) {
-        this.axios.get<T>(endpoint, config).then((response) => {
-          this.cache?.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
+        const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
+        this.fetch(url, {
+          ...config,
+          headers: {
+            ...this.defaultHeaders,
+            ...config?.headers,
+          },
+        }).then(async (response) => {
+          if (!response.ok) {
+            const text = await response.text();
+            throw new Error(
+              `${response.status} ${response.statusText}${
+                text ? ': ' + text : ''
+              }`,
+              {
+                cause: response,
+              }
+            );
+          }
+          const data = await this.getDataFromResponse(response);
+          this.cache?.set(cacheKey, data, ttl ?? DEFAULT_TTL);
         });
       }
       return cachedItem;
     }
 
-    const response = await this.axios.get<T>(endpoint, config);
+    const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
+    const response = await this.fetch(url, {
+      ...config,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
+        {
+          cause: response,
+        }
+      );
+    }
+    const data = await this.getDataFromResponse(response);
 
     if (this.cache) {
-      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
+      this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
     }
 
-    return response.data;
+    return data;
+  }
+
+  protected removeCache(endpoint: string, params?: Record<string, string>) {
+    const cacheKey = this.serializeCacheKey(endpoint, {
+      ...this.params,
+      ...params,
+    });
+    this.cache?.del(cacheKey);
+  }
+
+  private formatUrl(
+    endpoint: string,
+    params?: Record<string, string>,
+    overwriteBaseUrl?: string
+  ): string {
+    const baseUrl = overwriteBaseUrl || this.baseUrl;
+    const href =
+      baseUrl +
+      (baseUrl.endsWith('/') ? '' : '/') +
+      (endpoint.startsWith('/') ? endpoint.slice(1) : endpoint);
+    const searchParams = new URLSearchParams({
+      ...this.params,
+      ...params,
+    });
+    return (
+      href +
+      (searchParams.toString().length
+        ? '?' + searchParams.toString()
+        : searchParams.toString())
+    );
   }
 
   private serializeCacheKey(
     endpoint: string,
-    params?: Record<string, unknown>
+    params?: Record<string, unknown>,
+    headers?: Record<string, unknown>
   ) {
-    if (!params) {
-      return `${this.baseUrl}${endpoint}`;
+    const key = `${this.baseUrl}${endpoint}`;
+    if (!params && !headers) {
+      return key;
     }
 
-    return `${this.baseUrl}${endpoint}${JSON.stringify(params)}`;
+    return `${key}${JSON.stringify({ params, headers })}`;
+  }
+
+  private async getDataFromResponse(response: Response) {
+    const contentType = response.headers.get('Content-Type');
+    if (contentType?.includes('application/json')) {
+      return await response.json();
+    } else if (
+      contentType?.includes('application/xml') ||
+      contentType?.includes('text/html') ||
+      contentType?.includes('text/plain')
+    ) {
+      return await response.text();
+    } else {
+      try {
+        return await response.json();
+      } catch {
+        try {
+          return await response.blob();
+        } catch {
+          return null;
+        }
+      }
+    }
   }
 }
 

server/api/github.ts

@@ -1,6 +1,6 @@
+import ExternalAPI from '@server/api/externalapi';
 import cacheManager from '@server/lib/cache';
 import logger from '@server/logger';
-import ExternalAPI from './externalapi';
 
 interface GitHubRelease {
   url: string;
@@ -67,10 +67,6 @@ class GithubAPI extends ExternalAPI {
       'https://api.github.com',
       {},
       {
-        headers: {
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
-        },
         nodeCache: cacheManager.getCache('github').data,
       }
     );
@@ -85,9 +81,7 @@ class GithubAPI extends ExternalAPI {
       const data = await this.get<GitHubRelease[]>(
         '/repos/fallenbagel/jellyseerr/releases',
         {
-          params: {
-            per_page: take,
-          },
+          per_page: take.toString(),
         }
       );
 
@@ -112,10 +106,8 @@ class GithubAPI extends ExternalAPI {
       const data = await this.get<GithubCommit[]>(
         '/repos/fallenbagel/jellyseerr/commits',
         {
-          params: {
-            per_page: take,
-            branch,
-          },
+          per_page: take.toString(),
+          branch,
         }
       );
 

server/api/jellyfin.ts

@@ -109,8 +109,6 @@ class JellyfinAPI extends ExternalAPI {
       {
         headers: {
           'X-Emby-Authorization': authHeaderVal,
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
         },
       }
     );
@@ -122,7 +120,7 @@ class JellyfinAPI extends ExternalAPI {
     ClientIP?: string
   ): Promise<JellyfinLoginResponse> {
     const authenticate = async (useHeaders: boolean) => {
-      const headers =
+      const headers: { [key: string]: string } =
         useHeaders && ClientIP ? { 'X-Forwarded-For': ClientIP } : {};
 
       return this.post<JellyfinLoginResponse>(
@@ -131,6 +129,8 @@ class JellyfinAPI extends ExternalAPI {
           Username,
           Pw: Password,
         },
+        {},
+        undefined,
         { headers }
       );
     };
@@ -138,39 +138,38 @@ class JellyfinAPI extends ExternalAPI {
     try {
       return await authenticate(true);
     } catch (e) {
-      logger.debug(`Failed to authenticate with headers: ${e.message}`, {
+      logger.debug('Failed to authenticate with headers', {
         label: 'Jellyfin API',
+        error: e.cause.message ?? e.cause.statusText,
         ip: ClientIP,
       });
+
+      if (!e.cause.status) {
+        throw new ApiError(404, ApiErrorCode.InvalidUrl);
+      }
+
+      if (e.cause.status === 401) {
+        throw new ApiError(e.cause.status, ApiErrorCode.InvalidCredentials);
+      }
     }
 
     try {
       return await authenticate(false);
     } catch (e) {
-      const status = e.cause?.status;
-
-      const networkErrorCodes = new Set([
-        'ECONNREFUSED',
-        'EHOSTUNREACH',
-        'ENOTFOUND',
-        'ETIMEDOUT',
-        'ECONNRESET',
-        'EADDRINUSE',
-        'ENETDOWN',
-        'ENETUNREACH',
-        'EPIPE',
-        'ECONNABORTED',
-        'EPROTO',
-        'EHOSTDOWN',
-        'EAI_AGAIN',
-        'ERR_INVALID_URL',
-      ]);
-
-      if (networkErrorCodes.has(e.code) || status === 404) {
-        throw new ApiError(status, ApiErrorCode.InvalidUrl);
+      if (e.cause.status === 401) {
+        throw new ApiError(e.cause.status, ApiErrorCode.InvalidCredentials);
       }
 
-      throw new ApiError(status, ApiErrorCode.InvalidCredentials);
+      logger.error(
+        'Something went wrong while authenticating with the Jellyfin server',
+        {
+          label: 'Jellyfin API',
+          error: e.cause.message ?? e.cause.statusText,
+          ip: ClientIP,
+        }
+      );
+
+      throw new ApiError(e.cause.status, ApiErrorCode.Unknown);
     }
   }
 
@@ -198,8 +197,8 @@ class JellyfinAPI extends ExternalAPI {
       return serverResponse.ServerName;
     } catch (e) {
       logger.error(
-        `Something went wrong while getting the server name from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
+        'Something went wrong while getting the server name from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.Unknown);
@@ -213,8 +212,8 @@ class JellyfinAPI extends ExternalAPI {
       return { users: userReponse };
     } catch (e) {
       logger.error(
-        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
+        'Something went wrong while getting the account from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -229,8 +228,8 @@ class JellyfinAPI extends ExternalAPI {
       return userReponse;
     } catch (e) {
       logger.error(
-        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
+        'Something went wrong while getting the account from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -253,8 +252,11 @@ class JellyfinAPI extends ExternalAPI {
         return this.mapLibraries(mediaFolderResponse.Items);
       } catch (e) {
         logger.error(
-          `Something went wrong while getting libraries from the Jellyfin server: ${e.message}`,
-          { label: 'Jellyfin API' }
+          'Something went wrong while getting libraries from the Jellyfin server',
+          {
+            label: 'Jellyfin API',
+            error: e.cause.message ?? e.cause.statusText,
+          }
         );
 
         return [];
@@ -291,7 +293,16 @@ class JellyfinAPI extends ExternalAPI {
   public async getLibraryContents(id: string): Promise<JellyfinLibraryItem[]> {
     try {
       const libraryItemsResponse = await this.get<any>(
-        `/Users/${this.userId}/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}&collapseBoxSetItems=false`
+        `/Users/${this.userId}/Items`,
+        {
+          SortBy: 'SortName',
+          SortOrder: 'Ascending',
+          IncludeItemTypes: 'Series,Movie,Others',
+          Recursive: 'true',
+          StartIndex: '0',
+          ParentId: id,
+          collapseBoxSetItems: 'false',
+        }
       );
 
       return libraryItemsResponse.Items.filter(
@@ -299,8 +310,8 @@ class JellyfinAPI extends ExternalAPI {
       );
     } catch (e) {
       logger.error(
-        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
+        'Something went wrong while getting library content from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -310,14 +321,18 @@ class JellyfinAPI extends ExternalAPI {
   public async getRecentlyAdded(id: string): Promise<JellyfinLibraryItem[]> {
     try {
       const itemResponse = await this.get<any>(
-        `/Users/${this.userId}/Items/Latest?Limit=12&ParentId=${id}`
+        `/Users/${this.userId}/Items/Latest`,
+        {
+          Limit: '12',
+          ParentId: id,
+        }
       );
 
       return itemResponse;
     } catch (e) {
       logger.error(
-        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
+        'Something went wrong while getting library content from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -341,8 +356,8 @@ class JellyfinAPI extends ExternalAPI {
       }
 
       logger.error(
-        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
+        'Something went wrong while getting library content from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
       );
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
     }
@@ -355,8 +370,8 @@ class JellyfinAPI extends ExternalAPI {
       return seasonResponse.Items;
     } catch (e) {
       logger.error(
-        `Something went wrong while getting the list of seasons from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
+        'Something went wrong while getting the list of seasons from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -369,7 +384,10 @@ class JellyfinAPI extends ExternalAPI {
   ): Promise<JellyfinLibraryItem[]> {
     try {
       const episodeResponse = await this.get<any>(
-        `/Shows/${seriesID}/Episodes?seasonId=${seasonID}`
+        `/Shows/${seriesID}/Episodes`,
+        {
+          seasonId: seasonID,
+        }
       );
 
       return episodeResponse.Items.filter(
@@ -377,8 +395,8 @@ class JellyfinAPI extends ExternalAPI {
       );
     } catch (e) {
       logger.error(
-        `Something went wrong while getting the list of episodes from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
+        'Something went wrong while getting the list of episodes from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -394,8 +412,8 @@ class JellyfinAPI extends ExternalAPI {
       ).AccessToken;
     } catch (e) {
       logger.error(
-        `Something went wrong while creating an API key from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
+        'Something went wrong while creating an API key from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
       );
 
       throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);

server/api/plextv.ts

@@ -1,9 +1,10 @@
+import ExternalAPI from '@server/api/externalapi';
 import type { PlexDevice } from '@server/interfaces/api/plexInterfaces';
 import cacheManager from '@server/lib/cache';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import { randomUUID } from 'node:crypto';
 import xml2js from 'xml2js';
-import ExternalAPI from './externalapi';
 
 interface PlexAccountResponse {
   user: PlexUser;
@@ -127,6 +128,11 @@ export interface PlexWatchlistItem {
   title: string;
 }
 
+export interface PlexWatchlistCache {
+  etag: string;
+  response: WatchlistResponse;
+}
+
 class PlexTvAPI extends ExternalAPI {
   private authToken: string;
 
@@ -137,8 +143,6 @@ class PlexTvAPI extends ExternalAPI {
       {
         headers: {
           'X-Plex-Token': authToken,
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
         },
         nodeCache: cacheManager.getCache('plextv').data,
       }
@@ -149,15 +153,11 @@ class PlexTvAPI extends ExternalAPI {
 
   public async getDevices(): Promise<PlexDevice[]> {
     try {
-      const devicesResp = await this.axios.get(
-        '/api/resources?includeHttps=1',
-        {
-          transformResponse: [],
-          responseType: 'text',
-        }
-      );
+      const devicesResp = await this.get('/api/resources', {
+        includeHttps: '1',
+      });
       const parsedXml = await xml2js.parseStringPromise(
-        devicesResp.data as DeviceResponse
+        devicesResp as DeviceResponse
       );
       return parsedXml?.MediaContainer?.Device?.map((pxml: DeviceResponse) => ({
         name: pxml.$.name,
@@ -205,11 +205,11 @@ class PlexTvAPI extends ExternalAPI {
 
   public async getUser(): Promise<PlexUser> {
     try {
-      const account = await this.axios.get<PlexAccountResponse>(
+      const account = await this.get<PlexAccountResponse>(
         '/users/account.json'
       );
 
-      return account.data.user;
+      return account.user;
     } catch (e) {
       logger.error(
         `Something went wrong while getting the account from plex.tv: ${e.message}`,
@@ -249,13 +249,10 @@ class PlexTvAPI extends ExternalAPI {
   }
 
   public async getUsers(): Promise<UsersResponse> {
-    const response = await this.axios.get('/api/users', {
-      transformResponse: [],
-      responseType: 'text',
-    });
+    const data = await this.get('/api/users');
 
     const parsedXml = (await xml2js.parseStringPromise(
-      response.data
+      data as string
     )) as UsersResponse;
     return parsedXml;
   }
@@ -270,25 +267,50 @@ class PlexTvAPI extends ExternalAPI {
     items: PlexWatchlistItem[];
   }> {
     try {
-      const response = await this.axios.get<WatchlistResponse>(
-        '/library/sections/watchlist/all',
-        {
-          params: {
-            'X-Plex-Container-Start': offset,
-            'X-Plex-Container-Size': size,
-          },
-          baseURL: 'https://metadata.provider.plex.tv',
-        }
+      const watchlistCache = cacheManager.getCache('plexwatchlist');
+      let cachedWatchlist = watchlistCache.data.get<PlexWatchlistCache>(
+        this.authToken
       );
 
+      const params = new URLSearchParams({
+        'X-Plex-Container-Start': offset.toString(),
+        'X-Plex-Container-Size': size.toString(),
+      });
+      const response = await this.fetch(
+        `https://metadata.provider.plex.tv/library/sections/watchlist/all?${params.toString()}`,
+        {
+          headers: {
+            ...this.defaultHeaders,
+            ...(cachedWatchlist?.etag
+              ? { 'If-None-Match': cachedWatchlist.etag }
+              : {}),
+          },
+        }
+      );
+      const data = (await response.json()) as WatchlistResponse;
+
+      // If we don't recieve HTTP 304, the watchlist has been updated and we need to update the cache.
+      if (response.status >= 200 && response.status <= 299) {
+        cachedWatchlist = {
+          etag: response.headers.get('etag') ?? '',
+          response: data,
+        };
+
+        watchlistCache.data.set<PlexWatchlistCache>(
+          this.authToken,
+          cachedWatchlist
+        );
+      }
+
       const watchlistDetails = await Promise.all(
-        (response.data.MediaContainer.Metadata ?? []).map(
+        (cachedWatchlist?.response.MediaContainer.Metadata ?? []).map(
           async (watchlistItem) => {
             const detailedResponse = await this.getRolling<MetadataResponse>(
               `/library/metadata/${watchlistItem.ratingKey}`,
-              {
-                baseURL: 'https://metadata.provider.plex.tv',
-              }
+              {},
+              undefined,
+              {},
+              'https://metadata.provider.plex.tv'
             );
 
             const metadata = detailedResponse.MediaContainer.Metadata[0];
@@ -320,7 +342,7 @@ class PlexTvAPI extends ExternalAPI {
       return {
         offset,
         size,
-        totalSize: response.data.MediaContainer.totalSize,
+        totalSize: cachedWatchlist?.response.MediaContainer.totalSize ?? 0,
         items: filteredList,
       };
     } catch (e) {
@@ -336,6 +358,29 @@ class PlexTvAPI extends ExternalAPI {
       };
     }
   }
+
+  public async pingToken() {
+    try {
+      const data: { pong: unknown } = await this.get(
+        '/api/v2/ping',
+        {},
+        undefined,
+        {
+          headers: {
+            'X-Plex-Client-Identifier': randomUUID(),
+          },
+        }
+      );
+      if (!data?.pong) {
+        throw new Error('No pong response');
+      }
+    } catch (e) {
+      logger.error('Failed to ping token', {
+        label: 'Plex Refresh Token',
+        errorMessage: e.message,
+      });
+    }
+  }
 }
 
 export default PlexTvAPI;

server/api/pushover.ts

@@ -1,4 +1,4 @@
-import ExternalAPI from './externalapi';
+import ExternalAPI from '@server/api/externalapi';
 
 interface PushoverSoundsResponse {
   sounds: {
@@ -26,24 +26,13 @@ export const mapSounds = (sounds: {
 
 class PushoverAPI extends ExternalAPI {
   constructor() {
-    super(
-      'https://api.pushover.net/1',
-      {},
-      {
-        headers: {
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
-        },
-      }
-    );
+    super('https://api.pushover.net/1');
   }
 
   public async getSounds(appToken: string): Promise<PushoverSound[]> {
     try {
       const data = await this.get<PushoverSoundsResponse>('/sounds.json', {
-        params: {
-          token: appToken,
-        },
+        token: appToken,
       });
 
       return mapSounds(data.sounds);

server/api/rating/imdbRadarrProxy.ts

@@ -155,13 +155,13 @@ export interface IMDBRating {
  */
 class IMDBRadarrProxy extends ExternalAPI {
   constructor() {
-    super('https://api.radarr.video/v1', {
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-      },
-      nodeCache: cacheManager.getCache('imdb').data,
-    });
+    super(
+      'https://api.radarr.video/v1',
+      {},
+      {
+        nodeCache: cacheManager.getCache('imdb').data,
+      }
+    );
   }
 
   /**

server/api/rating/rottentomatoes.ts

@@ -63,15 +63,12 @@ class RottenTomatoes extends ExternalAPI {
     super(
       'https://79frdp12pn-dsn.algolia.net/1/indexes/*',
       {
-        'x-algolia-agent':
-          'Algolia%20for%20JavaScript%20(4.14.3)%3B%20Browser%20(lite)',
+        'x-algolia-agent': 'Algolia for JavaScript (4.14.3); Browser (lite)',
         'x-algolia-api-key': '175588f6e5f8319b27702e4cc4013561',
         'x-algolia-application-id': '79FRDP12PN',
       },
       {
         headers: {
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
           'x-algolia-usertoken': settings.clientId,
         },
         nodeCache: cacheManager.getCache('rt').data,
@@ -131,7 +128,7 @@ class RottenTomatoes extends ExternalAPI {
         movie = contentResults.hits.find((movie) => movie.title === name);
       }
 
-      if (!movie) {
+      if (!movie?.rottenTomatoes) {
         return null;
       }
 

server/api/servarr/base.ts

@@ -113,9 +113,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public getSystemStatus = async (): Promise<SystemStatus> => {
     try {
-      const response = await this.axios.get<SystemStatus>('/system/status');
+      const data = await this.get<SystemStatus>('/system/status');
 
-      return response.data;
+      return data;
     } catch (e) {
       throw new Error(
         `[${this.apiName}] Failed to retrieve system status: ${e.message}`
@@ -157,16 +157,15 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public getQueue = async (): Promise<(QueueItem & QueueItemAppendT)[]> => {
     try {
-      const response = await this.axios.get<QueueResponse<QueueItemAppendT>>(
+      const data = await this.get<QueueResponse<QueueItemAppendT>>(
         `/queue`,
         {
-          params: {
-            includeEpisode: true,
-          },
-        }
+          includeEpisode: 'true',
+        },
+        0
       );
 
-      return response.data.records;
+      return data.records;
     } catch (e) {
       throw new Error(
         `[${this.apiName}] Failed to retrieve queue: ${e.message}`
@@ -176,9 +175,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public getTags = async (): Promise<Tag[]> => {
     try {
-      const response = await this.axios.get<Tag[]>(`/tag`);
+      const data = await this.get<Tag[]>(`/tag`);
 
-      return response.data;
+      return data;
     } catch (e) {
       throw new Error(
         `[${this.apiName}] Failed to retrieve tags: ${e.message}`
@@ -188,11 +187,11 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
 
   public createTag = async ({ label }: { label: string }): Promise<Tag> => {
     try {
-      const response = await this.axios.post<Tag>(`/tag`, {
+      const data = await this.post<Tag>(`/tag`, {
         label,
       });
 
-      return response.data;
+      return data;
     } catch (e) {
       throw new Error(`[${this.apiName}] Failed to create tag: ${e.message}`);
     }
@@ -207,10 +206,15 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
     options: Record<string, unknown>
   ): Promise<void> {
     try {
-      await this.axios.post(`/command`, {
-        name: commandName,
-        ...options,
-      });
+      await this.post(
+        `/command`,
+        {
+          name: commandName,
+          ...options,
+        },
+        {},
+        0
+      );
     } catch (e) {
       throw new Error(`[${this.apiName}] Failed to run command: ${e.message}`);
     }

server/api/servarr/radarr.ts

@@ -37,9 +37,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
   public getMovies = async (): Promise<RadarrMovie[]> => {
     try {
-      const response = await this.axios.get<RadarrMovie[]>('/movie');
+      const data = await this.get<RadarrMovie[]>('/movie');
 
-      return response.data;
+      return data;
     } catch (e) {
       throw new Error(`[Radarr] Failed to retrieve movies: ${e.message}`);
     }
@@ -47,9 +47,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
   public getMovie = async ({ id }: { id: number }): Promise<RadarrMovie> => {
     try {
-      const response = await this.axios.get<RadarrMovie>(`/movie/${id}`);
+      const data = await this.get<RadarrMovie>(`/movie/${id}`);
 
-      return response.data;
+      return data;
     } catch (e) {
       throw new Error(`[Radarr] Failed to retrieve movie: ${e.message}`);
     }
@@ -57,17 +57,15 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
   public async getMovieByTmdbId(id: number): Promise<RadarrMovie> {
     try {
-      const response = await this.axios.get<RadarrMovie[]>('/movie/lookup', {
-        params: {
-          term: `tmdb:${id}`,
-        },
+      const data = await this.get<RadarrMovie[]>('/movie/lookup', {
+        term: `tmdb:${id}`,
       });
 
-      if (!response.data[0]) {
+      if (!data[0]) {
         throw new Error('Movie not found');
       }
 
-      return response.data[0];
+      return data[0];
     } catch (e) {
       logger.error('Error retrieving movie by TMDB ID', {
         label: 'Radarr API',
@@ -97,7 +95,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
 
       // movie exists in Radarr but is neither downloaded nor monitored
       if (movie.id && !movie.monitored) {
-        const response = await this.axios.put<RadarrMovie>(`/movie`, {
+        const data = await this.put<RadarrMovie>(`/movie`, {
           ...movie,
           title: options.title,
           qualityProfileId: options.qualityProfileId,
@@ -114,25 +112,25 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
           },
         });
 
-        if (response.data.monitored) {
+        if (data.monitored) {
           logger.info(
             'Found existing title in Radarr and set it to monitored.',
             {
               label: 'Radarr',
-              movieId: response.data.id,
-              movieTitle: response.data.title,
+              movieId: data.id,
+              movieTitle: data.title,
             }
           );
           logger.debug('Radarr update details', {
             label: 'Radarr',
-            movie: response.data,
+            movie: data,
           });
 
           if (options.searchNow) {
-            this.searchMovie(response.data.id);
+            this.searchMovie(data.id);
           }
 
-          return response.data;
+          return data;
         } else {
           logger.error('Failed to update existing movie in Radarr.', {
             label: 'Radarr',
@@ -150,7 +148,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
         return movie;
       }
 
-      const response = await this.axios.post<RadarrMovie>(`/movie`, {
+      const data = await this.post<RadarrMovie>(`/movie`, {
         title: options.title,
         qualityProfileId: options.qualityProfileId,
         profileId: options.profileId,
@@ -166,11 +164,11 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
         },
       });
 
-      if (response.data.id) {
+      if (data.id) {
         logger.info('Radarr accepted request', { label: 'Radarr' });
         logger.debug('Radarr add details', {
           label: 'Radarr',
-          movie: response.data,
+          movie: data,
         });
       } else {
         logger.error('Failed to add movie to Radarr', {
@@ -179,7 +177,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
         });
         throw new Error('Failed to add movie to Radarr');
       }
-      return response.data;
+      return data;
     } catch (e) {
       let errorData;
       try {
@@ -223,17 +221,32 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
   public removeMovie = async (movieId: number): Promise<void> => {
     try {
       const { id, title } = await this.getMovieByTmdbId(movieId);
-      await this.axios.delete(`/movie/${id}`, {
-        params: {
-          deleteFiles: true,
-          addImportExclusion: false,
-        },
+      await this.delete(`/movie/${id}`, {
+        deleteFiles: 'true',
+        addImportExclusion: 'false',
       });
       logger.info(`[Radarr] Removed movie ${title}`);
     } catch (e) {
       throw new Error(`[Radarr] Failed to remove movie: ${e.message}`);
     }
   };
+
+  public clearCache = ({
+    tmdbId,
+    externalId,
+  }: {
+    tmdbId?: number | null;
+    externalId?: number | null;
+  }) => {
+    if (tmdbId) {
+      this.removeCache('/movie/lookup', {
+        term: `tmdb:${tmdbId}`,
+      });
+    }
+    if (externalId) {
+      this.removeCache(`/movie/${externalId}`);
+    }
+  };
 }
 
 export default RadarrAPI;

server/api/servarr/sonarr.ts

@@ -117,9 +117,9 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeries(): Promise<SonarrSeries[]> {
     try {
-      const response = await this.axios.get<SonarrSeries[]>('/series');
+      const data = await this.get<SonarrSeries[]>('/series');
 
-      return response.data;
+      return data;
     } catch (e) {
       throw new Error(`[Sonarr] Failed to retrieve series: ${e.message}`);
     }
@@ -127,9 +127,9 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeriesById(id: number): Promise<SonarrSeries> {
     try {
-      const response = await this.axios.get<SonarrSeries>(`/series/${id}`);
+      const data = await this.get<SonarrSeries>(`/series/${id}`);
 
-      return response.data;
+      return data;
     } catch (e) {
       throw new Error(`[Sonarr] Failed to retrieve series by ID: ${e.message}`);
     }
@@ -137,17 +137,15 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeriesByTitle(title: string): Promise<SonarrSeries[]> {
     try {
-      const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
-        params: {
-          term: title,
-        },
+      const data = await this.get<SonarrSeries[]>('/series/lookup', {
+        term: title,
       });
 
-      if (!response.data[0]) {
+      if (!data[0]) {
         throw new Error('No series found');
       }
 
-      return response.data;
+      return data;
     } catch (e) {
       logger.error('Error retrieving series by series title', {
         label: 'Sonarr API',
@@ -160,17 +158,15 @@ class SonarrAPI extends ServarrBase<{
 
   public async getSeriesByTvdbId(id: number): Promise<SonarrSeries> {
     try {
-      const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
-        params: {
-          term: `tvdb:${id}`,
-        },
+      const data = await this.get<SonarrSeries[]>('/series/lookup', {
+        term: `tvdb:${id}`,
       });
 
-      if (!response.data[0]) {
+      if (!data[0]) {
         throw new Error('Series not found');
       }
 
-      return response.data[0];
+      return data[0];
     } catch (e) {
       logger.error('Error retrieving series by tvdb ID', {
         label: 'Sonarr API',
@@ -191,27 +187,27 @@ class SonarrAPI extends ServarrBase<{
         series.tags = options.tags ?? series.tags;
         series.seasons = this.buildSeasonList(options.seasons, series.seasons);
 
-        const newSeriesResponse = await this.axios.put<SonarrSeries>(
+        const newSeriesData = await this.put<SonarrSeries>(
           '/series',
-          series
+          series as any
         );
 
-        if (newSeriesResponse.data.id) {
+        if (newSeriesData.id) {
           logger.info('Updated existing series in Sonarr.', {
             label: 'Sonarr',
-            seriesId: newSeriesResponse.data.id,
-            seriesTitle: newSeriesResponse.data.title,
+            seriesId: newSeriesData.id,
+            seriesTitle: newSeriesData.title,
           });
           logger.debug('Sonarr update details', {
             label: 'Sonarr',
-            movie: newSeriesResponse.data,
+            movie: newSeriesData,
           });
 
           if (options.searchNow) {
-            this.searchSeries(newSeriesResponse.data.id);
+            this.searchSeries(newSeriesData.id);
           }
 
-          return newSeriesResponse.data;
+          return newSeriesData;
         } else {
           logger.error('Failed to update series in Sonarr', {
             label: 'Sonarr',
@@ -221,38 +217,35 @@ class SonarrAPI extends ServarrBase<{
         }
       }
 
-      const createdSeriesResponse = await this.axios.post<SonarrSeries>(
-        '/series',
-        {
-          tvdbId: options.tvdbid,
-          title: options.title,
-          qualityProfileId: options.profileId,
-          languageProfileId: options.languageProfileId,
-          seasons: this.buildSeasonList(
-            options.seasons,
-            series.seasons.map((season) => ({
-              seasonNumber: season.seasonNumber,
-              // We force all seasons to false if its the first request
-              monitored: false,
-            }))
-          ),
-          tags: options.tags,
-          seasonFolder: options.seasonFolder,
-          monitored: options.monitored,
-          rootFolderPath: options.rootFolderPath,
-          seriesType: options.seriesType,
-          addOptions: {
-            ignoreEpisodesWithFiles: true,
-            searchForMissingEpisodes: options.searchNow,
-          },
-        } as Partial<SonarrSeries>
-      );
+      const createdSeriesData = await this.post<SonarrSeries>('/series', {
+        tvdbId: options.tvdbid,
+        title: options.title,
+        qualityProfileId: options.profileId,
+        languageProfileId: options.languageProfileId,
+        seasons: this.buildSeasonList(
+          options.seasons,
+          series.seasons.map((season) => ({
+            seasonNumber: season.seasonNumber,
+            // We force all seasons to false if its the first request
+            monitored: false,
+          }))
+        ),
+        tags: options.tags,
+        seasonFolder: options.seasonFolder,
+        monitored: options.monitored,
+        rootFolderPath: options.rootFolderPath,
+        seriesType: options.seriesType,
+        addOptions: {
+          ignoreEpisodesWithFiles: true,
+          searchForMissingEpisodes: options.searchNow,
+        },
+      } as Partial<SonarrSeries>);
 
-      if (createdSeriesResponse.data.id) {
+      if (createdSeriesData.id) {
         logger.info('Sonarr accepted request', { label: 'Sonarr' });
         logger.debug('Sonarr add details', {
           label: 'Sonarr',
-          movie: createdSeriesResponse.data,
+          movie: createdSeriesData,
         });
       } else {
         logger.error('Failed to add movie to Sonarr', {
@@ -262,7 +255,7 @@ class SonarrAPI extends ServarrBase<{
         throw new Error('Failed to add series to Sonarr');
       }
 
-      return createdSeriesResponse.data;
+      return createdSeriesData;
     } catch (e) {
       let errorData;
       try {
@@ -347,20 +340,43 @@ class SonarrAPI extends ServarrBase<{
 
     return newSeasons;
   }
+
   public removeSerie = async (serieId: number): Promise<void> => {
     try {
       const { id, title } = await this.getSeriesByTvdbId(serieId);
-      await this.axios.delete(`/series/${id}`, {
-        params: {
-          deleteFiles: true,
-          addImportExclusion: false,
-        },
+      await this.delete(`/series/${id}`, {
+        deleteFiles: 'true',
+        addImportExclusion: 'false',
       });
       logger.info(`[Radarr] Removed serie ${title}`);
     } catch (e) {
       throw new Error(`[Radarr] Failed to remove serie: ${e.message}`);
     }
   };
+
+  public clearCache = ({
+    tvdbId,
+    externalId,
+    title,
+  }: {
+    tvdbId?: number | null;
+    externalId?: number | null;
+    title?: string | null;
+  }) => {
+    if (tvdbId) {
+      this.removeCache('/series/lookup', {
+        term: `tvdb:${tvdbId}`,
+      });
+    }
+    if (externalId) {
+      this.removeCache(`/series/${externalId}`);
+    }
+    if (title) {
+      this.removeCache('/series/lookup', {
+        term: title,
+      });
+    }
+  };
 }
 
 export default SonarrAPI;

server/api/tautulli.ts

@@ -1,8 +1,7 @@
+import ExternalAPI from '@server/api/externalapi';
 import type { User } from '@server/entity/User';
 import type { TautulliSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import type { AxiosInstance } from 'axios';
-import axios from 'axios';
 import { uniqWith } from 'lodash';
 
 export interface TautulliHistoryRecord {
@@ -113,25 +112,25 @@ interface TautulliInfoResponse {
   };
 }
 
-class TautulliAPI {
-  private axios: AxiosInstance;
-
+class TautulliAPI extends ExternalAPI {
   constructor(settings: TautulliSettings) {
-    this.axios = axios.create({
-      baseURL: `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
+    super(
+      `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
         settings.port
       }${settings.urlBase ?? ''}`,
-      params: { apikey: settings.apiKey },
-    });
+      {
+        apikey: settings.apiKey || '',
+      }
+    );
   }
 
   public async getInfo(): Promise<TautulliInfo> {
     try {
       return (
-        await this.axios.get<TautulliInfoResponse>('/api/v2', {
-          params: { cmd: 'get_tautulli_info' },
+        await this.get<TautulliInfoResponse>('/api/v2', {
+          cmd: 'get_tautulli_info',
         })
-      ).data.response.data;
+      ).response.data;
     } catch (e) {
       logger.error('Something went wrong fetching Tautulli server info', {
         label: 'Tautulli API',
@@ -148,14 +147,12 @@ class TautulliAPI {
   ): Promise<TautulliWatchStats[]> {
     try {
       return (
-        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
-          params: {
-            cmd: 'get_item_watch_time_stats',
-            rating_key: ratingKey,
-            grouping: 1,
-          },
+        await this.get<TautulliWatchStatsResponse>('/api/v2', {
+          cmd: 'get_item_watch_time_stats',
+          rating_key: ratingKey,
+          grouping: '1',
         })
-      ).data.response.data;
+      ).response.data;
     } catch (e) {
       logger.error(
         'Something went wrong fetching media watch stats from Tautulli',
@@ -176,14 +173,12 @@ class TautulliAPI {
   ): Promise<TautulliWatchUser[]> {
     try {
       return (
-        await this.axios.get<TautulliWatchUsersResponse>('/api/v2', {
-          params: {
-            cmd: 'get_item_user_stats',
-            rating_key: ratingKey,
-            grouping: 1,
-          },
+        await this.get<TautulliWatchUsersResponse>('/api/v2', {
+          cmd: 'get_item_user_stats',
+          rating_key: ratingKey,
+          grouping: '1',
         })
-      ).data.response.data;
+      ).response.data;
     } catch (e) {
       logger.error(
         'Something went wrong fetching media watch users from Tautulli',
@@ -206,15 +201,13 @@ class TautulliAPI {
       }
 
       return (
-        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
-          params: {
-            cmd: 'get_user_watch_time_stats',
-            user_id: user.plexId,
-            query_days: 0,
-            grouping: 1,
-          },
+        await this.get<TautulliWatchStatsResponse>('/api/v2', {
+          cmd: 'get_user_watch_time_stats',
+          user_id: user.plexId.toString(),
+          query_days: '0',
+          grouping: '1',
         })
-      ).data.response.data[0];
+      ).response.data[0];
     } catch (e) {
       logger.error(
         'Something went wrong fetching user watch stats from Tautulli',
@@ -245,19 +238,17 @@ class TautulliAPI {
 
       while (results.length < 20) {
         const tautulliData = (
-          await this.axios.get<TautulliHistoryResponse>('/api/v2', {
-            params: {
-              cmd: 'get_history',
-              grouping: 1,
-              order_column: 'date',
-              order_dir: 'desc',
-              user_id: user.plexId,
-              media_type: 'movie,episode',
-              length: take,
-              start,
-            },
+          await this.get<TautulliHistoryResponse>('/api/v2', {
+            cmd: 'get_history',
+            grouping: '1',
+            order_column: 'date',
+            order_dir: 'desc',
+            user_id: user.plexId.toString(),
+            media_type: 'movie,episode',
+            length: take.toString(),
+            start: start.toString(),
           })
-        ).data.response.data.data;
+        ).response.data.data;
 
         if (!tautulliData.length) {
           return results;

server/api/themoviedb/index.ts

@@ -99,12 +99,12 @@ interface DiscoverTvOptions {
 }
 
 class TheMovieDb extends ExternalAPI {
-  private region?: string;
+  private discoverRegion?: string;
   private originalLanguage?: string;
   constructor({
-    region,
+    discoverRegion,
     originalLanguage,
-  }: { region?: string; originalLanguage?: string } = {}) {
+  }: { discoverRegion?: string; originalLanguage?: string } = {}) {
     super(
       'https://api.themoviedb.org/3',
       {
@@ -113,12 +113,12 @@ class TheMovieDb extends ExternalAPI {
       {
         nodeCache: cacheManager.getCache('tmdb').data,
         rateLimit: {
-          maxRequests: 20,
           maxRPS: 50,
+          id: 'tmdb',
         },
       }
     );
-    this.region = region;
+    this.discoverRegion = discoverRegion;
     this.originalLanguage = originalLanguage;
   }
 
@@ -130,7 +130,10 @@ class TheMovieDb extends ExternalAPI {
   }: SearchOptions): Promise<TmdbSearchMultiResponse> => {
     try {
       const data = await this.get<TmdbSearchMultiResponse>('/search/multi', {
-        params: { query, page, include_adult: includeAdult, language },
+        query,
+        page: page.toString(),
+        include_adult: includeAdult ? 'true' : 'false',
+        language,
       });
 
       return data;
@@ -153,13 +156,11 @@ class TheMovieDb extends ExternalAPI {
   }: SingleSearchOptions): Promise<TmdbSearchMovieResponse> => {
     try {
       const data = await this.get<TmdbSearchMovieResponse>('/search/movie', {
-        params: {
-          query,
-          page,
-          include_adult: includeAdult,
-          language,
-          primary_release_year: year,
-        },
+        query,
+        page: page.toString(),
+        include_adult: includeAdult ? 'true' : 'false',
+        language,
+        primary_release_year: year?.toString() || '',
       });
 
       return data;
@@ -182,13 +183,11 @@ class TheMovieDb extends ExternalAPI {
   }: SingleSearchOptions): Promise<TmdbSearchTvResponse> => {
     try {
       const data = await this.get<TmdbSearchTvResponse>('/search/tv', {
-        params: {
-          query,
-          page,
-          include_adult: includeAdult,
-          language,
-          first_air_date_year: year,
-        },
+        query,
+        page: page.toString(),
+        include_adult: includeAdult ? 'true' : 'false',
+        language,
+        first_air_date_year: year?.toString() || '',
       });
 
       return data;
@@ -211,7 +210,7 @@ class TheMovieDb extends ExternalAPI {
   }): Promise<TmdbPersonDetails> => {
     try {
       const data = await this.get<TmdbPersonDetails>(`/person/${personId}`, {
-        params: { language },
+        language,
       });
 
       return data;
@@ -231,7 +230,7 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbPersonCombinedCredits>(
         `/person/${personId}/combined_credits`,
         {
-          params: { language },
+          language,
         }
       );
 
@@ -254,11 +253,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbMovieDetails>(
         `/movie/${movieId}`,
         {
-          params: {
-            language,
-            append_to_response:
-              'credits,external_ids,videos,keywords,release_dates,watch/providers',
-          },
+          language,
+          append_to_response:
+            'credits,external_ids,videos,keywords,release_dates,watch/providers',
         },
         43200
       );
@@ -280,11 +277,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbTvDetails>(
         `/tv/${tvId}`,
         {
-          params: {
-            language,
-            append_to_response:
-              'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
-          },
+          language,
+          append_to_response:
+            'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
         },
         43200
       );
@@ -308,10 +303,8 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSeasonWithEpisodes>(
         `/tv/${tvId}/season/${seasonNumber}`,
         {
-          params: {
-            language,
-            append_to_response: 'external_ids',
-          },
+          language: language || '',
+          append_to_response: 'external_ids',
         }
       );
 
@@ -334,10 +327,8 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/movie/${movieId}/recommendations`,
         {
-          params: {
-            page,
-            language,
-          },
+          page: page.toString(),
+          language,
         }
       );
 
@@ -360,10 +351,8 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/movie/${movieId}/similar`,
         {
-          params: {
-            page,
-            language,
-          },
+          page: page.toString(),
+          language,
         }
       );
 
@@ -386,10 +375,8 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/keyword/${keywordId}/movies`,
         {
-          params: {
-            page,
-            language,
-          },
+          page: page.toString(),
+          language,
         }
       );
 
@@ -412,10 +399,8 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchTvResponse>(
         `/tv/${tvId}/recommendations`,
         {
-          params: {
-            page,
-            language,
-          },
+          page: page.toString(),
+          language,
         }
       );
 
@@ -438,10 +423,8 @@ class TheMovieDb extends ExternalAPI {
   }): Promise<TmdbSearchTvResponse> {
     try {
       const data = await this.get<TmdbSearchTvResponse>(`/tv/${tvId}/similar`, {
-        params: {
-          page,
-          language,
-        },
+        page: page.toString(),
+        language,
       });
 
       return data;
@@ -482,40 +465,38 @@ class TheMovieDb extends ExternalAPI {
         .split('T')[0];
 
       const data = await this.get<TmdbSearchMovieResponse>('/discover/movie', {
-        params: {
-          sort_by: sortBy,
-          page,
-          include_adult: includeAdult,
-          language,
-          region: this.region,
-          with_original_language:
-            originalLanguage && originalLanguage !== 'all'
-              ? originalLanguage
-              : originalLanguage === 'all'
-              ? undefined
-              : this.originalLanguage,
-          // Set our release date values, but check if one is set and not the other,
-          // so we can force a past date or a future date. TMDB Requires both values if one is set!
-          'primary_release_date.gte':
-            !primaryReleaseDateGte && primaryReleaseDateLte
-              ? defaultPastDate
-              : primaryReleaseDateGte,
-          'primary_release_date.lte':
-            !primaryReleaseDateLte && primaryReleaseDateGte
-              ? defaultFutureDate
-              : primaryReleaseDateLte,
-          with_genres: genre,
-          with_companies: studio,
-          with_keywords: keywords,
-          'with_runtime.gte': withRuntimeGte,
-          '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,
-        },
+        sort_by: sortBy,
+        page: page.toString(),
+        include_adult: includeAdult ? 'true' : 'false',
+        language,
+        region: this.discoverRegion || '',
+        with_original_language:
+          originalLanguage && originalLanguage !== 'all'
+            ? originalLanguage
+            : originalLanguage === 'all'
+            ? ''
+            : this.originalLanguage || '',
+        // Set our release date values, but check if one is set and not the other,
+        // so we can force a past date or a future date. TMDB Requires both values if one is set!
+        'primary_release_date.gte':
+          !primaryReleaseDateGte && primaryReleaseDateLte
+            ? defaultPastDate
+            : primaryReleaseDateGte || '',
+        'primary_release_date.lte':
+          !primaryReleaseDateLte && primaryReleaseDateGte
+            ? defaultFutureDate
+            : primaryReleaseDateLte || '',
+        with_genres: genre || '',
+        with_companies: studio || '',
+        with_keywords: keywords || '',
+        'with_runtime.gte': withRuntimeGte || '',
+        '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 || '',
       });
 
       return data;
@@ -557,43 +538,41 @@ class TheMovieDb extends ExternalAPI {
         .split('T')[0];
 
       const data = await this.get<TmdbSearchTvResponse>('/discover/tv', {
-        params: {
-          sort_by: sortBy,
-          page: page.toString(),
-          language,
-          region: this.region || '',
-          // Set our release date values, but check if one is set and not the other,
-          // so we can force a past date or a future date. TMDB Requires both values if one is set!
-          'first_air_date.gte':
-            !firstAirDateGte && firstAirDateLte
-              ? defaultPastDate
-              : firstAirDateGte || '',
-          'first_air_date.lte':
-            !firstAirDateLte && firstAirDateGte
-              ? defaultFutureDate
-              : firstAirDateLte || '',
-          with_original_language:
-            originalLanguage && originalLanguage !== 'all'
-              ? originalLanguage
-              : originalLanguage === 'all'
-              ? ''
-              : this.originalLanguage || '',
-          include_null_first_air_dates: includeEmptyReleaseDate
-            ? 'true'
-            : 'false',
-          with_genres: genre || '',
-          with_networks: network?.toString() || '',
-          with_keywords: keywords || '',
-          'with_runtime.gte': withRuntimeGte || '',
-          '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 || '',
-          with_status: withStatus || '',
-        },
+        sort_by: sortBy,
+        page: page.toString(),
+        language,
+        region: this.discoverRegion || '',
+        // Set our release date values, but check if one is set and not the other,
+        // so we can force a past date or a future date. TMDB Requires both values if one is set!
+        'first_air_date.gte':
+          !firstAirDateGte && firstAirDateLte
+            ? defaultPastDate
+            : firstAirDateGte || '',
+        'first_air_date.lte':
+          !firstAirDateLte && firstAirDateGte
+            ? defaultFutureDate
+            : firstAirDateLte || '',
+        with_original_language:
+          originalLanguage && originalLanguage !== 'all'
+            ? originalLanguage
+            : originalLanguage === 'all'
+            ? ''
+            : this.originalLanguage || '',
+        include_null_first_air_dates: includeEmptyReleaseDate
+          ? 'true'
+          : 'false',
+        with_genres: genre || '',
+        with_networks: network?.toString() || '',
+        with_keywords: keywords || '',
+        'with_runtime.gte': withRuntimeGte || '',
+        '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 || '',
+        with_status: withStatus || '',
       });
 
       return data;
@@ -613,12 +592,10 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbUpcomingMoviesResponse>(
         '/movie/upcoming',
         {
-          params: {
-            page,
-            language,
-            region: this.region,
-            originalLanguage: this.originalLanguage,
-          },
+          page: page.toString(),
+          language,
+          region: this.discoverRegion || '',
+          originalLanguage: this.originalLanguage || '',
         }
       );
 
@@ -641,11 +618,9 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMultiResponse>(
         `/trending/all/${timeWindow}`,
         {
-          params: {
-            page,
-            language,
-            region: this.region,
-          },
+          page: page.toString(),
+          language,
+          region: this.discoverRegion || '',
         }
       );
 
@@ -666,9 +641,7 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchMovieResponse>(
         `/trending/movie/${timeWindow}`,
         {
-          params: {
-            page,
-          },
+          page: page.toString(),
         }
       );
 
@@ -689,9 +662,7 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbSearchTvResponse>(
         `/trending/tv/${timeWindow}`,
         {
-          params: {
-            page,
-          },
+          page: page.toString(),
         }
       );
 
@@ -720,10 +691,8 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbExternalIdResponse>(
         `/find/${externalId}`,
         {
-          params: {
-            external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
-            language,
-          },
+          external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
+          language,
         }
       );
 
@@ -813,9 +782,7 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbCollection>(
         `/collection/${collectionId}`,
         {
-          params: {
-            language,
-          },
+          language,
         }
       );
 
@@ -888,9 +855,7 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbGenresResult>(
         '/genre/movie/list',
         {
-          params: {
-            language,
-          },
+          language,
         },
         86400 // 24 hours
       );
@@ -902,9 +867,7 @@ class TheMovieDb extends ExternalAPI {
         const englishData = await this.get<TmdbGenresResult>(
           '/genre/movie/list',
           {
-            params: {
-              language: 'en',
-            },
+            language: 'en',
           },
           86400 // 24 hours
         );
@@ -939,9 +902,7 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbGenresResult>(
         '/genre/tv/list',
         {
-          params: {
-            language,
-          },
+          language,
         },
         86400 // 24 hours
       );
@@ -953,9 +914,7 @@ class TheMovieDb extends ExternalAPI {
         const englishData = await this.get<TmdbGenresResult>(
           '/genre/tv/list',
           {
-            params: {
-              language: 'en',
-            },
+            language: 'en',
           },
           86400 // 24 hours
         );
@@ -1010,10 +969,8 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbKeywordSearchResponse>(
         '/search/keyword',
         {
-          params: {
-            query,
-            page,
-          },
+          query,
+          page: page.toString(),
         },
         86400 // 24 hours
       );
@@ -1035,10 +992,8 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<TmdbCompanySearchResponse>(
         '/search/company',
         {
-          params: {
-            query,
-            page,
-          },
+          query,
+          page: page.toString(),
         },
         86400 // 24 hours
       );
@@ -1058,9 +1013,7 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<{ results: TmdbWatchProviderRegion[] }>(
         '/watch/providers/regions',
         {
-          params: {
-            language: language ?? this.originalLanguage,
-          },
+          language: language ? this.originalLanguage || '' : '',
         },
         86400 // 24 hours
       );
@@ -1084,10 +1037,8 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
         '/watch/providers/movie',
         {
-          params: {
-            language: language ?? this.originalLanguage,
-            watch_region: watchRegion,
-          },
+          language: language ? this.originalLanguage || '' : '',
+          watch_region: watchRegion,
         },
         86400 // 24 hours
       );
@@ -1111,10 +1062,8 @@ class TheMovieDb extends ExternalAPI {
       const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
         '/watch/providers/tv',
         {
-          params: {
-            language: language ?? this.originalLanguage,
-            watch_region: watchRegion,
-          },
+          language: language ? this.originalLanguage || '' : '',
+          watch_region: watchRegion,
         },
         86400 // 24 hours
       );

server/constants/error.ts

@@ -4,6 +4,7 @@ export enum ApiErrorCode {
   InvalidAuthToken = 'INVALID_AUTH_TOKEN',
   InvalidEmail = 'INVALID_EMAIL',
   NotAdmin = 'NOT_ADMIN',
+  NoAdminUser = 'NO_ADMIN_USER',
   SyncErrorGroupedFolders = 'SYNC_ERROR_GROUPED_FOLDERS',
   SyncErrorNoLibraries = 'SYNC_ERROR_NO_LIBRARIES',
   Unknown = 'UNKNOWN',

server/datasource.ts

@@ -1,7 +1,43 @@
-import 'reflect-metadata';
+import fs from 'fs';
+import type { TlsOptions } from 'tls';
 import type { DataSourceOptions, EntityTarget, Repository } from 'typeorm';
 import { DataSource } from 'typeorm';
 
+const DB_SSL_PREFIX = 'DB_SSL_';
+
+function boolFromEnv(envVar: string, defaultVal = false) {
+  if (process.env[envVar]) {
+    return process.env[envVar]?.toLowerCase() === 'true';
+  }
+  return defaultVal;
+}
+
+function stringOrReadFileFromEnv(envVar: string): Buffer | string | undefined {
+  if (process.env[envVar]) {
+    return process.env[envVar];
+  }
+  const filePath = process.env[`${envVar}_FILE`];
+  if (filePath) {
+    return fs.readFileSync(filePath);
+  }
+  return undefined;
+}
+
+function buildSslConfig(): TlsOptions | undefined {
+  if (process.env.DB_USE_SSL?.toLowerCase() !== 'true') {
+    return undefined;
+  }
+  return {
+    rejectUnauthorized: boolFromEnv(
+      `${DB_SSL_PREFIX}REJECT_UNAUTHORIZED`,
+      true
+    ),
+    ca: stringOrReadFileFromEnv(`${DB_SSL_PREFIX}CA`),
+    key: stringOrReadFileFromEnv(`${DB_SSL_PREFIX}KEY`),
+    cert: stringOrReadFileFromEnv(`${DB_SSL_PREFIX}CERT`),
+  };
+}
+
 const devConfig: DataSourceOptions = {
   type: 'sqlite',
   database: process.env.CONFIG_DIRECTORY
@@ -9,10 +45,10 @@ const devConfig: DataSourceOptions = {
     : 'config/db/db.sqlite3',
   synchronize: true,
   migrationsRun: false,
-  logging: false,
+  logging: boolFromEnv('DB_LOG_QUERIES'),
   enableWAL: true,
   entities: ['server/entity/**/*.ts'],
-  migrations: ['server/migration/**/*.ts'],
+  migrations: ['server/migration/sqlite/**/*.ts'],
   subscribers: ['server/subscriber/**/*.ts'],
 };
 
@@ -23,16 +59,56 @@ const prodConfig: DataSourceOptions = {
     : 'config/db/db.sqlite3',
   synchronize: false,
   migrationsRun: false,
-  logging: false,
+  logging: boolFromEnv('DB_LOG_QUERIES'),
   enableWAL: true,
   entities: ['dist/entity/**/*.js'],
-  migrations: ['dist/migration/**/*.js'],
+  migrations: ['dist/migration/sqlite/**/*.js'],
   subscribers: ['dist/subscriber/**/*.js'],
 };
 
-const dataSource = new DataSource(
-  process.env.NODE_ENV !== 'production' ? devConfig : prodConfig
-);
+const postgresDevConfig: DataSourceOptions = {
+  type: 'postgres',
+  host: process.env.DB_HOST,
+  port: parseInt(process.env.DB_PORT ?? '5432'),
+  username: process.env.DB_USER,
+  password: process.env.DB_PASS,
+  database: process.env.DB_NAME ?? 'jellyseerr',
+  ssl: buildSslConfig(),
+  synchronize: false,
+  migrationsRun: true,
+  logging: boolFromEnv('DB_LOG_QUERIES'),
+  entities: ['server/entity/**/*.ts'],
+  migrations: ['server/migration/postgres/**/*.ts'],
+  subscribers: ['server/subscriber/**/*.ts'],
+};
+
+const postgresProdConfig: DataSourceOptions = {
+  type: 'postgres',
+  host: process.env.DB_HOST,
+  port: parseInt(process.env.DB_PORT ?? '5432'),
+  username: process.env.DB_USER,
+  password: process.env.DB_PASS,
+  database: process.env.DB_NAME ?? 'jellyseerr',
+  ssl: buildSslConfig(),
+  synchronize: false,
+  migrationsRun: false,
+  logging: boolFromEnv('DB_LOG_QUERIES'),
+  entities: ['dist/entity/**/*.js'],
+  migrations: ['dist/migration/postgres/**/*.js'],
+  subscribers: ['dist/subscriber/**/*.js'],
+};
+
+export const isPgsql = process.env.DB_TYPE === 'postgres';
+
+function getDataSource(): DataSourceOptions {
+  if (process.env.NODE_ENV === 'production') {
+    return isPgsql ? postgresProdConfig : prodConfig;
+  } else {
+    return isPgsql ? postgresDevConfig : devConfig;
+  }
+}
+
+const dataSource = new DataSource(getDataSource());
 
 export const getRepository = <Entity extends object>(
   target: EntityTarget<Entity>

server/entity/Blacklist.ts

@@ -80,12 +80,12 @@ export class Blacklist implements BlacklistItem {
         status: MediaStatus.BLACKLISTED,
         status4k: MediaStatus.BLACKLISTED,
         mediaType: blacklistRequest.mediaType,
-        blacklist: blacklist,
+        blacklist: Promise.resolve(blacklist),
       });
 
       await mediaRepository.save(media);
     } else {
-      media.blacklist = blacklist;
+      media.blacklist = Promise.resolve(blacklist);
       media.status = MediaStatus.BLACKLISTED;
       media.status4k = MediaStatus.BLACKLISTED;
 

server/entity/Media.ts

@@ -10,6 +10,7 @@ import type { DownloadingItem } from '@server/lib/downloadtracker';
 import downloadTracker from '@server/lib/downloadtracker';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
 import { getHostname } from '@server/utils/getHostname';
 import {
   AfterLoad,
@@ -42,6 +43,10 @@ class Media {
         finalIds = tmdbIds;
       }
 
+      if (finalIds.length === 0) {
+        return [];
+      }
+
       const media = await mediaRepository
         .createQueryBuilder('media')
         .leftJoinAndSelect(
@@ -118,10 +123,8 @@ class Media {
   @OneToMany(() => Issue, (issue) => issue.media, { cascade: true })
   public issues: Issue[];
 
-  @OneToOne(() => Blacklist, (blacklist) => blacklist.media, {
-    eager: true,
-  })
-  public blacklist: Blacklist;
+  @OneToOne(() => Blacklist, (blacklist) => blacklist.media)
+  public blacklist: Promise<Blacklist>;
 
   @CreateDateColumn()
   public createdAt: Date;
@@ -129,10 +132,23 @@ class Media {
   @UpdateDateColumn()
   public updatedAt: Date;
 
-  @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
+  /**
+   * The `lastSeasonChange` column stores the date and time when the media was added to the library.
+   * It needs to be database-aware because SQLite supports `datetime` while PostgreSQL supports `timestamp with timezone (timestampz)`.
+   */
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
   public lastSeasonChange: Date;
 
-  @Column({ type: 'datetime', nullable: true })
+  /**
+   * The `mediaAddedAt` column stores the date and time when the media was added to the library.
+   * It needs to be database-aware because SQLite supports `datetime` while PostgreSQL supports `timestamp with timezone (timestampz)`.
+   * This column is nullable because it can be null when the media is not yet synced to the library.
+   */
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    nullable: true,
+  })
   public mediaAddedAt: Date;
 
   @Column({ nullable: true, type: 'int' })

server/entity/MediaRequest.ts

@@ -7,12 +7,14 @@ import type {
 import SonarrAPI from '@server/api/servarr/sonarr';
 import TheMovieDb from '@server/api/themoviedb';
 import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
+import type { TmdbKeyword } from '@server/api/themoviedb/interfaces';
 import {
   MediaRequestStatus,
   MediaStatus,
   MediaType,
 } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
+import OverrideRule from '@server/entity/OverrideRule';
 import type { MediaRequestBody } from '@server/interfaces/api/requestInterfaces';
 import notificationManager, { Notification } from '@server/lib/notifications';
 import { Permission } from '@server/lib/permissions';
@@ -57,6 +59,7 @@ export class MediaRequest {
     const mediaRepository = getRepository(Media);
     const requestRepository = getRepository(MediaRequest);
     const userRepository = getRepository(User);
+    const settings = getSettings();
 
     let requestUser = user;
 
@@ -205,6 +208,134 @@ export class MediaRequest {
       }
     }
 
+    // Apply overrides if the user is not an admin or has the "advanced request" permission
+    const useOverrides = !user.hasPermission([Permission.MANAGE_REQUESTS], {
+      type: 'or',
+    });
+
+    let rootFolder = requestBody.rootFolder;
+    let profileId = requestBody.profileId;
+    let tags = requestBody.tags;
+
+    if (useOverrides) {
+      const defaultRadarrId = requestBody.is4k
+        ? settings.radarr.findIndex((r) => r.is4k && r.isDefault)
+        : settings.radarr.findIndex((r) => !r.is4k && r.isDefault);
+      const defaultSonarrId = requestBody.is4k
+        ? settings.sonarr.findIndex((s) => s.is4k && s.isDefault)
+        : settings.sonarr.findIndex((s) => !s.is4k && s.isDefault);
+
+      const overrideRuleRepository = getRepository(OverrideRule);
+      const overrideRules = await overrideRuleRepository.find({
+        where:
+          requestBody.mediaType === MediaType.MOVIE
+            ? { radarrServiceId: defaultRadarrId }
+            : { sonarrServiceId: defaultSonarrId },
+      });
+
+      const appliedOverrideRules = overrideRules.filter((rule) => {
+        const hasAnimeKeyword =
+          'results' in tmdbMedia.keywords &&
+          tmdbMedia.keywords.results.some(
+            (keyword: TmdbKeyword) => keyword.id === ANIME_KEYWORD_ID
+          );
+
+        // Skip override rules if the media is an anime TV show as anime TV
+        // is handled by default and override rules do not explicitly include
+        // the anime keyword
+        if (
+          requestBody.mediaType === MediaType.TV &&
+          hasAnimeKeyword &&
+          (!rule.keywords ||
+            !rule.keywords.split(',').map(Number).includes(ANIME_KEYWORD_ID))
+        ) {
+          return false;
+        }
+
+        if (
+          rule.users &&
+          !rule.users
+            .split(',')
+            .some((userId) => Number(userId) === requestUser.id)
+        ) {
+          return false;
+        }
+        if (
+          rule.genre &&
+          !rule.genre
+            .split(',')
+            .some((genreId) =>
+              tmdbMedia.genres
+                .map((genre) => genre.id)
+                .includes(Number(genreId))
+            )
+        ) {
+          return false;
+        }
+        if (
+          rule.language &&
+          !rule.language
+            .split('|')
+            .some((languageId) => languageId === tmdbMedia.original_language)
+        ) {
+          return false;
+        }
+        if (
+          rule.keywords &&
+          !rule.keywords.split(',').some((keywordId) => {
+            let keywordList: TmdbKeyword[] = [];
+
+            if ('keywords' in tmdbMedia.keywords) {
+              keywordList = tmdbMedia.keywords.keywords;
+            } else if ('results' in tmdbMedia.keywords) {
+              keywordList = tmdbMedia.keywords.results;
+            }
+
+            return keywordList
+              .map((keyword: TmdbKeyword) => keyword.id)
+              .includes(Number(keywordId));
+          })
+        ) {
+          return false;
+        }
+        return true;
+      });
+
+      // hacky way to prioritize rules
+      // TODO: make this better
+      const prioritizedRule = appliedOverrideRules.sort((a, b) => {
+        const keys: (keyof OverrideRule)[] = ['genre', 'language', 'keywords'];
+
+        const aSpecificity = keys.filter((key) => a[key] !== null).length;
+        const bSpecificity = keys.filter((key) => b[key] !== null).length;
+
+        // Take the rule with the most specific condition first
+        return bSpecificity - aSpecificity;
+      })[0];
+
+      if (prioritizedRule) {
+        if (prioritizedRule.rootFolder) {
+          rootFolder = prioritizedRule.rootFolder;
+        }
+        if (prioritizedRule.profileId) {
+          profileId = prioritizedRule.profileId;
+        }
+        if (prioritizedRule.tags) {
+          tags = [
+            ...new Set([
+              ...(tags || []),
+              ...prioritizedRule.tags.split(',').map((tag) => Number(tag)),
+            ]),
+          ];
+        }
+
+        logger.debug('Override rule applied.', {
+          label: 'Media Request',
+          overrides: prioritizedRule,
+        });
+      }
+    }
+
     if (requestBody.mediaType === MediaType.MOVIE) {
       await mediaRepository.save(media);
 
@@ -243,9 +374,9 @@ export class MediaRequest {
           : undefined,
         is4k: requestBody.is4k,
         serverId: requestBody.serverId,
-        profileId: requestBody.profileId,
-        rootFolder: requestBody.rootFolder,
-        tags: requestBody.tags,
+        profileId: profileId,
+        rootFolder: rootFolder,
+        tags: tags,
         isAutoRequest: options.isAutoRequest ?? false,
       });
 
@@ -255,12 +386,14 @@ export class MediaRequest {
       const tmdbMediaShow = tmdbMedia as Awaited<
         ReturnType<typeof tmdb.getTvShow>
       >;
-      const requestedSeasons =
+      let requestedSeasons =
         requestBody.seasons === 'all'
-          ? tmdbMediaShow.seasons
-              .map((season) => season.season_number)
-              .filter((sn) => sn > 0)
+          ? tmdbMediaShow.seasons.map((season) => season.season_number)
           : (requestBody.seasons as number[]);
+      if (!settings.main.enableSpecialEpisodes) {
+        requestedSeasons = requestedSeasons.filter((sn) => sn > 0);
+      }
+
       let existingSeasons: number[] = [];
 
       // We need to check existing requests on this title to make sure we don't double up on seasons that were
@@ -346,10 +479,10 @@ export class MediaRequest {
           : undefined,
         is4k: requestBody.is4k,
         serverId: requestBody.serverId,
-        profileId: requestBody.profileId,
-        rootFolder: requestBody.rootFolder,
+        profileId: profileId,
+        rootFolder: rootFolder,
         languageProfileId: requestBody.languageProfileId,
-        tags: requestBody.tags,
+        tags: tags,
         seasons: finalSeasons.map(
           (sn) =>
             new SeasonRequest({
@@ -586,10 +719,15 @@ export class MediaRequest {
       // Do not update the status if the item is already partially available or available
       media[this.is4k ? 'status4k' : 'status'] !== MediaStatus.AVAILABLE &&
       media[this.is4k ? 'status4k' : 'status'] !==
-        MediaStatus.PARTIALLY_AVAILABLE
+        MediaStatus.PARTIALLY_AVAILABLE &&
+      media[this.is4k ? 'status4k' : 'status'] !== MediaStatus.PROCESSING
     ) {
-      media[this.is4k ? 'status4k' : 'status'] = MediaStatus.PROCESSING;
-      mediaRepository.save(media);
+      const statusField = this.is4k ? 'status4k' : 'status';
+
+      await mediaRepository.update(
+        { id: this.media.id },
+        { [statusField]: MediaStatus.PROCESSING }
+      );
     }
 
     if (
@@ -859,7 +997,7 @@ export class MediaRequest {
             const requestRepository = getRepository(MediaRequest);
 
             this.status = MediaRequestStatus.FAILED;
-            requestRepository.save(this);
+            await requestRepository.save(this);
 
             logger.warn(
               'Something went wrong sending movie request to Radarr, marking status as FAILED',
@@ -872,6 +1010,14 @@ export class MediaRequest {
             );
 
             this.sendNotification(media, Notification.MEDIA_FAILED);
+          })
+          .finally(() => {
+            radarr.clearCache({
+              tmdbId: movie.id,
+              externalId: this.is4k
+                ? media.externalServiceId4k
+                : media.externalServiceId,
+            });
           });
         logger.info('Sent request to Radarr', {
           label: 'Media Request',
@@ -1129,18 +1275,23 @@ export class MediaRequest {
               throw new Error('Media data not found');
             }
 
-            media[this.is4k ? 'externalServiceId4k' : 'externalServiceId'] =
-              sonarrSeries.id;
-            media[this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] =
-              sonarrSeries.titleSlug;
-            media[this.is4k ? 'serviceId4k' : 'serviceId'] = sonarrSettings?.id;
-            await mediaRepository.save(media);
+            const updateFields = {
+              [this.is4k ? 'externalServiceId4k' : 'externalServiceId']:
+                sonarrSeries.id,
+              [this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']:
+                sonarrSeries.titleSlug,
+              [this.is4k ? 'serviceId4k' : 'serviceId']: sonarrSettings?.id,
+            };
+
+            await mediaRepository.update({ id: this.media.id }, updateFields);
           })
           .catch(async () => {
             const requestRepository = getRepository(MediaRequest);
 
-            this.status = MediaRequestStatus.FAILED;
-            requestRepository.save(this);
+            await requestRepository.update(
+              { id: this.id },
+              { status: MediaRequestStatus.FAILED }
+            );
 
             logger.warn(
               'Something went wrong sending series request to Sonarr, marking status as FAILED',
@@ -1153,6 +1304,15 @@ export class MediaRequest {
             );
 
             this.sendNotification(media, Notification.MEDIA_FAILED);
+          })
+          .finally(() => {
+            sonarr.clearCache({
+              tvdbId,
+              externalId: this.is4k
+                ? media.externalServiceId4k
+                : media.externalServiceId,
+              title: series.name,
+            });
           });
         logger.info('Sent request to Sonarr', {
           label: 'Media Request',

server/entity/OverrideRule.ts

@@ -0,0 +1,52 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm';
+
+@Entity()
+class OverrideRule {
+  @PrimaryGeneratedColumn()
+  public id: number;
+
+  @Column({ type: 'int', nullable: true })
+  public radarrServiceId?: number;
+
+  @Column({ type: 'int', nullable: true })
+  public sonarrServiceId?: number;
+
+  @Column({ nullable: true })
+  public users?: string;
+
+  @Column({ nullable: true })
+  public genre?: string;
+
+  @Column({ nullable: true })
+  public language?: string;
+
+  @Column({ nullable: true })
+  public keywords?: string;
+
+  @Column({ type: 'int', nullable: true })
+  public profileId?: number;
+
+  @Column({ nullable: true })
+  public rootFolder?: string;
+
+  @Column({ nullable: true })
+  public tags?: string;
+
+  @CreateDateColumn()
+  public createdAt: Date;
+
+  @UpdateDateColumn()
+  public updatedAt: Date;
+
+  constructor(init?: Partial<OverrideRule>) {
+    Object.assign(this, init);
+  }
+}
+
+export default OverrideRule;

server/entity/Season.ts

@@ -23,7 +23,9 @@ class Season {
   @Column({ type: 'int', default: MediaStatus.UNKNOWN })
   public status4k: MediaStatus;
 
-  @ManyToOne(() => Media, (media) => media.seasons, { onDelete: 'CASCADE' })
+  @ManyToOne(() => Media, (media) => media.seasons, {
+    onDelete: 'CASCADE',
+  })
   public media: Promise<Media>;
 
   @CreateDateColumn()

server/entity/UserSettings.ts

@@ -31,7 +31,10 @@ export class UserSettings {
   public locale?: string;
 
   @Column({ nullable: true })
-  public region?: string;
+  public discoverRegion?: string;
+
+  @Column({ nullable: true })
+  public streamingRegion?: string;
 
   @Column({ nullable: true })
   public originalLanguage?: string;
@@ -57,6 +60,9 @@ export class UserSettings {
   @Column({ nullable: true })
   public telegramChatId?: string;
 
+  @Column({ nullable: true })
+  public telegramMessageThreadId?: string;
+
   @Column({ nullable: true })
   public telegramSendSilently?: boolean;
 

server/index.ts

@@ -1,5 +1,5 @@
 import PlexAPI from '@server/api/plexapi';
-import dataSource, { getRepository } from '@server/datasource';
+import dataSource, { getRepository, isPgsql } from '@server/datasource';
 import DiscoverSlider from '@server/entity/DiscoverSlider';
 import { Session } from '@server/entity/Session';
 import { User } from '@server/entity/User';
@@ -35,10 +35,17 @@ import * as OpenApiValidator from 'express-openapi-validator';
 import type { Store } from 'express-session';
 import session from 'express-session';
 import next from 'next';
+import dns from 'node:dns';
+import net from 'node:net';
 import path from 'path';
 import swaggerUi from 'swagger-ui-express';
 import YAML from 'yamljs';
 
+if (process.env.forceIpv4First === 'true') {
+  dns.setDefaultResultOrder('ipv4first');
+  net.setDefaultAutoSelectFamily(false);
+}
+
 const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');
 
 logger.info(`Starting Overseerr version ${getAppVersion()}`);
@@ -59,9 +66,13 @@ app
 
     // Run migrations in production
     if (process.env.NODE_ENV === 'production') {
-      await dbConnection.query('PRAGMA foreign_keys=OFF');
-      await dbConnection.runMigrations();
-      await dbConnection.query('PRAGMA foreign_keys=ON');
+      if (isPgsql) {
+        await dbConnection.runMigrations();
+      } else {
+        await dbConnection.query('PRAGMA foreign_keys=OFF');
+        await dbConnection.runMigrations();
+        await dbConnection.query('PRAGMA foreign_keys=ON');
+      }
     }
 
     // Load Settings

server/interfaces/api/discoverInterfaces.ts

@@ -5,6 +5,7 @@ export interface GenreSliderItem {
 }
 
 export interface WatchlistItem {
+  id: number;
   ratingKey: string;
   tmdbId: number;
   mediaType: 'movie' | 'tv';

server/interfaces/api/overrideRuleInterfaces.ts

@@ -0,0 +1,3 @@
+import type OverrideRule from '@server/entity/OverrideRule';
+
+export type OverrideRuleResultsResponse = OverrideRule[];

server/interfaces/api/settingsInterfaces.ts

@@ -32,10 +32,12 @@ export interface PublicSettingsResponse {
   localLogin: boolean;
   movie4kEnabled: boolean;
   series4kEnabled: boolean;
-  region: string;
+  discoverRegion: string;
+  streamingRegion: string;
   originalLanguage: string;
   mediaServerType: number;
   partialRequestsEnabled: boolean;
+  enableSpecialEpisodes: boolean;
   cacheImages: boolean;
   vapidPublic: string;
   enablePushRegistration: boolean;

server/interfaces/api/userSettingsInterfaces.ts

@@ -5,7 +5,8 @@ export interface UserSettingsGeneralResponse {
   email?: string;
   discordId?: string;
   locale?: string;
-  region?: string;
+  discoverRegion?: string;
+  streamingRegion?: string;
   originalLanguage?: string;
   movieQuotaLimit?: number;
   movieQuotaDays?: number;
@@ -33,6 +34,7 @@ export interface UserSettingsNotificationsResponse {
   telegramEnabled?: boolean;
   telegramBotUsername?: string;
   telegramChatId?: string;
+  telegramMessageThreadId?: string;
   telegramSendSilently?: boolean;
   webPushEnabled?: boolean;
   notificationTypes: Partial<NotificationAgentTypes>;

server/job/schedule.ts

@@ -2,6 +2,7 @@ import { MediaServerType } from '@server/constants/server';
 import availabilitySync from '@server/lib/availabilitySync';
 import downloadTracker from '@server/lib/downloadtracker';
 import ImageProxy from '@server/lib/imageproxy';
+import refreshToken from '@server/lib/refreshToken';
 import {
   jellyfinFullScanner,
   jellyfinRecentScanner,
@@ -13,7 +14,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 {
@@ -113,30 +113,20 @@ export const startJobs = (): void => {
   }
 
   // Watchlist Sync
-  const watchlistSyncJob: ScheduledJob = {
+  scheduledJobs.push({
     id: 'plex-watchlist-sync',
     name: 'Plex Watchlist Sync',
     type: 'process',
-    interval: 'fixed',
+    interval: 'seconds',
     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',
@@ -233,5 +223,19 @@ export const startJobs = (): void => {
     }),
   });
 
+  scheduledJobs.push({
+    id: 'plex-refresh-token',
+    name: 'Plex Refresh Token',
+    type: 'process',
+    interval: 'fixed',
+    cronSchedule: jobs['plex-refresh-token'].schedule,
+    job: schedule.scheduleJob(jobs['plex-refresh-token'].schedule, () => {
+      logger.info('Starting scheduled job: Plex Refresh Token', {
+        label: 'Jobs',
+      });
+      refreshToken.run();
+    }),
+  });
+
   logger.info('Scheduled jobs loaded', { label: 'Jobs' });
 };

server/lib/cache.ts

@@ -8,7 +8,8 @@ export type AvailableCacheIds =
   | 'imdb'
   | 'github'
   | 'plexguid'
-  | 'plextv';
+  | 'plextv'
+  | 'plexwatchlist';
 
 const DEFAULT_TTL = 300;
 const DEFAULT_CHECK_PERIOD = 120;
@@ -68,6 +69,7 @@ class CacheManager {
       stdTtl: 86400 * 7, // 1 week cache
       checkPeriod: 60,
     }),
+    plexwatchlist: new Cache('plexwatchlist', 'Plex Watchlist'),
   };
 
   public getCache(id: AvailableCacheIds): Cache {

server/lib/downloadtracker.ts

@@ -106,7 +106,7 @@ class DownloadTracker {
                 { label: 'Download Tracker' }
               );
             }
-          } catch (e) {
+          } catch {
             logger.error(
               `Unable to get queue from Radarr server: ${server.name}`,
               {

server/lib/imageproxy.ts

@@ -1,6 +1,6 @@
 import logger from '@server/logger';
-import axios from 'axios';
-import rateLimit, { type rateLimitOptions } from 'axios-rate-limit';
+import type { RateLimitOptions } from '@server/utils/rateLimit';
+import rateLimit from '@server/utils/rateLimit';
 import { createHash } from 'crypto';
 import { promises } from 'fs';
 import mime from 'mime/lite';
@@ -131,29 +131,33 @@ class ImageProxy {
     return 0;
   }
 
-  private axios;
+  private fetch: typeof fetch;
   private cacheVersion;
   private key;
+  private baseUrl;
+  private headers: HeadersInit | null = null;
 
   constructor(
     key: string,
     baseUrl: string,
     options: {
       cacheVersion?: number;
-      rateLimitOptions?: rateLimitOptions;
-      headers?: Record<string, unknown>;
+      rateLimitOptions?: RateLimitOptions;
+      headers?: HeadersInit;
     } = {}
   ) {
     this.cacheVersion = options.cacheVersion ?? 1;
+    this.baseUrl = baseUrl;
     this.key = key;
-    this.axios = axios.create({
-      baseURL: baseUrl,
-      headers: options.headers,
-    });
 
     if (options.rateLimitOptions) {
-      this.axios = rateLimit(this.axios, options.rateLimitOptions);
+      this.fetch = rateLimit(fetch, {
+        ...options.rateLimitOptions,
+      });
+    } else {
+      this.fetch = fetch;
     }
+    this.headers = options.headers || null;
   }
 
   public async getImage(
@@ -245,23 +249,34 @@ class ImageProxy {
   ): Promise<ImageResponse | null> {
     try {
       const directory = join(this.getCacheDirectory(), cacheKey);
-      const response = await this.axios.get(path, {
-        responseType: 'arraybuffer',
+      const href =
+        this.baseUrl +
+        (this.baseUrl.length > 0
+          ? this.baseUrl.endsWith('/')
+            ? ''
+            : '/'
+          : '') +
+        (path.startsWith('/') ? path.slice(1) : path);
+      const response = await this.fetch(href, {
+        headers: this.headers || undefined,
       });
-
-      const buffer = Buffer.from(response.data, 'binary');
+      if (!response.ok) {
+        return null;
+      }
+      const arrayBuffer = await response.arrayBuffer();
+      const buffer = Buffer.from(arrayBuffer);
 
       const extension = mime.getExtension(
-        response.headers['Content-Type']?.toString() ?? ''
+        response.headers.get('content-type') ?? ''
       );
 
       let maxAge = Number(
-        (response.headers['Cache-Control']?.toString() ?? '0').split('=')[1]
+        (response.headers.get('cache-control') ?? '0').split('=')[1]
       );
 
       if (!maxAge) maxAge = 86400;
       const expireAt = Date.now() + maxAge * 1000;
-      const etag = (response.headers.etag ?? '').replace(/"/g, '');
+      const etag = (response.headers.get('etag') ?? '').replace(/"/g, '');
 
       await this.writeToCacheDir(
         directory,

server/lib/notifications/agents/discord.ts

@@ -4,7 +4,6 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentDiscord } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -292,14 +291,27 @@ class DiscordAgent
         }
       }
 
-      await axios.post(settings.options.webhookUrl, {
-        username: settings.options.botUsername
-          ? settings.options.botUsername
-          : getSettings().main.applicationTitle,
-        avatar_url: settings.options.botAvatarUrl,
-        embeds: [this.buildEmbed(type, payload)],
-        content: userMentions.join(' '),
-      } as DiscordWebhookPayload);
+      if (settings.options.webhookRoleId) {
+        userMentions.push(`<@&${settings.options.webhookRoleId}>`);
+      }
+
+      const response = await fetch(settings.options.webhookUrl, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          username: settings.options.botUsername
+            ? settings.options.botUsername
+            : getSettings().main.applicationTitle,
+          avatar_url: settings.options.botAvatarUrl,
+          embeds: [this.buildEmbed(type, payload)],
+          content: userMentions.join(' '),
+        } as DiscordWebhookPayload),
+      });
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }
 
       return true;
     } catch (e) {

server/lib/notifications/agents/gotify.ts

@@ -2,7 +2,6 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
 import type { NotificationAgentGotify } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -133,7 +132,16 @@ class GotifyAgent
       const endpoint = `${settings.options.url}/message?token=${settings.options.token}`;
       const notificationPayload = this.getNotificationPayload(type, payload);
 
-      await axios.post(endpoint, notificationPayload);
+      const response = await fetch(endpoint, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(notificationPayload),
+      });
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }
 
       return true;
     } catch (e) {

server/lib/notifications/agents/lunasea.ts

@@ -3,7 +3,6 @@ import { MediaStatus } from '@server/constants/media';
 import type { NotificationAgentLunaSea } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -101,19 +100,23 @@ class LunaSeaAgent
     });
 
     try {
-      await axios.post(
-        settings.options.webhookUrl,
-        this.buildPayload(type, payload),
-        settings.options.profileName
+      const response = await fetch(settings.options.webhookUrl, {
+        method: 'POST',
+        headers: settings.options.profileName
           ? {
-              headers: {
-                Authorization: `Basic ${Buffer.from(
-                  `${settings.options.profileName}:`
-                ).toString('base64')}`,
-              },
+              'Content-Type': 'application/json',
             }
-          : undefined
-      );
+          : {
+              'Content-Type': 'application/json',
+              Authorization: `Basic ${Buffer.from(
+                `${settings.options.profileName}:`
+              ).toString('base64')}`,
+            },
+        body: JSON.stringify(this.buildPayload(type, payload)),
+      });
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }
 
       return true;
     } catch (e) {

server/lib/notifications/agents/pushbullet.ts

@@ -5,7 +5,6 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentPushbullet } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -123,15 +122,20 @@ class PushbulletAgent
       });
 
       try {
-        await axios.post(
-          endpoint,
-          { ...notificationPayload, channel_tag: settings.options.channelTag },
-          {
-            headers: {
-              'Access-Token': settings.options.accessToken,
-            },
-          }
-        );
+        const response = await fetch(endpoint, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'Access-Token': settings.options.accessToken,
+          },
+          body: JSON.stringify({
+            ...notificationPayload,
+            channel_tag: settings.options.channelTag,
+          }),
+        });
+        if (!response.ok) {
+          throw new Error(response.statusText, { cause: response });
+        }
       } catch (e) {
         let errorData;
         try {
@@ -170,11 +174,17 @@ class PushbulletAgent
         });
 
         try {
-          await axios.post(endpoint, notificationPayload, {
+          const response = await fetch(endpoint, {
+            method: 'POST',
             headers: {
+              'Content-Type': 'application/json',
               'Access-Token': payload.notifyUser.settings.pushbulletAccessToken,
             },
+            body: JSON.stringify(notificationPayload),
           });
+          if (!response.ok) {
+            throw new Error(response.statusText, { cause: response });
+          }
         } catch (e) {
           let errorData;
           try {
@@ -225,11 +235,17 @@ class PushbulletAgent
               });
 
               try {
-                await axios.post(endpoint, notificationPayload, {
+                const response = await fetch(endpoint, {
+                  method: 'POST',
                   headers: {
+                    'Content-Type': 'application/json',
                     'Access-Token': user.settings.pushbulletAccessToken,
                   },
+                  body: JSON.stringify(notificationPayload),
                 });
+                if (!response.ok) {
+                  throw new Error(response.statusText, { cause: response });
+                }
               } catch (e) {
                 let errorData;
                 try {

server/lib/notifications/agents/pushover.ts

@@ -5,7 +5,6 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentPushover } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -52,12 +51,15 @@ class PushoverAgent
     imageUrl: string
   ): Promise<Partial<PushoverImagePayload>> {
     try {
-      const response = await axios.get(imageUrl, {
-        responseType: 'arraybuffer',
-      });
-      const base64 = Buffer.from(response.data, 'binary').toString('base64');
+      const response = await fetch(imageUrl);
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }
+      const arrayBuffer = await response.arrayBuffer();
+      const base64 = Buffer.from(arrayBuffer).toString('base64');
       const contentType = (
-        response.headers['Content-Type'] || response.headers['content-type']
+        response.headers.get('Content-Type') ||
+        response.headers.get('content-type')
       )?.toString();
 
       return {
@@ -208,12 +210,21 @@ class PushoverAgent
       });
 
       try {
-        await axios.post(endpoint, {
-          ...notificationPayload,
-          token: settings.options.accessToken,
-          user: settings.options.userToken,
-          sound: settings.options.sound,
-        } as PushoverPayload);
+        const response = await fetch(endpoint, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({
+            ...notificationPayload,
+            token: settings.options.accessToken,
+            user: settings.options.userToken,
+            sound: settings.options.sound,
+          } as PushoverPayload),
+        });
+        if (!response.ok) {
+          throw new Error(response.statusText, { cause: response });
+        }
       } catch (e) {
         let errorData;
         try {
@@ -255,12 +266,21 @@ class PushoverAgent
         });
 
         try {
-          await axios.post(endpoint, {
-            ...notificationPayload,
-            token: payload.notifyUser.settings.pushoverApplicationToken,
-            user: payload.notifyUser.settings.pushoverUserKey,
-            sound: payload.notifyUser.settings.pushoverSound,
-          } as PushoverPayload);
+          const response = await fetch(endpoint, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+              ...notificationPayload,
+              token: payload.notifyUser.settings.pushoverApplicationToken,
+              user: payload.notifyUser.settings.pushoverUserKey,
+              sound: payload.notifyUser.settings.pushoverSound,
+            } as PushoverPayload),
+          });
+          if (!response.ok) {
+            throw new Error(response.statusText, { cause: response });
+          }
         } catch (e) {
           let errorData;
           try {
@@ -312,11 +332,20 @@ class PushoverAgent
               });
 
               try {
-                await axios.post(endpoint, {
-                  ...notificationPayload,
-                  token: user.settings.pushoverApplicationToken,
-                  user: user.settings.pushoverUserKey,
-                } as PushoverPayload);
+                const response = await fetch(endpoint, {
+                  method: 'POST',
+                  headers: {
+                    'Content-Type': 'application/json',
+                  },
+                  body: JSON.stringify({
+                    ...notificationPayload,
+                    token: user.settings.pushoverApplicationToken,
+                    user: user.settings.pushoverUserKey,
+                  } as PushoverPayload),
+                });
+                if (!response.ok) {
+                  throw new Error(response.statusText, { cause: response });
+                }
               } catch (e) {
                 let errorData;
                 try {

server/lib/notifications/agents/slack.ts

@@ -2,7 +2,6 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
 import type { NotificationAgentSlack } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -238,10 +237,16 @@ class SlackAgent
       subject: payload.subject,
     });
     try {
-      await axios.post(
-        settings.options.webhookUrl,
-        this.buildEmbed(type, payload)
-      );
+      const response = await fetch(settings.options.webhookUrl, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(this.buildEmbed(type, payload)),
+      });
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }
 
       return true;
     } catch (e) {

server/lib/notifications/agents/telegram.ts

@@ -5,7 +5,6 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentTelegram } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import {
   hasNotificationType,
   Notification,
@@ -18,6 +17,7 @@ interface TelegramMessagePayload {
   text: string;
   parse_mode: string;
   chat_id: string;
+  message_thread_id: string;
   disable_notification: boolean;
 }
 
@@ -26,6 +26,7 @@ interface TelegramPhotoPayload {
   caption: string;
   parse_mode: string;
   chat_id: string;
+  message_thread_id: string;
   disable_notification: boolean;
 }
 
@@ -175,11 +176,21 @@ class TelegramAgent
       });
 
       try {
-        await axios.post(endpoint, {
-          ...notificationPayload,
-          chat_id: settings.options.chatId,
-          disable_notification: !!settings.options.sendSilently,
-        } as TelegramMessagePayload | TelegramPhotoPayload);
+        const response = await fetch(endpoint, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({
+            ...notificationPayload,
+            chat_id: settings.options.chatId,
+            message_thread_id: settings.options.messageThreadId,
+            disable_notification: !!settings.options.sendSilently,
+          } as TelegramMessagePayload | TelegramPhotoPayload),
+        });
+        if (!response.ok) {
+          throw new Error(response.statusText, { cause: response });
+        }
       } catch (e) {
         let errorData;
         try {
@@ -217,12 +228,23 @@ class TelegramAgent
         });
 
         try {
-          await axios.post(endpoint, {
-            ...notificationPayload,
-            chat_id: payload.notifyUser.settings.telegramChatId,
-            disable_notification:
-              !!payload.notifyUser.settings.telegramSendSilently,
-          } as TelegramMessagePayload | TelegramPhotoPayload);
+          const response = await fetch(endpoint, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+              ...notificationPayload,
+              chat_id: payload.notifyUser.settings.telegramChatId,
+              message_thread_id:
+                payload.notifyUser.settings.telegramMessageThreadId,
+              disable_notification:
+                !!payload.notifyUser.settings.telegramSendSilently,
+            } as TelegramMessagePayload | TelegramPhotoPayload),
+          });
+          if (!response.ok) {
+            throw new Error(response.statusText, { cause: response });
+          }
         } catch (e) {
           let errorData;
           try {
@@ -271,11 +293,21 @@ class TelegramAgent
               });
 
               try {
-                await axios.post(endpoint, {
-                  ...notificationPayload,
-                  chat_id: user.settings.telegramChatId,
-                  disable_notification: !!user.settings?.telegramSendSilently,
-                } as TelegramMessagePayload | TelegramPhotoPayload);
+                const response = await fetch(endpoint, {
+                  method: 'POST',
+                  headers: {
+                    'Content-Type': 'application/json',
+                  },
+                  body: JSON.stringify({
+                    ...notificationPayload,
+                    chat_id: user.settings.telegramChatId,
+                    message_thread_id: user.settings.telegramMessageThreadId,
+                    disable_notification: !!user.settings?.telegramSendSilently,
+                  } as TelegramMessagePayload | TelegramPhotoPayload),
+                });
+                if (!response.ok) {
+                  throw new Error(response.statusText, { cause: response });
+                }
               } catch (e) {
                 let errorData;
                 try {

server/lib/notifications/agents/webhook.ts

@@ -3,7 +3,6 @@ import { MediaStatus } from '@server/constants/media';
 import type { NotificationAgentWebhook } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import { get } from 'lodash';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
@@ -178,17 +177,19 @@ class WebhookAgent
     });
 
     try {
-      await axios.post(
-        settings.options.webhookUrl,
-        this.buildPayload(type, payload),
-        settings.options.authHeader
-          ? {
-              headers: {
-                Authorization: settings.options.authHeader,
-              },
-            }
-          : undefined
-      );
+      const response = await fetch(settings.options.webhookUrl, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          ...(settings.options.authHeader
+            ? { Authorization: settings.options.authHeader }
+            : {}),
+        },
+        body: JSON.stringify(this.buildPayload(type, payload)),
+      });
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }
 
       return true;
     } catch (e) {

server/lib/refreshToken.ts

@@ -0,0 +1,37 @@
+import PlexTvAPI from '@server/api/plextv';
+import { getRepository } from '@server/datasource';
+import { User } from '@server/entity/User';
+import logger from '@server/logger';
+
+class RefreshToken {
+  public async run() {
+    const userRepository = getRepository(User);
+
+    const users = await userRepository
+      .createQueryBuilder('user')
+      .addSelect('user.plexToken')
+      .where("user.plexToken != ''")
+      .getMany();
+
+    for (const user of users) {
+      await this.refreshUserToken(user);
+    }
+  }
+
+  private async refreshUserToken(user: User) {
+    if (!user.plexToken) {
+      logger.warn('Skipping user refresh token for user without plex token', {
+        label: 'Plex Refresh Token',
+        user: user.displayName,
+      });
+      return;
+    }
+
+    const plexTvApi = new PlexTvAPI(user.plexToken);
+    plexTvApi.pingToken();
+  }
+}
+
+const refreshToken = new RefreshToken();
+
+export default refreshToken;

server/lib/scanners/jellyfin/index.ts

@@ -210,14 +210,27 @@ class JellyfinScanner {
         return;
       }
 
-      if (metadata.ProviderIds.Tvdb) {
-        tvShow = await this.tmdb.getShowByTvdbId({
-          tvdbId: Number(metadata.ProviderIds.Tvdb),
-        });
-      } else if (metadata.ProviderIds.Tmdb) {
-        tvShow = await this.tmdb.getTvShow({
-          tvId: Number(metadata.ProviderIds.Tmdb),
-        });
+      if (metadata.ProviderIds.Tmdb) {
+        try {
+          tvShow = await this.tmdb.getTvShow({
+            tvId: Number(metadata.ProviderIds.Tmdb),
+          });
+        } catch {
+          this.log('Unable to find TMDb ID for this title.', 'debug', {
+            jellyfinitem,
+          });
+        }
+      }
+      if (!tvShow && metadata.ProviderIds.Tvdb) {
+        try {
+          tvShow = await this.tmdb.getShowByTvdbId({
+            tvdbId: Number(metadata.ProviderIds.Tvdb),
+          });
+        } catch {
+          this.log('Unable to find TVDb ID for this title.', 'debug', {
+            jellyfinitem,
+          });
+        }
       }
 
       if (tvShow) {
@@ -491,7 +504,13 @@ class JellyfinScanner {
           }
         });
       } else {
-        this.log(`failed show: ${metadata.Name}`);
+        this.log(
+          `No information found for the show: ${metadata.Name}`,
+          'debug',
+          {
+            jellyfinitem,
+          }
+        );
       }
     } catch (e) {
       this.log(

server/lib/scanners/plex/index.ts

@@ -277,8 +277,11 @@ class PlexScanner
 
     const seasons = tvShow.seasons;
     const processableSeasons: ProcessableSeason[] = [];
+    const settings = getSettings();
 
-    const filteredSeasons = seasons.filter((sn) => sn.season_number !== 0);
+    const filteredSeasons = settings.main.enableSpecialEpisodes
+      ? seasons
+      : seasons.filter((sn) => sn.season_number !== 0);
 
     for (const season of filteredSeasons) {
       const matchedPlexSeason = metadata.Children?.Metadata.find(

server/lib/scanners/sonarr/index.ts

@@ -102,11 +102,12 @@ class SonarrScanner
       }
 
       const tmdbId = tvShow.id;
+      const settings = getSettings();
 
       const filteredSeasons = sonarrSeries.seasons.filter(
         (sn) =>
-          sn.seasonNumber !== 0 &&
-          tvShow.seasons.find((s) => s.season_number === sn.seasonNumber)
+          tvShow.seasons.find((s) => s.season_number === sn.seasonNumber) &&
+          (!settings.main.enableSpecialEpisodes ? sn.seasonNumber !== 0 : true)
       );
 
       for (const season of filteredSeasons) {

server/lib/settings/index.ts

@@ -76,6 +76,7 @@ export interface DVRSettings {
   syncEnabled: boolean;
   preventSearch: boolean;
   tagRequests: boolean;
+  overrideRule: number[];
 }
 
 export interface RadarrSettings extends DVRSettings {
@@ -124,11 +125,13 @@ export interface MainSettings {
   hideAvailable: boolean;
   localLogin: boolean;
   newPlexLogin: boolean;
-  region: string;
+  discoverRegion: string;
+  streamingRegion: string;
   originalLanguage: string;
   trustProxy: boolean;
   mediaServerType: number;
   partialRequestsEnabled: boolean;
+  enableSpecialEpisodes: boolean;
   locale: string;
   proxy: ProxySettings;
 }
@@ -144,13 +147,15 @@ interface FullPublicSettings extends PublicSettings {
   localLogin: boolean;
   movie4kEnabled: boolean;
   series4kEnabled: boolean;
-  region: string;
+  discoverRegion: string;
+  streamingRegion: string;
   originalLanguage: string;
   mediaServerType: number;
   jellyfinExternalHost?: string;
   jellyfinForgotPasswordUrl?: string;
   jellyfinServerName?: string;
   partialRequestsEnabled: boolean;
+  enableSpecialEpisodes: boolean;
   cacheImages: boolean;
   vapidPublic: string;
   enablePushRegistration: boolean;
@@ -170,6 +175,7 @@ export interface NotificationAgentDiscord extends NotificationAgentConfig {
     botUsername?: string;
     botAvatarUrl?: string;
     webhookUrl: string;
+    webhookRoleId?: string;
     enableMentions: boolean;
   };
 }
@@ -210,6 +216,7 @@ export interface NotificationAgentTelegram extends NotificationAgentConfig {
     botUsername?: string;
     botAPI: string;
     chatId: string;
+    messageThreadId: string;
     sendSilently: boolean;
   };
 }
@@ -281,6 +288,7 @@ export type JobId =
   | 'plex-recently-added-scan'
   | 'plex-full-scan'
   | 'plex-watchlist-sync'
+  | 'plex-refresh-token'
   | 'radarr-scan'
   | 'sonarr-scan'
   | 'download-sync'
@@ -331,11 +339,13 @@ class Settings {
         hideAvailable: false,
         localLogin: true,
         newPlexLogin: true,
-        region: '',
+        discoverRegion: '',
+        streamingRegion: '',
         originalLanguage: '',
         trustProxy: false,
         mediaServerType: MediaServerType.NOT_CONFIGURED,
         partialRequestsEnabled: true,
+        enableSpecialEpisodes: false,
         locale: 'en',
         proxy: {
           enabled: false,
@@ -394,6 +404,7 @@ class Settings {
             types: 0,
             options: {
               webhookUrl: '',
+              webhookRoleId: '',
               enableMentions: true,
             },
           },
@@ -417,6 +428,7 @@ class Settings {
             options: {
               botAPI: '',
               chatId: '',
+              messageThreadId: '',
               sendSilently: false,
             },
           },
@@ -467,7 +479,10 @@ class Settings {
           schedule: '0 0 3 * * *',
         },
         'plex-watchlist-sync': {
-          schedule: '0 */10 * * * *',
+          schedule: '0 */3 * * * *',
+        },
+        'plex-refresh-token': {
+          schedule: '0 0 5 * * *',
         },
         'radarr-scan': {
           schedule: '0 0 4 * * *',
@@ -570,10 +585,12 @@ class Settings {
       series4kEnabled: this.data.sonarr.some(
         (sonarr) => sonarr.is4k && sonarr.isDefault
       ),
-      region: this.data.main.region,
+      discoverRegion: this.data.main.discoverRegion,
+      streamingRegion: this.data.main.streamingRegion,
       originalLanguage: this.data.main.originalLanguage,
       mediaServerType: this.main.mediaServerType,
       partialRequestsEnabled: this.data.main.partialRequestsEnabled,
+      enableSpecialEpisodes: this.data.main.enableSpecialEpisodes,
       cacheImages: this.data.main.cacheImages,
       vapidPublic: this.vapidPublic,
       enablePushRegistration: this.data.notifications.agents.webpush.enabled,
@@ -682,10 +699,9 @@ class Settings {
   }
 
   public async save(): Promise<void> {
-    await fs.writeFile(
-      SETTINGS_PATH,
-      JSON.stringify(this.data, undefined, ' ')
-    );
+    const tmp = SETTINGS_PATH + '.tmp';
+    await fs.writeFile(tmp, JSON.stringify(this.data, undefined, ' '));
+    await fs.rename(tmp, SETTINGS_PATH);
   }
 }
 

server/lib/settings/migrations/0004_migrate_region_setting.ts

@@ -0,0 +1,17 @@
+import type { AllSettings } from '@server/lib/settings';
+
+const migrateRegionSetting = (settings: any): AllSettings => {
+  const oldRegion = settings.main.region;
+  if (oldRegion) {
+    settings.main.discoverRegion = oldRegion;
+    settings.main.streamingRegion = oldRegion;
+  } else {
+    settings.main.discoverRegion = '';
+    settings.main.streamingRegion = 'US';
+  }
+  delete settings.main.region;
+
+  return settings;
+};
+
+export default migrateRegionSetting;

server/lib/watchlistsync.ts

@@ -62,7 +62,7 @@ class WatchlistSync {
 
     const plexTvApi = new PlexTvAPI(user.plexToken);
 
-    const response = await plexTvApi.getWatchlist({ size: 200 });
+    const response = await plexTvApi.getWatchlist({ size: 20 });
 
     const mediaItems = await Media.getRelatedMedia(
       user,

server/migration/postgres/1734786061496-InitialMigration.ts

@@ -0,0 +1,195 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class InitialMigration1734786061496 implements MigrationInterface {
+  name = 'InitialMigration1734786061496';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "blacklist" ("id" SERIAL NOT NULL, "mediaType" character varying NOT NULL, "title" character varying, "tmdbId" integer NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "userId" integer, "mediaId" integer, CONSTRAINT "UQ_6bbafa28411e6046421991ea21c" UNIQUE ("tmdbId"), CONSTRAINT "REL_62b7ade94540f9f8d8bede54b9" UNIQUE ("mediaId"), CONSTRAINT "PK_04dc42a96bf0914cda31b579702" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
+    );
+    await queryRunner.query(
+      `CREATE TABLE "season_request" ("id" SERIAL NOT NULL, "seasonNumber" integer NOT NULL, "status" integer NOT NULL DEFAULT '1', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "requestId" integer, CONSTRAINT "PK_4811e502081543bf620f1fa4328" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "media_request" ("id" SERIAL NOT NULL, "status" integer NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "type" character varying NOT NULL, "is4k" boolean NOT NULL DEFAULT false, "serverId" integer, "profileId" integer, "rootFolder" character varying, "languageProfileId" integer, "tags" text, "isAutoRequest" boolean NOT NULL DEFAULT false, "mediaId" integer NOT NULL, "requestedById" integer, "modifiedById" integer, CONSTRAINT "PK_f8334500e8e12db87536558c66c" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "season" ("id" SERIAL NOT NULL, "seasonNumber" integer NOT NULL, "status" integer NOT NULL DEFAULT '1', "status4k" integer NOT NULL DEFAULT '1', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "mediaId" integer NOT NULL, CONSTRAINT "PK_8ac0d081dbdb7ab02d166bcda9f" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "media" ("id" SERIAL NOT NULL, "mediaType" character varying NOT NULL, "tmdbId" integer NOT NULL, "tvdbId" integer, "imdbId" character varying, "status" integer NOT NULL DEFAULT '1', "status4k" integer NOT NULL DEFAULT '1', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "lastSeasonChange" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "mediaAddedAt" TIMESTAMP WITH TIME ZONE DEFAULT now(), "serviceId" integer, "serviceId4k" integer, "externalServiceId" integer, "externalServiceId4k" integer, "externalServiceSlug" character varying, "externalServiceSlug4k" character varying, "ratingKey" character varying, "ratingKey4k" character varying, "jellyfinMediaId" character varying, "jellyfinMediaId4k" character varying, CONSTRAINT "UQ_41a289eb1fa489c1bc6f38d9c3c" UNIQUE ("tvdbId"), CONSTRAINT "PK_f4e0fcac36e050de337b670d8bd" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5" ON "media" ("tmdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_41a289eb1fa489c1bc6f38d9c3" ON "media" ("tvdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7ff2d11f6a83cb52386eaebe74" ON "media" ("imdbId") `
+    );
+    await queryRunner.query(
+      `CREATE TABLE "watchlist" ("id" SERIAL NOT NULL, "ratingKey" character varying NOT NULL, "mediaType" character varying NOT NULL, "title" character varying NOT NULL, "tmdbId" integer NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "requestedById" integer, "mediaId" integer NOT NULL, CONSTRAINT "UNIQUE_USER_DB" UNIQUE ("tmdbId", "requestedById"), CONSTRAINT "PK_0c8c0dbcc8d379117138e71ad5b" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_939f205946256cc0d2a1ac51a8" ON "watchlist" ("tmdbId") `
+    );
+    await queryRunner.query(
+      `CREATE TABLE "user_push_subscription" ("id" SERIAL NOT NULL, "endpoint" character varying NOT NULL, "p256dh" character varying NOT NULL, "auth" character varying NOT NULL, "userId" integer, CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "PK_397020e7be9a4086cc798e0bb63" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "user_settings" ("id" SERIAL NOT NULL, "locale" character varying NOT NULL DEFAULT '', "discoverRegion" character varying, "streamingRegion" character varying, "originalLanguage" character varying, "pgpKey" character varying, "discordId" character varying, "pushbulletAccessToken" character varying, "pushoverApplicationToken" character varying, "pushoverUserKey" character varying, "pushoverSound" character varying, "telegramChatId" character varying, "telegramSendSilently" boolean, "watchlistSyncMovies" boolean, "watchlistSyncTv" boolean, "notificationTypes" text, "userId" integer, CONSTRAINT "REL_986a2b6d3c05eb4091bb8066f7" UNIQUE ("userId"), CONSTRAINT "PK_00f004f5922a0744d174530d639" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "user" ("id" SERIAL NOT NULL, "email" character varying NOT NULL, "plexUsername" character varying, "jellyfinUsername" character varying, "username" character varying, "password" character varying, "resetPasswordGuid" character varying, "recoveryLinkExpirationDate" date, "userType" integer NOT NULL DEFAULT '1', "plexId" integer, "jellyfinUserId" character varying, "jellyfinDeviceId" character varying, "jellyfinAuthToken" character varying, "plexToken" character varying, "permissions" integer NOT NULL DEFAULT '0', "avatar" character varying NOT NULL, "movieQuotaLimit" integer, "movieQuotaDays" integer, "tvQuotaLimit" integer, "tvQuotaDays" integer, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"), CONSTRAINT "PK_cace4a159ff9f2512dd42373760" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "issue_comment" ("id" SERIAL NOT NULL, "message" text NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "userId" integer, "issueId" integer, CONSTRAINT "PK_2ad05784e2ae661fa409e5e0248" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "issue" ("id" SERIAL NOT NULL, "issueType" integer NOT NULL, "status" integer NOT NULL DEFAULT '1', "problemSeason" integer NOT NULL DEFAULT '0', "problemEpisode" integer NOT NULL DEFAULT '0', "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), "mediaId" integer, "createdById" integer, "modifiedById" integer, CONSTRAINT "PK_f80e086c249b9f3f3ff2fd321b7" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "discover_slider" ("id" SERIAL NOT NULL, "type" integer NOT NULL, "order" integer NOT NULL, "isBuiltIn" boolean NOT NULL DEFAULT false, "enabled" boolean NOT NULL DEFAULT true, "title" character varying, "data" character varying, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_20a71a098d04bae448e4d51db23" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "session" ("expiredAt" bigint NOT NULL, "id" character varying(255) NOT NULL, "json" text NOT NULL, CONSTRAINT "PK_f55da76ac1c3ac420f444d2ff11" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_28c5d1d16da7908c97c9bc2f74" ON "session" ("expiredAt") `
+    );
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" ADD CONSTRAINT "FK_53c1ab62c3e5875bc3ac474823e" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" ADD CONSTRAINT "FK_62b7ade94540f9f8d8bede54b99" FOREIGN KEY ("mediaId") REFERENCES "media"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "season_request" ADD CONSTRAINT "FK_6f14737e346d6b27d8e50d2157a" FOREIGN KEY ("requestId") REFERENCES "media_request"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" ADD CONSTRAINT "FK_a1aa713f41c99e9d10c48da75a0" FOREIGN KEY ("mediaId") REFERENCES "media"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" ADD CONSTRAINT "FK_6997bee94720f1ecb7f31137095" FOREIGN KEY ("requestedById") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" ADD CONSTRAINT "FK_f4fc4efa14c3ba2b29c4525fa15" FOREIGN KEY ("modifiedById") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "season" ADD CONSTRAINT "FK_087099b39600be695591da9a49c" FOREIGN KEY ("mediaId") REFERENCES "media"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "watchlist" ADD CONSTRAINT "FK_ae34e6b153a90672eb9dc4857d7" FOREIGN KEY ("requestedById") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "watchlist" ADD CONSTRAINT "FK_6641da8d831b93dfcb429f8b8bc" FOREIGN KEY ("mediaId") REFERENCES "media"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" ADD CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user_settings" ADD CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "issue_comment" ADD CONSTRAINT "FK_707b033c2d0653f75213614789d" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "issue_comment" ADD CONSTRAINT "FK_180710fead1c94ca499c57a7d42" FOREIGN KEY ("issueId") REFERENCES "issue"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "issue" ADD CONSTRAINT "FK_276e20d053f3cff1645803c95d8" FOREIGN KEY ("mediaId") REFERENCES "media"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "issue" ADD CONSTRAINT "FK_10b17b49d1ee77e7184216001e0" FOREIGN KEY ("createdById") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "issue" ADD CONSTRAINT "FK_da88a1019c850d1a7b143ca02e5" FOREIGN KEY ("modifiedById") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "issue" DROP CONSTRAINT "FK_da88a1019c850d1a7b143ca02e5"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "issue" DROP CONSTRAINT "FK_10b17b49d1ee77e7184216001e0"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "issue" DROP CONSTRAINT "FK_276e20d053f3cff1645803c95d8"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "issue_comment" DROP CONSTRAINT "FK_180710fead1c94ca499c57a7d42"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "issue_comment" DROP CONSTRAINT "FK_707b033c2d0653f75213614789d"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user_settings" DROP CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" DROP CONSTRAINT "FK_03f7958328e311761b0de675fbe"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "watchlist" DROP CONSTRAINT "FK_6641da8d831b93dfcb429f8b8bc"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "watchlist" DROP CONSTRAINT "FK_ae34e6b153a90672eb9dc4857d7"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "season" DROP CONSTRAINT "FK_087099b39600be695591da9a49c"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" DROP CONSTRAINT "FK_f4fc4efa14c3ba2b29c4525fa15"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" DROP CONSTRAINT "FK_6997bee94720f1ecb7f31137095"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" DROP CONSTRAINT "FK_a1aa713f41c99e9d10c48da75a0"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "season_request" DROP CONSTRAINT "FK_6f14737e346d6b27d8e50d2157a"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" DROP CONSTRAINT "FK_62b7ade94540f9f8d8bede54b99"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" DROP CONSTRAINT "FK_53c1ab62c3e5875bc3ac474823e"`
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_28c5d1d16da7908c97c9bc2f74"`
+    );
+    await queryRunner.query(`DROP TABLE "session"`);
+    await queryRunner.query(`DROP TABLE "discover_slider"`);
+    await queryRunner.query(`DROP TABLE "issue"`);
+    await queryRunner.query(`DROP TABLE "issue_comment"`);
+    await queryRunner.query(`DROP TABLE "user"`);
+    await queryRunner.query(`DROP TABLE "user_settings"`);
+    await queryRunner.query(`DROP TABLE "user_push_subscription"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_939f205946256cc0d2a1ac51a8"`
+    );
+    await queryRunner.query(`DROP TABLE "watchlist"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_7ff2d11f6a83cb52386eaebe74"`
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_41a289eb1fa489c1bc6f38d9c3"`
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_7157aad07c73f6a6ae3bbd5ef5"`
+    );
+    await queryRunner.query(`DROP TABLE "media"`);
+    await queryRunner.query(`DROP TABLE "season"`);
+    await queryRunner.query(`DROP TABLE "media_request"`);
+    await queryRunner.query(`DROP TABLE "season_request"`);
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_6bbafa28411e6046421991ea21"`
+    );
+    await queryRunner.query(`DROP TABLE "blacklist"`);
+  }
+}

server/migration/postgres/1734786596045-AddTelegramMessageThreadId.ts

@@ -0,0 +1,19 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddTelegramMessageThreadId1734786596045
+  implements MigrationInterface
+{
+  name = 'AddTelegramMessageThreadId1734786596045';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user_settings" ADD "telegramMessageThreadId" character varying`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user_settings" DROP COLUMN "telegramMessageThreadId"`
+    );
+  }
+}

server/migration/postgres/1734805738349-AddOverrideRules.ts

@@ -0,0 +1,15 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddOverrideRules1734805738349 implements MigrationInterface {
+  name = 'AddOverrideRules1734805738349';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "override_rule" ("id" SERIAL NOT NULL, "radarrServiceId" integer, "sonarrServiceId" integer, "users" character varying, "genre" character varying, "language" character varying, "keywords" character varying, "profileId" integer, "rootFolder" character varying, "tags" character varying, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_657f810c7b20a4fce45aee8f182" PRIMARY KEY ("id"))`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE "override_rule"`);
+  }
+}

server/migration/postgres/1734809898562-FixNullFields.ts

@@ -0,0 +1,65 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class FixNullFields1734809898562 implements MigrationInterface {
+  name = 'FixNullFields1734809898562';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "watchlist" DROP CONSTRAINT "FK_6641da8d831b93dfcb429f8b8bc"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "watchlist" ALTER COLUMN "mediaId" DROP NOT NULL`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" DROP CONSTRAINT "FK_a1aa713f41c99e9d10c48da75a0"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" ALTER COLUMN "mediaId" DROP NOT NULL`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "season" DROP CONSTRAINT "FK_087099b39600be695591da9a49c"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "season" ALTER COLUMN "mediaId" DROP NOT NULL`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "watchlist" ADD CONSTRAINT "FK_6641da8d831b93dfcb429f8b8bc" FOREIGN KEY ("mediaId") REFERENCES "media"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" ADD CONSTRAINT "FK_a1aa713f41c99e9d10c48da75a0" FOREIGN KEY ("mediaId") REFERENCES "media"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "season" ADD CONSTRAINT "FK_087099b39600be695591da9a49c" FOREIGN KEY ("mediaId") REFERENCES "media"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "season" DROP CONSTRAINT "FK_087099b39600be695591da9a49c"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" DROP CONSTRAINT "FK_a1aa713f41c99e9d10c48da75a0"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "watchlist" DROP CONSTRAINT "FK_6641da8d831b93dfcb429f8b8bc"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "season" ALTER COLUMN "mediaId" SET NOT NULL`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "season" ADD CONSTRAINT "FK_087099b39600be695591da9a49c" FOREIGN KEY ("mediaId") REFERENCES "media"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" ALTER COLUMN "mediaId" SET NOT NULL`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "media_request" ADD CONSTRAINT "FK_a1aa713f41c99e9d10c48da75a0" FOREIGN KEY ("mediaId") REFERENCES "media"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "watchlist" ALTER COLUMN "mediaId" SET NOT NULL`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "watchlist" ADD CONSTRAINT "FK_6641da8d831b93dfcb429f8b8bc" FOREIGN KEY ("mediaId") REFERENCES "media"("id") ON DELETE CASCADE ON UPDATE NO ACTION`
+    );
+  }
+}