fix: rewrite the rate limit utility

2025-12-24 02:39:18 -05:00 · 2024-07-26 15:07:24 +02:00
206 changed files with 4547 additions and 10478 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -403,114 +403,6 @@
      "contributions": [
        "doc"
      ]
-    },
-    {
-      "login": "mobihen",
-      "name": "Nir Israel Hen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/35529491?v=4",
-      "profile": "https://mobihen.com",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "XDark187",
-      "name": "Baraa",
-      "avatar_url": "https://avatars.githubusercontent.com/u/39034192?v=4",
-      "profile": "https://github.com/XDark187",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "franciscofsales",
-      "name": "Francisco Sales",
-      "avatar_url": "https://avatars.githubusercontent.com/u/7977645?v=4",
-      "profile": "https://github.com/franciscofsales",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "myselfolli",
-      "name": "Oliver Laing",
-      "avatar_url": "https://avatars.githubusercontent.com/u/37535998?v=4",
-      "profile": "https://github.com/myselfolli",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "M0NsTeRRR",
-      "name": "Ludovic Ortega",
-      "avatar_url": "https://avatars.githubusercontent.com/u/37785089?v=4",
-      "profile": "https://github.com/M0NsTeRRR",
-      "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"
-      ]
    }
  ]
 }
--- a/.dockerignore
+++ b/.dockerignore
@@ -18,7 +18,7 @@ config/logs/*
 config/*.json
 dist
 Dockerfile*
-compose.yaml
+docker-compose.yml
 docs
 LICENSE
 node_modules
--- a/.gitattributes
+++ b/.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
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # Global code ownership
-*                               @Fallenbagel @gauthier-th
+*                               @Fallenbagel
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -1,6 +1,6 @@
 name: 🐛 Bug Report
 description: Report a problem
-labels: ['bug', 'awaiting triage']
+labels: ['type:bug', 'awaiting-triage']
 body:
  - type: markdown
    attributes:
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -1,6 +1,6 @@
 name: ✨ Feature Request
 description: Suggest an idea
-labels: ['enhancement', 'awaiting triage']
+labels: ['type:enhancement', 'awaiting-triage']
 body:
  - type: markdown
    attributes:
--- a/.github/workflows/lint-helm-charts.yml
+++ b/.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
--- a/.github/workflows/test-docs-deploy.yml
+++ b/.github/workflows/test-docs-deploy.yml
@@ -4,7 +4,7 @@ on:
  pull_request:
    branches:
      - develop
-    paths:
+    path:
      - 'docs/**'
      - 'gen-docs/**'

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

 # logs
 config/logs/*.log*
--- a/.prettierignore
+++ b/.prettierignore
@@ -9,6 +9,3 @@ pnpm-lock.yaml
 src/assets/
 public/
 docs/
-
-# helm charts
-**/charts
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -15,11 +15,5 @@ module.exports = {
        rangeEnd: 0, // default: Infinity
      },
    },
-    {
-      files: 'charts/**',
-      options: {
-        rangeEnd: 0, // default: Infinity
-      },
-    },
  ],
 };
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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.

--- a/README.md
+++ b/README.md
@@ -8,10 +8,10 @@
 <p align="center">
 <a href="https://discord.gg/ckbvBtDJgC"><img src="https://img.shields.io/discord/952656177924300932" alt="Discord"></a>
 <a href="https://hub.docker.com/r/fallenbagel/jellyseerr"><img src="https://img.shields.io/docker/pulls/fallenbagel/jellyseerr" alt="Docker pulls"></a>
-<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="http://jellyseerr.borgcube.de/engage/jellyseerr/"><img src="http://jellyseerr.borgcube.de/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-48-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-40-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 **Jellyseerr** is a free and open source software application for managing requests for your media library.
@@ -137,16 +137,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://joaquinolivero.com"><img src="https://avatars.githubusercontent.com/u/66050823?v=4?s=100" width="100px;" alt="Joaquin Olivero"/><br /><sub><b>Joaquin Olivero</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=JoaquinOlivero" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Bretterteig"><img src="https://avatars.githubusercontent.com/u/47298401?v=4?s=100" width="100px;" alt="Julian Behr"/><br /><sub><b>Julian Behr</b></sub></a><br /><a href="#translation-Bretterteig" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ThowZzy"><img src="https://avatars.githubusercontent.com/u/61882536?v=4?s=100" width="100px;" alt="ThowZzy"/><br /><sub><b>ThowZzy</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=ThowZzy" title="Code">💻</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>
-      <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>
-    </tr>
-    <tr>
-      <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://mobihen.com"><img src="https://avatars.githubusercontent.com/u/35529491?v=4?s=100" width="100px;" alt="Nir Israel Hen"/><br /><sub><b>Nir Israel Hen</b></sub></a><br /><a href="#translation-mobihen" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/XDark187"><img src="https://avatars.githubusercontent.com/u/39034192?v=4?s=100" width="100px;" alt="Baraa"/><br /><sub><b>Baraa</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=XDark187" title="Code">💻</a></td>
-      <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>
    </tr>
  </tbody>
 </table>
@@ -291,12 +281,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>
--- a/charts/jellyseerr/.helmignore
+++ b/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/
--- a/charts/jellyseerr/Chart.yaml
+++ b/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
--- a/charts/jellyseerr/README.md
+++ b/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 | `[]` |  |
--- a/charts/jellyseerr/README.md.gotmpl
+++ b/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" . }}
--- a/charts/jellyseerr/templates/NOTES.txt
+++ b/charts/jellyseerr/templates/NOTES.txt
@@ -1,5 +0,0 @@
-***********************************************************************
- Welcome to {{ .Chart.Name }}
- Chart version: {{ .Chart.Version }}
- App   version: {{ .Chart.AppVersion }}
-***********************************************************************
--- a/charts/jellyseerr/templates/_helpers.tpl
+++ b/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 }}
--- a/charts/jellyseerr/templates/deployment.yaml
+++ b/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 }}
--- a/charts/jellyseerr/templates/hpa.yaml
+++ b/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 }}
--- a/charts/jellyseerr/templates/ingress.yaml
+++ b/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 }}
--- a/charts/jellyseerr/templates/persistentvolumeclaim.yaml
+++ b/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 }}"
--- a/charts/jellyseerr/templates/service.yaml
+++ b/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
--- a/charts/jellyseerr/templates/serviceaccount.yaml
+++ b/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 }}
--- a/charts/jellyseerr/templates/tests/test-connection.yaml
+++ b/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
--- a/charts/jellyseerr/values.yaml
+++ b/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: {}
--- a/cypress/config/settings.cypress.json
+++ b/cypress/config/settings.cypress.json
@@ -16,8 +16,7 @@
    "hideAvailable": false,
    "localLogin": true,
    "newPlexLogin": true,
-    "discoverRegion": "",
-    "streamingRegion": "",
+    "region": "",
    "originalLanguage": "",
    "trustProxy": false,
    "mediaServerType": 1,
@@ -76,7 +75,6 @@
        "types": 0,
        "options": {
          "webhookUrl": "",
-          "webhookRoleId": "",
          "enableMentions": true
        }
      },
--- a/cypress/e2e/user/user-list.cy.ts
+++ b/cypress/e2e/user/user-list.cy.ts
@@ -1,5 +1,5 @@
 const testUser = {
-  username: 'Test User',
+  displayName: 'Test User',
  emailAddress: 'test@seeerr.dev',
  password: 'test1234',
 };
@@ -32,7 +32,7 @@ describe('User List', () => {

    cy.get('[data-testid=modal-title]').should('contain', 'Create Local User');

-    cy.get('#username').type(testUser.username);
+    cy.get('#displayName').type(testUser.displayName);
    cy.get('#email').type(testUser.emailAddress);
    cy.get('#password').type(testUser.password);

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,4 @@
+version: '3'
 services:
  jellyseerr:
    build:
--- a/docs/extending-jellyseerr/reverse-proxy.mdx
+++ b/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:
--- a/docs/getting-started/aur.mdx
+++ b/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.
 :::
--- a/docs/getting-started/buildfromsource.mdx
+++ b/docs/getting-started/buildfromsource.mdx
@@ -12,12 +12,49 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';

 ### Prerequisites
+<Tabs groupId="versions" queryString>
+  <TabItem value="latest" label="Latest">
+    - [Node.js 18.x](https://nodejs.org/en/download/)
+    - [Yarn 1.x](https://classic.yarnpkg.com/lang/en/docs/install)
+    - [Git](https://git-scm.com/downloads)
+  </TabItem>
+
+  <TabItem value="develop" label="Develop">
    - [Node.js 20.x](https://nodejs.org/en/download/)
    - [Pnpm 9.x](https://pnpm.io/installation)
    - [Git](https://git-scm.com/downloads)
+  </TabItem>
+</Tabs>
+

 ## Unix (Linux, macOS)
 ### Installation
+<Tabs groupId="versions" queryString>
+  <TabItem value="latest" label="latest">
+1. Assuming you want the working directory to be `/opt/jellyseerr`, create the directory and navigate to it:
+```bash
+sudo mkdir -p /opt/jellyseerr && cd /opt/jellyseerr
+```
+2. Clone the Jellyseerr repository and checkout the latest release:
+```bash
+git clone https://github.com/Fallenbagel/jellyseerr.git
+cd jellyseerr
+git checkout main
+```
+3. Install the dependencies:
+```bash
+CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000
+```
+4. Build the project:
+```bash
+yarn build
+```
+5. Start Jellyseerr:
+```bash
+yarn start
+```
+  </TabItem>
+  <TabItem value="develop" label="develop">
 1. Assuming you want the working directory to be `/opt/jellyseerr`, create the directory and navigate to it:
 ```bash
 sudo mkdir -p /opt/jellyseerr && cd /opt/jellyseerr
@@ -40,6 +77,8 @@ pnpm build
 ```bash
 pnpm start
 ```
+  </TabItem>
+</Tabs>

 :::info
 You can now access Jellyseerr by visiting `http://localhost:5055` in your web browser.
@@ -195,6 +234,32 @@ pm2 status jellyseerr

 ## Windows
 ### Installation
+<Tabs groupId="versions" queryString>
+  <TabItem value="latest" label="latest">
+1. Assuming you want the working directory to be `C:\jellyseerr`, create the directory and navigate to it:
+```powershell
+mkdir C:\jellyseerr
+cd C:\jellyseerr
+```
+2. Clone the Jellyseerr repository and checkout the latest release:
+```powershell
+git clone https://github.com/Fallenbagel/jellyseerr.git .
+git checkout main
+```
+3. Install the dependencies:
+```powershell
+set CYPRESS_INSTALL_BINARY=0 && yarn install --frozen-lockfile --network-timeout 1000000
+```
+4. Build the project:
+```powershell
+yarn build
+```
+5. Start Jellyseerr:
+```powershell
+yarn start
+```
+  </TabItem>
+  <TabItem value="develop" label="develop">
 1. Assuming you want the working directory to be `C:\jellyseerr`, create the directory and navigate to it:
 ```powershell
 mkdir C:\jellyseerr
@@ -207,7 +272,6 @@ git checkout develop # by default, you are on the develop branch so this step is
 ```
 3. Install the dependencies:
 ```powershell
-npm install -g win-node-env
 set CYPRESS_INSTALL_BINARY=0 && pnpm install --frozen-lockfile
 ```
 4. Build the project:
@@ -218,6 +282,8 @@ pnpm build
 ```powershell
 pnpm start
 ```
+  </TabItem>
+</Tabs>

 :::tip
 You can add the environment variables to a `.env` file in the Jellyseerr directory.
@@ -245,7 +311,6 @@ node dist/index.js
 - Set the trigger to "When the computer starts"
 - Set the action to "Start a program"
 - Set the program/script to the path of the `start-jellyseerr.bat` file
- Set the "Start in" to the jellyseerr directory.
 - Click "Finish"

 Now, Jellyseerr will start when the computer boots up in the background.
--- a/docs/getting-started/docker.mdx
+++ b/docs/getting-started/docker.mdx
@@ -71,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:
@@ -94,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.
--- a/docs/getting-started/nixpkg.mdx
+++ b/docs/getting-started/nixpkg.mdx
@@ -22,7 +22,7 @@ export const VersionMismatchWarning = () => {
    <>
      {!isUpToDate ? (
        <Admonition type="warning">
-          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>.
+          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">override the package derivation</a>.
        </Admonition>
      ) : (
        <Admonition type="success">
@@ -95,12 +95,12 @@ export const VersionMatch = () => {
      };

      offlineCache = pkgs.fetchYarnDeps {
-        sha256 = pkgs.lib.fakeSha256;
+        sha256 = pkgs.lib.fakeSha256; 
      };
-    });
+    }); 
  };
 }`;
-
+ 
  const module = `{ config, pkgs, lib, ... }:

 with lib;
--- a/docs/troubleshooting.mdx
+++ b/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.
--- a/docs/using-jellyseerr/notifications/discord.md
+++ b/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 &rarr; Integrations &rarr; 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!
--- a/docs/using-jellyseerr/settings/general.md
+++ b/docs/using-jellyseerr/settings/general.md
@@ -12,8 +12,6 @@ This is your Jellyseerr API key, which can be used to integrate Jellyseerr with

 If you need to generate a new API key for any reason, simply click the button to the right of the text box.

-If you want to set the API key, rather than letting it be randomly generated, you can use the API_KEY environment variable. Whatever that variable is set to will be your API key.
-
 ## Application Title

 If you aren't a huge fan of the name "Jellyseerr" and would like to display something different to your users, you can customize the application title!
@@ -58,9 +56,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

--- a/docs/using-jellyseerr/users/editing-users.md
+++ b/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-and-discover-language) to suit their own preferences.

 ### Movie Request Limit & Series Request Limit

--- a/next.config.js
+++ b/next.config.js
@@ -6,11 +6,15 @@ module.exports = {
    commitTag: process.env.COMMIT_TAG || 'local',
    forceIpv4First: process.env.FORCE_IPV4_FIRST === 'true' ? 'true' : 'false',
  },
+  publicRuntimeConfig: {
+    // Will be available on both server and client
+    JELLYFIN_TYPE: process.env.JELLYFIN_TYPE,
+  },
  images: {
    remotePatterns: [
      { hostname: 'gravatar.com' },
      { hostname: 'image.tmdb.org' },
-      { hostname: 'artworks.thetvdb.com' },
+      { hostname: '*', protocol: 'https' },
    ],
  },
  webpack(config) {
--- a/overseerr-api.yml
+++ b/overseerr-api.yml
@@ -38,8 +38,6 @@ tags:
    description: Endpoints related to getting service (Radarr/Sonarr) details.
  - name: watchlist
    description: Collection of media to watch later
-  - name: blacklist
-    description: Blacklisted media from discovery page.
 servers:
  - url: '{server}/api/v1'
    variables:
@@ -48,19 +46,6 @@ servers:

 components:
  schemas:
-    Blacklist:
-      type: object
-      properties:
-        tmdbId:
-          type: number
-          example: 1
-        title:
-          type: string
-        media:
-          $ref: '#/components/schemas/MediaInfo'
-        userId:
-          type: number
-          example: 1
    Watchlist:
      type: object
      properties:
@@ -143,12 +128,10 @@ components:
      properties:
        locale:
          type: string
-        discoverRegion:
+        region:
          type: string
        originalLanguage:
          type: string
-        streamingRegion:
-          type: string
    MainSettings:
      type: object
      properties:
@@ -1275,8 +1258,6 @@ components:
              type: string
            webhookUrl:
              type: string
-            webhookRoleId:
-              type: string
            enableMentions:
              type: boolean
    SlackSettings:
@@ -1992,9 +1973,6 @@ paths:
                  appDataPath:
                    type: string
                    example: /app/config
-                  appDataPermissions:
-                    type: boolean
-                    example: true
  /settings/main:
    get:
      summary: Get main settings
@@ -2797,15 +2775,6 @@ paths:
                          imageCount:
                            type: number
                            example: 123
-                      avatar:
-                        type: object
-                        properties:
-                          size:
-                            type: number
-                            example: 123456
-                          imageCount:
-                            type: number
-                            example: 123
                  apiCaches:
                    type: array
                    items:
@@ -3617,8 +3586,6 @@ paths:
                  type: string
                email:
                  type: string
-                serverType:
-                  type: number
              required:
                - username
                - password
@@ -4073,109 +4040,6 @@ paths:
                      restricted:
                        type: boolean
                        example: false
-  /blacklist:
-    get:
-      summary: Returns blacklisted items
-      description: Returns list of all blacklisted media
-      tags:
-        - settings
-      parameters:
-        - in: query
-          name: take
-          schema:
-            type: number
-            nullable: true
-            example: 25
-        - in: query
-          name: skip
-          schema:
-            type: number
-            nullable: true
-            example: 0
-        - in: query
-          name: search
-          schema:
-            type: string
-            nullable: true
-            example: dune
-      responses:
-        '200':
-          description: Blacklisted items returned
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  pageInfo:
-                    $ref: '#/components/schemas/PageInfo'
-                  results:
-                    type: array
-                    items:
-                      type: object
-                      properties:
-                        user:
-                          $ref: '#/components/schemas/User'
-                        createdAt:
-                          type: string
-                          example: 2024-04-21T01:55:44.000Z
-                        id:
-                          type: number
-                          example: 1
-                        mediaType:
-                          type: string
-                          example: movie
-                        title:
-                          type: string
-                          example: Dune
-                        tmdbId:
-                          type: number
-                          example: 438631
-    post:
-      summary: Add media to blacklist
-      tags:
-        - blacklist
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Blacklist'
-      responses:
-        '201':
-          description: Item succesfully blacklisted
-        '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:
-        - blacklist
-      parameters:
-        - in: path
-          name: tmdbId
-          description: tmdbId ID
-          required: true
-          example: '1'
-          schema:
-            type: string
-      responses:
-        '204':
-          description: Succesfully removed media item
  /watchlist:
    post:
      summary: Add media to watchlist
@@ -4998,11 +4862,6 @@ paths:
          schema:
            type: string
            example: 8|9
-        - in: query
-          name: status
-          schema:
-            type: string
-            example: 3|4
      responses:
        '200':
          description: Results
@@ -5488,7 +5347,7 @@ paths:
                    - type: array
                      items:
                        type: number
-                        minimum: 0
+                        minimum: 1
                    - type: string
                      enum: [all]
                is4k:
@@ -5594,7 +5453,7 @@ paths:
                  type: array
                  items:
                    type: number
-                    minimum: 0
+                    minimum: 1
                is4k:
                  type: boolean
                  example: false
--- a/package.json
+++ b/package.json
@@ -62,7 +62,6 @@
    "formik": "^2.4.6",
    "gravatar-url": "3.1.0",
    "lodash": "4.17.21",
-    "mime": "3",
    "next": "^14.2.4",
    "node-cache": "5.1.2",
    "node-gyp": "9.3.1",
@@ -93,8 +92,7 @@
    "sqlite3": "5.1.4",
    "swagger-ui-express": "4.6.2",
    "swr": "2.2.5",
-    "typeorm": "0.3.11",
-    "undici": "^6.20.1",
+    "typeorm": "0.3.12",
    "web-push": "3.5.0",
    "winston": "3.8.2",
    "winston-daily-rotate-file": "4.7.1",
@@ -121,7 +119,6 @@
    "@types/express": "4.17.17",
    "@types/express-session": "1.17.6",
    "@types/lodash": "4.14.191",
-    "@types/mime": "3",
    "@types/node": "20.14.8",
    "@types/node-schedule": "2.1.0",
    "@types/nodemailer": "6.4.7",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -49,7 +49,7 @@ importers:
        version: 2.11.0
      connect-typeorm:
        specifier: 1.1.4
-        version: 1.1.4(typeorm@0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5)))
+        version: 1.1.4(typeorm@0.3.12(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5)))
      cookie-parser:
        specifier: 1.4.6
        version: 1.4.6
@@ -98,9 +98,6 @@ importers:
      lodash:
        specifier: 4.17.21
        version: 4.17.21
-      mime:
-        specifier: '3'
-        version: 3.0.0
      next:
        specifier: ^14.2.4
        version: 14.2.4(@babel/core@7.24.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -192,11 +189,8 @@ importers:
        specifier: 2.2.5
        version: 2.2.5(react@18.3.1)
      typeorm:
-        specifier: 0.3.11
-        version: 0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))
-      undici:
-        specifier: ^6.20.1
-        version: 6.20.1
+        specifier: 0.3.12
+        version: 0.3.12(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))
      web-push:
        specifier: 3.5.0
        version: 3.5.0
