fix: update avatar on new login

Previously, avatars were cached using image links from Jellyfin/Emby. Now, avatar images are
obtained directly from the API to avoid some configuration bugs.

.all-contributorsrc

@@ -448,114 +448,6 @@
       "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"
-      ]
     }
   ]
 }

.dockerignore

@@ -18,7 +18,7 @@ config/logs/*
 config/*.json
 dist
 Dockerfile*
-compose.yaml
+docker-compose.yml
 docs
 LICENSE
 node_modules

.gitattributes

@@ -40,7 +40,7 @@ docs export-ignore
 .all-contributorsrc export-ignore
 .editorconfig export-ignore
 Dockerfile.local export-ignore
-compose.yaml export-ignore
+docker-compose.yml export-ignore
 stylelint.config.js export-ignore
 
 public/os_logo_filled.png export-ignore

.github/ISSUE_TEMPLATE/bug.yml

@@ -55,14 +55,6 @@ 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:22-alpine
+    container: node:20-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: 22
+          node-version: 20
       - name: Pnpm Setup
         uses: pnpm/action-setup@v4
         with:

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

@@ -1,33 +0,0 @@
-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: 22
+          node-version: 20
       - 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
-    paths:
+    path:
       - 'docs/**'
       - 'gen-docs/**'
 

.gitignore

@@ -34,7 +34,6 @@ yarn-error.log*
 # database
 config/db/*.sqlite3*
 config/settings.json
-config/settings.old.json
 
 # logs
 config/logs/*.log*

.prettierignore

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

.prettierrc.js

@@ -15,11 +15,5 @@ module.exports = {
         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 22.x)
+- [NodeJS](https://nodejs.org/en/download/) (Node 20.x)
 - [Pnpm](https://pnpm.io/cli/install)
 - [Git](https://git-scm.com/downloads)
 
@@ -48,11 +48,11 @@ All help is welcome and greatly appreciated! If you would like to contribute to
 4. Run the development environment:
 
    ```bash
-   pnpm install
+   pnpm
    pnpm dev
    ```
 
-   - Alternatively, you can use [Docker](https://www.docker.com/) with `docker compose up -d`. This method does not require installing NodeJS or Yarn on your machine directly.
+   - Alternatively, you can use [Docker](https://www.docker.com/) with `docker-compose up -d`. This method does not require installing NodeJS or Yarn on your machine directly.
 
 5. Create your patch and test your changes.
 
@@ -101,46 +101,6 @@ 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:22-alpine AS BUILD_IMAGE
+FROM node:20-alpine AS BUILD_IMAGE
 
 WORKDIR /app
 
@@ -36,7 +36,7 @@ RUN touch config/DOCKER
 RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
 
 
-FROM node:22-alpine
+FROM node:20-alpine
 
 # Metadata for Github Package Registry
 LABEL org.opencontainers.image.source="https://github.com/Fallenbagel/jellyseerr"

Dockerfile.local

@@ -1,4 +1,4 @@
-FROM node:22-alpine
+FROM node:20-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-60-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-48-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 additional 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 support for [Jellyfin](https://github.com/jellyfin/jellyfin) & [Emby](https://github.com/MediaBrowser/Emby) media servers!
 
 ## Current Features
 
@@ -147,22 +147,6 @@ 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>
@@ -307,12 +291,6 @@ 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

@@ -1,23 +0,0 @@
-# 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

@@ -1,13 +0,0 @@
-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

@@ -1,69 +0,0 @@
-# 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

@@ -1,17 +0,0 @@
-{{ 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

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

charts/jellyseerr/templates/_helpers.tpl

@@ -1,70 +0,0 @@
-{{/*
-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

@@ -1,85 +0,0 @@
-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

@@ -1,32 +0,0 @@
-{{- 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

@@ -1,41 +0,0 @@
-{{- 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

@@ -1,20 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -1,13 +0,0 @@
-{{- 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

@@ -1,15 +0,0 @@
-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

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

docker-compose.postgres.yaml

@@ -1,38 +0,0 @@
----
-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:

docker-compose.yml

@@ -1,3 +1,4 @@
+version: '3'
 services:
   jellyseerr:
     build:

docs/README.md

@@ -17,7 +17,6 @@ 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

@@ -1,82 +0,0 @@
----
-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
-
-If you want to use SQLite, you can simply set the `DB_TYPE` environment variable to `sqlite`. This is the default configuration so even if you don't set any other options, SQLite will be used.
-
-```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
-
-### TCP Connection
-
-If your PostgreSQL server is configured to accept TCP connections, you can specify the host and port using the `DB_HOST` and `DB_PORT` environment variables. This is useful for remote connections where the server uses a network host and port.
-
-```dotenv
-DB_TYPE="postgres" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite".
-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".
-```
-
-### Unix Socket Connection
-
-If your PostgreSQL server is configured to accept Unix socket connections, you can specify the path to the socket directory using the `DB_SOCKET_PATH` environment variable. This is useful for local connections where the server uses a Unix socket.
-
-```dotenv
-DB_TYPE="postgres" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite".
-DB_SOCKET_PATH="/var/run/postgresql" # (required) The path to the PostgreSQL Unix socket directory.
-DB_USER= # (required) Username used to connect to the database.
-DB_PASS= # (optional) Password of the user used to connect to the database, depending on the server's authentication configuration.
-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,8 +95,6 @@ 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';
@@ -192,7 +190,7 @@ Caddy will automatically obtain and renew SSL certificates for your domain.
 
 ## Traefik (v2)
 
-Add the following labels to the Jellyseerr service in your `compose.yaml` file:
+Add the following labels to the Jellyseerr service in your `docker-compose.yml` file:
 
 ```yaml
 labels:

docs/getting-started/aur.mdx

@@ -6,10 +6,6 @@ sidebar_position: 4
 
 # AUR (Arch User Repository)
 
-:::note Disclaimer
-This AUR package is not maintained by us but by a third party. Please refer to the maintainer for any issues.
-:::
-
 :::info
 This method is not recommended for most users. It is intended for advanced users who are using Arch Linux or an Arch-based distribution.
 :::

docs/getting-started/buildfromsource.mdx

@@ -6,15 +6,13 @@ 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.
-
-Refer to [Configuring Databases](/extending-jellyseerr/database-config#postgresql-options) for details on how to configure your database.
 :::
 
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
 ### Prerequisites
-    - [Node.js 22.x](https://nodejs.org/en/download/)
+    - [Node.js 20.x](https://nodejs.org/en/download/)
     - [Pnpm 9.x](https://pnpm.io/installation)
     - [Git](https://git-scm.com/downloads)
 
@@ -28,7 +26,7 @@ sudo mkdir -p /opt/jellyseerr && cd /opt/jellyseerr
 ```bash
 git clone https://github.com/Fallenbagel/jellyseerr.git
 cd jellyseerr
-git checkout main
+git checkout develop # by default, you are on the develop branch so this step is not necessary
 ```
 3. Install the dependencies:
 ```bash
@@ -60,6 +58,9 @@ 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
 ```
@@ -202,7 +203,7 @@ cd C:\jellyseerr
 2. Clone the Jellyseerr repository and checkout the develop branch:
 ```powershell
 git clone https://github.com/Fallenbagel/jellyseerr.git .
-git checkout main
+git checkout develop # by default, you are on the develop branch so this step is not necessary
 ```
 3. Install the dependencies:
 ```powershell

docs/getting-started/docker.mdx

@@ -7,8 +7,6 @@ sidebar_position: 1
 :::info
 This is the recommended method for most users.
 Details on how to install Docker can be found on the [official Docker website](https://docs.docker.com/get-docker/).
-
-Refer to [Configuring Databases](/extending-jellyseerr/database-config#postgresql-options) for details on how to configure your database.
 :::
 
 ## Unix (Linux, macOS)
@@ -73,7 +71,7 @@ You could also use [diun](https://github.com/crazy-max/diun) to receive notifica
 For details on how to use Docker Compose, please [review the official Compose documentation](https://docs.docker.com/compose/reference/).
 
 #### Installation:
-Define the `jellyseerr` service in your `compose.yaml` as follows:
+Define the `jellyseerr` service in your `docker-compose.yml` as follows:
 ```yaml
 ---
 services:
@@ -96,17 +94,17 @@ If you are using emby, make sure to set the `JELLYFIN_TYPE` environment variable
 
 Then, start all services defined in the Compose file:
 ```bash
-docker compose up -d
+docker-compose up -d
 ```
 
 #### Updating:
 Pull the latest image:
 ```bash
-docker compose pull jellyseerr
+docker-compose pull jellyseerr
 ```
 Then, restart all services defined in the Compose file:
 ```bash
-docker compose up -d
+docker-compose up -d
 ```
 :::tip
 You may alternatively use a third-party mechanism like [dockge](https://github.com/louislam/dockge) to manage your docker compose files.
@@ -147,16 +145,6 @@ 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>
 
@@ -179,16 +167,6 @@ 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>
@@ -207,6 +185,3 @@ 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/getting-started/nixpkg.mdx

@@ -6,8 +6,6 @@ sidebar_position: 3
 
 import { JellyseerrVersion, NixpkgVersion } from '@site/src/components/JellyseerrVersion';
 import Admonition from '@theme/Admonition';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
 
 # Nix Package Manager (Advanced)
 :::info
@@ -15,55 +13,22 @@ This method is not recommended for most users. It is intended for advanced users
 :::
 
 export const VersionMismatchWarning = () => {
-  let jellyseerrVersion = null;
+  const jellyseerrVersion = JellyseerrVersion();
-  let nixpkgVersions = null;
+  const nixpkgVersion = NixpkgVersion();
-  try {
-    jellyseerrVersion = JellyseerrVersion();
-    nixpkgVersions = NixpkgVersion();
-  } catch (err) {
-    return (
-      <Admonition type="error">
-        Failed to load version information. Error: {err.message || JSON.stringify(err)}
-      </Admonition>
-    );
-  }
 
-    if (!nixpkgVersions || nixpkgVersions.error) {
+  const isUpToDate = jellyseerrVersion === nixpkgVersion;
-    return (
-      <Admonition type="error">
-        Failed to fetch Nixpkg versions: {nixpkgVersions?.error || 'Unknown error'}
-      </Admonition>
-    );
-  }
-
-  const isUnstableUpToDate = jellyseerrVersion === nixpkgVersions.unstable;
-  const isStableUpToDate = jellyseerrVersion === nixpkgVersions.stable;
 
   return (
-     <>
+    <>
-      {!isStableUpToDate ? (
+      {!isUpToDate ? (
-  <Admonition type="warning">
+        <Admonition type="warning">
-    The{' '}
+          The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to <a href="#overriding-the-package-derivation">override the package derivation</a>.
-    <a href="https://github.com/NixOS/nixpkgs/blob/nixos-24.11/pkgs/servers/jellyseerr/default.nix#L14">
+        </Admonition>
-      upstream Jellyseerr Nix Package (v{nixpkgVersions.stable})
+      ) : (
-    </a>{' '}
+        <Admonition type="success">
-    is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>,{' '}
+          The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is <b>up-to-date</b> with <b>Jellyseerr v{jellyseerrVersion}</b>.
-    {isUnstableUpToDate ? (
+        </Admonition>
-      <>
+      )}
-        consider using the{' '}
-        <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/by-name/je/jellyseerr/package.nix">
-          unstable package
-        </a>{' '}
-        instead.
-      </>
-    ) : (
-      <>
-        you will need to{' '}
-        <a href="#overriding-the-package-derivation">override the package derivation</a>.
-      </>
-    )}
-  </Admonition>
-) : null} 
     </>
   );
 };
@@ -83,8 +48,6 @@ To get up and running with jellyseerr using Nix, you can add the following to yo
 
 If you want more advanced configuration options, you can use the following:
 
-<Tabs groupId="nixpkg-methods" queryString>
-  <TabItem value="default" label="Default Configurations">
 ```nix
 { config, pkgs, ... }:
 
@@ -93,20 +56,53 @@ If you want more advanced configuration options, you can use the following:
     enable = true;
     port = 5055;
     openFirewall = true;
-    package = pkgs.jellyseerr; # Use the unstable package if stable is not up-to-date
   };
 }
 ```
-  </TabItem>
+
-  <TabItem value="custom" label="Database Configurations">
+After adding the configuration to your `configuration.nix`, you can run the following command to install jellyseerr:
-In order to use postgres, you will need to add override the default module of jellyseerr with the following as the current default module is not compatible with postgres:
+
-```nix
+```bash
+nixos-rebuild switch
+```
+After rebuild is complete jellyseerr should be running, verify that it is with the following command.
+```bash
+systemctl status jellyseerr
+```
+
+:::info
+You can now access Jellyseerr by visiting `http://localhost:5055` in your web browser.
+:::
+
+
+
+import CodeBlock from '@theme/CodeBlock';
+
+## Overriding the package derivation
+export const VersionMatch = () => {
+  const jellyseerrVersion = JellyseerrVersion();
+  const nixpkgVersion = NixpkgVersion();
+
+  const code = `{ config, pkgs, ... }:
 {
-  config,
+  nixpkgs.config.packageOverrides = pkgs: {
-  pkgs,
+    jellyseerr = pkgs.jellyseerr.overrideAttrs (oldAttrs: rec {
-  lib,
+      version = "${jellyseerrVersion}";
-  ...
+
-}:
+      src = pkgs.fetchFromGitHub {
+        rev = "v\${version}";
+        sha256 = pkgs.lib.fakeSha256;
+      };
+
+      offlineCache = pkgs.fetchYarnDeps {
+        sha256 = pkgs.lib.fakeSha256;
+      };
+    });
+  };
+}`;
+
+  const module = `{ config, pkgs, lib, ... }:
+
 with lib;
 let
   cfg = config.services.jellyseerr;
@@ -117,65 +113,28 @@ in
   disabledModules = [ "services/misc/jellyseerr.nix" ];
 
   options.services.jellyseerr = {
-    enable = mkEnableOption ''Jellyseerr, a requests manager for Jellyfin'';
+    enable = mkEnableOption (mdDoc ''Jellyseerr, a requests manager for Jellyfin'');
 
     openFirewall = mkOption {
       type = types.bool;
       default = false;
-      description = ''Open port in the firewall for the Jellyseerr web interface.'';
+      description = mdDoc ''Open port in the firewall for the Jellyseerr web interface.'';
     };
 
     port = mkOption {
       type = types.port;
       default = 5055;
-      description = ''The port which the Jellyseerr web UI should listen to.'';
+      description = mdDoc ''The port which the Jellyseerr web UI should listen to.'';
     };
 
     package = mkOption {
-      type = types.package;
+        type = types.package;
-      default = pkgs.jellyseerr;
+        default = pkgs.jellyseerr;
-      defaultText = literalExpression "pkgs.jellyseerr";
+        defaultText = literalExpression "pkgs.jellyseerr";
-      description = ''
+        description = lib.mdDoc ''
-        Jellyseerr package to use.
+          Jellyseerr package to use.
-      '';
+        '';
-    };
-
-    databaseConfig = mkOption {
-      type = types.attrsOf types.str;
-      default = {
-        type = "sqlite";
-        configDirectory = "config";
-        logQueries = "false";
       };
-      description = ''
-        Database configuration. For "sqlite", only "type", "configDirectory", and "logQueries" are relevant.
-        For "postgres", include host, port, user, pass, name, and optionally socket.
-        Example:
-        {
-          type = "postgres";
-          socket = "/run/postgresql";
-          user = "jellyseerr";
-          name = "jellyseerr";
-          logQueries = "false";
-        }
-        or
-        {
-          type = "postgres";
-          host = "localhost";
-          port = "5432";
-          user = "dbuser";
-          pass = "password";
-          name = "jellyseerr";
-          logQueries = "false";
-        }
-        or
-        {
-          type = "sqlite";
-          configDirectory = "config";
-          logQueries = "false";
-        }
-      '';
-    };
   };
 
   config = mkIf cfg.enable {
@@ -183,29 +142,14 @@ in
       description = "Jellyseerr, a requests manager for Jellyfin";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment =
+      environment.PORT = toString cfg.port;
-        let
-          dbConfig = cfg.databaseConfig;
-        in
-        {
-          PORT = toString cfg.port;
-          DB_TYPE = toString dbConfig.type;
-          CONFIG_DIRECTORY = toString dbConfig.configDirectory or "";
-          DB_LOG_QUERIES = toString dbConfig.logQueries;
-          DB_HOST = if dbConfig.type == "postgres" && !(hasAttr "socket" dbConfig) then toString dbConfig.host or "" else "";
-          DB_PORT = if dbConfig.type == "postgres" && !(hasAttr "socket" dbConfig) then toString dbConfig.port or "" else "";
-          DB_SOCKET_PATH = if dbConfig.type == "postgres" && hasAttr "socket" dbConfig then toString dbConfig.socket or "" else "";
-          DB_USER = if dbConfig.type == "postgres" then toString dbConfig.user or "" else "";
-          DB_PASS = if dbConfig.type == "postgres" then toString dbConfig.pass or "" else "";
-          DB_NAME = if dbConfig.type == "postgres" then toString dbConfig.name or "" else "";
-        };
       serviceConfig = {
         Type = "exec";
         StateDirectory = "jellyseerr";
-        WorkingDirectory = "${cfg.package}/libexec/jellyseerr";
+        WorkingDirectory = "\${cfg.package}/libexec/jellyseerr/deps/jellyseerr";
         DynamicUser = true;
-        ExecStart = "${cfg.package}/bin/jellyseerr";
+        ExecStart = "\${cfg.package}/bin/jellyseerr";
-        BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/libexec/jellyseerr/config/" ];
+        BindPaths = [ "/var/lib/jellyseerr/:\${cfg.package}/libexec/jellyseerr/deps/jellyseerr/config/" ];
         Restart = "on-failure";
         ProtectHome = true;
         ProtectSystem = "strict";
@@ -225,47 +169,57 @@ in
       };
     };
 
-    networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
+    networking.firewall = mkIf cfg.openFirewall {
-  };
+      allowedTCPPorts = [ cfg.port ];
-}
-```
-Then, import the module into your `configuration.nix`:
-```nix
-{ config, pkgs, ... }:
-{
-  imports = [ ./modules/jellyseerr.nix ];
-
-  services.jellyseerr = {
-    enable = true;
-    port = 5055;
-    openFirewall = true;
-    package = pkgs.unstable.jellyseerr; # use the unstable package if stable is not up-to-date
-    databaseConfig = {
-      type = "postgres";
-      host = "localhost"; # or socket: "/run/postgresql"
-      port = "5432"; # if using socket, this is not needed
-      user = "jellyseerr";
-      pass = "jellyseerr";
-      name = "jellyseerr";
-      logQueries = "false";
     };
-  }
+  };
-}
+}`;
-```
-  </TabItem>
-</Tabs>
 
-After adding the configuration to your `configuration.nix`, you can run the following command to install jellyseerr:
+  const configuration = `{ config, pkgs, ... }:
+{
+    imports = [ ./jellyseerr-module.nix ]
 
-```bash
+    services.jellyseerr = {
-nixos-rebuild switch
+        enable = true;
-```
+        port = 5055;
-After rebuild is complete jellyseerr should be running, verify that it is with the following command.
+        openFirewall = true;
-```bash
+        package = (pkgs.callPackage (import ../../../pkgs/jellyseerr) { });
-systemctl status jellyseerr
+    };
-```
+}`;
 
-:::info
+  const isUpToDate = jellyseerrVersion === nixpkgVersion;
-You can now access Jellyseerr by visiting `http://localhost:5055` in your web browser.
+
-:::
+  return (
+    <>
+      {isUpToDate ? (
+        <>
+          <p>The latest version of Jellyseerr <strong>({jellyseerrVersion})</strong> and the Jellyseerr nixpkg package version <strong>({nixpkgVersion})</strong> is <strong>up-to-date</strong>.</p>
+          <p>There is no need to override the package derivation.</p>
+        </>
+      ) : (
+        <>
+          <p>The latest version of Jellyseerr <strong>({jellyseerrVersion})</strong> and the Jellyseerr nixpkg version <strong>(v{nixpkgVersion})</strong> is <strong>out-of-date</strong>.
+          If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to override the package derivation.</p>
+          <p>In order to override the package derivation:</p>
+          <ol>
+            <li style={{ marginBottom: '1rem' }}>Grab the <a href="https://raw.githubusercontent.com/NixOS/nixpkgs/nixos-unstable/pkgs/servers/jellyseerr/default.nix">latest nixpkg derivation for Jellyseerr</a></li>
+            <li style={{ marginBottom: '1rem' }}>Grab the latest <a href="https://raw.githubusercontent.com/Fallenbagel/jellyseerr/main/package.json">package.json</a> for Jellyseerr</li>
+            <li style={{ marginBottom: '1rem' }}>Add it to the same directory as the nixpkg derivation</li>
+            <li style={{ marginBottom: '1rem' }}>Update the `src` and `offlineCache` attributes in the nixpkg derivation:</li>
+            <CodeBlock className="language-nix" style={{ marginBottom: '1rem' }}>{code}</CodeBlock>
+            <Admonition type="tip" style={{ marginBottom: '1rem' }}>You can replace the <b>sha256</b> with the actual hash that <b>nixos-rebuild</b> outputs when you run the command.</Admonition>
+            <li style={{ marginBottom: '1rem' }}>Grab this module and import it in your `configuration.nix`</li>
+            <CodeBlock className="language-nix" style={{ marginBottom: '1rem' }}>{module}</CodeBlock>
+            <Admonition type="tip" style={{ marginBottom: '1rem' }}>We are using a custom module because the upstream module does not have a package option.</Admonition>
+            <li style={{ marginBottom: '1rem' }}>Call the new package in your `configuration.nix`</li>
+            <CodeBlock className="language-nix" style={{ marginBottom: '1rem' }}>{configuration}</CodeBlock>
+          </ol>
+        </>
+      )}
+    </>
+  );
+
+};
+
+<VersionMatch />
 

docs/troubleshooting.mdx

@@ -1,158 +0,0 @@
----
-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,10 +18,6 @@ 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 & Streaming Region
+## Discover Region & Discover Language
 
-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.
+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.
 
 ## 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--streaming-region) to suit their own preferences.
+Users can override the [global filter settings](/using-jellyseerr/settings/general#discover-region--discover-language) to suit their own preferences.
 
 ### Movie Request Limit & Series Request Limit
 

gen-docs/package.json

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

gen-docs/src/components/JellyseerrVersion/index.tsx

@@ -26,37 +26,25 @@ export const JellyseerrVersion = () => {
 };
 
 export const NixpkgVersion = () => {
-  const [versions, setVersions] = useState(null);
+  const [version, setVersion] = useState(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
 
   useEffect(() => {
     const fetchVersion = async () => {
       try {
-        const unstableUrl =
+        const url =
-          'https://raw.githubusercontent.com/NixOS/nixpkgs/refs/heads/nixos-unstable/pkgs/by-name/je/jellyseerr/package.nix';
+          'https://raw.githubusercontent.com/NixOS/nixpkgs/nixos-unstable/pkgs/servers/jellyseerr/default.nix';
-        const stableUrl =
+        const response = await fetch(url);
-          'https://raw.githubusercontent.com/NixOS/nixpkgs/refs/heads/nixos-24.11/pkgs/servers/jellyseerr/default.nix';
+        const data = await response.text();
-
-        const [unstableResponse, stableResponse] = await Promise.all([
-          fetch(unstableUrl),
-          fetch(stableUrl),
-        ]);
-
-        const unstableData = await unstableResponse.text();
-        const stableData = await stableResponse.text();
 
         const versionRegex = /version\s*=\s*"([^"]+)"/;
-
+        const match = data.match(versionRegex);
-        const unstableMatch = unstableData.match(versionRegex);
+        if (match && match[1]) {
-        const stableMatch = stableData.match(versionRegex);
+          setVersion(match[1]);
-
+        } else {
-        const unstableVersion =
+          setError('0.0.0');
-          unstableMatch && unstableMatch[1] ? unstableMatch[1] : '0.0.0';
+        }
-        const stableVersion =
-          stableMatch && stableMatch[1] ? stableMatch[1] : '0.0.0';
-
-        setVersions({ unstable: unstableVersion, stable: stableVersion });
         setLoading(false);
       } catch (err) {
         setError(err.message);
@@ -75,5 +63,5 @@ export const NixpkgVersion = () => {
     return { error };
   }
 
-  return versions;
+  return version;
 };

next.config.js

@@ -10,7 +10,6 @@ module.exports = {
     remotePatterns: [
       { hostname: 'gravatar.com' },
       { hostname: 'image.tmdb.org' },
-      { hostname: 'artworks.thetvdb.com' },
     ],
   },
   webpack(config) {

overseerr-api.yml

@@ -143,12 +143,10 @@ components:
       properties:
         locale:
           type: string
-        discoverRegion:
+        region:
           type: string
         originalLanguage:
           type: string
-        streamingRegion:
-          type: string
     MainSettings:
       type: object
       properties:
@@ -188,9 +186,6 @@ components:
         defaultPermissions:
           type: number
           example: 32
-        enableSpecialEpisodes:
-          type: boolean
-          example: false
     PlexLibrary:
       type: object
       properties:
@@ -1278,8 +1273,6 @@ components:
               type: string
             webhookUrl:
               type: string
-            webhookRoleId:
-              type: string
             enableMentions:
               type: boolean
     SlackSettings:
@@ -1341,8 +1334,6 @@ components:
               type: string
             chatId:
               type: string
-            messageThreadId:
-              type: string
             sendSilently:
               type: boolean
     PushbulletSettings:
@@ -1826,9 +1817,6 @@ components:
         telegramChatId:
           type: string
           nullable: true
-        telegramMessageThreadId:
-          type: string
-          nullable: true
         telegramSendSilently:
           type: boolean
           nullable: true
@@ -1942,11 +1930,6 @@ components:
           type: string
         native_name:
           type: string
-    OverrideRule:
-      type: object
-      properties:
-        id:
-          type: string
   securitySchemes:
     cookieAuth:
       type: apiKey
@@ -2005,9 +1988,6 @@ paths:
                   appDataPath:
                     type: string
                     example: /app/config
-                  appDataPermissions:
-                    type: boolean
-                    example: true
   /settings/main:
     get:
       summary: Get main settings
@@ -3770,11 +3750,6 @@ 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
@@ -3891,7 +3866,7 @@ paths:
             schema:
               type: object
               properties:
-                jellyfinUserIds:
+                jellyfinIds:
                   type: array
                   items:
                     type: string
@@ -4164,21 +4139,6 @@ 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:
@@ -5456,13 +5416,6 @@ 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:
@@ -5513,7 +5466,7 @@ paths:
                     - type: array
                       items:
                         type: number
-                        minimum: 0
+                        minimum: 1
                     - type: string
                       enum: [all]
                 is4k:
@@ -5619,7 +5572,7 @@ paths:
                   type: array
                   items:
                     type: number
-                    minimum: 0
+                    minimum: 1
                 is4k:
                   type: boolean
                   example: false
@@ -6983,74 +6936,6 @@ 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
-      parameters:
-        - in: path
-          name: ruleId
-          required: true
-          schema:
-            type: number
-      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

@@ -69,7 +69,6 @@
     "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",
@@ -94,8 +93,7 @@
     "sqlite3": "5.1.4",
     "swagger-ui-express": "4.6.2",
     "swr": "2.2.5",
-    "typeorm": "0.3.11",
+    "typeorm": "0.3.12",
-    "undici": "^6.20.1",
     "web-push": "3.5.0",
     "winston": "3.8.2",
     "winston-daily-rotate-file": "4.7.1",
@@ -123,7 +121,7 @@
     "@types/express-session": "1.17.6",
     "@types/lodash": "4.14.191",
     "@types/mime": "3",
-    "@types/node": "22.10.5",
+    "@types/node": "20.14.8",
     "@types/node-schedule": "2.1.0",
     "@types/nodemailer": "6.4.7",
     "@types/react": "^18.3.3",
@@ -169,7 +167,7 @@
     "typescript": "4.9.5"
   },
   "engines": {
-    "node": "^22.0.0",
+    "node": "^20.0.0",
     "pnpm": "^9.0.0"
   },
   "overrides": {

server/api/externalapi.ts

@@ -1,5 +1,3 @@
-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';
@@ -34,32 +32,13 @@ class ExternalAPI {
       this.fetch = fetch;
     }
 
-    const url = new URL(baseUrl);
+    this.baseUrl = baseUrl;
-
+    this.params = params;
-    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;
   }
 
@@ -69,13 +48,10 @@ class ExternalAPI {
     ttl?: number,
     config?: RequestInit
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       ...this.params,
       ...params,
-      headers,
     });
-
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
@@ -84,7 +60,10 @@ class ExternalAPI {
     const url = this.formatUrl(endpoint, params);
     const response = await this.fetch(url, {
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
     });
     if (!response.ok) {
       const text = await response.text();
@@ -111,13 +90,10 @@ class ExternalAPI {
     ttl?: number,
     config?: RequestInit
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       config: { ...this.params, ...params },
-      headers,
       data,
     });
-
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
@@ -127,7 +103,10 @@ class ExternalAPI {
     const response = await this.fetch(url, {
       method: 'POST',
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
       body: data ? JSON.stringify(data) : undefined,
     });
     if (!response.ok) {
@@ -155,13 +134,10 @@ class ExternalAPI {
     ttl?: number,
     config?: RequestInit
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       config: { ...this.params, ...params },
       data,
-      headers,
     });
-
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
@@ -171,7 +147,10 @@ class ExternalAPI {
     const response = await this.fetch(url, {
       method: 'PUT',
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
       body: JSON.stringify(data),
     });
     if (!response.ok) {
@@ -227,11 +206,9 @@ class ExternalAPI {
     config?: RequestInit,
     overwriteBaseUrl?: string
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       ...this.params,
       ...params,
-      headers,
     });
     const cachedItem = this.cache?.get<T>(cacheKey);
 
@@ -246,7 +223,10 @@ class ExternalAPI {
         const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
         this.fetch(url, {
           ...config,
-          headers,
+          headers: {
+            ...this.defaultHeaders,
+            ...config?.headers,
+          },
         }).then(async (response) => {
           if (!response.ok) {
             const text = await response.text();
@@ -269,7 +249,10 @@ class ExternalAPI {
     const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
     const response = await this.fetch(url, {
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
     });
     if (!response.ok) {
       const text = await response.text();
@@ -289,14 +272,6 @@ class ExternalAPI {
     return data;
   }
 
-  protected removeCache(endpoint: string, options?: Record<string, string>) {
-    const cacheKey = this.serializeCacheKey(endpoint, {
-      ...this.params,
-      ...options,
-    });
-    this.cache?.del(cacheKey);
-  }
-
   private formatUrl(
     endpoint: string,
     params?: Record<string, string>,
@@ -321,13 +296,13 @@ class ExternalAPI {
 
   private serializeCacheKey(
     endpoint: string,
-    options?: Record<string, unknown>
+    params?: Record<string, unknown>
   ) {
-    if (!options) {
+    if (!params) {
       return `${this.baseUrl}${endpoint}`;
     }
 
-    return `${this.baseUrl}${endpoint}${JSON.stringify(options)}`;
+    return `${this.baseUrl}${endpoint}${JSON.stringify(params)}`;
   }
 
   private async getDataFromResponse(response: Response) {

server/api/jellyfin.ts

@@ -138,38 +138,39 @@ class JellyfinAPI extends ExternalAPI {
     try {
       return await authenticate(true);
     } catch (e) {
-      logger.debug('Failed to authenticate with headers', {
+      logger.debug(`Failed to authenticate with headers: ${e.message}`, {
         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) {
-      if (e.cause.status === 401) {
+      const status = e.cause?.status;
-        throw new ApiError(e.cause.status, ApiErrorCode.InvalidCredentials);
+
+      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);
       }
 
-      logger.error(
+      throw new ApiError(status, ApiErrorCode.InvalidCredentials);
-        '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);
     }
   }
 
@@ -197,8 +198,8 @@ class JellyfinAPI extends ExternalAPI {
       return serverResponse.ServerName;
     } catch (e) {
       logger.error(
-        'Something went wrong while getting the server name from the Jellyfin server',
+        `Something went wrong while getting the server name from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        { label: 'Jellyfin API' }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.Unknown);
@@ -212,8 +213,8 @@ class JellyfinAPI extends ExternalAPI {
       return { users: userReponse };
     } catch (e) {
       logger.error(
-        'Something went wrong while getting the account from the Jellyfin server',
+        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        { label: 'Jellyfin API' }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -228,8 +229,8 @@ class JellyfinAPI extends ExternalAPI {
       return userReponse;
     } catch (e) {
       logger.error(
-        'Something went wrong while getting the account from the Jellyfin server',
+        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        { label: 'Jellyfin API' }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -252,11 +253,8 @@ class JellyfinAPI extends ExternalAPI {
         return this.mapLibraries(mediaFolderResponse.Items);
       } catch (e) {
         logger.error(
-          'Something went wrong while getting libraries from the Jellyfin server',
+          `Something went wrong while getting libraries from the Jellyfin server: ${e.message}`,
-          {
+          { label: 'Jellyfin API' }
-            label: 'Jellyfin API',
-            error: e.cause.message ?? e.cause.statusText,
-          }
         );
 
         return [];
@@ -310,8 +308,8 @@ class JellyfinAPI extends ExternalAPI {
       );
     } catch (e) {
       logger.error(
-        'Something went wrong while getting library content from the Jellyfin server',
+        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        { label: 'Jellyfin API' }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -331,8 +329,8 @@ class JellyfinAPI extends ExternalAPI {
       return itemResponse;
     } catch (e) {
       logger.error(
-        'Something went wrong while getting library content from the Jellyfin server',
+        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        { label: 'Jellyfin API' }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -356,8 +354,8 @@ class JellyfinAPI extends ExternalAPI {
       }
 
       logger.error(
-        'Something went wrong while getting library content from the Jellyfin server',
+        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        { label: 'Jellyfin API' }
       );
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
     }
@@ -370,8 +368,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',
+        `Something went wrong while getting the list of seasons from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        { label: 'Jellyfin API' }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -395,8 +393,8 @@ class JellyfinAPI extends ExternalAPI {
       );
     } catch (e) {
       logger.error(
-        'Something went wrong while getting the list of episodes from the Jellyfin server',
+        `Something went wrong while getting the list of episodes from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        { label: 'Jellyfin API' }
       );
 
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
@@ -412,8 +410,8 @@ class JellyfinAPI extends ExternalAPI {
       ).AccessToken;
     } catch (e) {
       logger.error(
-        'Something went wrong while creating an API key from the Jellyfin server',
+        `Something went wrong while creating an API key the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        { label: 'Jellyfin API' }
       );
 
       throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);

server/api/plexapi.ts

@@ -180,7 +180,7 @@ class PlexAPI {
       settings.plex.libraries = [];
     }
 
-    await settings.save();
+    settings.save();
   }
 
   public async getLibraryContents(

server/api/plextv.ts

@@ -3,7 +3,6 @@ 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';
 
 interface PlexAccountResponse {
@@ -128,11 +127,6 @@ export interface PlexWatchlistItem {
   title: string;
 }
 
-export interface PlexWatchlistCache {
-  etag: string;
-  response: WatchlistResponse;
-}
-
 class PlexTvAPI extends ExternalAPI {
   private authToken: string;
 
@@ -267,11 +261,6 @@ class PlexTvAPI extends ExternalAPI {
     items: PlexWatchlistItem[];
   }> {
     try {
-      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(),
@@ -279,62 +268,42 @@ class PlexTvAPI extends ExternalAPI {
       const response = await this.fetch(
         `https://metadata.provider.plex.tv/library/sections/watchlist/all?${params.toString()}`,
         {
-          headers: {
+          headers: this.defaultHeaders,
-            ...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(
-        (cachedWatchlist?.response.MediaContainer.Metadata ?? []).map(
+        (data.MediaContainer.Metadata ?? []).map(async (watchlistItem) => {
-          async (watchlistItem) => {
+          const detailedResponse = await this.getRolling<MetadataResponse>(
-            const detailedResponse = await this.getRolling<MetadataResponse>(
+            `/library/metadata/${watchlistItem.ratingKey}`,
-              `/library/metadata/${watchlistItem.ratingKey}`,
+            {},
-              {},
+            undefined,
-              undefined,
+            {},
-              {},
+            'https://metadata.provider.plex.tv'
-              'https://metadata.provider.plex.tv'
+          );
-            );
 
-            const metadata = detailedResponse.MediaContainer.Metadata[0];
+          const metadata = detailedResponse.MediaContainer.Metadata[0];
 
-            const tmdbString = metadata.Guid.find((guid) =>
+          const tmdbString = metadata.Guid.find((guid) =>
-              guid.id.startsWith('tmdb')
+            guid.id.startsWith('tmdb')
-            );
+          );
-            const tvdbString = metadata.Guid.find((guid) =>
+          const tvdbString = metadata.Guid.find((guid) =>
-              guid.id.startsWith('tvdb')
+            guid.id.startsWith('tvdb')
-            );
+          );
 
-            return {
+          return {
-              ratingKey: metadata.ratingKey,
+            ratingKey: metadata.ratingKey,
-              // This should always be set? But I guess it also cannot be?
+            // This should always be set? But I guess it also cannot be?
-              // We will filter out the 0's afterwards
+            // We will filter out the 0's afterwards
-              tmdbId: tmdbString ? Number(tmdbString.id.split('//')[1]) : 0,
+            tmdbId: tmdbString ? Number(tmdbString.id.split('//')[1]) : 0,
-              tvdbId: tvdbString
+            tvdbId: tvdbString
-                ? Number(tvdbString.id.split('//')[1])
+              ? Number(tvdbString.id.split('//')[1])
-                : undefined,
+              : undefined,
-              title: metadata.title,
+            title: metadata.title,
-              type: metadata.type,
+            type: metadata.type,
-            };
+          };
-          }
+        })
-        )
       );
 
       const filteredList = watchlistDetails.filter((detail) => detail.tmdbId);
@@ -342,7 +311,7 @@ class PlexTvAPI extends ExternalAPI {
       return {
         offset,
         size,
-        totalSize: cachedWatchlist?.response.MediaContainer.totalSize ?? 0,
+        totalSize: data.MediaContainer.totalSize,
         items: filteredList,
       };
     } catch (e) {
@@ -358,29 +327,6 @@ 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/rating/rottentomatoes.ts

@@ -128,7 +128,7 @@ class RottenTomatoes extends ExternalAPI {
         movie = contentResults.hits.find((movie) => movie.title === name);
       }
 
-      if (!movie?.rottenTomatoes) {
+      if (!movie) {
         return null;
       }
 

server/api/servarr/radarr.ts

@@ -230,23 +230,6 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
       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

@@ -353,30 +353,6 @@ class SonarrAPI extends ServarrBase<{
       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/themoviedb/index.ts

@@ -99,12 +99,12 @@ interface DiscoverTvOptions {
 }
 
 class TheMovieDb extends ExternalAPI {
-  private discoverRegion?: string;
+  private region?: string;
   private originalLanguage?: string;
   constructor({
-    discoverRegion,
+    region,
     originalLanguage,
-  }: { discoverRegion?: string; originalLanguage?: string } = {}) {
+  }: { region?: string; originalLanguage?: string } = {}) {
     super(
       'https://api.themoviedb.org/3',
       {
@@ -118,7 +118,7 @@ class TheMovieDb extends ExternalAPI {
         },
       }
     );
-    this.discoverRegion = discoverRegion;
+    this.region = region;
     this.originalLanguage = originalLanguage;
   }
 
@@ -469,7 +469,7 @@ class TheMovieDb extends ExternalAPI {
         page: page.toString(),
         include_adult: includeAdult ? 'true' : 'false',
         language,
-        region: this.discoverRegion || '',
+        region: this.region || '',
         with_original_language:
           originalLanguage && originalLanguage !== 'all'
             ? originalLanguage
@@ -541,7 +541,7 @@ class TheMovieDb extends ExternalAPI {
         sort_by: sortBy,
         page: page.toString(),
         language,
-        region: this.discoverRegion || '',
+        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':
@@ -594,7 +594,7 @@ class TheMovieDb extends ExternalAPI {
         {
           page: page.toString(),
           language,
-          region: this.discoverRegion || '',
+          region: this.region || '',
           originalLanguage: this.originalLanguage || '',
         }
       );
@@ -620,7 +620,7 @@ class TheMovieDb extends ExternalAPI {
         {
           page: page.toString(),
           language,
-          region: this.discoverRegion || '',
+          region: this.region || '',
         }
       );
 

server/constants/error.ts

@@ -4,7 +4,6 @@ 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,43 +1,7 @@
-import fs from 'fs';
+import 'reflect-metadata';
-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
@@ -45,10 +9,10 @@ const devConfig: DataSourceOptions = {
     : 'config/db/db.sqlite3',
   synchronize: true,
   migrationsRun: false,
-  logging: boolFromEnv('DB_LOG_QUERIES'),
+  logging: false,
   enableWAL: true,
   entities: ['server/entity/**/*.ts'],