@@ -270,9 +264,6 @@ importers:
      '@types/lodash':
        specifier: 4.14.191
        version: 4.14.191
-      '@types/mime':
-        specifier: '3'
-        version: 3.0.4
      '@types/node':
        specifier: 20.14.8
        version: 20.14.8
@@ -2857,9 +2848,6 @@ packages:
  '@types/mime@1.3.5':
    resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}

-  '@types/mime@3.0.4':
-    resolution: {integrity: sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==}
-
  '@types/minimatch@3.0.5':
    resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==}

@@ -4267,6 +4255,10 @@ packages:
    resolution: {integrity: sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==}
    engines: {node: '>=0.11'}

+  date-fns@2.30.0:
+    resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
+    engines: {node: '>=0.11'}
+
  dateformat@3.0.3:
    resolution: {integrity: sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==}

@@ -5388,8 +5380,8 @@ packages:
    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
    engines: {node: '>= 6'}

-  https-proxy-agent@7.0.5:
-    resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==}
+  https-proxy-agent@7.0.4:
+    resolution: {integrity: sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==}
    engines: {node: '>= 14'}

  human-signals@1.1.1:
@@ -6553,6 +6545,11 @@ packages:
    engines: {node: '>=10'}
    hasBin: true

+  mkdirp@2.1.6:
+    resolution: {integrity: sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==}
+    engines: {node: '>=10'}
+    hasBin: true
+
  modify-values@1.0.1:
    resolution: {integrity: sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==}
    engines: {node: '>=0.10.0'}
@@ -7724,6 +7721,9 @@ packages:
  reflect-metadata@0.1.13:
    resolution: {integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==}

+  reflect-metadata@0.1.14:
+    resolution: {integrity: sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==}
+
  reflect.getprototypeof@1.0.6:
    resolution: {integrity: sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==}
    engines: {node: '>= 0.4'}
@@ -8661,8 +8661,8 @@ packages:
  typedarray@0.0.6:
    resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}

-  typeorm@0.3.11:
-    resolution: {integrity: sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==}
+  typeorm@0.3.12:
+    resolution: {integrity: sha512-sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA==}
    engines: {node: '>= 12.9.0'}
    hasBin: true
    peerDependencies:
@@ -8673,7 +8673,7 @@ packages:
      ioredis: ^5.0.4
      mongodb: ^3.6.0
      mssql: ^7.3.0
-      mysql2: ^2.2.5
+      mysql2: ^2.2.5 || ^3.0.1
      oracledb: ^5.1.0
      pg: ^8.5.1
      pg-native: ^3.0.0
@@ -8759,10 +8759,6 @@ packages:
  undici-types@5.26.5:
    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}

-  undici@6.20.1:
-    resolution: {integrity: sha512-AjQF1QsmqfJys+LXfGTNum+qw4S88CojRInG/6t31W/1fk6G59s92bnAvGz5Cmur+kQv2SURXEvvudLmbrE8QA==}
-    engines: {node: '>=18.17'}
-
  unicode-canonical-property-names-ecmascript@2.0.0:
    resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
    engines: {node: '>=4'}
@@ -10840,7 +10836,7 @@ snapshots:
      nopt: 5.0.0
      npmlog: 5.0.1
      rimraf: 3.0.2
-      semver: 7.3.8
+      semver: 7.6.2
      tar: 6.2.1
    transitivePeerDependencies:
      - encoding
@@ -10915,13 +10911,13 @@ snapshots:
  '@npmcli/fs@1.1.1':
    dependencies:
      '@gar/promisify': 1.1.3
-      semver: 7.3.8
+      semver: 7.6.2
    optional: true

  '@npmcli/fs@2.1.2':
    dependencies:
      '@gar/promisify': 1.1.3
-      semver: 7.3.8
+      semver: 7.6.2

  '@npmcli/move-file@1.1.2':
    dependencies:
@@ -12305,7 +12301,7 @@ snapshots:
      fs-extra: 11.2.0
      globby: 11.1.0
      http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.5
+      https-proxy-agent: 7.0.4
      issue-parser: 6.0.0
      lodash: 4.17.21
      mime: 3.0.0
@@ -12330,7 +12326,7 @@ snapshots:
      read-pkg: 5.2.0
      registry-auth-token: 5.0.2
      semantic-release: 19.0.5(encoding@0.1.13)
-      semver: 7.3.8
+      semver: 7.6.2
      tempy: 1.0.1

  '@semantic-release/release-notes-generator@10.0.3(semantic-release@19.0.5(encoding@0.1.13))':
@@ -12674,8 +12670,6 @@ snapshots:

  '@types/mime@1.3.5': {}

-  '@types/mime@3.0.4': {}
-
  '@types/minimatch@3.0.5': {}

  '@types/minimist@1.2.5': {}
@@ -12893,7 +12887,7 @@ snapshots:
      debug: 4.3.5(supports-color@8.1.1)
      globby: 11.1.0
      is-glob: 4.0.3
-      semver: 7.3.8
+      semver: 7.6.2
      tsutils: 3.21.0(typescript@4.9.5)
    optionalDependencies:
      typescript: 4.9.5
@@ -13819,13 +13813,13 @@ snapshots:
      ini: 1.3.8
      proto-list: 1.2.4

-  connect-typeorm@1.1.4(typeorm@0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))):
+  connect-typeorm@1.1.4(typeorm@0.3.12(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))):
    dependencies:
      '@types/debug': 0.0.31
      '@types/express-session': 1.17.6
      debug: 4.3.5(supports-color@8.1.1)
      express-session: 1.18.0
-      typeorm: 0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))
+      typeorm: 0.3.12(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))
    transitivePeerDependencies:
      - supports-color

@@ -14176,6 +14170,10 @@ snapshots:

  date-fns@2.29.3: {}

+  date-fns@2.30.0:
+    dependencies:
+      '@babel/runtime': 7.24.7
+
  dateformat@3.0.3: {}

  dayjs@1.11.11: {}
@@ -15730,7 +15728,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  https-proxy-agent@7.0.5:
+  https-proxy-agent@7.0.4:
    dependencies:
      agent-base: 7.1.1
      debug: 4.3.5(supports-color@8.1.1)
@@ -17140,6 +17138,8 @@ snapshots:

  mkdirp@1.0.4: {}

+  mkdirp@2.1.6: {}
+
  modify-values@1.0.1: {}

  moment@2.30.1: {}
@@ -17269,7 +17269,7 @@ snapshots:
      nopt: 5.0.0
      npmlog: 6.0.2
      rimraf: 3.0.2
-      semver: 7.3.8
+      semver: 7.6.2
      tar: 6.2.1
      which: 2.0.2
    transitivePeerDependencies:
@@ -17348,7 +17348,7 @@ snapshots:
    dependencies:
      hosted-git-info: 4.1.0
      is-core-module: 2.14.0
-      semver: 7.3.8
+      semver: 7.6.2
      validate-npm-package-license: 3.0.4

  normalize-path@3.0.0: {}
@@ -18361,6 +18361,8 @@ snapshots:

  reflect-metadata@0.1.13: {}

+  reflect-metadata@0.1.14: {}
+
  reflect.getprototypeof@1.0.6:
    dependencies:
      call-bind: 1.0.7
@@ -19418,23 +19420,23 @@ snapshots:

  typedarray@0.0.6: {}

-  typeorm@0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5)):
+  typeorm@0.3.12(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5)):
    dependencies:
      '@sqltools/formatter': 1.2.5
      app-root-path: 3.1.0
      buffer: 6.0.3
      chalk: 4.1.2
      cli-highlight: 2.1.11
-      date-fns: 2.29.3
+      date-fns: 2.30.0
      debug: 4.3.5(supports-color@8.1.1)
      dotenv: 16.4.5
-      glob: 7.2.3
+      glob: 8.1.0
      js-yaml: 4.1.0
-      mkdirp: 1.0.4
-      reflect-metadata: 0.1.13
+      mkdirp: 2.1.6
+      reflect-metadata: 0.1.14
      sha.js: 2.4.11
      tslib: 2.6.3
-      uuid: 8.3.2
+      uuid: 9.0.1
      xml2js: 0.4.23
      yargs: 17.7.2
    optionalDependencies:
@@ -19473,8 +19475,6 @@ snapshots:

  undici-types@5.26.5: {}

-  undici@6.20.1: {}
-
  unicode-canonical-property-names-ecmascript@2.0.0: {}

  unicode-emoji-utils@1.2.0:
--- a/server/api/externalapi.ts
+++ b/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);
-
-    const settings = getSettings();
-
+    this.baseUrl = baseUrl;
+    this.params = params;
    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;
  }

@@ -89,15 +68,12 @@ class ExternalAPI {
    if (!response.ok) {
      const text = await response.text();
      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`
      );
    }
    const data = await this.getDataFromResponse(response);

-    if (this.cache && ttl !== 0) {
+    if (this.cache) {
      this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
    }

@@ -106,7 +82,7 @@ class ExternalAPI {

  protected async post<T>(
    endpoint: string,
-    data?: Record<string, unknown>,
+    data: Record<string, unknown>,
    params?: Record<string, string>,
    ttl?: number,
    config?: RequestInit
@@ -128,20 +104,11 @@ class ExternalAPI {
        ...this.defaultHeaders,
        ...config?.headers,
      },
-      body: data ? JSON.stringify(data) : undefined,
+      body: JSON.stringify(data),
    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
    const resData = await this.getDataFromResponse(response);

-    if (this.cache && ttl !== 0) {
+    if (this.cache) {
      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
    }

@@ -174,18 +141,9 @@ class ExternalAPI {
      },
      body: JSON.stringify(data),
    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
    const resData = await this.getDataFromResponse(response);

-    if (this.cache && ttl !== 0) {
+    if (this.cache) {
      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
    }

@@ -199,22 +157,12 @@ class ExternalAPI {
  ): Promise<T> {
    const url = this.formatUrl(endpoint, params);
    const response = await this.fetch(url, {
-      method: 'DELETE',
      ...config,
      headers: {
        ...this.defaultHeaders,
        ...config?.headers,
      },
    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
    const data = await this.getDataFromResponse(response);

    return data;
@@ -249,17 +197,6 @@ class ExternalAPI {
            ...config?.headers,
          },
        }).then(async (response) => {
-          if (!response.ok) {
-            const text = await response.text();
-            throw new Error(
-              `${response.status} ${response.statusText}${
-                text ? ': ' + text : ''
-              }`,
-              {
-                cause: response,
-              }
-            );
-          }
          const data = await this.getDataFromResponse(response);
          this.cache?.set(cacheKey, data, ttl ?? DEFAULT_TTL);
        });
@@ -275,15 +212,6 @@ class ExternalAPI {
        ...config?.headers,
      },
    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
    const data = await this.getDataFromResponse(response);

    if (this.cache) {
@@ -307,12 +235,7 @@ class ExternalAPI {
      ...this.params,
      ...params,
    });
-    return (
-      href +
-      (searchParams.toString().length
-        ? '?' + searchParams.toString()
-        : searchParams.toString())
-    );
+    return `${href}?${searchParams.toString()}`;
  }

  private serializeCacheKey(
@@ -327,24 +250,20 @@ class ExternalAPI {
  }

  private async getDataFromResponse(response: Response) {
-    const contentType = response.headers.get('Content-Type');
-    if (contentType?.includes('application/json')) {
+    const contentType = response.headers.get('Content-Type')?.split(';')[0];
+    if (contentType === 'application/json') {
      return await response.json();
    } else if (
-      contentType?.includes('application/xml') ||
-      contentType?.includes('text/html') ||
-      contentType?.includes('text/plain')
+      contentType === 'application/xml' ||
+      contentType === 'text/html' ||
+      contentType === 'text/plain'
    ) {
      return await response.text();
    } else {
      try {
        return await response.json();
      } catch {
-        try {
-          return await response.blob();
-        } catch {
-          return null;
-        }
+        return await response.blob();
      }
    }
  }
--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -93,7 +93,9 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
 }

 class JellyfinAPI extends ExternalAPI {
+  private authToken?: string;
  private userId?: string;
+  private jellyfinHost: string;

  constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
    let authHeaderVal: string;
@@ -112,6 +114,9 @@ class JellyfinAPI extends ExternalAPI {
        },
      }
    );
+
+    this.jellyfinHost = jellyfinHost;
+    this.authToken = authToken;
  }

  public async login(
@@ -138,38 +143,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) {
-        throw new ApiError(e.cause.status, ApiErrorCode.InvalidCredentials);
+      const status = e.response?.status;
+
+      const networkErrorCodes = new Set([
+        'ECONNREFUSED',
+        'EHOSTUNREACH',
+        'ENOTFOUND',
+        'ETIMEDOUT',
+        'ECONNRESET',
+        'EADDRINUSE',
+        'ENETDOWN',
+        'ENETUNREACH',
+        'EPIPE',
+        'ECONNABORTED',
+        'EPROTO',
+        'EHOSTDOWN',
+        'EAI_AGAIN',
+        'ERR_INVALID_URL',
+      ]);
+
+      if (networkErrorCodes.has(e.code) || status === 404) {
+        throw new ApiError(status, ApiErrorCode.InvalidUrl);
      }

-      logger.error(
-        'Something went wrong while authenticating with the Jellyfin server',
-        {
-          label: 'Jellyfin API',
-          error: e.cause.message ?? e.cause.statusText,
-          ip: ClientIP,
-        }
-      );
-
-      throw new ApiError(e.cause.status, ApiErrorCode.Unknown);
+      throw new ApiError(status, ApiErrorCode.InvalidCredentials);
    }
  }

@@ -184,7 +190,7 @@ class JellyfinAPI extends ExternalAPI {

      return systemInfoResponse;
    } catch (e) {
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -197,11 +203,11 @@ class JellyfinAPI extends ExternalAPI {
      return serverResponse.ServerName;
    } catch (e) {
      logger.error(
-        'Something went wrong while getting the server name from the Jellyfin server',
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        `Something went wrong while getting the server name from the Jellyfin server: ${e.message}`,
+        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.Unknown);
+      throw new ApiError(e.response?.status, ApiErrorCode.Unknown);
    }
  }

@@ -212,11 +218,11 @@ class JellyfinAPI extends ExternalAPI {
      return { users: userReponse };
    } catch (e) {
      logger.error(
-        'Something went wrong while getting the account from the Jellyfin server',
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
+        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -228,11 +234,11 @@ class JellyfinAPI extends ExternalAPI {
      return userReponse;
    } catch (e) {
      logger.error(
-        'Something went wrong while getting the account from the Jellyfin server',
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
+        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -252,11 +258,8 @@ class JellyfinAPI extends ExternalAPI {
        return this.mapLibraries(mediaFolderResponse.Items);
      } catch (e) {
        logger.error(
-          'Something went wrong while getting libraries from the Jellyfin server',
-          {
-            label: 'Jellyfin API',
-            error: e.cause.message ?? e.cause.statusText,
-          }
+          `Something went wrong while getting libraries from the Jellyfin server: ${e.message}`,
+          { label: 'Jellyfin API' }
        );

        return [];
@@ -310,11 +313,11 @@ class JellyfinAPI extends ExternalAPI {
      );
    } catch (e) {
      logger.error(
-        'Something went wrong while getting library content from the Jellyfin server',
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
+        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -331,11 +334,11 @@ class JellyfinAPI extends ExternalAPI {
      return itemResponse;
    } catch (e) {
      logger.error(
-        'Something went wrong while getting library content from the Jellyfin server',
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
+        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -350,16 +353,16 @@ class JellyfinAPI extends ExternalAPI {
      return itemResponse;
    } catch (e) {
      if (availabilitySync.running) {
-        if (e.cause?.status === 500) {
+        if (e.response && e.response.status === 500) {
          return undefined;
        }
      }

      logger.error(
-        'Something went wrong while getting library content from the Jellyfin server',
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
+        { label: 'Jellyfin API' }
      );
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -370,11 +373,11 @@ class JellyfinAPI extends ExternalAPI {
      return seasonResponse.Items;
    } catch (e) {
      logger.error(
-        'Something went wrong while getting the list of seasons from the Jellyfin server',
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        `Something went wrong while getting the list of seasons from the Jellyfin server: ${e.message}`,
+        { label: 'Jellyfin API' }
      );

-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -395,25 +398,8 @@ class JellyfinAPI extends ExternalAPI {
      );
    } catch (e) {
      logger.error(
-        'Something went wrong while getting the list of episodes from the Jellyfin server',
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
-      );
-
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
-    }
-  }
-
-  public async createApiToken(appName: string): Promise<string> {
-    try {
-      await this.post(`/Auth/Keys?App=${appName}`);
-      const apiKeys = await this.get<any>(`/Auth/Keys`);
-      return apiKeys.Items.reverse().find(
-        (item: any) => item.AppName === appName
-      ).AccessToken;
-    } catch (e) {
-      logger.error(
-        'Something went wrong while creating an API key from the Jellyfin server',
-        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
+        `Something went wrong while getting the list of episodes from the Jellyfin server: ${e.message}`,
+        { label: 'Jellyfin API' }
      );

      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
--- a/server/api/plexapi.ts
+++ b/server/api/plexapi.ts
@@ -180,7 +180,7 @@ class PlexAPI {
      settings.plex.libraries = [];
    }

-    await settings.save();
+    settings.save();
  }

  public async getLibraryContents(
--- a/server/api/plextv.ts
+++ b/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: {
-            ...this.defaultHeaders,
-            ...(cachedWatchlist?.etag
-              ? { 'If-None-Match': cachedWatchlist.etag }
-              : {}),
-          },
+          headers: this.defaultHeaders,
        }
      );
      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(
-          async (watchlistItem) => {
-            const detailedResponse = await this.getRolling<MetadataResponse>(
-              `/library/metadata/${watchlistItem.ratingKey}`,
-              {},
-              undefined,
-              {},
-              'https://metadata.provider.plex.tv'
-            );
+        (data.MediaContainer.Metadata ?? []).map(async (watchlistItem) => {
+          const detailedResponse = await this.getRolling<MetadataResponse>(
+            `/library/metadata/${watchlistItem.ratingKey}`,
+            {},
+            undefined,
+            {},
+            'https://metadata.provider.plex.tv'
+          );

-            const metadata = detailedResponse.MediaContainer.Metadata[0];
+          const metadata = detailedResponse.MediaContainer.Metadata[0];

-            const tmdbString = metadata.Guid.find((guid) =>
-              guid.id.startsWith('tmdb')
-            );
-            const tvdbString = metadata.Guid.find((guid) =>
-              guid.id.startsWith('tvdb')
-            );
+          const tmdbString = metadata.Guid.find((guid) =>
+            guid.id.startsWith('tmdb')
+          );
+          const tvdbString = metadata.Guid.find((guid) =>
+            guid.id.startsWith('tvdb')
+          );

-            return {
-              ratingKey: metadata.ratingKey,
-              // This should always be set? But I guess it also cannot be?
-              // We will filter out the 0's afterwards
-              tmdbId: tmdbString ? Number(tmdbString.id.split('//')[1]) : 0,
-              tvdbId: tvdbString
-                ? Number(tvdbString.id.split('//')[1])
-                : undefined,
-              title: metadata.title,
-              type: metadata.type,
-            };
-          }
-        )
+          return {
+            ratingKey: metadata.ratingKey,
+            // This should always be set? But I guess it also cannot be?
+            // We will filter out the 0's afterwards
+            tmdbId: tmdbString ? Number(tmdbString.id.split('//')[1]) : 0,
+            tvdbId: tvdbString
+              ? Number(tvdbString.id.split('//')[1])
+              : undefined,
+            title: metadata.title,
+            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;
--- a/server/api/rating/imdbRadarrProxy.ts
+++ b/server/api/rating/imdbRadarrProxy.ts
@@ -175,11 +175,7 @@ class IMDBRadarrProxy extends ExternalAPI {
        `/movie/imdb/${IMDBid}`
      );

-      if (
-        !data?.length ||
-        data[0].ImdbId !== IMDBid ||
-        !data[0].MovieRatings.Imdb
-      ) {
+      if (!data?.length || data[0].ImdbId !== IMDBid) {
        return null;
      }

--- a/server/api/rating/rottentomatoes.ts
+++ b/server/api/rating/rottentomatoes.ts
@@ -182,7 +182,7 @@ class RottenTomatoes extends ExternalAPI {
        );
      }

-      if (!tvshow || !tvshow.rottenTomatoes) {
+      if (!tvshow) {
        return null;
      }

--- a/server/api/servarr/base.ts
+++ b/server/api/servarr/base.ts
@@ -157,13 +157,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {

  public getQueue = async (): Promise<(QueueItem & QueueItemAppendT)[]> => {
    try {
-      const data = await this.get<QueueResponse<QueueItemAppendT>>(
-        `/queue`,
-        {
-          includeEpisode: 'true',
-        },
-        0
-      );
+      const data = await this.get<QueueResponse<QueueItemAppendT>>(`/queue`, {
+        includeEpisode: 'true',
+      });

      return data.records;
    } catch (e) {
@@ -197,24 +193,15 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
    }
  };

-  async refreshMonitoredDownloads(): Promise<void> {
-    await this.runCommand('RefreshMonitoredDownloads', {});
-  }
-
  protected async runCommand(
    commandName: string,
    options: Record<string, unknown>
  ): Promise<void> {
    try {
-      await this.post(
-        `/command`,
-        {
-          name: commandName,
-          ...options,
-        },
-        {},
-        0
-      );
+      await this.post(`/command`, {
+        name: commandName,
+        ...options,
+      });
    } catch (e) {
      throw new Error(`[${this.apiName}] Failed to run command: ${e.message}`);
    }
--- a/server/api/servarr/radarr.ts
+++ b/server/api/servarr/radarr.ts
@@ -179,20 +179,13 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
      }
      return data;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error(
        'Failed to add movie to Radarr. This might happen if the movie already exists, in which case you can safely ignore this error.',
        {
          label: 'Radarr',
          errorMessage: e.message,
          options,
-          response: errorData,
+          response: e?.response?.data,
        }
      );
      throw new Error('Failed to add movie to Radarr');
--- a/server/api/servarr/sonarr.ts
+++ b/server/api/servarr/sonarr.ts
@@ -257,18 +257,11 @@ class SonarrAPI extends ServarrBase<{

      return createdSeriesData;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Something went wrong while adding a series to Sonarr.', {
        label: 'Sonarr API',
        errorMessage: e.message,
        options,
-        response: errorData,
+        response: e?.response?.data,
      });
      throw new Error('Failed to add series');
    }
@@ -303,10 +296,10 @@ class SonarrAPI extends ServarrBase<{
    });

    try {
-      await this.runCommand('MissingEpisodeSearch', { seriesId });
+      await this.runCommand('SeriesSearch', { seriesId });
    } catch (e) {
      logger.error(
-        'Something went wrong while executing Sonarr missing episode search.',
+        'Something went wrong while executing Sonarr series search.',
        {
          label: 'Sonarr API',
          errorMessage: e.message,
--- a/server/api/themoviedb/index.ts
+++ b/server/api/themoviedb/index.ts
@@ -95,16 +95,15 @@ interface DiscoverTvOptions {
  sortBy?: SortOptions;
  watchRegion?: string;
  watchProviders?: string;
-  withStatus?: string; // Returning Series: 0 Planned: 1 In Production: 2 Ended: 3 Cancelled: 4 Pilot: 5
 }

 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 +117,7 @@ class TheMovieDb extends ExternalAPI {
        },
      }
    );
-    this.discoverRegion = discoverRegion;
+    this.region = region;
    this.originalLanguage = originalLanguage;
  }

@@ -469,7 +468,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
@@ -524,7 +523,6 @@ class TheMovieDb extends ExternalAPI {
    voteCountLte,
    watchProviders,
    watchRegion,
-    withStatus,
  }: DiscoverTvOptions = {}): Promise<TmdbSearchTvResponse> => {
    try {
      const defaultFutureDate = new Date(
@@ -541,7 +539,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':
@@ -572,7 +570,6 @@ class TheMovieDb extends ExternalAPI {
        'vote_count.lte': voteCountLte || '',
        with_watch_providers: watchProviders || '',
        watch_region: watchRegion || '',
-        with_status: withStatus || '',
      });

      return data;
@@ -594,7 +591,7 @@ class TheMovieDb extends ExternalAPI {
        {
          page: page.toString(),
          language,
-          region: this.discoverRegion || '',
+          region: this.region || '',
          originalLanguage: this.originalLanguage || '',
        }
      );
@@ -620,7 +617,7 @@ class TheMovieDb extends ExternalAPI {
        {
          page: page.toString(),
          language,
-          region: this.discoverRegion || '',
+          region: this.region || '',
        }
      );

--- a/server/constants/error.ts
+++ b/server/constants/error.ts
@@ -2,7 +2,6 @@ export enum ApiErrorCode {
  InvalidUrl = 'INVALID_URL',
  InvalidCredentials = 'INVALID_CREDENTIALS',
  InvalidAuthToken = 'INVALID_AUTH_TOKEN',
-  InvalidEmail = 'INVALID_EMAIL',
  NotAdmin = 'NOT_ADMIN',
  SyncErrorGroupedFolders = 'SYNC_ERROR_GROUPED_FOLDERS',
  SyncErrorNoLibraries = 'SYNC_ERROR_NO_LIBRARIES',
--- a/server/constants/media.ts
+++ b/server/constants/media.ts
@@ -16,5 +16,4 @@ export enum MediaStatus {
  PROCESSING,
  PARTIALLY_AVAILABLE,
  AVAILABLE,
-  BLACKLISTED,
 }
--- a/server/constants/server.ts
+++ b/server/constants/server.ts
@@ -4,8 +4,3 @@ export enum MediaServerType {
  EMBY,
  NOT_CONFIGURED,
 }
-
-export enum ServerType {
-  JELLYFIN = 'Jellyfin',
-  EMBY = 'Emby',
-}
--- a/server/constants/user.ts
+++ b/server/constants/user.ts
@@ -2,5 +2,4 @@ export enum UserType {
  PLEX = 1,
  LOCAL = 2,
  JELLYFIN = 3,
-  EMBY = 4,
 }
--- a/server/entity/Blacklist.ts
+++ b/server/entity/Blacklist.ts
@@ -1,95 +0,0 @@
-import { MediaStatus, type MediaType } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
-import Media from '@server/entity/Media';
-import { User } from '@server/entity/User';
-import type { BlacklistItem } from '@server/interfaces/api/blacklistInterfaces';
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  JoinColumn,
-  ManyToOne,
-  OneToOne,
-  PrimaryGeneratedColumn,
-  Unique,
-} from 'typeorm';
-import type { ZodNumber, ZodOptional, ZodString } from 'zod';
-
-@Entity()
-@Unique(['tmdbId'])
-export class Blacklist implements BlacklistItem {
-  @PrimaryGeneratedColumn()
-  public id: number;
-
-  @Column({ type: 'varchar' })
-  public mediaType: MediaType;
-
-  @Column({ nullable: true, type: 'varchar' })
-  title?: string;
-
-  @Column()
-  @Index()
-  public tmdbId: number;
-
-  @ManyToOne(() => User, (user) => user.id, {
-    eager: true,
-  })
-  user: User;
-
-  @OneToOne(() => Media, (media) => media.blacklist, {
-    onDelete: 'CASCADE',
-  })
-  @JoinColumn()
-  public media: Media;
-
-  @CreateDateColumn()
-  public createdAt: Date;
-
-  constructor(init?: Partial<Blacklist>) {
-    Object.assign(this, init);
-  }
-
-  public static async addToBlacklist({
-    blacklistRequest,
-  }: {
-    blacklistRequest: {
-      mediaType: MediaType;
-      title?: ZodOptional<ZodString>['_output'];
-      tmdbId: ZodNumber['_output'];
-    };
-  }): Promise<void> {
-    const blacklist = new this({
-      ...blacklistRequest,
-    });
-
-    const mediaRepository = getRepository(Media);
-    let media = await mediaRepository.findOne({
-      where: {
-        tmdbId: blacklistRequest.tmdbId,
-      },
-    });
-
-    const blacklistRepository = getRepository(this);
-
-    await blacklistRepository.save(blacklist);
-
-    if (!media) {
-      media = new Media({
-        tmdbId: blacklistRequest.tmdbId,
-        status: MediaStatus.BLACKLISTED,
-        status4k: MediaStatus.BLACKLISTED,
-        mediaType: blacklistRequest.mediaType,
-        blacklist: Promise.resolve(blacklist),
-      });
-
-      await mediaRepository.save(media);
-    } else {
-      media.blacklist = Promise.resolve(blacklist);
-      media.status = MediaStatus.BLACKLISTED;
-      media.status4k = MediaStatus.BLACKLISTED;
-
-      await mediaRepository.save(media);
-    }
-  }
-}
--- a/server/entity/Media.ts
+++ b/server/entity/Media.ts
@@ -3,7 +3,6 @@ import SonarrAPI from '@server/api/servarr/sonarr';
 import { MediaStatus, MediaType } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import { getRepository } from '@server/datasource';
-import { Blacklist } from '@server/entity/Blacklist';
 import type { User } from '@server/entity/User';
 import { Watchlist } from '@server/entity/Watchlist';
 import type { DownloadingItem } from '@server/lib/downloadtracker';
@@ -18,7 +17,6 @@ import {
  Entity,
  Index,
  OneToMany,
-  OneToOne,
  PrimaryGeneratedColumn,
  UpdateDateColumn,
 } from 'typeorm';
@@ -68,7 +66,7 @@ class Media {

    try {
      const media = await mediaRepository.findOne({
-        where: { tmdbId: id, mediaType: mediaType },
+        where: { tmdbId: id, mediaType },
        relations: { requests: true, issues: true },
      });

@@ -118,9 +116,6 @@ class Media {
  @OneToMany(() => Issue, (issue) => issue.media, { cascade: true })
  public issues: Issue[];

-  @OneToOne(() => Blacklist, (blacklist) => blacklist.media)
-  public blacklist: Promise<Blacklist>;
-
  @CreateDateColumn()
  public createdAt: Date;

@@ -216,10 +211,9 @@ class Media {
      }
    } else {
      const pageName =
-        getSettings().main.mediaServerType == MediaServerType.EMBY
-          ? 'item'
-          : 'details';
+        process.env.JELLYFIN_TYPE === 'emby' ? 'item' : 'details';
      const { serverId, externalHostname } = getSettings().jellyfin;
+
      const jellyfinHost =
        externalHostname && externalHostname.length > 0
          ? externalHostname
@@ -229,7 +223,7 @@ class Media {
        this.mediaUrl = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
      }
      if (this.jellyfinMediaId4k) {
-        this.mediaUrl4k = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId4k}&context=home&serverId=${serverId}`;
+        this.mediaUrl4k = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
      }
    }
  }