-  migrations: ['server/migration/sqlite/**/*.ts'],
+  migrations: ['server/migration/**/*.ts'],
   subscribers: ['server/subscriber/**/*.ts'],
 };
 
@@ -59,60 +23,16 @@ const prodConfig: DataSourceOptions = {
     : 'config/db/db.sqlite3',
   synchronize: false,
   migrationsRun: false,
-  logging: boolFromEnv('DB_LOG_QUERIES'),
+  logging: false,
   enableWAL: true,
   entities: ['dist/entity/**/*.js'],
-  migrations: ['dist/migration/sqlite/**/*.js'],
+  migrations: ['dist/migration/**/*.js'],
   subscribers: ['dist/subscriber/**/*.js'],
 };
 
-const postgresDevConfig: DataSourceOptions = {
+const dataSource = new DataSource(
-  type: 'postgres',
+  process.env.NODE_ENV !== 'production' ? devConfig : prodConfig
-  host: process.env.DB_SOCKET_PATH || process.env.DB_HOST,
+);
-  port: process.env.DB_SOCKET_PATH
-    ? undefined
-    : 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_SOCKET_PATH || process.env.DB_HOST,
-  port: process.env.DB_SOCKET_PATH
-    ? undefined
-    : 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: Promise.resolve(blacklist),
+        blacklist: blacklist,
       });
 
       await mediaRepository.save(media);
     } else {
-      media.blacklist = Promise.resolve(blacklist);
+      media.blacklist = blacklist;
       media.status = MediaStatus.BLACKLISTED;
       media.status4k = MediaStatus.BLACKLISTED;
 

server/entity/Media.ts

@@ -10,7 +10,6 @@ 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,
@@ -43,10 +42,6 @@ class Media {
         finalIds = tmdbIds;
       }
 
-      if (finalIds.length === 0) {
-        return [];
-      }
-
       const media = await mediaRepository
         .createQueryBuilder('media')
         .leftJoinAndSelect(
@@ -123,8 +118,10 @@ class Media {
   @OneToMany(() => Issue, (issue) => issue.media, { cascade: true })
   public issues: Issue[];
 
-  @OneToOne(() => Blacklist, (blacklist) => blacklist.media)
+  @OneToOne(() => Blacklist, (blacklist) => blacklist.media, {
-  public blacklist: Promise<Blacklist>;
+    eager: true,
+  })
+  public blacklist: Blacklist;
 
   @CreateDateColumn()
   public createdAt: Date;
@@ -132,23 +129,10 @@ 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,14 +7,12 @@ 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';
@@ -59,7 +57,6 @@ export class MediaRequest {
     const mediaRepository = getRepository(Media);
     const requestRepository = getRepository(MediaRequest);
     const userRepository = getRepository(User);
-    const settings = getSettings();
 
     let requestUser = user;
 
@@ -208,134 +205,6 @@ 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);
 
@@ -374,9 +243,9 @@ export class MediaRequest {
           : undefined,
         is4k: requestBody.is4k,
         serverId: requestBody.serverId,
-        profileId: profileId,
+        profileId: requestBody.profileId,
-        rootFolder: rootFolder,
+        rootFolder: requestBody.rootFolder,
-        tags: tags,
+        tags: requestBody.tags,
         isAutoRequest: options.isAutoRequest ?? false,
       });
 
@@ -386,14 +255,12 @@ export class MediaRequest {
       const tmdbMediaShow = tmdbMedia as Awaited<
         ReturnType<typeof tmdb.getTvShow>
       >;
-      let requestedSeasons =
+      const requestedSeasons =
         requestBody.seasons === 'all'
-          ? tmdbMediaShow.seasons.map((season) => season.season_number)
+          ? tmdbMediaShow.seasons
+              .map((season) => season.season_number)
+              .filter((sn) => sn > 0)
           : (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
@@ -479,10 +346,10 @@ export class MediaRequest {
           : undefined,
         is4k: requestBody.is4k,
         serverId: requestBody.serverId,
-        profileId: profileId,
+        profileId: requestBody.profileId,
-        rootFolder: rootFolder,
+        rootFolder: requestBody.rootFolder,
         languageProfileId: requestBody.languageProfileId,
-        tags: tags,
+        tags: requestBody.tags,
         seasons: finalSeasons.map(
           (sn) =>
             new SeasonRequest({
@@ -719,15 +586,10 @@ 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
     ) {
-      const statusField = this.is4k ? 'status4k' : 'status';
+      media[this.is4k ? 'status4k' : 'status'] = MediaStatus.PROCESSING;
-
+      mediaRepository.save(media);
-      await mediaRepository.update(
-        { id: this.media.id },
-        { [statusField]: MediaStatus.PROCESSING }
-      );
     }
 
     if (
@@ -997,7 +859,7 @@ export class MediaRequest {
             const requestRepository = getRepository(MediaRequest);
 
             this.status = MediaRequestStatus.FAILED;
-            await requestRepository.save(this);
+            requestRepository.save(this);
 
             logger.warn(
               'Something went wrong sending movie request to Radarr, marking status as FAILED',
@@ -1010,14 +872,6 @@ 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',
@@ -1275,23 +1129,18 @@ export class MediaRequest {
               throw new Error('Media data not found');
             }
 
-            const updateFields = {
+            media[this.is4k ? 'externalServiceId4k' : 'externalServiceId'] =
-              [this.is4k ? 'externalServiceId4k' : 'externalServiceId']:
+              sonarrSeries.id;
-                sonarrSeries.id,
+            media[this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] =
-              [this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']:
+              sonarrSeries.titleSlug;
-                sonarrSeries.titleSlug,
+            media[this.is4k ? 'serviceId4k' : 'serviceId'] = sonarrSettings?.id;
-              [this.is4k ? 'serviceId4k' : 'serviceId']: sonarrSettings?.id,
+            await mediaRepository.save(media);
-            };
-
-            await mediaRepository.update({ id: this.media.id }, updateFields);
           })
           .catch(async () => {
             const requestRepository = getRepository(MediaRequest);
 
-            await requestRepository.update(
+            this.status = MediaRequestStatus.FAILED;
-              { id: this.id },
+            requestRepository.save(this);
-              { status: MediaRequestStatus.FAILED }
-            );
 
             logger.warn(
               'Something went wrong sending series request to Sonarr, marking status as FAILED',
@@ -1304,15 +1153,6 @@ 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

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

server/entity/UserSettings.ts

@@ -31,10 +31,7 @@ export class UserSettings {
   public locale?: string;
 
   @Column({ nullable: true })
-  public discoverRegion?: string;
+  public region?: string;
-
-  @Column({ nullable: true })
-  public streamingRegion?: string;
 
   @Column({ nullable: true })
   public originalLanguage?: string;
@@ -60,9 +57,6 @@ 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, isPgsql } from '@server/datasource';
+import dataSource, { getRepository } from '@server/datasource';
 import DiscoverSlider from '@server/entity/DiscoverSlider';
 import { Session } from '@server/entity/Session';
 import { User } from '@server/entity/User';
@@ -21,9 +21,7 @@ import clearCookies from '@server/middleware/clearcookies';
 import routes from '@server/routes';
 import avatarproxy from '@server/routes/avatarproxy';
 import imageproxy from '@server/routes/imageproxy';
-import { appDataPermissions } from '@server/utils/appDataVolume';
 import { getAppVersion } from '@server/utils/appVersion';
-import createCustomProxyAgent from '@server/utils/customProxyAgent';
 import restartFlag from '@server/utils/restartFlag';
 import { getClientIp } from '@supercharge/request-ip';
 import { TypeormStore } from 'connect-typeorm/out';
@@ -53,12 +51,6 @@ const dev = process.env.NODE_ENV !== 'production';
 const app = next({ dev });
 const handle = app.getRequestHandler();
 
-if (!appDataPermissions()) {
-  logger.error(
-    'Something went wrong while checking config folder! Please ensure the config folder is set up properly.\nhttps://docs.jellyseerr.dev/getting-started'
-  );
-}
-
 app
   .prepare()
   .then(async () => {
@@ -66,24 +58,15 @@ app
 
     // Run migrations in production
     if (process.env.NODE_ENV === 'production') {
-      if (isPgsql) {
+      await dbConnection.query('PRAGMA foreign_keys=OFF');
-        await dbConnection.runMigrations();
+      await dbConnection.runMigrations();
-      } else {
+      await dbConnection.query('PRAGMA foreign_keys=ON');
-        await dbConnection.query('PRAGMA foreign_keys=OFF');
-        await dbConnection.runMigrations();
-        await dbConnection.query('PRAGMA foreign_keys=ON');
-      }
     }
 
     // Load Settings
     const settings = await getSettings().load();
     restartFlag.initializeSettings(settings.main);
 
-    // Register HTTP proxy
-    if (settings.main.proxy.enabled) {
-      await createCustomProxyAgent(settings.main.proxy);
-    }
-
     // Migrate library types
     if (
       settings.plex.libraries.length > 1 &&

server/interfaces/api/discoverInterfaces.ts

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

server/interfaces/api/overrideRuleInterfaces.ts

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

server/interfaces/api/settingsInterfaces.ts

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

server/interfaces/api/userSettingsInterfaces.ts

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

server/job/schedule.ts

@@ -2,7 +2,6 @@ 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,
@@ -14,6 +13,7 @@ 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,20 +113,30 @@ export const startJobs = (): void => {
   }
 
   // Watchlist Sync
-  scheduledJobs.push({
+  const watchlistSyncJob: ScheduledJob = {
     id: 'plex-watchlist-sync',
     name: 'Plex Watchlist Sync',
     type: 'process',
-    interval: 'seconds',
+    interval: 'fixed',
     cronSchedule: jobs['plex-watchlist-sync'].schedule,
-    job: schedule.scheduleJob(jobs['plex-watchlist-sync'].schedule, () => {
+    job: schedule.scheduleJob(new Date(Date.now() + 1000 * 60 * 20), () => {
       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',
@@ -223,19 +233,5 @@ 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,8 +8,7 @@ export type AvailableCacheIds =
   | 'imdb'
   | 'github'
   | 'plexguid'
-  | 'plextv'
+  | 'plextv';
-  | 'plexwatchlist';
 
 const DEFAULT_TTL = 300;
 const DEFAULT_CHECK_PERIOD = 120;
@@ -69,7 +68,6 @@ class CacheManager {
       stdTtl: 86400 * 7, // 1 week cache
       checkPeriod: 60,
     }),
-    plexwatchlist: new Cache('plexwatchlist', 'Plex Watchlist'),
   };
 
   public getCache(id: AvailableCacheIds): Cache {

server/lib/notifications/agents/discord.ts

@@ -291,10 +291,6 @@ class DiscordAgent
         }
       }
 
-      if (settings.options.webhookRoleId) {
-        userMentions.push(`<@&${settings.options.webhookRoleId}>`);
-      }
-
       const response = await fetch(settings.options.webhookUrl, {
         method: 'POST',
         headers: {

server/lib/notifications/agents/telegram.ts

@@ -17,7 +17,6 @@ interface TelegramMessagePayload {
   text: string;
   parse_mode: string;
   chat_id: string;
-  message_thread_id: string;
   disable_notification: boolean;
 }
 
@@ -26,7 +25,6 @@ interface TelegramPhotoPayload {
   caption: string;
   parse_mode: string;
   chat_id: string;
-  message_thread_id: string;
   disable_notification: boolean;
 }
 
@@ -184,7 +182,6 @@ class TelegramAgent
           body: JSON.stringify({
             ...notificationPayload,
             chat_id: settings.options.chatId,
-            message_thread_id: settings.options.messageThreadId,
             disable_notification: !!settings.options.sendSilently,
           } as TelegramMessagePayload | TelegramPhotoPayload),
         });
@@ -236,8 +233,6 @@ class TelegramAgent
             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),
@@ -301,7 +296,6 @@ class TelegramAgent
                   body: JSON.stringify({
                     ...notificationPayload,
                     chat_id: user.settings.telegramChatId,
-                    message_thread_id: user.settings.telegramMessageThreadId,
                     disable_notification: !!user.settings?.telegramSendSilently,
                   } as TelegramMessagePayload | TelegramPhotoPayload),
                 });

server/lib/refreshToken.ts

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

server/lib/scanners/plex/index.ts

@@ -129,7 +129,7 @@ class PlexScanner
           });
 
           settings.plex.libraries = newLibraries;
-          await settings.save();
+          settings.save();
         }
       } else {
         for (const library of this.libraries) {
@@ -277,11 +277,8 @@ class PlexScanner
 
     const seasons = tvShow.seasons;
     const processableSeasons: ProcessableSeason[] = [];
-    const settings = getSettings();
 
-    const filteredSeasons = settings.main.enableSpecialEpisodes
+    const filteredSeasons = seasons.filter((sn) => sn.season_number !== 0);
-      ? 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,12 +102,11 @@ class SonarrScanner
       }
 
       const tmdbId = tvShow.id;
-      const settings = getSettings();
 
       const filteredSeasons = sonarrSeries.seasons.filter(
         (sn) =>
-          tvShow.seasons.find((s) => s.season_number === sn.seasonNumber) &&
+          sn.seasonNumber !== 0 &&
-          (!settings.main.enableSpecialEpisodes ? sn.seasonNumber !== 0 : true)
+          tvShow.seasons.find((s) => s.season_number === sn.seasonNumber)
       );
 
       for (const season of filteredSeasons) {

server/lib/settings/index.ts

@@ -2,7 +2,7 @@ import { MediaServerType } from '@server/constants/server';
 import { Permission } from '@server/lib/permissions';
 import { runMigrations } from '@server/lib/settings/migrator';
 import { randomUUID } from 'crypto';
-import fs from 'fs/promises';
+import fs from 'fs';
 import { merge } from 'lodash';
 import path from 'path';
 import webpush from 'web-push';
@@ -76,7 +76,6 @@ export interface DVRSettings {
   syncEnabled: boolean;
   preventSearch: boolean;
   tagRequests: boolean;
-  overrideRule: number[];
 }
 
 export interface RadarrSettings extends DVRSettings {
@@ -100,17 +99,6 @@ interface Quota {
   quotaDays?: number;
 }
 
-export interface ProxySettings {
-  enabled: boolean;
-  hostname: string;
-  port: number;
-  useSsl: boolean;
-  user: string;
-  password: string;
-  bypassFilter: string;
-  bypassLocalAddresses: boolean;
-}
-
 export interface MainSettings {
   apiKey: string;
   applicationTitle: string;
@@ -125,15 +113,12 @@ export interface MainSettings {
   hideAvailable: boolean;
   localLogin: boolean;
   newPlexLogin: boolean;
-  discoverRegion: string;
+  region: string;
-  streamingRegion: string;
   originalLanguage: string;
   trustProxy: boolean;
   mediaServerType: number;
   partialRequestsEnabled: boolean;
-  enableSpecialEpisodes: boolean;
   locale: string;
-  proxy: ProxySettings;
 }
 
 interface PublicSettings {
@@ -147,15 +132,13 @@ interface FullPublicSettings extends PublicSettings {
   localLogin: boolean;
   movie4kEnabled: boolean;
   series4kEnabled: boolean;
-  discoverRegion: string;
+  region: string;
-  streamingRegion: string;
   originalLanguage: string;
   mediaServerType: number;
   jellyfinExternalHost?: string;
   jellyfinForgotPasswordUrl?: string;
   jellyfinServerName?: string;
   partialRequestsEnabled: boolean;
-  enableSpecialEpisodes: boolean;
   cacheImages: boolean;
   vapidPublic: string;
   enablePushRegistration: boolean;
@@ -175,7 +158,6 @@ export interface NotificationAgentDiscord extends NotificationAgentConfig {
     botUsername?: string;
     botAvatarUrl?: string;
     webhookUrl: string;
-    webhookRoleId?: string;
     enableMentions: boolean;
   };
 }
@@ -216,7 +198,6 @@ export interface NotificationAgentTelegram extends NotificationAgentConfig {
     botUsername?: string;
     botAPI: string;
     chatId: string;
-    messageThreadId: string;
     sendSilently: boolean;
   };
 }
@@ -288,7 +269,6 @@ export type JobId =
   | 'plex-recently-added-scan'
   | 'plex-full-scan'
   | 'plex-watchlist-sync'
-  | 'plex-refresh-token'
   | 'radarr-scan'
   | 'sonarr-scan'
   | 'download-sync'
@@ -339,24 +319,12 @@ class Settings {
         hideAvailable: false,
         localLogin: true,
         newPlexLogin: true,
-        discoverRegion: '',
+        region: '',
-        streamingRegion: '',
         originalLanguage: '',
         trustProxy: false,
         mediaServerType: MediaServerType.NOT_CONFIGURED,
         partialRequestsEnabled: true,
-        enableSpecialEpisodes: false,
         locale: 'en',
-        proxy: {
-          enabled: false,
-          hostname: '',
-          port: 8080,
-          useSsl: false,
-          user: '',
-          password: '',
-          bypassFilter: '',
-          bypassLocalAddresses: true,
-        },
       },
       plex: {
         name: '',
@@ -404,7 +372,6 @@ class Settings {
             types: 0,
             options: {
               webhookUrl: '',
-              webhookRoleId: '',
               enableMentions: true,
             },
           },
@@ -428,7 +395,6 @@ class Settings {
             options: {
               botAPI: '',
               chatId: '',
-              messageThreadId: '',
               sendSilently: false,
             },
           },
@@ -479,10 +445,7 @@ class Settings {
           schedule: '0 0 3 * * *',
         },
         'plex-watchlist-sync': {
-          schedule: '0 */3 * * * *',
+          schedule: '0 */10 * * * *',
-        },
-        'plex-refresh-token': {
-          schedule: '0 0 5 * * *',
         },
         'radarr-scan': {
           schedule: '0 0 4 * * *',
@@ -516,6 +479,10 @@ class Settings {
   }
 
   get main(): MainSettings {
+    if (!this.data.main.apiKey) {
+      this.data.main.apiKey = this.generateApiKey();
+      this.save();
+    }
     return this.data.main;
   }
 
@@ -585,12 +552,10 @@ class Settings {
       series4kEnabled: this.data.sonarr.some(
         (sonarr) => sonarr.is4k && sonarr.isDefault
       ),
-      discoverRegion: this.data.main.discoverRegion,
+      region: this.data.main.region,
-      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,
@@ -619,20 +584,29 @@ class Settings {
   }
 
   get clientId(): string {
+    if (!this.data.clientId) {
+      this.data.clientId = randomUUID();
+      this.save();
+    }
+
     return this.data.clientId;
   }
 
   get vapidPublic(): string {
+    this.generateVapidKeys();
+
     return this.data.vapidPublic;
   }
 
   get vapidPrivate(): string {
+    this.generateVapidKeys();
+
     return this.data.vapidPrivate;
   }
 
-  public async regenerateApiKey(): Promise<MainSettings> {
+  public regenerateApiKey(): MainSettings {
     this.main.apiKey = this.generateApiKey();
-    await this.save();
+    this.save();
     return this.main;
   }
 
@@ -644,6 +618,15 @@ class Settings {
     }
   }
 
+  private generateVapidKeys(force = false): void {
+    if (!this.data.vapidPublic || !this.data.vapidPrivate || force) {
+      const vapidKeys = webpush.generateVAPIDKeys();
+      this.data.vapidPrivate = vapidKeys.privateKey;
+      this.data.vapidPublic = vapidKeys.publicKey;
+      this.save();
+    }
+  }
+
   /**
    * Settings Load
    *
@@ -658,50 +641,30 @@ class Settings {
       return this;
     }
 
-    let data;
+    if (!fs.existsSync(SETTINGS_PATH)) {
-    try {
+      this.save();
-      data = await fs.readFile(SETTINGS_PATH, 'utf-8');
-    } catch {
-      await this.save();
     }
+    const data = fs.readFileSync(SETTINGS_PATH, 'utf-8');
 
     if (data) {
       const parsedJson = JSON.parse(data);
-      const migratedData = await runMigrations(parsedJson, SETTINGS_PATH);
+      this.data = await runMigrations(parsedJson, SETTINGS_PATH);
-      this.data = merge(this.data, migratedData);
-    }
 
-    // generate keys and ids if it's missing
+      this.data = merge(this.data, parsedJson);
-    let change = false;
+
-    if (!this.data.main.apiKey) {
+      if (process.env.API_KEY) {
-      this.data.main.apiKey = this.generateApiKey();
+        if (this.main.apiKey != process.env.API_KEY) {
-      change = true;
+          this.main.apiKey = process.env.API_KEY;
-    } else if (process.env.API_KEY) {
+        }
-      if (this.main.apiKey != process.env.API_KEY) {
-        this.main.apiKey = process.env.API_KEY;
       }
-    }
-    if (!this.data.clientId) {
-      this.data.clientId = randomUUID();
-      change = true;
-    }
-    if (!this.data.vapidPublic || !this.data.vapidPrivate) {
-      const vapidKeys = webpush.generateVAPIDKeys();
-      this.data.vapidPrivate = vapidKeys.privateKey;
-      this.data.vapidPublic = vapidKeys.publicKey;
-      change = true;
-    }
-    if (change) {
-      await this.save();
-    }
 
+      this.save();
+    }
     return this;
   }
 
-  public async save(): Promise<void> {
+  public save(): void {
-    const tmp = SETTINGS_PATH + '.tmp';
+    fs.writeFileSync(SETTINGS_PATH, JSON.stringify(this.data, undefined, ' '));
-    await fs.writeFile(tmp, JSON.stringify(this.data, undefined, ' '));
-    await fs.rename(tmp, SETTINGS_PATH);
   }
 }
 

server/lib/settings/migrations/0001_migrate_hostname.ts

@@ -1,14 +1,15 @@
 import type { AllSettings } from '@server/lib/settings';
 
 const migrateHostname = (settings: any): AllSettings => {
-  if (settings.jellyfin?.hostname) {
+  const oldJellyfinSettings = settings.jellyfin;
-    const { hostname } = settings.jellyfin;
+  if (oldJellyfinSettings && oldJellyfinSettings.hostname) {
+    const { hostname } = oldJellyfinSettings;
     const protocolMatch = hostname.match(/^(https?):\/\//i);
     const useSsl = protocolMatch && protocolMatch[1].toLowerCase() === 'https';
     const remainingUrl = hostname.replace(/^(https?):\/\//i, '');
     const urlMatch = remainingUrl.match(/^([^:]+)(:([0-9]+))?(\/.*)?$/);
 
-    delete settings.jellyfin.hostname;
+    delete oldJellyfinSettings.hostname;
     if (urlMatch) {
       const [, ip, , port, urlBase] = urlMatch;
       settings.jellyfin = {
@@ -20,7 +21,9 @@ const migrateHostname = (settings: any): AllSettings => {
       };
     }
   }
-
+  if (settings.jellyfin && settings.jellyfin.hostname) {
+    delete settings.jellyfin.hostname;
+  }
   return settings;
 };
 

server/lib/settings/migrations/0002_migrate_apitokens.ts

@@ -27,14 +27,8 @@ const migrateApiTokens = async (settings: any): Promise<AllSettings> => {
       admin.jellyfinDeviceId
     );
     jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
-    try {
+    const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
-      const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
+    settings.jellyfin.apiKey = apiKey;
-      settings.jellyfin.apiKey = apiKey;
-    } catch {
-      throw new Error(
-        "Failed to create Jellyfin API token from admin account. Please check your network configuration or edit your settings.json by adding an 'apiKey' field inside of the 'jellyfin' section to fix this issue."
-      );
-    }
   }
   return settings;
 };

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

@@ -1,17 +0,0 @@
-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/settings/migrator.ts

@@ -1,6 +1,7 @@
+/* eslint-disable no-console */
 import type { AllSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import fs from 'fs/promises';
+import fs from 'fs';
 import path from 'path';
 
 const migrationsDir = path.join(__dirname, 'migrations');
@@ -9,56 +10,19 @@ export const runMigrations = async (
   settings: AllSettings,
   SETTINGS_PATH: string
 ): Promise<AllSettings> => {
+  const migrations = fs
+    .readdirSync(migrationsDir)
+    .filter((file) => file.endsWith('.js') || file.endsWith('.ts'))
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    .map((file) => require(path.join(migrationsDir, file)).default);
+
   let migrated = settings;
 
   try {
-    // we read old backup and create a backup of currents settings
-    const BACKUP_PATH = SETTINGS_PATH.replace('.json', '.old.json');
-    let oldBackup: string | null = null;
-    try {
-      oldBackup = await fs.readFile(BACKUP_PATH, 'utf-8');
-    } catch {
-      /* empty */
-    }
-    await fs.writeFile(BACKUP_PATH, JSON.stringify(settings, undefined, ' '));
-
-    const migrations = (await fs.readdir(migrationsDir)).filter(
-      (file) => file.endsWith('.js') || file.endsWith('.ts')
-    );
-
     const settingsBefore = JSON.stringify(migrated);
 
     for (const migration of migrations) {
-      try {
+      migrated = await migration(migrated);
-        logger.debug(`Checking migration '${migration}'...`, {
-          label: 'Settings Migrator',
-        });
-        const { default: migrationFn } = await import(
-          path.join(migrationsDir, migration)
-        );
-        const newSettings = await migrationFn(structuredClone(migrated));
-        if (JSON.stringify(migrated) !== JSON.stringify(newSettings)) {
-          logger.debug(`Migration '${migration}' has been applied.`, {
-            label: 'Settings Migrator',
-          });
-        }
-        migrated = newSettings;
-      } catch (e) {
-        // we stop jellyseerr if the migration failed
-        logger.error(
-          `Error while running migration '${migration}': ${e.message}`,
-          {
-            label: 'Settings Migrator',
-          }
-        );
-        logger.error(
-          'A common cause for this error is a permission issue with your configuration folder, a network issue or a corrupted database.',
-          {
-            label: 'Settings Migrator',
-          }
-        );
-        process.exit();
-      }
     }
 
     const settingsAfter = JSON.stringify(migrated);
@@ -66,33 +30,30 @@ export const runMigrations = async (
     if (settingsBefore !== settingsAfter) {
       // a migration occured
       // we check that the new config will be saved
-      await fs.writeFile(
+      fs.writeFileSync(SETTINGS_PATH, JSON.stringify(migrated, undefined, ' '));
-        SETTINGS_PATH,
+      const fileSaved = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf-8'));
-        JSON.stringify(migrated, undefined, ' ')
-      );
-      const fileSaved = JSON.parse(await fs.readFile(SETTINGS_PATH, 'utf-8'));
       if (JSON.stringify(fileSaved) !== settingsAfter) {
         // something went wrong while saving file
         throw new Error('Unable to save settings after migration.');
       }
-    } else if (oldBackup) {
-      // no migration occured
-      // we save the old backup (to avoid settings.json and settings.old.json being the same)
-      await fs.writeFile(BACKUP_PATH, oldBackup.toString());
     }
   } catch (e) {
-    // we stop jellyseerr if the migration failed
     logger.error(
       `Something went wrong while running settings migrations: ${e.message}`,
-      {
+      { label: 'Settings Migrator' }
-        label: 'Settings Migrator',
-      }
     );
-    logger.error(
+    // we stop jellyseerr if the migration failed
-      'A common cause for this issue is a permission error of your configuration folder.',
+    console.log(
-      {
+      '===================================================================='
-        label: 'Settings Migrator',
+    );
-      }
+    console.log(
+      '       SOMETHING WENT WRONG WHILE RUNNING SETTINGS MIGRATIONS       '
+    );
+    console.log(
+      '   Please check that your configuration folder is properly set up   '
+    );
+    console.log(
+      '===================================================================='
     );
     process.exit();
   }

server/lib/watchlistsync.ts

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