--- a/server/entity/MediaRequest.ts
+++ b/server/entity/MediaRequest.ts
@@ -40,7 +40,6 @@ export class RequestPermissionError extends Error {}
 export class QuotaRestrictedError extends Error {}
 export class DuplicateMediaRequestError extends Error {}
 export class NoSeasonsAvailableError extends Error {}
-export class BlacklistedMediaError extends Error {}

 type MediaRequestOptions = {
  isAutoRequest?: boolean;
@@ -144,16 +143,6 @@ export class MediaRequest {
        mediaType: requestBody.mediaType,
      });
    } else {
-      if (media.status === MediaStatus.BLACKLISTED) {
-        logger.warn('Request for media blocked due to being blacklisted', {
-          tmdbId: tmdbMedia.id,
-          mediaType: requestBody.mediaType,
-          label: 'Media Request',
-        });
-
-        throw new BlacklistedMediaError('This media is blacklisted.');
-      }
-
      if (media.status === MediaStatus.UNKNOWN && !requestBody.is4k) {
        media.status = MediaStatus.PENDING;
      }
@@ -257,7 +246,9 @@ export class MediaRequest {
      >;
      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[]);
      let existingSeasons: number[] = [];

--- a/server/entity/UserSettings.ts
+++ b/server/entity/UserSettings.ts
@@ -31,10 +31,7 @@ export class UserSettings {
  public locale?: string;

  @Column({ nullable: true })
-  public discoverRegion?: string;
-
-  @Column({ nullable: true })
-  public streamingRegion?: string;
+  public region?: string;

  @Column({ nullable: true })
  public originalLanguage?: string;
--- a/server/index.ts
+++ b/server/index.ts
@@ -19,11 +19,8 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 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 +50,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 () => {
@@ -72,14 +63,9 @@ app
    }

    // Load Settings
-    const settings = await getSettings().load();
+    const settings = getSettings();
    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 &&
@@ -188,7 +174,7 @@ app
        },
        store: new TypeormStore({
          cleanupLimit: 2,
-          ttl: 60 * 60 * 24 * 30,
+          ttl: 1000 * 60 * 60 * 24 * 30,
        }).connect(sessionRespository) as Store,
      })
    );
@@ -216,7 +202,6 @@ app

    // Do not set cookies so CDNs can cache them
    server.use('/imageproxy', clearCookies, imageproxy);
-    server.use('/avatarproxy', clearCookies, avatarproxy);

    server.get('*', (req, res) => handle(req, res));
    server.use(
--- a/server/interfaces/api/blacklistInterfaces.ts
+++ b/server/interfaces/api/blacklistInterfaces.ts
@@ -1,14 +0,0 @@
-import type { User } from '@server/entity/User';
-import type { PaginatedResponse } from '@server/interfaces/api/common';
-
-export interface BlacklistItem {
-  tmdbId: number;
-  mediaType: 'movie' | 'tv';
-  title?: string;
-  createdAt?: Date;
-  user: User;
-}
-
-export interface BlacklistResultsResponse extends PaginatedResponse {
-  results: BlacklistItem[];
-}
--- a/server/interfaces/api/common.ts
+++ b/server/interfaces/api/common.ts
@@ -8,16 +8,3 @@ interface PageInfo {
 export interface PaginatedResponse {
  pageInfo: PageInfo;
 }
-
-/**
- * Get the keys of an object that are not functions
- */
-type NonFunctionPropertyNames<T> = {
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  [K in keyof T]: T[K] extends Function ? never : K;
-}[keyof T];
-
-/**
- * Get the properties of an object that are not functions
- */
-export type NonFunctionProperties<T> = Pick<T, NonFunctionPropertyNames<T>>;
--- a/server/interfaces/api/requestInterfaces.ts
+++ b/server/interfaces/api/requestInterfaces.ts
@@ -1,9 +1,9 @@
 import type { MediaType } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties, PaginatedResponse } from './common';
+import type { PaginatedResponse } from './common';

 export interface RequestResultsResponse extends PaginatedResponse {
-  results: NonFunctionProperties<MediaRequest>[];
+  results: MediaRequest[];
 }

 export type MediaRequestBody = {
@@ -14,7 +14,6 @@ export type MediaRequestBody = {
  is4k?: boolean;
  serverId?: number;
  profileId?: number;
-  profileName?: string;
  rootFolder?: string;
  languageProfileId?: number;
  userId?: number;
--- a/server/interfaces/api/settingsInterfaces.ts
+++ b/server/interfaces/api/settingsInterfaces.ts
@@ -32,8 +32,7 @@ export interface PublicSettingsResponse {
  localLogin: boolean;
  movie4kEnabled: boolean;
  series4kEnabled: boolean;
-  discoverRegion: string;
-  streamingRegion: string;
+  region: string;
  originalLanguage: string;
  mediaServerType: number;
  partialRequestsEnabled: boolean;
@@ -59,7 +58,7 @@ export interface CacheItem {

 export interface CacheResponse {
  apiCaches: CacheItem[];
-  imageCache: Record<'tmdb' | 'avatar', { size: number; imageCount: number }>;
+  imageCache: Record<'tmdb', { size: number; imageCount: number }>;
 }

 export interface StatusResponse {
--- a/server/interfaces/api/userSettingsInterfaces.ts
+++ b/server/interfaces/api/userSettingsInterfaces.ts
@@ -5,8 +5,7 @@ export interface UserSettingsGeneralResponse {
  email?: string;
  discordId?: string;
  locale?: string;
-  discoverRegion?: string;
-  streamingRegion?: string;
+  region?: string;
  originalLanguage?: string;
  movieQuotaLimit?: number;
  movieQuotaDays?: number;
--- a/server/job/schedule.ts
+++ b/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',
@@ -217,23 +227,6 @@ export const startJobs = (): void => {
      });
      // Clean TMDB image cache
      ImageProxy.clearCache('tmdb');
-
-      // Clean users avatar image cache
-      ImageProxy.clearCache('avatar');
-    }),
-  });
-
-  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();
    }),
  });

--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -63,7 +63,12 @@ class AvailabilitySync {
      ) {
        admin = await userRepository.findOne({
          where: { id: 1 },
-          select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
+          select: [
+            'id',
+            'jellyfinAuthToken',
+            'jellyfinUserId',
+            'jellyfinDeviceId',
+          ],
          order: { id: 'ASC' },
        });
      }
@@ -81,7 +86,7 @@ class AvailabilitySync {
          if (admin) {
            this.jellyfinClient = new JellyfinAPI(
              getHostname(),
-              settings.jellyfin.apiKey,
+              admin.jellyfinAuthToken,
              admin.jellyfinDeviceId
            );

--- a/server/lib/cache.ts
+++ b/server/lib/cache.ts
@@ -8,8 +8,7 @@ export type AvailableCacheIds =
  | 'imdb'
  | 'github'
  | 'plexguid'
-  | 'plextv'
-  | 'plexwatchlist';
+  | 'plextv';

 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 {
--- a/server/lib/downloadtracker.ts
+++ b/server/lib/downloadtracker.ts
@@ -20,7 +20,6 @@ export interface DownloadingItem {
  timeLeft: string;
  estimatedCompletionTime: Date;
  title: string;
-  downloadId: string;
  episode?: EpisodeNumberResult;
 }

@@ -85,7 +84,6 @@ class DownloadTracker {
          });

          try {
-            await radarr.refreshMonitoredDownloads();
            const queueItems = await radarr.getQueue();

            this.radarrServers[server.id] = queueItems.map((item) => ({
@@ -97,7 +95,6 @@ class DownloadTracker {
              status: item.status,
              timeLeft: item.timeleft,
              title: item.title,
-              downloadId: item.downloadId,
            }));

            if (queueItems.length > 0) {
@@ -163,7 +160,6 @@ class DownloadTracker {
          });

          try {
-            await sonarr.refreshMonitoredDownloads();
            const queueItems = await sonarr.getQueue();

            this.sonarrServers[server.id] = queueItems.map((item) => ({
@@ -176,7 +172,6 @@ class DownloadTracker {
              timeLeft: item.timeleft,
              title: item.title,
              episode: item.episode,
-              downloadId: item.downloadId,
            }));

            if (queueItems.length > 0) {
--- a/server/lib/imageproxy.ts
+++ b/server/lib/imageproxy.ts
@@ -3,7 +3,6 @@ import type { RateLimitOptions } from '@server/utils/rateLimit';
 import rateLimit from '@server/utils/rateLimit';
 import { createHash } from 'crypto';
 import { promises } from 'fs';
-import mime from 'mime/lite';
 import path, { join } from 'path';

 type ImageResponse = {
@@ -12,7 +11,7 @@ type ImageResponse = {
    curRevalidate: number;
    isStale: boolean;
    etag: string;
-    extension: string | null;
+    extension: string;
    cacheKey: string;
    cacheMiss: boolean;
  };
@@ -28,45 +27,29 @@ class ImageProxy {
    let deletedImages = 0;
    const cacheDirectory = path.join(baseCacheDirectory, key);

-    try {
-      const files = await promises.readdir(cacheDirectory);
+    const files = await promises.readdir(cacheDirectory);

-      for (const file of files) {
-        const filePath = path.join(cacheDirectory, file);
-        const stat = await promises.lstat(filePath);
+    for (const file of files) {
+      const filePath = path.join(cacheDirectory, file);
+      const stat = await promises.lstat(filePath);

-        if (stat.isDirectory()) {
-          const imageFiles = await promises.readdir(filePath);
+      if (stat.isDirectory()) {
+        const imageFiles = await promises.readdir(filePath);

-          for (const imageFile of imageFiles) {
-            const [, expireAtSt] = imageFile.split('.');
-            const expireAt = Number(expireAtSt);
-            const now = Date.now();
+        for (const imageFile of imageFiles) {
+          const [, expireAtSt] = imageFile.split('.');
+          const expireAt = Number(expireAtSt);
+          const now = Date.now();

-            if (now > expireAt) {
-              await promises.rm(path.join(filePath), {
-                recursive: true,
-              });
-              deletedImages += 1;
-            }
+          if (now > expireAt) {
+            await promises.rm(path.join(filePath, imageFile));
+            deletedImages += 1;
          }
        }
      }
-    } catch (e) {
-      if (e.code === 'ENOENT') {
-        logger.error('Directory not found', {
-          label: 'Image Cache',
-          message: e.message,
-        });
-      } else {
-        logger.error('Failed to read directory', {
-          label: 'Image Cache',
-          message: e.message,
-        });
-      }
    }

-    logger.info(`Cleared ${deletedImages} stale image(s) from cache '${key}'`, {
+    logger.info(`Cleared ${deletedImages} stale image(s) from cache`, {
      label: 'Image Cache',
    });
  }
@@ -86,56 +69,39 @@ class ImageProxy {
  }

  private static async getDirectorySize(dir: string): Promise<number> {
-    try {
-      const files = await promises.readdir(dir, {
-        withFileTypes: true,
-      });
+    const files = await promises.readdir(dir, {
+      withFileTypes: true,
+    });

-      const paths = files.map(async (file) => {
-        const path = join(dir, file.name);
+    const paths = files.map(async (file) => {
+      const path = join(dir, file.name);

-        if (file.isDirectory()) return await ImageProxy.getDirectorySize(path);
+      if (file.isDirectory()) return await ImageProxy.getDirectorySize(path);

-        if (file.isFile()) {
-          const { size } = await promises.stat(path);
+      if (file.isFile()) {
+        const { size } = await promises.stat(path);

-          return size;
-        }
-
-        return 0;
-      });
-
-      return (await Promise.all(paths))
-        .flat(Infinity)
-        .reduce((i, size) => i + size, 0);
-    } catch (e) {
-      if (e.code === 'ENOENT') {
-        return 0;
+        return size;
      }
-    }

-    return 0;
+      return 0;
+    });
+
+    return (await Promise.all(paths))
+      .flat(Infinity)
+      .reduce((i, size) => i + size, 0);
  }

  private static async getImageCount(dir: string) {
-    try {
-      const files = await promises.readdir(dir);
+    const files = await promises.readdir(dir);

-      return files.length;
-    } catch (e) {
-      if (e.code === 'ENOENT') {
-        return 0;
-      }
-    }
-
-    return 0;
+    return files.length;
  }

  private fetch: typeof fetch;
  private cacheVersion;
  private key;
  private baseUrl;
-  private headers: HeadersInit | null = null;

  constructor(
    key: string,
@@ -143,7 +109,6 @@ class ImageProxy {
    options: {
      cacheVersion?: number;
      rateLimitOptions?: RateLimitOptions;
-      headers?: HeadersInit;
    } = {}
  ) {
    this.cacheVersion = options.cacheVersion ?? 1;
@@ -157,13 +122,9 @@ class ImageProxy {
    } else {
      this.fetch = fetch;
    }
-    this.headers = options.headers || null;
  }

-  public async getImage(
-    path: string,
-    fallbackPath?: string
-  ): Promise<ImageResponse> {
+  public async getImage(path: string): Promise<ImageResponse> {
    const cacheKey = this.getCacheKey(path);

    const imageResponse = await this.get(cacheKey);
@@ -172,11 +133,7 @@ class ImageProxy {
      const newImage = await this.set(path, cacheKey);

      if (!newImage) {
-        if (fallbackPath) {
-          return await this.getImage(fallbackPath);
-        } else {
-          throw new Error('Failed to load image');
-        }
+        throw new Error('Failed to load image');
      }

      return newImage;
@@ -190,27 +147,6 @@ class ImageProxy {
    return imageResponse;
  }

-  public async clearCachedImage(path: string) {
-    // find cacheKey
-    const cacheKey = this.getCacheKey(path);
-
-    try {
-      const directory = join(this.getCacheDirectory(), cacheKey);
-      const files = await promises.readdir(directory);
-
-      await promises.rm(directory, { recursive: true });
-
-      logger.info(`Cleared ${files[0]} from cache 'avatar'`, {
-        label: 'Image Cache',
-      });
-    } catch (e) {
-      logger.error('Failed to clear cached image', {
-        label: 'Image Cache',
-        message: e.message,
-      });
-    }
-  }
-
  private async get(cacheKey: string): Promise<ImageResponse | null> {
    try {
      const directory = join(this.getCacheDirectory(), cacheKey);
@@ -251,30 +187,16 @@ class ImageProxy {
      const directory = join(this.getCacheDirectory(), cacheKey);
      const href =
        this.baseUrl +
-        (this.baseUrl.length > 0
-          ? this.baseUrl.endsWith('/')
-            ? ''
-            : '/'
-          : '') +
+        (this.baseUrl.endsWith('/') ? '' : '/') +
        (path.startsWith('/') ? path.slice(1) : path);
-      const response = await this.fetch(href, {
-        headers: this.headers || undefined,
-      });
-      if (!response.ok) {
-        return null;
-      }
+      const response = await this.fetch(href);
      const arrayBuffer = await response.arrayBuffer();
      const buffer = Buffer.from(arrayBuffer);

-      const extension = mime.getExtension(
-        response.headers.get('content-type') ?? ''
-      );
-
-      let maxAge = Number(
+      const extension = path.split('.').pop() ?? '';
+      const maxAge = Number(
        (response.headers.get('cache-control') ?? '0').split('=')[1]
      );
-
-      if (!maxAge) maxAge = 86400;
      const expireAt = Date.now() + maxAge * 1000;
      const etag = (response.headers.get('etag') ?? '').replace(/"/g, '');

@@ -310,7 +232,7 @@ class ImageProxy {

  private async writeToCacheDir(
    dir: string,
-    extension: string | null,
+    extension: string,
    maxAge: number,
    expireAt: number,
    buffer: Buffer,
--- a/server/lib/notifications/agents/discord.ts
+++ b/server/lib/notifications/agents/discord.ts
@@ -291,11 +291,7 @@ class DiscordAgent
        }
      }

-      if (settings.options.webhookRoleId) {
-        userMentions.push(`<@&${settings.options.webhookRoleId}>`);
-      }
-
-      const response = await fetch(settings.options.webhookUrl, {
+      await fetch(settings.options.webhookUrl, {
        method: 'POST',
        headers: {
          'Content-Type': 'application/json',
@@ -309,25 +305,15 @@ class DiscordAgent
          content: userMentions.join(' '),
        } as DiscordWebhookPayload),
      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }

      return true;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error sending Discord notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });

      return false;
--- a/server/lib/notifications/agents/gotify.ts
+++ b/server/lib/notifications/agents/gotify.ts
@@ -132,32 +132,22 @@ class GotifyAgent
      const endpoint = `${settings.options.url}/message?token=${settings.options.token}`;
      const notificationPayload = this.getNotificationPayload(type, payload);

-      const response = await fetch(endpoint, {
+      await fetch(endpoint, {
        method: 'POST',
        headers: {
          'Content-Type': 'application/json',
        },
        body: JSON.stringify(notificationPayload),
      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }

      return true;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error sending Gotify notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });

      return false;
--- a/server/lib/notifications/agents/lunasea.ts
+++ b/server/lib/notifications/agents/lunasea.ts
@@ -100,7 +100,7 @@ class LunaSeaAgent
    });

    try {
-      const response = await fetch(settings.options.webhookUrl, {
+      await fetch(settings.options.webhookUrl, {
        method: 'POST',
        headers: settings.options.profileName
          ? {
@@ -114,25 +114,15 @@ class LunaSeaAgent
            },
        body: JSON.stringify(this.buildPayload(type, payload)),
      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }

      return true;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error sending LunaSea notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });

      return false;
--- a/server/lib/notifications/agents/pushbullet.ts
+++ b/server/lib/notifications/agents/pushbullet.ts
@@ -122,7 +122,7 @@ class PushbulletAgent
      });

      try {
-        const response = await fetch(endpoint, {
+        await fetch(endpoint, {
          method: 'POST',
          headers: {
            'Content-Type': 'application/json',
@@ -133,23 +133,13 @@ class PushbulletAgent
            channel_tag: settings.options.channelTag,
          }),
        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
      } catch (e) {
-        let errorData;
-        try {
-          errorData = await e.cause?.text();
-          errorData = JSON.parse(errorData);
-        } catch {
-          /* empty */
-        }
        logger.error('Error sending Pushbullet notification', {
          label: 'Notifications',
          type: Notification[type],
          subject: payload.subject,
          errorMessage: e.message,
-          response: errorData,
+          response: e.response?.data,
        });

        return false;
@@ -174,7 +164,7 @@ class PushbulletAgent
        });

        try {
-          const response = await fetch(endpoint, {
+          await fetch(endpoint, {
            method: 'POST',
            headers: {
              'Content-Type': 'application/json',
@@ -182,24 +172,14 @@ class PushbulletAgent
            },
            body: JSON.stringify(notificationPayload),
          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
        } catch (e) {
-          let errorData;
-          try {
-            errorData = await e.cause?.text();
-            errorData = JSON.parse(errorData);
-          } catch {
-            /* empty */
-          }
          logger.error('Error sending Pushbullet notification', {
            label: 'Notifications',
            recipient: payload.notifyUser.displayName,
            type: Notification[type],
            subject: payload.subject,
            errorMessage: e.message,
-            response: errorData,
+            response: e.response?.data,
          });

          return false;
@@ -235,7 +215,7 @@ class PushbulletAgent
              });

              try {
-                const response = await fetch(endpoint, {
+                await fetch(endpoint, {
                  method: 'POST',
                  headers: {
                    'Content-Type': 'application/json',
@@ -243,24 +223,14 @@ class PushbulletAgent
                  },
                  body: JSON.stringify(notificationPayload),
                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
              } catch (e) {
-                let errorData;
-                try {
-                  errorData = await e.cause?.text();
-                  errorData = JSON.parse(errorData);
-                } catch {
-                  /* empty */
-                }
                logger.error('Error sending Pushbullet notification', {
                  label: 'Notifications',
                  recipient: user.displayName,
                  type: Notification[type],
                  subject: payload.subject,
                  errorMessage: e.message,
-                  response: errorData,
+                  response: e.response?.data,
                });

                return false;
--- a/server/lib/notifications/agents/pushover.ts
+++ b/server/lib/notifications/agents/pushover.ts
@@ -52,9 +52,6 @@ class PushoverAgent
  ): Promise<Partial<PushoverImagePayload>> {
    try {
      const response = await fetch(imageUrl);
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
      const arrayBuffer = await response.arrayBuffer();
      const base64 = Buffer.from(arrayBuffer).toString('base64');
      const contentType = (
@@ -67,17 +64,10 @@ class PushoverAgent
        attachment_type: contentType,
      };
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error getting image payload', {
        label: 'Notifications',
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });
      return {};
    }
@@ -210,7 +200,7 @@ class PushoverAgent
      });

      try {
-        const response = await fetch(endpoint, {
+        await fetch(endpoint, {
          method: 'POST',
          headers: {
            'Content-Type': 'application/json',
@@ -222,23 +212,13 @@ class PushoverAgent
            sound: settings.options.sound,
          } as PushoverPayload),
        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
      } catch (e) {
-        let errorData;
-        try {
-          errorData = await e.cause?.text();
-          errorData = JSON.parse(errorData);
-        } catch {
-          /* empty */
-        }
        logger.error('Error sending Pushover notification', {
          label: 'Notifications',
          type: Notification[type],
          subject: payload.subject,
          errorMessage: e.message,
-          response: errorData,
+          response: e.response?.data,
        });

        return false;
@@ -266,7 +246,7 @@ class PushoverAgent
        });

        try {
-          const response = await fetch(endpoint, {
+          await fetch(endpoint, {
            method: 'POST',
            headers: {
              'Content-Type': 'application/json',
@@ -278,24 +258,14 @@ class PushoverAgent
              sound: payload.notifyUser.settings.pushoverSound,
            } as PushoverPayload),
          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
        } catch (e) {
-          let errorData;
-          try {
-            errorData = await e.cause?.text();
-            errorData = JSON.parse(errorData);
-          } catch {
-            /* empty */
-          }
          logger.error('Error sending Pushover notification', {
            label: 'Notifications',
            recipient: payload.notifyUser.displayName,
            type: Notification[type],
            subject: payload.subject,
            errorMessage: e.message,
-            response: errorData,
+            response: e.response?.data,
          });

          return false;
@@ -332,7 +302,7 @@ class PushoverAgent
              });

              try {
-                const response = await fetch(endpoint, {
+                await fetch(endpoint, {
                  method: 'POST',
                  headers: {
                    'Content-Type': 'application/json',
@@ -343,24 +313,14 @@ class PushoverAgent
                    user: user.settings.pushoverUserKey,
                  } as PushoverPayload),
                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
              } catch (e) {
-                let errorData;
-                try {
-                  errorData = await e.cause?.text();
-                  errorData = JSON.parse(errorData);
-                } catch {
-                  /* empty */
-                }
                logger.error('Error sending Pushover notification', {
                  label: 'Notifications',
                  recipient: user.displayName,
                  type: Notification[type],
                  subject: payload.subject,
                  errorMessage: e.message,
-                  response: errorData,
+                  response: e.response?.data,
                });

                return false;
--- a/server/lib/notifications/agents/slack.ts
+++ b/server/lib/notifications/agents/slack.ts
@@ -237,32 +237,22 @@ class SlackAgent
      subject: payload.subject,
    });
    try {
-      const response = await fetch(settings.options.webhookUrl, {
+      await fetch(settings.options.webhookUrl, {
        method: 'POST',
        headers: {
          'Content-Type': 'application/json',
        },
        body: JSON.stringify(this.buildEmbed(type, payload)),
      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }

      return true;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error sending Slack notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });

      return false;
--- a/server/lib/notifications/agents/telegram.ts
+++ b/server/lib/notifications/agents/telegram.ts
@@ -174,7 +174,7 @@ class TelegramAgent
      });

      try {
-        const response = await fetch(endpoint, {
+        await fetch(endpoint, {
          method: 'POST',
          headers: {
            'Content-Type': 'application/json',
@@ -185,23 +185,13 @@ class TelegramAgent
            disable_notification: !!settings.options.sendSilently,
          } as TelegramMessagePayload | TelegramPhotoPayload),
        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
      } catch (e) {
-        let errorData;
-        try {
-          errorData = await e.cause?.text();
-          errorData = JSON.parse(errorData);
-        } catch {
-          /* empty */
-        }
        logger.error('Error sending Telegram notification', {
          label: 'Notifications',
          type: Notification[type],
          subject: payload.subject,
          errorMessage: e.message,
-          response: errorData,
+          response: e.response?.data,
        });

        return false;
@@ -225,7 +215,7 @@ class TelegramAgent
        });

        try {
-          const response = await fetch(endpoint, {
+          await fetch(endpoint, {
            method: 'POST',
            headers: {
              'Content-Type': 'application/json',
@@ -237,24 +227,14 @@ class TelegramAgent
                !!payload.notifyUser.settings.telegramSendSilently,
            } as TelegramMessagePayload | TelegramPhotoPayload),
          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
        } catch (e) {
-          let errorData;
-          try {
-            errorData = await e.cause?.text();
-            errorData = JSON.parse(errorData);
-          } catch {
-            /* empty */
-          }
          logger.error('Error sending Telegram notification', {
            label: 'Notifications',
            recipient: payload.notifyUser.displayName,
            type: Notification[type],
            subject: payload.subject,
            errorMessage: e.message,
-            response: errorData,
+            response: e.response?.data,
          });

          return false;
@@ -288,7 +268,7 @@ class TelegramAgent
              });

              try {
-                const response = await fetch(endpoint, {
+                await fetch(endpoint, {
                  method: 'POST',
                  headers: {
                    'Content-Type': 'application/json',
@@ -299,24 +279,14 @@ class TelegramAgent
                    disable_notification: !!user.settings?.telegramSendSilently,
                  } as TelegramMessagePayload | TelegramPhotoPayload),
                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
              } catch (e) {
-                let errorData;
-                try {
-                  errorData = await e.cause?.text();
-                  errorData = JSON.parse(errorData);
-                } catch {
-                  /* empty */
-                }
                logger.error('Error sending Telegram notification', {
                  label: 'Notifications',
                  recipient: user.displayName,
                  type: Notification[type],
                  subject: payload.subject,
                  errorMessage: e.message,
-                  response: errorData,
+                  response: e.response?.data,
                });

                return false;
--- a/server/lib/notifications/agents/webhook.ts
+++ b/server/lib/notifications/agents/webhook.ts
@@ -177,7 +177,7 @@ class WebhookAgent
    });

    try {
-      const response = await fetch(settings.options.webhookUrl, {
+      await fetch(settings.options.webhookUrl, {
        method: 'POST',
        headers: {
          'Content-Type': 'application/json',
@@ -187,25 +187,15 @@ class WebhookAgent
        },
        body: JSON.stringify(this.buildPayload(type, payload)),
      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }

      return true;
    } catch (e) {
-      let errorData;
-      try {
-        errorData = await e.cause?.text();
-        errorData = JSON.parse(errorData);
-      } catch {
-        /* empty */
-      }
      logger.error('Error sending webhook notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: errorData,
+        response: e.response?.data,
      });

      return false;
--- a/server/lib/permissions.ts
+++ b/server/lib/permissions.ts
@@ -27,8 +27,6 @@ export enum Permission {
  AUTO_REQUEST_TV = 33554432,
  RECENT_VIEW = 67108864,
  WATCHLIST_VIEW = 134217728,
-  MANAGE_BLACKLIST = 268435456,
-  VIEW_BLACKLIST = 1073741824,
 }

 export interface PermissionCheckOptions {
--- a/server/lib/refreshToken.ts
+++ b/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;
--- a/server/lib/scanners/jellyfin/index.ts
+++ b/server/lib/scanners/jellyfin/index.ts
@@ -210,27 +210,14 @@ class JellyfinScanner {
        return;
      }

-      if (metadata.ProviderIds.Tmdb) {
-        try {
-          tvShow = await this.tmdb.getTvShow({
-            tvId: Number(metadata.ProviderIds.Tmdb),
-          });
-        } catch {
-          this.log('Unable to find TMDb ID for this title.', 'debug', {
-            jellyfinitem,
-          });
-        }
-      }
-      if (!tvShow && metadata.ProviderIds.Tvdb) {
-        try {
-          tvShow = await this.tmdb.getShowByTvdbId({
-            tvdbId: Number(metadata.ProviderIds.Tvdb),
-          });
-        } catch {
-          this.log('Unable to find TVDb ID for this title.', 'debug', {
-            jellyfinitem,
-          });
-        }
+      if (metadata.ProviderIds.Tvdb) {
+        tvShow = await this.tmdb.getShowByTvdbId({
+          tvdbId: Number(metadata.ProviderIds.Tvdb),
+        });
+      } else if (metadata.ProviderIds.Tmdb) {
+        tvShow = await this.tmdb.getTvShow({
+          tvId: Number(metadata.ProviderIds.Tmdb),
+        });
      }

      if (tvShow) {
@@ -504,13 +491,7 @@ class JellyfinScanner {
          }
        });
      } else {
-        this.log(
-          `No information found for the show: ${metadata.Name}`,
-          'debug',
-          {
-            jellyfinitem,
-          }
-        );
+        this.log(`failed show: ${metadata.Name}`);
      }
    } catch (e) {
      this.log(
@@ -586,10 +567,7 @@ class JellyfinScanner {
  public async run(): Promise<void> {
    const settings = getSettings();

-    if (
-      settings.main.mediaServerType != MediaServerType.JELLYFIN &&
-      settings.main.mediaServerType != MediaServerType.EMBY
-    ) {
+    if (settings.main.mediaServerType != MediaServerType.JELLYFIN) {
      return;
    }

@@ -604,7 +582,12 @@ class JellyfinScanner {
      const userRepository = getRepository(User);
      const admin = await userRepository.findOne({
        where: { id: 1 },
-        select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
+        select: [
+          'id',
+          'jellyfinAuthToken',
+          'jellyfinUserId',
+          'jellyfinDeviceId',
+        ],
        order: { id: 'ASC' },
      });

@@ -614,7 +597,7 @@ class JellyfinScanner {

      this.jfClient = new JellyfinAPI(
        getHostname(),
-        settings.jellyfin.apiKey,
+        admin.jellyfinAuthToken,
        admin.jellyfinDeviceId
      );

--- a/server/lib/scanners/plex/index.ts
+++ b/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) {
@@ -278,7 +278,9 @@ class PlexScanner
    const seasons = tvShow.seasons;
    const processableSeasons: ProcessableSeason[] = [];

-    for (const season of seasons) {
+    const filteredSeasons = seasons.filter((sn) => sn.season_number !== 0);
+
+    for (const season of filteredSeasons) {
      const matchedPlexSeason = metadata.Children?.Metadata.find(
        (md) => Number(md.index) === season.season_number
      );
--- a/server/lib/scanners/sonarr/index.ts
+++ b/server/lib/scanners/sonarr/index.ts
@@ -103,8 +103,10 @@ class SonarrScanner

      const tmdbId = tvShow.id;

-      const filteredSeasons = sonarrSeries.seasons.filter((sn) =>
-        tvShow.seasons.find((s) => s.season_number === sn.seasonNumber)
+      const filteredSeasons = sonarrSeries.seasons.filter(
+        (sn) =>
+          sn.seasonNumber !== 0 &&
+          tvShow.seasons.find((s) => s.season_number === sn.seasonNumber)
      );

      for (const season of filteredSeasons) {
--- a/server/lib/settings/index.ts
+++ b/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';
@@ -47,7 +47,6 @@ export interface JellyfinSettings {
  jellyfinForgotPasswordUrl?: string;
  libraries: Library[];
  serverId: string;
-  apiKey: string;
 }
 export interface TautulliSettings {
  hostname?: string;
@@ -99,17 +98,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;
@@ -124,14 +112,12 @@ export interface MainSettings {
  hideAvailable: boolean;
  localLogin: boolean;
  newPlexLogin: boolean;
-  discoverRegion: string;
-  streamingRegion: string;
+  region: string;
  originalLanguage: string;
  trustProxy: boolean;
  mediaServerType: number;
  partialRequestsEnabled: boolean;
  locale: string;
-  proxy: ProxySettings;
 }

 interface PublicSettings {
@@ -145,8 +131,7 @@ interface FullPublicSettings extends PublicSettings {
  localLogin: boolean;
  movie4kEnabled: boolean;
  series4kEnabled: boolean;
-  discoverRegion: string;
-  streamingRegion: string;
+  region: string;
  originalLanguage: string;
  mediaServerType: number;
  jellyfinExternalHost?: string;
@@ -172,7 +157,6 @@ export interface NotificationAgentDiscord extends NotificationAgentConfig {
    botUsername?: string;
    botAvatarUrl?: string;
    webhookUrl: string;
-    webhookRoleId?: string;
    enableMentions: boolean;
  };
 }
@@ -284,7 +268,6 @@ export type JobId =
  | 'plex-recently-added-scan'
  | 'plex-full-scan'
  | 'plex-watchlist-sync'
-  | 'plex-refresh-token'
  | 'radarr-scan'
  | 'sonarr-scan'
  | 'download-sync'
@@ -335,23 +318,12 @@ class Settings {
        hideAvailable: false,
        localLogin: true,
        newPlexLogin: true,
-        discoverRegion: '',
-        streamingRegion: '',
+        region: '',
        originalLanguage: '',
        trustProxy: false,
        mediaServerType: MediaServerType.NOT_CONFIGURED,
        partialRequestsEnabled: true,
        locale: 'en',
-        proxy: {
-          enabled: false,
-          hostname: '',
-          port: 8080,
-          useSsl: false,
-          user: '',
-          password: '',
-          bypassFilter: '',
-          bypassLocalAddresses: true,
-        },
      },
      plex: {
        name: '',
@@ -370,7 +342,6 @@ class Settings {
        jellyfinForgotPasswordUrl: '',
        libraries: [],
        serverId: '',
-        apiKey: '',
      },
      tautulli: {},
      radarr: [],
@@ -399,7 +370,6 @@ class Settings {
            types: 0,
            options: {
              webhookUrl: '',
-              webhookRoleId: '',
              enableMentions: true,
            },
          },
@@ -473,10 +443,7 @@ class Settings {
          schedule: '0 0 3 * * *',
        },
        'plex-watchlist-sync': {
-          schedule: '0 */3 * * * *',
-        },
-        'plex-refresh-token': {
-          schedule: '0 0 5 * * *',
+          schedule: '0 */10 * * * *',
        },
        'radarr-scan': {
          schedule: '0 0 4 * * *',
@@ -510,6 +477,10 @@ class Settings {
  }

  get main(): MainSettings {
+    if (!this.data.main.apiKey) {
+      this.data.main.apiKey = this.generateApiKey();
+      this.save();
+    }
    return this.data.main;
  }

@@ -579,8 +550,7 @@ class Settings {
      series4kEnabled: this.data.sonarr.some(
        (sonarr) => sonarr.is4k && sonarr.isDefault
      ),
-      discoverRegion: this.data.main.discoverRegion,
-      streamingRegion: this.data.main.streamingRegion,
+      region: this.data.main.region,
      originalLanguage: this.data.main.originalLanguage,
      mediaServerType: this.main.mediaServerType,
      partialRequestsEnabled: this.data.main.partialRequestsEnabled,
@@ -612,28 +582,42 @@ 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;
  }

  private generateApiKey(): string {
-    if (process.env.API_KEY) {
-      return process.env.API_KEY;
-    } else {
-      return Buffer.from(`${Date.now()}${randomUUID()}`).toString('base64');
+    return Buffer.from(`${Date.now()}${randomUUID()}`).toString('base64');
+  }
+
+  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();
    }
  }

@@ -645,59 +629,34 @@ class Settings {
   * @param overrideSettings If passed in, will override all existing settings with these
   * values
   */
-  public async load(overrideSettings?: AllSettings): Promise<Settings> {
+  public load(overrideSettings?: AllSettings): Settings {
    if (overrideSettings) {
      this.data = overrideSettings;
      return this;
    }

-    let data;
-    try {
-      data = await fs.readFile(SETTINGS_PATH, 'utf-8');
-    } catch {
-      await this.save();
+    if (!fs.existsSync(SETTINGS_PATH)) {
+      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 = merge(this.data, migratedData);
-    }
+      this.data = runMigrations(parsedJson);

-    // generate keys and ids if it's missing
-    let change = false;
-    if (!this.data.main.apiKey) {
-      this.data.main.apiKey = this.generateApiKey();
-      change = true;
-    } 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.data = merge(this.data, parsedJson);

+      this.save();
+    }
    return this;
  }

-  public async save(): Promise<void> {
-    const tmp = SETTINGS_PATH + '.tmp';
-    await fs.writeFile(tmp, JSON.stringify(this.data, undefined, ' '));
-    await fs.rename(tmp, SETTINGS_PATH);
+  public save(): void {
+    fs.writeFileSync(SETTINGS_PATH, JSON.stringify(this.data, undefined, ' '));
  }
 }

+let loaded = false;
 let settings: Settings | undefined;

 export const getSettings = (initialSettings?: AllSettings): Settings => {
@@ -705,6 +664,11 @@ export const getSettings = (initialSettings?: AllSettings): Settings => {
    settings = new Settings(initialSettings);
  }

+  if (!loaded) {
+    settings.load();
+    loaded = true;
+  }
+
  return settings;
 };

--- a/server/lib/settings/migrations/0001_migrate_hostname.ts
+++ b/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 { hostname } = settings.jellyfin;
+  const oldJellyfinSettings = 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;
 };

--- a/server/lib/settings/migrations/0002_migrate_apitokens.ts
+++ b/server/lib/settings/migrations/0002_migrate_apitokens.ts
@@ -1,42 +0,0 @@
-import JellyfinAPI from '@server/api/jellyfin';
-import { MediaServerType } from '@server/constants/server';
-import { getRepository } from '@server/datasource';
-import { User } from '@server/entity/User';
-import type { AllSettings } from '@server/lib/settings';
-import { getHostname } from '@server/utils/getHostname';
-
-const migrateApiTokens = async (settings: any): Promise<AllSettings> => {
-  const mediaServerType = settings.main.mediaServerType;
-  if (
-    !settings.jellyfin.apiKey &&
-    (mediaServerType === MediaServerType.JELLYFIN ||
-      mediaServerType === MediaServerType.EMBY)
-  ) {
-    const userRepository = getRepository(User);
-    const admin = await userRepository.findOne({
-      where: { id: 1 },
-      select: ['id', 'jellyfinAuthToken', 'jellyfinUserId', 'jellyfinDeviceId'],
-      order: { id: 'ASC' },
-    });
-    if (!admin) {
-      return settings;
-    }
-    const jellyfinClient = new JellyfinAPI(
-      getHostname(settings.jellyfin),
-      admin.jellyfinAuthToken,
-      admin.jellyfinDeviceId
-    );
-    jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
-    try {
-      const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
-      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;
-};
-
-export default migrateApiTokens;
--- a/server/lib/settings/migrations/0003_emby_media_server_type.ts
+++ b/server/lib/settings/migrations/0003_emby_media_server_type.ts
@@ -1,16 +0,0 @@
-import { MediaServerType } from '@server/constants/server';
-import type { AllSettings } from '@server/lib/settings';
-
-const migrateHostname = (settings: any): AllSettings => {
-  const oldMediaServerType = settings.main.mediaServerType;
-  if (
-    oldMediaServerType === MediaServerType.JELLYFIN &&
-    process.env.JELLYFIN_TYPE === 'emby'
-  ) {
-    settings.main.mediaServerType = MediaServerType.EMBY;
-  }
-
-  return settings;
-};
-
-export default migrateHostname;
--- a/server/lib/settings/migrations/0004_migrate_region_setting.ts
+++ b/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;
--- a/server/lib/settings/migrator.ts
+++ b/server/lib/settings/migrator.ts
@@ -1,100 +1,20 @@
 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');

-export const runMigrations = async (
-  settings: AllSettings,
-  SETTINGS_PATH: string
-): Promise<AllSettings> => {
+export const runMigrations = (settings: AllSettings): 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 {
-        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);
-
-    if (settingsBefore !== settingsAfter) {
-      // a migration occured
-      // we check that the new config will be saved
-      await fs.writeFile(
-        SETTINGS_PATH,
-        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',
-      }
-    );
-    logger.error(
-      'A common cause for this issue is a permission error of your configuration folder.',
-      {
-        label: 'Settings Migrator',
-      }
-    );
-    process.exit();
+  for (const migration of migrations) {
+    migrated = migration(migrated);
  }

  return migrated;
--- a/server/lib/watchlistsync.ts
+++ b/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,
--- a/server/migration/1699901142442-AddBlacklist.ts
+++ b/server/migration/1699901142442-AddBlacklist.ts
@@ -1,20 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class AddBlacklist1699901142442 implements MigrationInterface {
-  name = 'AddBlacklist1699901142442';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `CREATE TABLE "blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')),"userId" integer, "mediaId" integer,CONSTRAINT "UQ_6bbafa28411e6046421991ea21c" UNIQUE ("tmdbId", "userId"))`
-    );
-
-    await queryRunner.query(
-      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`DROP TABLE "blacklist"`);
-    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
-  }
-}
--- a/server/migration/1727907530757-AddUserSettingsStreamingRegion.ts
+++ b/server/migration/1727907530757-AddUserSettingsStreamingRegion.ts
@@ -1,53 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class AddUserSettingsStreamingRegion1727907530757
-  implements MigrationInterface
-{
-  name = 'AddUserSettingsStreamingRegion1727907530757';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `CREATE TABLE "temporary_user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "notificationTypes" text, "discordId" varchar, "userId" integer, "originalLanguage" varchar, "telegramChatId" varchar, "telegramSendSilently" boolean, "pgpKey" varchar, "locale" varchar NOT NULL DEFAULT (''), "pushbulletAccessToken" varchar, "pushoverApplicationToken" varchar, "pushoverUserKey" varchar, "watchlistSyncMovies" boolean, "watchlistSyncTv" boolean, "pushoverSound" varchar, CONSTRAINT "UQ_986a2b6d3c05eb4091bb8066f78" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_user_settings"("id", "notificationTypes", "discordId", "userId", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv", "pushoverSound") SELECT "id", "notificationTypes", "discordId", "userId", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv", "pushoverSound" FROM "user_settings"`
-    );
-    await queryRunner.query(`DROP TABLE "user_settings"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_user_settings" RENAME TO "user_settings"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "temporary_user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "notificationTypes" text, "discordId" varchar, "userId" integer, "originalLanguage" varchar, "telegramChatId" varchar, "telegramSendSilently" boolean, "pgpKey" varchar, "locale" varchar NOT NULL DEFAULT (''), "pushbulletAccessToken" varchar, "pushoverApplicationToken" varchar, "pushoverUserKey" varchar, "watchlistSyncMovies" boolean, "watchlistSyncTv" boolean, "pushoverSound" varchar, "discoverRegion" varchar, "streamingRegion" varchar, CONSTRAINT "UQ_986a2b6d3c05eb4091bb8066f78" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_user_settings"("id", "notificationTypes", "discordId", "userId", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv", "pushoverSound") SELECT "id", "notificationTypes", "discordId", "userId", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv", "pushoverSound" FROM "user_settings"`
-    );
-    await queryRunner.query(`DROP TABLE "user_settings"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_user_settings" RENAME TO "user_settings"`
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "user_settings" RENAME TO "temporary_user_settings"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "notificationTypes" text, "discordId" varchar, "userId" integer, "originalLanguage" varchar, "telegramChatId" varchar, "telegramSendSilently" boolean, "pgpKey" varchar, "locale" varchar NOT NULL DEFAULT (''), "pushbulletAccessToken" varchar, "pushoverApplicationToken" varchar, "pushoverUserKey" varchar, "watchlistSyncMovies" boolean, "watchlistSyncTv" boolean, "pushoverSound" varchar, CONSTRAINT "UQ_986a2b6d3c05eb4091bb8066f78" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "user_settings"("id", "notificationTypes", "discordId", "userId", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv", "pushoverSound") SELECT "id", "notificationTypes", "discordId", "userId", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv", "pushoverSound" FROM "temporary_user_settings"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_user_settings"`);
-    await queryRunner.query(
-      `ALTER TABLE "user_settings" RENAME TO "temporary_user_settings"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "notificationTypes" text, "discordId" varchar, "userId" integer, "originalLanguage" varchar, "telegramChatId" varchar, "telegramSendSilently" boolean, "pgpKey" varchar, "locale" varchar NOT NULL DEFAULT (''), "pushbulletAccessToken" varchar, "pushoverApplicationToken" varchar, "pushoverUserKey" varchar, "watchlistSyncMovies" boolean, "watchlistSyncTv" boolean, "pushoverSound" varchar, "region" varchar, CONSTRAINT "UQ_986a2b6d3c05eb4091bb8066f78" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "user_settings"("id", "notificationTypes", "discordId", "userId", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv", "pushoverSound") SELECT "id", "notificationTypes", "discordId", "userId", "originalLanguage", "telegramChatId", "telegramSendSilently", "pgpKey", "locale", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "watchlistSyncMovies", "watchlistSyncTv", "pushoverSound" FROM "temporary_user_settings"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_user_settings"`);
-  }
-}
--- a/server/models/Movie.ts
+++ b/server/models/Movie.ts
@@ -85,7 +85,6 @@ export interface MovieDetails {
  mediaUrl?: string;
  watchProviders?: WatchProviders[];
  keywords: Keyword[];
-  onUserWatchlist?: boolean;
 }

 export const mapProductionCompany = (
@@ -102,8 +101,7 @@ export const mapProductionCompany = (

 export const mapMovieDetails = (
  movie: TmdbMovieDetails,
-  media?: Media,
-  userWatchlist?: boolean
+  media?: Media
 ): MovieDetails => ({
  id: movie.id,
  adult: movie.adult,
@@ -150,5 +148,4 @@ export const mapMovieDetails = (
    id: keyword.id,
    name: keyword.name,
  })),
-  onUserWatchlist: userWatchlist,
 });
--- a/server/models/Tv.ts
+++ b/server/models/Tv.ts
@@ -111,7 +111,6 @@ export interface TvDetails {
  keywords: Keyword[];
  mediaInfo?: Media;
  watchProviders?: WatchProviders[];
-  onUserWatchlist?: boolean;
 }

 const mapEpisodeResult = (episode: TmdbTvEpisodeResult): Episode => ({
@@ -162,8 +161,7 @@ export const mapNetwork = (network: TmdbNetwork): TvNetwork => ({

 export const mapTvDetails = (
  show: TmdbTvDetails,
-  media?: Media,
-  userWatchlist?: boolean
+  media?: Media
 ): TvDetails => ({
  createdBy: show.created_by,
  episodeRunTime: show.episode_run_time,
@@ -225,5 +223,4 @@ export const mapTvDetails = (
  })),
  mediaInfo: media,
  watchProviders: mapWatchProviders(show['watch/providers']?.results ?? {}),
-  onUserWatchlist: userWatchlist,
 });
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -1,7 +1,7 @@
 import JellyfinAPI from '@server/api/jellyfin';
 import PlexTvAPI from '@server/api/plextv';
 import { ApiErrorCode } from '@server/constants/error';
-import { MediaServerType, ServerType } from '@server/constants/server';
+import { MediaServerType } from '@server/constants/server';
 import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
 import { User } from '@server/entity/User';
@@ -14,6 +14,7 @@ import { ApiError } from '@server/types/error';
 import { getHostname } from '@server/utils/getHostname';
 import * as EmailValidator from 'email-validator';
 import { Router } from 'express';
+import gravatarUrl from 'gravatar-url';
 import net from 'net';

 const authRoutes = Router();
@@ -87,7 +88,7 @@ authRoutes.post('/plex', async (req, res, next) => {
      });

      settings.main.mediaServerType = MediaServerType.PLEX;
-      await settings.save();
+      settings.save();
      startJobs();

      await userRepository.save(user);
@@ -226,20 +227,15 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
    urlBase?: string;
    useSsl?: boolean;
    email?: string;
-    serverType?: number;
  };

-  //Make sure jellyfin login is enabled, but only if jellyfin && Emby is not already configured
+  //Make sure jellyfin login is enabled, but only if jellyfin is not already configured
  if (
    settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
-    settings.main.mediaServerType !== MediaServerType.EMBY &&
-    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED &&
-    settings.jellyfin.ip !== ''
+    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED
  ) {
    return res.status(500).json({ error: 'Jellyfin login is disabled' });
-  }
-
-  if (!body.username) {
+  } else if (!body.username) {
    return res.status(500).json({ error: 'You must provide an username' });
  } else if (settings.jellyfin.ip !== '' && body.hostname) {
    return res
@@ -260,6 +256,8 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
            urlBase: body.urlBase,
          });

+    const { externalHostname } = getSettings().jellyfin;
+
    // Try to find deviceId that corresponds to jellyfin user, else generate a new one
    let user = await userRepository.findOne({
      where: { jellyfinUsername: body.username },
@@ -275,7 +273,11 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
    }

    // First we need to attempt to log the user in to jellyfin
-    const jellyfinserver = new JellyfinAPI(hostname ?? '', undefined, deviceId);
+    const jellyfinserver = new JellyfinAPI(hostname, undefined, deviceId);
+    const jellyfinHost =
+      externalHostname && externalHostname.length > 0
+        ? externalHostname
+        : hostname;

    const ip = req.ip;
    let clientIp;
@@ -299,93 +301,36 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      where: { jellyfinUserId: account.User.Id },
    });

-    const missingAdminUser = !user && !(await userRepository.count());
-    if (
-      missingAdminUser ||
-      settings.main.mediaServerType === MediaServerType.NOT_CONFIGURED
-    ) {
+    if (!user && !(await userRepository.count())) {
      // Check if user is admin on jellyfin
      if (account.User.Policy.IsAdministrator === false) {
        throw new ApiError(403, ApiErrorCode.NotAdmin);
      }

-      if (
-        body.serverType !== MediaServerType.JELLYFIN &&
-        body.serverType !== MediaServerType.EMBY
-      ) {
-        throw new Error('select_server_type');
-      }
-      settings.main.mediaServerType = body.serverType;
-
-      if (missingAdminUser) {
-        logger.info(
-          'Sign-in attempt from Jellyfin user with access to the media server; creating initial admin user for Jellyseerr',
-          {
-            label: 'API',
-            ip: req.ip,
-            jellyfinUsername: account.User.Name,
-          }
-        );
-
-        // User doesn't exist, and there are no users in the database, we'll create the user
-        // with admin permissions
-
-        user = new User({
-          id: 1,
-          email: body.email || account.User.Name,
+      logger.info(
+        'Sign-in attempt from Jellyfin user with access to the media server; creating initial admin user for Overseerr',
+        {
+          label: 'API',
+          ip: req.ip,
          jellyfinUsername: account.User.Name,
-          jellyfinUserId: account.User.Id,
-          jellyfinDeviceId: deviceId,
-          jellyfinAuthToken: account.AccessToken,
-          permissions: Permission.ADMIN,
-          avatar: `/avatarproxy/${account.User.Id}`,
-          userType:
-            body.serverType === MediaServerType.JELLYFIN
-              ? UserType.JELLYFIN
-              : UserType.EMBY,
-        });
-
-        await userRepository.save(user);
-      } else {
-        logger.info(
-          'Sign-in attempt from Jellyfin user with access to the media server; editing admin user for Jellyseerr',
-          {
-            label: 'API',
-            ip: req.ip,
-            jellyfinUsername: account.User.Name,
-          }
-        );
-
-        // User alread exist but settings.json is not configured, we'll edit the admin user
-
-        user = await userRepository.findOne({
-          where: { id: 1 },
-        });
-        if (!user) {
-          throw new Error('Unable to find admin user to edit');
        }
-        user.email = body.email || account.User.Name;
-        user.jellyfinUsername = account.User.Name;
-        user.jellyfinUserId = account.User.Id;
-        user.jellyfinDeviceId = deviceId;
-        user.jellyfinAuthToken = account.AccessToken;
-        user.permissions = Permission.ADMIN;
-        user.avatar = `/avatarproxy/${account.User.Id}`;
-        user.userType =
-          body.serverType === MediaServerType.JELLYFIN
-            ? UserType.JELLYFIN
-            : UserType.EMBY;
-
-        await userRepository.save(user);
-      }
-
-      // Create an API key on Jellyfin from this admin user
-      const jellyfinClient = new JellyfinAPI(
-        hostname,
-        account.AccessToken,
-        deviceId
      );
-      const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
+
+      // User doesn't exist, and there are no users in the database, we'll create the user
+      // with admin permission
+      settings.main.mediaServerType = MediaServerType.JELLYFIN;
+      user = new User({
+        email: body.email,
+        jellyfinUsername: account.User.Name,
+        jellyfinUserId: account.User.Id,
+        jellyfinDeviceId: deviceId,
+        jellyfinAuthToken: account.AccessToken,
+        permissions: Permission.ADMIN,
+        avatar: account.User.PrimaryImageTag
+          ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
+          : gravatarUrl(body.email ?? '', { default: 'mm', size: 200 }),
+        userType: UserType.JELLYFIN,
+      });

      const serverName = await jellyfinserver.getServerName();

@@ -395,21 +340,22 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      settings.jellyfin.port = body.port ?? 8096;
      settings.jellyfin.urlBase = body.urlBase ?? '';
      settings.jellyfin.useSsl = body.useSsl ?? false;
-      settings.jellyfin.apiKey = apiKey;
-      await settings.save();
+      settings.save();
      startJobs();
+
+      await userRepository.save(user);
    }
    // User already exists, let's update their information
    else if (account.User.Id === user?.jellyfinUserId) {
      logger.info(
        `Found matching ${
          settings.main.mediaServerType === MediaServerType.JELLYFIN
-            ? ServerType.JELLYFIN
-            : ServerType.EMBY
+            ? 'Jellyfin'
+            : 'Emby'
        } user; updating user with ${
          settings.main.mediaServerType === MediaServerType.JELLYFIN
-            ? ServerType.JELLYFIN
-            : ServerType.EMBY
+            ? 'Jellyfin'
+            : 'Emby'
        }`,
        {
          label: 'API',
@@ -417,13 +363,31 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
          jellyfinUsername: account.User.Name,
        }
      );
-      user.avatar = `/avatarproxy/${account.User.Id}`;
+      // Let's check if their authtoken is up to date
+      if (user.jellyfinAuthToken !== account.AccessToken) {
+        user.jellyfinAuthToken = account.AccessToken;
+      }
+      // Update the users avatar with their jellyfin profile pic (incase it changed)
+      if (account.User.PrimaryImageTag) {
+        user.avatar = `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
+      } else {
+        user.avatar = gravatarUrl(user.email, {
+          default: 'mm',
+          size: 200,
+        });
+      }
      user.jellyfinUsername = account.User.Name;

      if (user.username === account.User.Name) {
        user.username = '';
      }

+      // TODO: If JELLYFIN_TYPE is set to 'emby' then set mediaServerType to EMBY
+      // if (process.env.JELLYFIN_TYPE === 'emby') {
+      //   settings.main.mediaServerType = MediaServerType.EMBY;
+      //   settings.save();
+      // }
+
      await userRepository.save(user);
    } else if (!settings.main.newPlexLogin) {
      logger.warn(
@@ -449,19 +413,22 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        }
      );

+      if (!body.email) {
+        throw new Error('add_email');
+      }
+
      user = new User({
        email: body.email,
        jellyfinUsername: account.User.Name,
        jellyfinUserId: account.User.Id,
        jellyfinDeviceId: deviceId,
+        jellyfinAuthToken: account.AccessToken,
        permissions: settings.main.defaultPermissions,
-        avatar: `/avatarproxy/${account.User.Id}`,
-        userType:
-          settings.main.mediaServerType === MediaServerType.JELLYFIN
-            ? UserType.JELLYFIN
-            : UserType.EMBY,
+        avatar: account.User.PrimaryImageTag
+          ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
+          : gravatarUrl(body.email, { default: 'mm', size: 200 }),
+        userType: UserType.JELLYFIN,
      });
-
      //initialize Jellyfin/Emby users with local login
      const passedExplicitPassword = body.password && body.password.length > 0;
      if (passedExplicitPassword) {
--- a/server/routes/avatarproxy.ts
+++ b/server/routes/avatarproxy.ts
@@ -1,92 +0,0 @@
-import { MediaServerType } from '@server/constants/server';
-import { getRepository } from '@server/datasource';
-import { User } from '@server/entity/User';
-import ImageProxy from '@server/lib/imageproxy';
-import { getSettings } from '@server/lib/settings';
-import logger from '@server/logger';
-import { getAppVersion } from '@server/utils/appVersion';
-import { getHostname } from '@server/utils/getHostname';
-import { Router } from 'express';
-import gravatarUrl from 'gravatar-url';
-
-const router = Router();
-
-let _avatarImageProxy: ImageProxy | null = null;
-async function initAvatarImageProxy() {
-  if (!_avatarImageProxy) {
-    const userRepository = getRepository(User);
-    const admin = await userRepository.findOne({
-      where: { id: 1 },
-      select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
-      order: { id: 'ASC' },
-    });
-    const deviceId = admin?.jellyfinDeviceId;
-    const authToken = getSettings().jellyfin.apiKey;
-    _avatarImageProxy = new ImageProxy('avatar', '', {
-      headers: {
-        'X-Emby-Authorization': `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}", Token="${authToken}"`,
-      },
-    });
-  }
-  return _avatarImageProxy;
-}
-
-router.get('/:jellyfinUserId', async (req, res) => {
-  try {
-    if (!req.params.jellyfinUserId.match(/^[a-f0-9]{32}$/)) {
-      const mediaServerType = getSettings().main.mediaServerType;
-      throw new Error(
-        `Provided URL is not ${
-          mediaServerType === MediaServerType.JELLYFIN
-            ? 'a Jellyfin'
-            : 'an Emby'
-        } avatar.`
-      );
-    }
-
-    const avatarImageCache = await initAvatarImageProxy();
-
-    const user = await getRepository(User).findOne({
-      where: { jellyfinUserId: req.params.jellyfinUserId },
-    });
-
-    const fallbackUrl = gravatarUrl(user?.email || 'none', {
-      default: 'mm',
-      size: 200,
-    });
-
-    const setttings = getSettings();
-    const jellyfinAvatarUrl =
-      setttings.main.mediaServerType === MediaServerType.JELLYFIN
-        ? `${getHostname()}/UserImage?UserId=${req.params.jellyfinUserId}`
-        : `${getHostname()}/Users/${
-            req.params.jellyfinUserId
-          }/Images/Primary?quality=90`;
-
-    let imageData = await avatarImageCache.getImage(
-      jellyfinAvatarUrl,
-      fallbackUrl
-    );
-
-    if (imageData.meta.extension === 'json') {
-      // this is a 404
-      imageData = await avatarImageCache.getImage(fallbackUrl);
-    }
-
-    res.writeHead(200, {
-      'Content-Type': `image/${imageData.meta.extension}`,
-      'Content-Length': imageData.imageBuffer.length,
-      'Cache-Control': `public, max-age=${imageData.meta.curRevalidate}`,
-      'OS-Cache-Key': imageData.meta.cacheKey,
-      'OS-Cache-Status': imageData.meta.cacheMiss ? 'MISS' : 'HIT',
-    });
-
-    res.end(imageData.imageBuffer);
-  } catch (e) {
-    logger.error('Failed to proxy avatar image', {
-      errorMessage: e.message,
-    });
-  }
-});
-
-export default router;
--- a/server/routes/blacklist.ts
+++ b/server/routes/blacklist.ts
@@ -1,171 +0,0 @@
-import { MediaType } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
-import { Blacklist } from '@server/entity/Blacklist';
-import Media from '@server/entity/Media';
-import type { BlacklistResultsResponse } from '@server/interfaces/api/blacklistInterfaces';
-import { Permission } from '@server/lib/permissions';
-import logger from '@server/logger';
-import { isAuthenticated } from '@server/middleware/auth';
-import { Router } from 'express';
-import { EntityNotFoundError, QueryFailedError } from 'typeorm';
-import { z } from 'zod';
-
-const blacklistRoutes = Router();
-
-export const blacklistAdd = z.object({
-  tmdbId: z.coerce.number(),
-  mediaType: z.nativeEnum(MediaType),
-  title: z.coerce.string().optional(),
-  user: z.coerce.number(),
-});
-
-blacklistRoutes.get(
-  '/',
-  isAuthenticated([Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST], {
-    type: 'or',
-  }),
-  async (req, res, next) => {
-    const pageSize = req.query.take ? Number(req.query.take) : 25;
-    const skip = req.query.skip ? Number(req.query.skip) : 0;
-    const search = (req.query.search as string) ?? '';
-
-    try {
-      let query = getRepository(Blacklist)
-        .createQueryBuilder('blacklist')
-        .leftJoinAndSelect('blacklist.user', 'user');
-
-      if (search.length > 0) {
-        query = query.where('blacklist.title like :title', {
-          title: `%${search}%`,
-        });
-      }
-
-      const [blacklistedItems, itemsCount] = await query
-        .orderBy('blacklist.createdAt', 'DESC')
-        .take(pageSize)
-        .skip(skip)
-        .getManyAndCount();
-
-      return res.status(200).json({
-        pageInfo: {
-          pages: Math.ceil(itemsCount / pageSize),
-          pageSize,
-          results: itemsCount,
-          page: Math.ceil(skip / pageSize) + 1,
-        },
-        results: blacklistedItems,
-      } as BlacklistResultsResponse);
-    } catch (error) {
-      logger.error('Something went wrong while retrieving blacklisted items', {
-        label: 'Blacklist',
-        errorMessage: error.message,
-      });
-      return next({
-        status: 500,
-        message: 'Unable to retrieve blacklisted items.',
-      });
-    }
-  }
-);
-
-blacklistRoutes.get(
-  '/:id',
-  isAuthenticated([Permission.MANAGE_BLACKLIST], {
-    type: 'or',
-  }),
-  async (req, res, next) => {
-    try {
-      const blacklisteRepository = getRepository(Blacklist);
-
-      const blacklistItem = await blacklisteRepository.findOneOrFail({
-        where: { tmdbId: Number(req.params.id) },
-      });
-
-      return res.status(200).send(blacklistItem);
-    } catch (e) {
-      if (e instanceof EntityNotFoundError) {
-        return next({
-          status: 401,
-          message: e.message,
-        });
-      }
-      return next({ status: 500, message: e.message });
-    }
-  }
-);
-
-blacklistRoutes.post(
-  '/',
-  isAuthenticated([Permission.MANAGE_BLACKLIST], {
-    type: 'or',
-  }),
-  async (req, res, next) => {
-    try {
-      const values = blacklistAdd.parse(req.body);
-
-      await Blacklist.addToBlacklist({
-        blacklistRequest: values,
-      });
-
-      return res.status(201).send();
-    } catch (error) {
-      if (!(error instanceof Error)) {
-        return;
-      }
-
-      if (error instanceof QueryFailedError) {
-        switch (error.driverError.errno) {
-          case 19:
-            return next({ status: 412, message: 'Item already blacklisted' });
-          default:
-            logger.warn('Something wrong with data blacklist', {
-              tmdbId: req.body.tmdbId,
-              mediaType: req.body.mediaType,
-              label: 'Blacklist',
-            });
-            return next({ status: 409, message: 'Something wrong' });
-        }
-      }
-
-      return next({ status: 500, message: error.message });
-    }
-  }
-);
-
-blacklistRoutes.delete(
-  '/:id',
-  isAuthenticated([Permission.MANAGE_BLACKLIST], {
-    type: 'or',
-  }),
-  async (req, res, next) => {
-    try {
-      const blacklisteRepository = getRepository(Blacklist);
-
-      const blacklistItem = await blacklisteRepository.findOneOrFail({
-        where: { tmdbId: Number(req.params.id) },
-      });
-
-      await blacklisteRepository.remove(blacklistItem);
-
-      const mediaRepository = getRepository(Media);
-
-      const mediaItem = await mediaRepository.findOneOrFail({
-        where: { tmdbId: Number(req.params.id) },
-      });
-
-      await mediaRepository.remove(mediaItem);
-
-      return res.status(204).send();
-    } catch (e) {
-      if (e instanceof EntityNotFoundError) {
-        return next({
-          status: 401,
-          message: e.message,
-        });
-      }
-      return next({ status: 500, message: e.message });
-    }
-  }
-);
-
-export default blacklistRoutes;
--- a/server/routes/discover.ts
+++ b/server/routes/discover.ts
@@ -29,12 +29,12 @@ import { z } from 'zod';
 export const createTmdbWithRegionLanguage = (user?: User): TheMovieDb => {
  const settings = getSettings();

-  const discoverRegion =
-    user?.settings?.streamingRegion === 'all'
+  const region =
+    user?.settings?.region === 'all'
      ? ''
-      : user?.settings?.streamingRegion
-      ? user?.settings?.streamingRegion
-      : settings.main.discoverRegion;
+      : user?.settings?.region
+      ? user?.settings?.region
+      : settings.main.region;

  const originalLanguage =
    user?.settings?.originalLanguage === 'all'
@@ -44,7 +44,7 @@ export const createTmdbWithRegionLanguage = (user?: User): TheMovieDb => {
      : settings.main.originalLanguage;

  return new TheMovieDb({
-    discoverRegion,
+    region,
    originalLanguage,
  });
 };
@@ -71,7 +71,6 @@ const QueryFilterOptions = z.object({
  network: z.coerce.string().optional(),
  watchProviders: z.coerce.string().optional(),
  watchRegion: z.coerce.string().optional(),
-  status: z.coerce.string().optional(),
 });

 export type FilterOptions = z.infer<typeof QueryFilterOptions>;
@@ -386,7 +385,6 @@ discoverRoutes.get('/tv', async (req, res, next) => {
      voteCountLte: query.voteCountLte,
      watchProviders: query.watchProviders,
      watchRegion: query.watchRegion,
-      withStatus: query.status,
    });

    const media = await Media.getRelatedMedia(
--- a/Show More
+++ b/Show More