fix: fixes pending media removal after request deletion

This fixes MORE TPYEORM LIFECYCLE HOOK ISSUES for postgresql. Current behavior is after media request is removed (either by cancellation or deletion) the media remains as `pending` unless a user with `manage requests` clears the media data, on **POSTGRESQL** database. With this change, the media status will be changed to `UKNOWN` with the media request removal. TLDR; Though the @AfterRemove() hook in MediaRequest works fine in SQLite it doesn't reliably update the media status in PostgreSQL which is likely due to transaction timing or relation loading differences between the two databases
fix(imagecache): fix avatar cache folder creation (#1581 )
2025-12-30 13:39:12 -05:00 · 2025-04-22 13:40:53 +08:00 · 2025-04-12 02:24:13 +08:00 · 2025-04-12 01:08:01 +08:00 · 2025-04-11 22:49:26 +08:00 · 2025-04-11 22:48:44 +08:00
215 changed files with 10872 additions and 6370 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -94,7 +94,8 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/345752?v=4",
      "profile": "https://github.com/jab416171",
      "contributions": [
-        "doc"
+        "doc",
+        "code"
      ]
    },
    {
@@ -248,7 +249,8 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/854646?v=4",
      "profile": "http://www.piribisoft.com",
      "contributions": [
-        "doc"
+        "doc",
+        "code"
      ]
    },
    {
@@ -338,7 +340,8 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/37781713?v=4",
      "profile": "https://gauthierth.fr/",
      "contributions": [
-        "code"
+        "code",
+        "maintenance"
      ]
    },
    {
@@ -610,6 +613,240 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "michaelhthomas",
+      "name": "Michael Thomas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18223295?v=4",
+      "profile": "http://michaelt.xyz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "j0srisk",
+      "name": "Joseph Risk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18372584?v=4",
+      "profile": "http://josephrisk.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Loetwiek",
+      "name": "Loetwiek",
+      "avatar_url": "https://avatars.githubusercontent.com/u/79059734?v=4",
+      "profile": "https://github.com/Loetwiek",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Fuochi",
+      "name": "Fuochi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4720478?v=4",
+      "profile": "https://github.com/Fuochi",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "demrich",
+      "name": "David Emrich",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30092389?v=4",
+      "profile": "https://github.com/demrich",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "maxnatamo",
+      "name": "Max T. Kristiansen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5898152?v=4",
+      "profile": "https://maxtrier.dk",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DamsDev1",
+      "name": "Damien Fajole",
+      "avatar_url": "https://avatars.githubusercontent.com/u/60252259?v=4",
+      "profile": "https://damsdev.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AhmedNSidd",
+      "name": "Ahmed Siddiqui",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36286128?v=4",
+      "profile": "https://github.com/AhmedNSidd",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JackW6809",
+      "name": "JackOXI",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53652452?v=4",
+      "profile": "https://github.com/JackW6809",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "StancuFlorin",
+      "name": "Stancu Florin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1199404?v=4",
+      "profile": "http://indicus.ro",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "RankWeis",
+      "name": "RankWeis",
+      "avatar_url": "https://avatars.githubusercontent.com/u/733691?v=4",
+      "profile": "https://github.com/RankWeis",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "j0srisk",
+      "name": "Joseph Risk",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18372584?v=4",
+      "profile": "http://josephrisk.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Loetwiek",
+      "name": "Loetwiek",
+      "avatar_url": "https://avatars.githubusercontent.com/u/79059734?v=4",
+      "profile": "https://github.com/Loetwiek",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Fuochi",
+      "name": "Fuochi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4720478?v=4",
+      "profile": "https://github.com/Fuochi",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "demrich",
+      "name": "David Emrich",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30092389?v=4",
+      "profile": "https://github.com/demrich",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "maxnatamo",
+      "name": "Max T. Kristiansen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5898152?v=4",
+      "profile": "https://maxtrier.dk",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DamsDev1",
+      "name": "Damien Fajole",
+      "avatar_url": "https://avatars.githubusercontent.com/u/60252259?v=4",
+      "profile": "https://damsdev.me",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AhmedNSidd",
+      "name": "Ahmed Siddiqui",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36286128?v=4",
+      "profile": "https://github.com/AhmedNSidd",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JackW6809",
+      "name": "JackOXI",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53652452?v=4",
+      "profile": "https://github.com/JackW6809",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "StancuFlorin",
+      "name": "Stancu Florin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1199404?v=4",
+      "profile": "http://indicus.ro",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "lmiklosko",
+      "name": "Lukas Miklosko",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44380311?v=4",
+      "profile": "https://github.com/lmiklosko",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gauthier-th",
+      "name": "Gauthier",
+      "avatar_url": "https://avatars.githubusercontent.com/u/37781713?v=4",
+      "profile": "https://gauthierth.fr/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jessielw",
+      "name": "Jessie Wilson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48299282?v=4",
+      "profile": "http://www.linkedin.com/in/jessielwilson",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "brotaxt",
+      "name": "DominicKo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25477935?v=4",
+      "profile": "https://github.com/brotaxt",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "corentinnormand",
+      "name": "Corentin Normand",
+      "avatar_url": "https://avatars.githubusercontent.com/u/30508927?v=4",
+      "profile": "https://doctolib.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "benbeauchamp7",
+      "name": "Ben Beauchamp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43358492?v=4",
+      "profile": "https://github.com/benbeauchamp7",
+      "contributions": [
+        "code"
+      ]
    }
  ]
 }
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -98,6 +98,8 @@ jobs:
          push: true
          build-args: |
            COMMIT_TAG=${{ github.sha }}
+            BUILD_VERSION=develop
+            BUILD_DATE=${{ github.event.repository.updated_at }}
          outputs: |
            type=image,push-by-digest=true,name=fallenbagel/jellyseerr,push=true
            type=image,push-by-digest=true,name=ghcr.io/${{ env.OWNER_LC }}/jellyseerr,push=true
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -36,3 +36,11 @@ jobs:
          # Fix test titles in cypress dashboard
          COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}}
          COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}
+      - name: Upload video files
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: cypress-videos
+          path: |
+            cypress/videos
+            cypress/screenshots
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -33,5 +33,7 @@ jobs:
          push: true
          build-args: |
            COMMIT_TAG=${{ github.sha }}
+            BUILD_VERSION=${{ steps.get_version.outputs.VERSION }}
+            BUILD_DATE=${{ github.event.repository.updated_at }}
          tags: |
            fallenbagel/jellyseerr:${{ steps.get_version.outputs.VERSION }}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -58,12 +58,27 @@ All help is welcome and greatly appreciated! If you would like to contribute to

   - Be sure to follow both the [code](#contributing-code) and [UI text](#ui-text-style) guidelines.
   - Should you need to update your fork, you can do so by rebasing from `upstream`:
+
     ```bash
     git fetch upstream
     git rebase upstream/develop
     git push origin BRANCH_NAME -f
     ```

+### Helm Chart
+
+Tools Required:
+
+- [Helm](https://helm.sh/docs/intro/install/)
+- [helm-docs](https://github.com/norwoodj/helm-docs)
+
+Steps:
+
+1. Make the necessary changes.
+2. Test your changes.
+3. Update the `version` in `charts/jellyseerr-chart/Chart.yaml` following [Semantic Versioning (SemVer)](https://semver.org/).
+4. Run the `helm-docs` command to regenerate the chart's README.
+
 ### Contributing Code

 - If you are taking on an existing bug or feature ticket, please comment on the [issue](https://github.com/fallenbagel/jellyseerr/issues) to avoid multiple people working on the same thing.
@@ -97,7 +112,7 @@ When adding new UI text, please try to adhere to the following guidelines:

 ## Translation

-We use [Weblate](https://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/) for our translations, and your help with localizing Overseerr would be greatly appreciated! If your language is not listed below, please [open a feature request](https://github.com/fallenbagel/jellyseerr/issues/new/choose).
+We use [Weblate](https://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/) for our translations, and your help with localizing Jellyseerr would be greatly appreciated! If your language is not listed below, please [open a feature request](https://github.com/fallenbagel/jellyseerr/issues/new/choose).

 <a href="https://jellyseerr.borgcube.de/engage/jellysseerr/"><img src="https://jellyseerr.borgcube.de/widget/jellyseerr/multi-auto.svg" alt="Translation status" /></a>

--- a/13
+++ b/13
@@ -38,8 +38,17 @@ RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json

 FROM node:22-alpine

-# Metadata for Github Package Registry
-LABEL org.opencontainers.image.source="https://github.com/Fallenbagel/jellyseerr"
+# OCI Meta information
+ARG BUILD_DATE
+ARG BUILD_VERSION
+LABEL \
+    org.opencontainers.image.authors="Fallenbagel" \
+    org.opencontainers.image.source="https://github.com/fallenbagel/jellyseerr" \
+    org.opencontainers.image.created=${BUILD_DATE} \
+    org.opencontainers.image.version=${BUILD_VERSION} \
+    org.opencontainers.image.title="Jellyseerr" \
+    org.opencontainers.image.description="Open-source media request and discovery manager for Jellyfin, Plex, and Emby." \
+    org.opencontainers.image.licenses="MIT"

 WORKDIR /app

--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 <a href="http://translate.jellyseerr.dev/engage/jellyseerr/"><img src="http://translate.jellyseerr.dev/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-66-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-92-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 **Jellyseerr** is a free and open source software application for managing requests for your media library. It integrates with the media server of your choice: [Jellyfin](https://jellyfin.org), [Plex](https://plex.tv), and [Emby](https://emby.media/). In addition, it integrates with your existing services, such as **[Sonarr](https://sonarr.tv/)**, **[Radarr](https://radarr.video/)**.
@@ -96,7 +96,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
    </tr>
    <tr>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/CyferShepard"><img src="https://avatars.githubusercontent.com/u/24864904?v=4?s=100" width="100px;" alt="Thegan Govender"/><br /><sub><b>Thegan Govender</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=CyferShepard" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jab416171"><img src="https://avatars.githubusercontent.com/u/345752?v=4?s=100" width="100px;" alt="jab416171"/><br /><sub><b>jab416171</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=jab416171" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jab416171"><img src="https://avatars.githubusercontent.com/u/345752?v=4?s=100" width="100px;" alt="jab416171"/><br /><sub><b>jab416171</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=jab416171" title="Documentation">📖</a> <a href="https://github.com/fallenbagel/jellyseerr/commits?author=jab416171" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://nvds.be"><img src="https://avatars.githubusercontent.com/u/5257222?v=4?s=100" width="100px;" alt="Nicolai Van der Storm"/><br /><sub><b>Nicolai Van der Storm</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=NicolaiVdS" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Smexhy"><img src="https://avatars.githubusercontent.com/u/4880625?v=4?s=100" width="100px;" alt="Smexhy"/><br /><sub><b>Smexhy</b></sub></a><br /><a href="#translation-Smexhy" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://dd06-dev.fr"><img src="https://avatars.githubusercontent.com/u/58089504?v=4?s=100" width="100px;" alt="dd060606"/><br /><sub><b>dd060606</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=dd060606" title="Code">💻</a></td>
@@ -117,7 +117,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/davidfdezalcoba"><img src="https://avatars.githubusercontent.com/u/15996018?v=4?s=100" width="100px;" alt="David Fernández Alcoba"/><br /><sub><b>David Fernández Alcoba</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=davidfdezalcoba" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Gauvino"><img src="https://avatars.githubusercontent.com/u/68083474?v=4?s=100" width="100px;" alt="Gauvino"/><br /><sub><b>Gauvino</b></sub></a><br /><a href="#translation-Gauvino" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/EthanArmbrust"><img src="https://avatars.githubusercontent.com/u/22754714?v=4?s=100" width="100px;" alt="EthanArmbrust"/><br /><sub><b>EthanArmbrust</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=EthanArmbrust" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.piribisoft.com"><img src="https://avatars.githubusercontent.com/u/854646?v=4?s=100" width="100px;" alt="Eduardo"/><br /><sub><b>Eduardo</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=SirMartin" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.piribisoft.com"><img src="https://avatars.githubusercontent.com/u/854646?v=4?s=100" width="100px;" alt="Eduardo"/><br /><sub><b>Eduardo</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=SirMartin" title="Documentation">📖</a> <a href="https://github.com/fallenbagel/jellyseerr/commits?author=SirMartin" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RickLuiken"><img src="https://avatars.githubusercontent.com/u/34110371?v=4?s=100" width="100px;" alt="RickLuiken"/><br /><sub><b>RickLuiken</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=RickLuiken" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Br33ce"><img src="https://avatars.githubusercontent.com/u/124933490?v=4?s=100" width="100px;" alt="Br33ce"/><br /><sub><b>Br33ce</b></sub></a><br /><a href="#translation-Br33ce" title="Translation">🌍</a></td>
    </tr>
@@ -131,7 +131,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://www.boniface.me"><img src="https://avatars.githubusercontent.com/u/4031396?v=4?s=100" width="100px;" alt="Joshua M. Boniface"/><br /><sub><b>Joshua M. Boniface</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=joshuaboniface" title="Code">💻</a></td>
    </tr>
    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://gauthierth.fr/"><img src="https://avatars.githubusercontent.com/u/37781713?v=4?s=100" width="100px;" alt="Gauthier"/><br /><sub><b>Gauthier</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=gauthier-th" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://gauthierth.fr/"><img src="https://avatars.githubusercontent.com/u/37781713?v=4?s=100" width="100px;" alt="Gauthier"/><br /><sub><b>Gauthier</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=gauthier-th" title="Code">💻</a> <a href="#maintenance-gauthier-th" title="Maintenance">🚧</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Kara-Zor-El"><img src="https://avatars.githubusercontent.com/u/69772087?v=4?s=100" width="100px;" alt="Kara"/><br /><sub><b>Kara</b></sub></a><br /><a href="#infra-Kara-Zor-El" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
      <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>
@@ -170,6 +170,40 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/methbkts"><img src="https://avatars.githubusercontent.com/u/30674934?v=4?s=100" width="100px;" alt="Metin Bektas"/><br /><sub><b>Metin Bektas</b></sub></a><br /><a href="#infra-methbkts" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andrewkolda"><img src="https://avatars.githubusercontent.com/u/158614532?v=4?s=100" width="100px;" alt="andrewkolda"/><br /><sub><b>andrewkolda</b></sub></a><br /><a href="#design-andrewkolda" title="Design">🎨</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://ishanjain.me"><img src="https://avatars.githubusercontent.com/u/7921368?v=4?s=100" width="100px;" alt="Ishan Jain"/><br /><sub><b>Ishan Jain</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=ishanjain28" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://michaelt.xyz"><img src="https://avatars.githubusercontent.com/u/18223295?v=4?s=100" width="100px;" alt="Michael Thomas"/><br /><sub><b>Michael Thomas</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=michaelhthomas" 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>
+      <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>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/demrich"><img src="https://avatars.githubusercontent.com/u/30092389?v=4?s=100" width="100px;" alt="David Emrich"/><br /><sub><b>David Emrich</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=demrich" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://maxtrier.dk"><img src="https://avatars.githubusercontent.com/u/5898152?v=4?s=100" width="100px;" alt="Max T. Kristiansen"/><br /><sub><b>Max T. Kristiansen</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=maxnatamo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://damsdev.me"><img src="https://avatars.githubusercontent.com/u/60252259?v=4?s=100" width="100px;" alt="Damien Fajole"/><br /><sub><b>Damien Fajole</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=DamsDev1" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AhmedNSidd"><img src="https://avatars.githubusercontent.com/u/36286128?v=4?s=100" width="100px;" alt="Ahmed Siddiqui"/><br /><sub><b>Ahmed Siddiqui</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=AhmedNSidd" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JackW6809"><img src="https://avatars.githubusercontent.com/u/53652452?v=4?s=100" width="100px;" alt="JackOXI"/><br /><sub><b>JackOXI</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=JackW6809" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://indicus.ro"><img src="https://avatars.githubusercontent.com/u/1199404?v=4?s=100" width="100px;" alt="Stancu Florin"/><br /><sub><b>Stancu Florin</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=StancuFlorin" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RankWeis"><img src="https://avatars.githubusercontent.com/u/733691?v=4?s=100" width="100px;" alt="RankWeis"/><br /><sub><b>RankWeis</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=RankWeis" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuochi"><img src="https://avatars.githubusercontent.com/u/4720478?v=4?s=100" width="100px;" alt="Fuochi"/><br /><sub><b>Fuochi</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Fuochi" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/demrich"><img src="https://avatars.githubusercontent.com/u/30092389?v=4?s=100" width="100px;" alt="David Emrich"/><br /><sub><b>David Emrich</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=demrich" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://maxtrier.dk"><img src="https://avatars.githubusercontent.com/u/5898152?v=4?s=100" width="100px;" alt="Max T. Kristiansen"/><br /><sub><b>Max T. Kristiansen</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=maxnatamo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://damsdev.me"><img src="https://avatars.githubusercontent.com/u/60252259?v=4?s=100" width="100px;" alt="Damien Fajole"/><br /><sub><b>Damien Fajole</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=DamsDev1" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AhmedNSidd"><img src="https://avatars.githubusercontent.com/u/36286128?v=4?s=100" width="100px;" alt="Ahmed Siddiqui"/><br /><sub><b>Ahmed Siddiqui</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=AhmedNSidd" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JackW6809"><img src="https://avatars.githubusercontent.com/u/53652452?v=4?s=100" width="100px;" alt="JackOXI"/><br /><sub><b>JackOXI</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=JackW6809" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://indicus.ro"><img src="https://avatars.githubusercontent.com/u/1199404?v=4?s=100" width="100px;" alt="Stancu Florin"/><br /><sub><b>Stancu Florin</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=StancuFlorin" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lmiklosko"><img src="https://avatars.githubusercontent.com/u/44380311?v=4?s=100" width="100px;" alt="Lukas Miklosko"/><br /><sub><b>Lukas Miklosko</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=lmiklosko" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://gauthierth.fr/"><img src="https://avatars.githubusercontent.com/u/37781713?v=4?s=100" width="100px;" alt="Gauthier"/><br /><sub><b>Gauthier</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=gauthier-th" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.linkedin.com/in/jessielwilson"><img src="https://avatars.githubusercontent.com/u/48299282?v=4?s=100" width="100px;" alt="Jessie Wilson"/><br /><sub><b>Jessie Wilson</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=jessielw" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/brotaxt"><img src="https://avatars.githubusercontent.com/u/25477935?v=4?s=100" width="100px;" alt="DominicKo"/><br /><sub><b>DominicKo</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=brotaxt" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://doctolib.com"><img src="https://avatars.githubusercontent.com/u/30508927?v=4?s=100" width="100px;" alt="Corentin Normand"/><br /><sub><b>Corentin Normand</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=corentinnormand" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/benbeauchamp7"><img src="https://avatars.githubusercontent.com/u/43358492?v=4?s=100" width="100px;" alt="Ben Beauchamp"/><br /><sub><b>Ben Beauchamp</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=benbeauchamp7" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
@@ -287,7 +321,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/byakurau"><img src="https://avatars.githubusercontent.com/u/1811683?v=4?s=100" width="100px;" alt="byakurau"/><br /><sub><b>byakurau</b></sub></a><br /><a href="#translation-byakurau" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/miknii"><img src="https://avatars.githubusercontent.com/u/109232569?v=4?s=100" width="100px;" alt="miknii"/><br /><sub><b>miknii</b></sub></a><br /><a href="#translation-miknii" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Eclipseop"><img src="https://avatars.githubusercontent.com/u/5846213?v=4?s=100" width="100px;" alt="Mackenzie"/><br /><sub><b>Mackenzie</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Eclipseop" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/s0up4200"><img src="https://avatars.githubusercontent.com/u/18177310?v=4?s=100" width="100px;" alt="soup"/><br /><sub><b>soup</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=s0up4200" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/s0up4200"><img src="https://avatars.githubusercontent.com/u/18177310?v=4?s=100" width="100px;" alt="soup"/><br /><sub><b>soup</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=s0up4200" title="Documentation">📖</a> <a href="https://github.com/sct/overseerr/commits?author=s0up4200" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ceptonit"><img src="https://avatars.githubusercontent.com/u/12678743?v=4?s=100" width="100px;" alt="ceptonit"/><br /><sub><b>ceptonit</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=ceptonit" title="Documentation">📖</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/aedelbro"><img src="https://avatars.githubusercontent.com/u/36162221?v=4?s=100" width="100px;" alt="aedelbro"/><br /><sub><b>aedelbro</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=aedelbro" title="Code">💻</a></td>
    </tr>
@@ -320,6 +354,10 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
    </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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JackW6809"><img src="https://avatars.githubusercontent.com/u/53652452?v=4?s=100" width="100px;" alt="JackOXI"/><br /><sub><b>JackOXI</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=JackW6809" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://indicus.ro"><img src="https://avatars.githubusercontent.com/u/1199404?v=4?s=100" width="100px;" alt="Stancu Florin"/><br /><sub><b>Stancu Florin</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=StancuFlorin" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lmiklosko"><img src="https://avatars.githubusercontent.com/u/44380311?v=4?s=100" width="100px;" alt="Lukas Miklosko"/><br /><sub><b>Lukas Miklosko</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=lmiklosko" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://gauthierth.fr/"><img src="https://avatars.githubusercontent.com/u/37781713?v=4?s=100" width="100px;" alt="Gauthier"/><br /><sub><b>Gauthier</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=gauthier-th" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
--- a/charts/jellyseerr-chart/Chart.yaml
+++ b/charts/jellyseerr-chart/Chart.yaml
@@ -3,8 +3,8 @@ kubeVersion: ">=1.23.0-0"
 name: jellyseerr-chart
 description: Jellyseerr helm chart for Kubernetes
 type: application
-version: 2.1.1
-appVersion: "2.3.0"
+version: 2.3.3
+appVersion: "2.5.2"
 maintainers:
  - name: Jellyseerr
    url: https://github.com/Fallenbagel/jellyseerr
--- a/charts/jellyseerr-chart/README.md
+++ b/charts/jellyseerr-chart/README.md
@@ -1,6 +1,6 @@
 # jellyseerr-chart

-![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square)
+![Version: 2.3.3](https://img.shields.io/badge/Version-2.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.2](https://img.shields.io/badge/AppVersion-2.5.2-informational?style=flat-square)

 Jellyseerr helm chart for Kubernetes

--- a/charts/jellyseerr-chart/templates/persistentvolumeclaim.yaml
+++ b/charts/jellyseerr-chart/templates/persistentvolumeclaim.yaml
@@ -4,6 +4,10 @@ metadata:
  name: {{ include "jellyseerr.configPersistenceName" . }}
  labels:
    {{- include "jellyseerr.labels" . | nindent 4 }}
+  {{- with .Values.config.persistence.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
  {{- with .Values.config.persistence.accessModes }}
  accessModes:
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -4,6 +4,7 @@ export default defineConfig({
  projectId: 'xkm1b4',
  e2e: {
    baseUrl: 'http://localhost:5055',
+    video: true,
    experimentalSessionAndOrigin: true,
  },
  env: {
--- a/cypress/config/settings.cypress.json
+++ b/cypress/config/settings.cypress.json
@@ -4,7 +4,7 @@
  "vapidPublic": "BK_EpP8NDm9waor2zn6_S28o3ZYv4kCkJOfYpO3pt3W6jnPmxrgTLANUBNbbyaNatPnSQ12De9CeqSYQrqWzHTs",
  "main": {
    "apiKey": "testkey",
-    "applicationTitle": "Overseerr",
+    "applicationTitle": "Jellyseerr",
    "applicationUrl": "",
    "csrfProtection": false,
    "cacheImages": false,
@@ -19,12 +19,12 @@
    "discoverRegion": "",
    "streamingRegion": "",
    "originalLanguage": "",
+    "blacklistedTags": "",
+    "blacklistedTagsLimit": 50,
    "trustProxy": false,
    "mediaServerType": 1,
    "partialRequestsEnabled": true,
    "enableSpecialEpisodes": false,
-    "forceIpv4First": false,
-    "dnsServers": "",
    "locale": "en"
  },
  "plex": {
@@ -71,7 +71,7 @@
          "ignoreTls": false,
          "requireTls": false,
          "allowSelfSigned": false,
-          "senderName": "Overseerr"
+          "senderName": "Jellyseerr"
        }
      },
      "discord": {
@@ -139,7 +139,8 @@
        "types": 0,
        "options": {
          "url": "",
-          "token": ""
+          "token": "",
+          "priority": 0
        }
      }
    }
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -6,7 +6,6 @@ Cypress.Commands.add('login', (email, password) => {
    [email, password],
    () => {
      cy.visit('/login');
-      cy.contains('Use your Overseerr account').click();

      cy.get('[data-testid=email]').type(email);
      cy.get('[data-testid=password]').type(password);
--- a/docs/getting-started/buildfromsource.mdx
+++ b/docs/getting-started/buildfromsource.mdx
@@ -255,7 +255,8 @@ To run jellyseerr as a service:
 1. Download the [Non-Sucking Service Manager](https://nssm.cc/download)
 2. Install NSSM:
 ```powershell
-nssm install Jellyseerr "C:\Program Files\nodejs\node.exe" ["C:\jellyseerr\dist\index.js"]
+nssm install Jellyseerr "C:\Program Files\nodejs\node.exe" "C:\jellyseerr\dist\index.js"
+nssm set Jellyseerr AppDirectory "C:\jellyseerr"
 nssm set Jellyseerr AppEnvironmentExtra NODE_ENV=production
 ```
 3. Start the service:
--- a/docs/getting-started/docker.mdx
+++ b/docs/getting-started/docker.mdx
@@ -37,7 +37,7 @@ docker run -d \
  -p 5055:5055 \
  -v /path/to/appdata/config:/app/config \
  --restart unless-stopped \
-  fallenbagel/jellyseerr
+  ghcr.io/fallenbagel/jellyseerr
 ```
 :::tip
 If you are using emby, make sure to set the `JELLYFIN_TYPE` environment variable to `emby`.
@@ -55,7 +55,7 @@ docker stop jellyseerr && docker rm Jellyseerr
 ```
 Pull the latest image:
 ```bash
-docker pull fallenbagel/jellyseerr
+docker pull ghcr.io/fallenbagel/jellyseerr
 ```
 Finally, run the container with the same parameters originally used to create the container:
 ```bash
@@ -78,7 +78,7 @@ Define the `jellyseerr` service in your `compose.yaml` as follows:
 ---
 services:
  jellyseerr:
-    image: fallenbagel/jellyseerr:latest
+    image: ghcr.io/fallenbagel/jellyseerr:latest
    container_name: jellyseerr
    environment:
      - LOG_LEVEL=debug
@@ -146,7 +146,7 @@ Then, create and start the Jellyseerr container:
 <Tabs groupId="docker-methods" queryString>
  <TabItem value="docker-cli" label="Docker CLI">
 ```bash
-docker run -d --name jellyseerr -e LOG_LEVEL=debug -e TZ=Asia/Tashkent -p 5055:5055 -v "jellyseerr-data:/app/config" --restart unless-stopped fallenbagel/jellyseerr:latest
+docker run -d --name jellyseerr -e LOG_LEVEL=debug -e TZ=Asia/Tashkent -p 5055:5055 -v "jellyseerr-data:/app/config" --restart unless-stopped ghcr.io/fallenbagel/jellyseerr:latest
 ```

 #### Updating:
--- a/docs/troubleshooting.mdx
+++ b/docs/troubleshooting.mdx
@@ -24,6 +24,12 @@ or for Cloudflare's DNS:
 ```bash
 --dns=1.1.1.1
 ```
+or for Quad9 DNS:
+```bash
+--dns=9.9.9.9
+```
+
+You can try them all and see which one works for your network.

  </TabItem>

@@ -45,6 +51,16 @@ services:
    dns:
      - 1.1.1.1
 ```
+or for Quad9's DNS:
+```yaml
+---
+services:
+  jellyseerr:
+    dns:
+      - 9.9.9.9
+```
+
+You can try them all and see which one works for your network.

  </TabItem>

@@ -56,7 +72,7 @@ services:
 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.
+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 or `9.9.9.9` for Quad9's DNS.

  </TabItem>

@@ -73,41 +89,15 @@ services:
    ```bash
    nameserver 1.1.1.1
    ```
+    or for Quad9's DNS:
+    ```bash
+    nameserver 9.9.9.9
+    ```

  </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
+### Option 2: Use Jellyseerr through a proxy

 If you can't change your DNS servers or force IPV4 resolution, you can use Jellyseerr through a proxy.

--- a/docs/using-jellyseerr/settings/general.md
+++ b/docs/using-jellyseerr/settings/general.md
@@ -62,6 +62,14 @@ Set the default display language for Jellyseerr. Users can override this setting

 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.

+## Blacklist Content with Tags and Limit Content Blacklisted per Tag
+
+These settings blacklist any TV shows or movies that have one of the entered tags. The "Process Blacklisted Tags" job adds entries to the blacklist based on the configured blacklisted tags. If a blacklisted tag is removed, any media blacklisted under that tag will be removed from the blacklist when the "Process Blacklisted Tags" job runs.
+
+The limit setting determines how many pages per tag the job will process, with each page containing 20 entries. The job cycles through all 16 available discovery sort options, querying the defined number of pages to blacklist media that is most likely to appear at the top of each sort. Higher limits will create a more accurate blacklist, but will require more storage.
+
+Blacklisted tags are disabled until at least one tag is entered. These settings cannot be overridden in user settings.
+
 ## Hide Available Media

 When enabled, media which is already available will not appear on the "Discover" home page, or in the "Recommended" or "Similar" categories or other links on media detail pages.
--- a/docs/using-jellyseerr/settings/users.md
+++ b/docs/using-jellyseerr/settings/users.md
@@ -14,6 +14,14 @@ When disabled, your mediaserver OAuth becomes the only sign-in option, and any "

 This setting is **enabled** by default.

+## Enable Jellyfin/Emby/Plex Sign-In
+
+When enabled, users will be able to sign in to Jellyseerr using their Jellyfin/Emby/Plex credentials, provided they have linked their media server accounts.
+
+When disabled, users will only be able to sign in using their email address. Users without a password set will not be able to sign in to Jellyseerr.
+
+This setting is **enabled** by default.
+
 ## Enable New Jellyfin/Emby/Plex Sign-In

 When enabled, users with access to your media server will be able to sign in to Jellyseerr even if they have not yet been imported. Users will be automatically assigned the permissions configured in the [Default Permissions](#default-permissions) setting upon first sign-in.
--- a/jellyseerr-api.yml
+++ b/jellyseerr-api.yml
@@ -1,19 +1,19 @@
 openapi: '3.0.2'
 info:
-  title: 'Overseerr API'
+  title: 'Jellyseerr API'
  version: '1.0.0'
  description: |
-    This is the documentation for the Overseerr API backend.
+    This is the documentation for the Jellyseerr API backend.

    Two primary authentication methods are supported:

    - **Cookie Authentication**: A valid sign-in to the `/auth/plex` or `/auth/local` will generate a valid authentication cookie.
-    - **API Key Authentication**: Sign-in is also possible by passing an `X-Api-Key` header along with a valid API Key generated by Overseerr.
+    - **API Key Authentication**: Sign-in is also possible by passing an `X-Api-Key` header along with a valid API Key generated by Jellyseerr.
 tags:
  - name: public
    description: Public API endpoints requiring no authentication.
  - name: settings
-    description: Endpoints related to Overseerr's settings and configuration.
+    description: Endpoints related to Jellyseerr's settings and configuration.
  - name: auth
    description: Endpoints related to logging in or out, and the currently authenticated user.
  - name: users
@@ -160,7 +160,7 @@ components:
          example: en
        applicationTitle:
          type: string
-          example: Overseerr
+          example: Jellyseerr
        applicationUrl:
          type: string
          example: https://os.example.com
@@ -191,12 +191,6 @@ components:
        csrfProtection:
          type: boolean
          example: false
-        forceIpv4First:
-          type: boolean
-          example: false
-        dnsServers:
-          type: string
-          example: '1.1.1.1'
        trustProxy:
          type: boolean
          example: true
@@ -1438,7 +1432,7 @@ components:
              example: no-reply@example.com
            senderName:
              type: string
-              example: Overseerr
+              example: Jellyseerr
            smtpHost:
              type: string
              example: 127.0.0.1
@@ -1969,8 +1963,8 @@ components:
 paths:
  /status:
    get:
-      summary: Get Overseerr status
-      description: Returns the current Overseerr status in a JSON object.
+      summary: Get Jellyseerr status
+      description: Returns the current Jellyseerr status in a JSON object.
      security: []
      tags:
        - public
@@ -3815,6 +3809,11 @@ paths:
          required: false
          schema:
            type: string
+        - in: query
+          name: includeIds
+          required: false
+          schema:
+            type: string
      responses:
        '200':
          description: A JSON array of all users
@@ -3963,6 +3962,8 @@ paths:
                  type: string
                p256dh:
                  type: string
+                userAgent:
+                  type: string
              required:
                - endpoint
                - auth
@@ -3970,6 +3971,88 @@ paths:
      responses:
        '204':
          description: Successfully registered push subscription
+  /user/{userId}/pushSubscriptions:
+    get:
+      summary: Get all web push notification settings for a user
+      description: |
+        Returns all web push notification settings for a user in a JSON object.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+      responses:
+        '200':
+          description: User web push notification settings in JSON
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  endpoint:
+                    type: string
+                  p256dh:
+                    type: string
+                  auth:
+                    type: string
+                  userAgent:
+                    type: string
+  /user/{userId}/pushSubscription/{key}:
+    get:
+      summary: Get web push notification settings for a user
+      description: |
+        Returns web push notification settings for a user in a JSON object.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+        - in: path
+          name: key
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: User web push notification settings in JSON
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  endpoint:
+                    type: string
+                  p256dh:
+                    type: string
+                  auth:
+                    type: string
+                  userAgent:
+                    type: string
+    delete:
+      summary: Delete user push subscription by key
+      description: Deletes the user push subscription with the provided key.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+        - in: path
+          name: key
+          required: true
+          schema:
+            type: string
+      responses:
+        '204':
+          description: Successfully removed user push subscription
  /user/{userId}:
    get:
      summary: Get user by ID
@@ -4156,6 +4239,12 @@ paths:
            type: string
            nullable: true
            example: dune
+        - in: query
+          name: filter
+          schema:
+            type: string
+            enum: [all, manual, blacklistedTags]
+            default: manual
      responses:
        '200':
          description: Blacklisted items returned
@@ -4423,6 +4512,104 @@ paths:
      responses:
        '204':
          description: User password updated
+  /user/{userId}/settings/linked-accounts/plex:
+    post:
+      summary: Link the provided Plex account to the current user
+      description: Logs in to Plex with the provided auth token, then links the associated Plex account with the user's account. Users can only link external accounts to their own account.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                authToken:
+                  type: string
+              required:
+                - authToken
+      responses:
+        '204':
+          description: Linking account succeeded
+        '403':
+          description: Invalid credentials
+        '422':
+          description: Account already linked to a user
+    delete:
+      summary: Remove the linked Plex account for a user
+      description: Removes the linked Plex account for a specific user. Requires `MANAGE_USERS` permission if editing other users.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+      responses:
+        '204':
+          description: Unlinking account succeeded
+        '400':
+          description: Unlink request invalid
+        '404':
+          description: User does not exist
+  /user/{userId}/settings/linked-accounts/jellyfin:
+    post:
+      summary: Link the provided Jellyfin account to the current user
+      description: Logs in to Jellyfin with the provided credentials, then links the associated Jellyfin account with the user's account. Users can only link external accounts to their own account.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                username:
+                  type: string
+                  example: 'Mr User'
+                password:
+                  type: string
+                  example: 'supersecret'
+      responses:
+        '204':
+          description: Linking account succeeded
+        '403':
+          description: Invalid credentials
+        '422':
+          description: Account already linked to a user
+    delete:
+      summary: Remove the linked Jellyfin account for a user
+      description: Removes the linked Jellyfin account for a specific user. Requires `MANAGE_USERS` permission if editing other users.
+      tags:
+        - users
+      parameters:
+        - in: path
+          name: userId
+          required: true
+          schema:
+            type: number
+      responses:
+        '204':
+          description: Unlinking account succeeded
+        '400':
+          description: Unlink request invalid
+        '404':
+          description: User does not exist
  /user/{userId}/settings/notifications:
    get:
      summary: Get notification settings for a user
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />

 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
--- a/next.config.js
+++ b/next.config.js
@@ -4,7 +4,6 @@
 module.exports = {
  env: {
    commitTag: process.env.COMMIT_TAG || 'local',
-    forceIpv4First: process.env.FORCE_IPV4_FIRST === 'true' ? 'true' : 'false',
  },
  images: {
    remotePatterns: [
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
  "scripts": {
    "preinstall": "npx only-allow pnpm",
    "postinstall": "node postinstall-win.js",
-    "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
+    "dev": "nodemon -e ts --watch server --watch jellyseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
    "build:server": "tsc --project server/tsconfig.json && copyfiles -u 2 server/templates/**/*.{html,pug} dist/templates && tsc-alias -p server/tsconfig.json",
    "build:next": "next build",
    "build": "pnpm build:next && pnpm build:server",
@@ -32,6 +32,7 @@
  },
  "license": "MIT",
  "dependencies": {
+    "@dr.pogodin/csurf": "^1.14.1",
    "@formatjs/intl-displaynames": "6.2.6",
    "@formatjs/intl-locale": "3.1.1",
    "@formatjs/intl-pluralrules": "5.1.10",
@@ -43,20 +44,22 @@
    "@svgr/webpack": "6.5.1",
    "@tanem/react-nprogress": "5.0.30",
    "@types/wink-jaro-distance": "^2.0.2",
+    "@types/ua-parser-js": "^0.7.36",
    "ace-builds": "1.15.2",
+    "axios": "1.3.4",
+    "axios-rate-limit": "1.3.0",
    "bcrypt": "5.1.0",
    "bowser": "2.11.0",
    "connect-typeorm": "1.1.4",
-    "cookie-parser": "1.4.6",
+    "cookie-parser": "1.4.7",
    "copy-to-clipboard": "3.3.3",
    "country-flag-icons": "1.5.5",
    "cronstrue": "2.23.0",
-    "csurf": "1.11.0",
    "date-fns": "2.29.3",
    "dayjs": "1.11.7",
-    "email-templates": "9.0.0",
+    "email-templates": "12.0.1",
    "email-validator": "2.0.4",
-    "express": "4.18.2",
+    "express": "4.21.2",
    "express-openapi-validator": "4.13.8",
    "express-rate-limit": "6.7.0",
    "express-session": "1.17.3",
@@ -64,15 +67,15 @@
    "gravatar-url": "3.1.0",
    "lodash": "4.17.21",
    "mime": "3",
-    "next": "^14.2.4",
+    "next": "^14.2.25",
    "node-cache": "5.1.2",
    "node-gyp": "9.3.1",
    "node-schedule": "2.1.1",
-    "nodemailer": "6.9.1",
-    "openpgp": "5.7.0",
+    "nodemailer": "6.10.0",
+    "openpgp": "5.11.2",
    "pg": "8.11.0",
    "plex-api": "5.3.2",
-    "pug": "3.0.2",
+    "pug": "3.0.3",
    "react": "^18.3.1",
    "react-ace": "10.1.0",
    "react-animate-height": "2.1.2",
@@ -86,17 +89,20 @@
    "react-spring": "9.7.1",
    "react-tailwindcss-datepicker-sct": "1.3.4",
    "react-toast-notifications": "2.5.1",
+    "react-transition-group": "^4.4.5",
    "react-truncate-markup": "5.1.2",
    "react-use-clipboard": "1.0.9",
    "reflect-metadata": "0.1.13",
    "secure-random-password": "0.2.3",
-    "semver": "7.3.8",
+    "semver": "7.7.1",
    "sharp": "^0.33.4",
-    "sqlite3": "5.1.4",
+    "sqlite3": "5.1.7",
    "swagger-ui-express": "4.6.2",
    "swr": "2.2.5",
+    "tailwind-merge": "^2.6.0",
    "typeorm": "0.3.11",
-    "undici": "^6.20.1",
+    "undici": "^7.3.0",
+    "ua-parser-js": "^1.0.35",
    "web-push": "3.5.0",
    "wink-jaro-distance": "^2.0.0",
    "winston": "3.8.2",
@@ -104,7 +110,7 @@
    "xml2js": "0.4.23",
    "yamljs": "0.3.0",
    "yup": "0.32.11",
-    "zod": "3.20.6"
+    "zod": "3.24.2"
  },
  "devDependencies": {
    "@commitlint/cli": "17.4.4",
@@ -114,8 +120,8 @@
    "@semantic-release/exec": "6.0.3",
    "@semantic-release/git": "10.0.1",
    "@tailwindcss/aspect-ratio": "0.4.2",
-    "@tailwindcss/forms": "0.5.3",
-    "@tailwindcss/typography": "0.5.9",
+    "@tailwindcss/forms": "0.5.10",
+    "@tailwindcss/typography": "0.5.16",
    "@types/bcrypt": "5.0.0",
    "@types/cookie-parser": "1.4.3",
    "@types/country-flag-icons": "1.2.0",
@@ -144,7 +150,7 @@
    "commitizen": "4.3.0",
    "copyfiles": "2.4.1",
    "cy-mobile-commands": "0.3.0",
-    "cypress": "12.7.0",
+    "cypress": "14.1.0",
    "cz-conventional-changelog": "3.3.0",
    "eslint": "8.35.0",
    "eslint-config-next": "^14.2.4",
@@ -157,8 +163,8 @@
    "eslint-plugin-react-hooks": "4.6.0",
    "husky": "8.0.3",
    "lint-staged": "13.1.2",
-    "nodemon": "2.0.20",
-    "postcss": "8.4.21",
+    "nodemon": "3.1.9",
+    "postcss": "8.4.31",
    "prettier": "2.8.4",
    "prettier-plugin-organize-imports": "3.2.2",
    "prettier-plugin-tailwindcss": "0.2.3",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/public/images/jellyseerr_poster_not_found.png
+++ b/public/images/jellyseerr_poster_not_found.png
--- a/public/images/jellyseerr_poster_not_found_logo_center.png
+++ b/public/images/jellyseerr_poster_not_found_logo_center.png
--- a/public/images/jellyseerr_poster_not_found_logo_top.png
+++ b/public/images/jellyseerr_poster_not_found_logo_top.png
--- a/public/sw.js
+++ b/public/sw.js
@@ -3,7 +3,7 @@
 // previously cached resources to be updated from the network.
 // This variable is intentionally declared and unused.
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const OFFLINE_VERSION = 3;
+const OFFLINE_VERSION = 4;
 const CACHE_NAME = 'offline';
 // Customize this with a different URL if needed.
 const OFFLINE_URL = '/offline.html';
@@ -107,6 +107,25 @@ self.addEventListener('push', (event) => {
    );
  }

+  // Set the badge with the amount of pending requests
+  // Only update the badge if the payload confirms they are the admin
+  if (
+    (payload.notificationType === 'MEDIA_APPROVED' ||
+      payload.notificationType === 'MEDIA_DECLINED') &&
+    payload.isAdmin
+  ) {
+    if ('setAppBadge' in navigator) {
+      navigator.setAppBadge(payload.pendingRequestsCount);
+    }
+    return;
+  }
+
+  if (payload.notificationType === 'MEDIA_PENDING') {
+    if ('setAppBadge' in navigator) {
+      navigator.setAppBadge(payload.pendingRequestsCount);
+    }
+  }
+
  event.waitUntil(self.registration.showNotification(payload.subject, options));
 });

--- a/server/api/animelist.ts
+++ b/server/api/animelist.ts
@@ -1,8 +1,7 @@
 import logger from '@server/logger';
-import fs, { promises as fsp } from 'node:fs';
-import path from 'node:path';
-import { Readable } from 'node:stream';
-import type { ReadableStream } from 'node:stream/web';
+import axios from 'axios';
+import fs, { promises as fsp } from 'fs';
+import path from 'path';
 import xml2js from 'xml2js';

 const UPDATE_INTERVAL_MSEC = 24 * 3600 * 1000; // how often to download new mapping in milliseconds
@@ -162,18 +161,14 @@ class AnimeListMapping {
      label: 'Anime-List Sync',
    });
    try {
-      const response = await fetch(MAPPING_URL);
-      if (!response.ok) {
-        throw new Error(`Failed to fetch: ${response.statusText}`);
-      }
+      const response = await axios.get(MAPPING_URL, {
+        responseType: 'stream',
+      });
      await new Promise<void>((resolve, reject) => {
        const writer = fs.createWriteStream(LOCAL_PATH);
        writer.on('finish', resolve);
        writer.on('error', reject);
-        if (!response.body) return reject();
-        Readable.fromWeb(response.body as ReadableStream<Uint8Array>).pipe(
-          writer
-        );
+        response.data.pipe(writer);
      });
    } catch (e) {
      throw new Error(`Failed to download Anime-List mapping: ${e.message}`);
--- a/server/api/externalapi.ts
+++ b/server/api/externalapi.ts
@@ -1,7 +1,6 @@
-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 { AxiosInstance, AxiosRequestConfig } from 'axios';
+import axios from 'axios';
+import rateLimit from 'axios-rate-limit';
 import type NodeCache from 'node-cache';

 // 5 minute default TTL (in seconds)
@@ -13,109 +12,75 @@ const DEFAULT_ROLLING_BUFFER = 10000;
 interface ExternalAPIOptions {
  nodeCache?: NodeCache;
  headers?: Record<string, unknown>;
-  rateLimit?: RateLimitOptions;
+  rateLimit?: {
+    maxRPS: number;
+    maxRequests: number;
+  };
 }

 class ExternalAPI {
-  protected fetch: typeof fetch;
-  protected params: Record<string, string>;
-  protected defaultHeaders: { [key: string]: string };
+  protected axios: AxiosInstance;
  private baseUrl: string;
  private cache?: NodeCache;

  constructor(
    baseUrl: string,
-    params: Record<string, string> = {},
+    params: Record<string, unknown>,
    options: ExternalAPIOptions = {}
  ) {
+    this.axios = axios.create({
+      baseURL: baseUrl,
+      params,
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+        ...options.headers,
+      },
+    });
+
    if (options.rateLimit) {
-      this.fetch = rateLimit(fetch, options.rateLimit);
-    } else {
-      this.fetch = fetch;
-    }
-
-    const url = new URL(baseUrl);
-
-    const settings = getSettings();
-
-    this.defaultHeaders = {
-      'Content-Type': 'application/json',
-      Accept: 'application/json',
-      ...((url.username || url.password) && {
-        Authorization: `Basic ${Buffer.from(
-          `${url.username}:${url.password}`
-        ).toString('base64')}`,
-      }),
-      ...(settings.main.mediaServerType === MediaServerType.EMBY && {
-        'Accept-Encoding': 'gzip',
-      }),
-      ...options.headers,
-    };
-
-    if (url.username || url.password) {
-      url.username = '';
-      url.password = '';
-      baseUrl = url.toString();
+      this.axios = rateLimit(this.axios, {
+        maxRequests: options.rateLimit.maxRequests,
+        maxRPS: options.rateLimit.maxRPS,
+      });
    }

    this.baseUrl = baseUrl;
-    this.params = params;
    this.cache = options.nodeCache;
  }

  protected async get<T>(
    endpoint: string,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit
+    config?: AxiosRequestConfig,
+    ttl?: number
  ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
    const cacheKey = this.serializeCacheKey(endpoint, {
-      ...this.params,
-      ...params,
-      headers,
+      ...config?.params,
+      headers: config?.headers,
    });
-
    const cachedItem = this.cache?.get<T>(cacheKey);
    if (cachedItem) {
      return cachedItem;
    }

-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      ...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);
+    const response = await this.axios.get<T>(endpoint, config);

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

-    return data;
+    return response.data;
  }

  protected async post<T>(
    endpoint: string,
    data?: Record<string, unknown>,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit
+    config?: AxiosRequestConfig,
+    ttl?: number
  ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
    const cacheKey = this.serializeCacheKey(endpoint, {
-      config: { ...this.params, ...params },
-      headers,
-      data,
+      config: config?.params,
+      ...(data ? { data } : {}),
    });

    const cachedItem = this.cache?.get<T>(cacheKey);
@@ -123,115 +88,23 @@ class ExternalAPI {
      return cachedItem;
    }

-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      method: 'POST',
-      ...config,
-      headers,
-      body: data ? JSON.stringify(data) : undefined,
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const resData = await this.getDataFromResponse(response);
+    const response = await this.axios.post<T>(endpoint, data, config);

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

-    return resData;
-  }
-
-  protected async put<T>(
-    endpoint: string,
-    data: Record<string, unknown>,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit
-  ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
-    const cacheKey = this.serializeCacheKey(endpoint, {
-      config: { ...this.params, ...params },
-      data,
-      headers,
-    });
-
-    const cachedItem = this.cache?.get<T>(cacheKey);
-    if (cachedItem) {
-      return cachedItem;
-    }
-
-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      method: 'PUT',
-      ...config,
-      headers,
-      body: JSON.stringify(data),
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const resData = await this.getDataFromResponse(response);
-
-    if (this.cache && ttl !== 0) {
-      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
-    }
-
-    return resData;
-  }
-
-  protected async delete<T>(
-    endpoint: string,
-    params?: Record<string, string>,
-    config?: RequestInit
-  ): Promise<T> {
-    const url = this.formatUrl(endpoint, params);
-    const response = await this.fetch(url, {
-      method: 'DELETE',
-      ...config,
-      headers: {
-        ...this.defaultHeaders,
-        ...config?.headers,
-      },
-    });
-    if (!response.ok) {
-      const text = await response.text();
-      throw new Error(
-        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
-        {
-          cause: response,
-        }
-      );
-    }
-    const data = await this.getDataFromResponse(response);
-
-    return data;
+    return response.data;
  }

  protected async getRolling<T>(
    endpoint: string,
-    params?: Record<string, string>,
-    ttl?: number,
-    config?: RequestInit,
-    overwriteBaseUrl?: string
+    config?: AxiosRequestConfig,
+    ttl?: number
  ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
    const cacheKey = this.serializeCacheKey(endpoint, {
-      ...this.params,
-      ...params,
-      headers,
+      ...config?.params,
+      headers: config?.headers,
    });
    const cachedItem = this.cache?.get<T>(cacheKey);

@@ -243,82 +116,29 @@ class ExternalAPI {
        keyTtl - (ttl ?? DEFAULT_TTL) * 1000 <
        Date.now() - DEFAULT_ROLLING_BUFFER
      ) {
-        const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
-        this.fetch(url, {
-          ...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);
+        this.axios.get<T>(endpoint, config).then((response) => {
+          this.cache?.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
        });
      }
      return cachedItem;
    }

-    const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
-    const response = await this.fetch(url, {
-      ...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);
+    const response = await this.axios.get<T>(endpoint, config);

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

-    return data;
+    return response.data;
  }

-  protected removeCache(endpoint: string, options?: Record<string, string>) {
+  protected removeCache(endpoint: string, options?: Record<string, unknown>) {
    const cacheKey = this.serializeCacheKey(endpoint, {
-      ...this.params,
      ...options,
    });
    this.cache?.del(cacheKey);
  }

-  private formatUrl(
-    endpoint: string,
-    params?: Record<string, string>,
-    overwriteBaseUrl?: string
-  ): string {
-    const baseUrl = overwriteBaseUrl || this.baseUrl;
-    const href =
-      baseUrl +
-      (baseUrl.endsWith('/') ? '' : '/') +
-      (endpoint.startsWith('/') ? endpoint.slice(1) : endpoint);
-    const searchParams = new URLSearchParams({
-      ...this.params,
-      ...params,
-    });
-    return (
-      href +
-      (searchParams.toString().length
-        ? '?' + searchParams.toString()
-        : searchParams.toString())
-    );
-  }
-
  private serializeCacheKey(
    endpoint: string,
    options?: Record<string, unknown>
@@ -329,29 +149,6 @@ class ExternalAPI {

    return `${this.baseUrl}${endpoint}${JSON.stringify(options)}`;
  }
-
-  private async getDataFromResponse(response: Response) {
-    const contentType = response.headers.get('Content-Type');
-    if (contentType?.includes('application/json')) {
-      return await response.json();
-    } else if (
-      contentType?.includes('application/xml') ||
-      contentType?.includes('text/html') ||
-      contentType?.includes('text/plain')
-    ) {
-      return await response.text();
-    } else {
-      try {
-        return await response.json();
-      } catch {
-        try {
-          return await response.blob();
-        } catch {
-          return null;
-        }
-      }
-    }
-  }
 }

 export default ExternalAPI;
--- a/server/api/github.ts
+++ b/server/api/github.ts
@@ -1,6 +1,6 @@
-import ExternalAPI from '@server/api/externalapi';
 import cacheManager from '@server/lib/cache';
 import logger from '@server/logger';
+import ExternalAPI from './externalapi';

 interface GitHubRelease {
  url: string;
@@ -67,12 +67,16 @@ class GithubAPI extends ExternalAPI {
      'https://api.github.com',
      {},
      {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
        nodeCache: cacheManager.getCache('github').data,
      }
    );
  }

-  public async getOverseerrReleases({
+  public async getJellyseerrReleases({
    take = 20,
  }: {
    take?: number;
@@ -81,21 +85,23 @@ class GithubAPI extends ExternalAPI {
      const data = await this.get<GitHubRelease[]>(
        '/repos/fallenbagel/jellyseerr/releases',
        {
-          per_page: take.toString(),
+          params: {
+            per_page: take,
+          },
        }
      );

      return data;
    } catch (e) {
      logger.warn(
-        "Failed to retrieve GitHub releases. This may be an issue on GitHub's end. Overseerr can't check if it's on the latest version.",
+        "Failed to retrieve GitHub releases. This may be an issue on GitHub's end. Jellyseerr can't check if it's on the latest version.",
        { label: 'GitHub API', errorMessage: e.message }
      );
      return [];
    }
  }

-  public async getOverseerrCommits({
+  public async getJellyseerrCommits({
    take = 20,
    branch = 'develop',
  }: {
@@ -106,15 +112,17 @@ class GithubAPI extends ExternalAPI {
      const data = await this.get<GithubCommit[]>(
        '/repos/fallenbagel/jellyseerr/commits',
        {
-          per_page: take.toString(),
-          branch,
+          params: {
+            per_page: take,
+            branch,
+          },
        }
      );

      return data;
    } catch (e) {
      logger.warn(
-        "Failed to retrieve GitHub commits. This may be an issue on GitHub's end. Overseerr can't check if it's on the latest version.",
+        "Failed to retrieve GitHub commits. This may be an issue on GitHub's end. Jellyseerr can't check if it's on the latest version.",
        { label: 'GitHub API', errorMessage: e.message }
      );
      return [];
--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -1,7 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import ExternalAPI from '@server/api/externalapi';
 import { ApiErrorCode } from '@server/constants/error';
+import { MediaServerType } from '@server/constants/server';
 import availabilitySync from '@server/lib/availabilitySync';
+import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { ApiError } from '@server/types/error';
 import { getAppVersion } from '@server/utils/appVersion';
@@ -92,15 +94,34 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
  DateCreated?: string;
 }

+export interface JellyfinItemsReponse {
+  Items: JellyfinLibraryItemExtended[];
+  TotalRecordCount: number;
+  StartIndex: number;
+}
+
 class JellyfinAPI extends ExternalAPI {
  private userId?: string;
+  private mediaServerType: MediaServerType;
+
+  constructor(
+    jellyfinHost: string,
+    authToken?: string | null,
+    deviceId?: string | null
+  ) {
+    const settings = getSettings();
+    const safeDeviceId =
+      deviceId && deviceId.length > 0
+        ? deviceId
+        : Buffer.from(`BOT_jellyseerr_fallback_${Date.now()}`).toString(
+            'base64'
+          );

-  constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
    let authHeaderVal: string;
    if (authToken) {
-      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}", Token="${authToken}"`;
+      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${safeDeviceId}", Version="${getAppVersion()}", Token="${authToken}"`;
    } else {
-      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}"`;
+      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${safeDeviceId}", Version="${getAppVersion()}"`;
    }

    super(
@@ -109,9 +130,13 @@ class JellyfinAPI extends ExternalAPI {
      {
        headers: {
          'X-Emby-Authorization': authHeaderVal,
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
        },
      }
    );
+
+    this.mediaServerType = settings.main.mediaServerType;
  }

  public async login(
@@ -120,7 +145,7 @@ class JellyfinAPI extends ExternalAPI {
    ClientIP?: string
  ): Promise<JellyfinLoginResponse> {
    const authenticate = async (useHeaders: boolean) => {
-      const headers: { [key: string]: string } =
+      const headers =
        useHeaders && ClientIP ? { 'X-Forwarded-For': ClientIP } : {};

      return this.post<JellyfinLoginResponse>(
@@ -129,8 +154,6 @@ class JellyfinAPI extends ExternalAPI {
          Username,
          Pw: Password,
        },
-        {},
-        undefined,
        { headers }
      );
    };
@@ -140,36 +163,36 @@ class JellyfinAPI extends ExternalAPI {
    } catch (e) {
      logger.debug('Failed to authenticate with headers', {
        label: 'Jellyfin API',
-        error: e.cause.message ?? e.cause.statusText,
+        error: e.response?.statusText,
        ip: ClientIP,
      });

-      if (!e.cause.status) {
+      if (!e.response?.status) {
        throw new ApiError(404, ApiErrorCode.InvalidUrl);
      }

-      if (e.cause.status === 401) {
-        throw new ApiError(e.cause.status, ApiErrorCode.InvalidCredentials);
+      if (e.response?.status === 401) {
+        throw new ApiError(e.response?.status, ApiErrorCode.InvalidCredentials);
      }
    }

    try {
      return await authenticate(false);
    } catch (e) {
-      if (e.cause.status === 401) {
-        throw new ApiError(e.cause.status, ApiErrorCode.InvalidCredentials);
+      if (e.response?.status === 401) {
+        throw new ApiError(e.response?.status, ApiErrorCode.InvalidCredentials);
      }

      logger.error(
-        'Something went wrong while authenticating with the Jellyfin server',
+        `Something went wrong while authenticating with the Jellyfin server: ${e.message}`,
        {
          label: 'Jellyfin API',
-          error: e.cause.message ?? e.cause.statusText,
+          error: e.response?.status,
          ip: ClientIP,
        }
      );

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

@@ -184,7 +207,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 +220,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', error: e.response?.status }
      );

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

@@ -212,11 +235,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', error: e.response?.status }
      );

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

@@ -228,11 +251,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', error: e.response?.status }
      );

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

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

@@ -293,16 +316,7 @@ class JellyfinAPI extends ExternalAPI {
  public async getLibraryContents(id: string): Promise<JellyfinLibraryItem[]> {
    try {
      const libraryItemsResponse = await this.get<any>(
-        `/Users/${this.userId}/Items`,
-        {
-          SortBy: 'SortName',
-          SortOrder: 'Ascending',
-          IncludeItemTypes: 'Series,Movie,Others',
-          Recursive: 'true',
-          StartIndex: '0',
-          ParentId: id,
-          collapseBoxSetItems: 'false',
-        }
+        `/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}&collapseBoxSetItems=false`
      );

      return libraryItemsResponse.Items.filter(
@@ -310,32 +324,36 @@ 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', error: e?.response?.status }
      );

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

  public async getRecentlyAdded(id: string): Promise<JellyfinLibraryItem[]> {
    try {
+      const endpoint =
+        this.mediaServerType === MediaServerType.JELLYFIN
+          ? `/Items/Latest`
+          : `/Users/${this.userId}/Items/Latest`;
      const itemResponse = await this.get<any>(
-        `/Users/${this.userId}/Items/Latest`,
-        {
-          Limit: '12',
-          ParentId: id,
-        }
+        `${endpoint}?Limit=12&ParentId=${id}${
+          this.mediaServerType === MediaServerType.JELLYFIN
+            ? `&userId=${this.userId ?? 'Me'}`
+            : ''
+        }`
      );

      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', error: e.response?.status }
      );

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

@@ -343,23 +361,26 @@ class JellyfinAPI extends ExternalAPI {
    id: string
  ): Promise<JellyfinLibraryItemExtended | undefined> {
    try {
-      const itemResponse = await this.get<any>(
-        `/Users/${this.userId}/Items/${id}`
-      );
+      const itemResponse = await this.get<JellyfinItemsReponse>(`/Items`, {
+        params: {
+          ids: id,
+          fields: 'ProviderIds,MediaSources,Width,Height,IsHD,DateCreated',
+        },
+      });

-      return itemResponse;
+      return itemResponse.Items?.[0];
    } catch (e) {
      if (availabilitySync.running) {
-        if (e.cause?.status === 500) {
+        if (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', error: e.response?.status }
      );
-      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -370,11 +391,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', error: e.response?.status }
      );

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

@@ -384,10 +405,7 @@ class JellyfinAPI extends ExternalAPI {
  ): Promise<JellyfinLibraryItem[]> {
    try {
      const episodeResponse = await this.get<any>(
-        `/Shows/${seriesID}/Episodes`,
-        {
-          seasonId: seasonID,
-        }
+        `/Shows/${seriesID}/Episodes?seasonId=${seasonID}`
      );

      return episodeResponse.Items.filter(
@@ -395,11 +413,11 @@ 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 }
+        `Something went wrong while getting the list of episodes from the Jellyfin server: ${e.message}`,
+        { label: 'Jellyfin API', error: e.response?.status }
      );

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

@@ -412,8 +430,8 @@ class JellyfinAPI extends ExternalAPI {
      ).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 creating an API key from the Jellyfin server: ${e.message}`,
+        { label: 'Jellyfin API', error: e.response?.status }
      );

      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
--- a/server/api/plexapi.ts
+++ b/server/api/plexapi.ts
@@ -92,7 +92,7 @@ class PlexAPI {
    plexSettings,
    timeout,
  }: {
-    plexToken?: string;
+    plexToken?: string | null;
    plexSettings?: PlexSettings;
    timeout?: number;
  }) {
@@ -107,7 +107,7 @@ class PlexAPI {
      port: settingsPlex.port,
      https: settingsPlex.useSsl,
      timeout: timeout,
-      token: plexToken,
+      token: plexToken ?? undefined,
      authenticator: {
        authenticate: (
          _plexApi,
@@ -124,9 +124,9 @@ class PlexAPI {
      // },
      options: {
        identifier: settings.clientId,
-        product: 'Overseerr',
-        deviceName: 'Overseerr',
-        platform: 'Overseerr',
+        product: 'Jellyseerr',
+        deviceName: 'Jellyseerr',
+        platform: 'Jellyseerr',
      },
    });
  }
--- a/server/api/plextv.ts
+++ b/server/api/plextv.ts
@@ -1,10 +1,10 @@
-import ExternalAPI from '@server/api/externalapi';
 import type { PlexDevice } from '@server/interfaces/api/plexInterfaces';
 import cacheManager from '@server/lib/cache';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { randomUUID } from 'node:crypto';
 import xml2js from 'xml2js';
+import ExternalAPI from './externalapi';

 interface PlexAccountResponse {
  user: PlexUser;
@@ -143,6 +143,8 @@ class PlexTvAPI extends ExternalAPI {
      {
        headers: {
          'X-Plex-Token': authToken,
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
        },
        nodeCache: cacheManager.getCache('plextv').data,
      }
@@ -153,11 +155,15 @@ class PlexTvAPI extends ExternalAPI {

  public async getDevices(): Promise<PlexDevice[]> {
    try {
-      const devicesResp = await this.get('/api/resources', {
-        includeHttps: '1',
-      });
+      const devicesResp = await this.axios.get(
+        '/api/resources?includeHttps=1',
+        {
+          transformResponse: [],
+          responseType: 'text',
+        }
+      );
      const parsedXml = await xml2js.parseStringPromise(
-        devicesResp as DeviceResponse
+        devicesResp.data as DeviceResponse
      );
      return parsedXml?.MediaContainer?.Device?.map((pxml: DeviceResponse) => ({
        name: pxml.$.name,
@@ -205,11 +211,11 @@ class PlexTvAPI extends ExternalAPI {

  public async getUser(): Promise<PlexUser> {
    try {
-      const account = await this.get<PlexAccountResponse>(
+      const account = await this.axios.get<PlexAccountResponse>(
        '/users/account.json'
      );

-      return account.user;
+      return account.data.user;
    } catch (e) {
      logger.error(
        `Something went wrong while getting the account from plex.tv: ${e.message}`,
@@ -249,10 +255,13 @@ class PlexTvAPI extends ExternalAPI {
  }

  public async getUsers(): Promise<UsersResponse> {
-    const data = await this.get('/api/users');
+    const response = await this.axios.get('/api/users', {
+      transformResponse: [],
+      responseType: 'text',
+    });

    const parsedXml = (await xml2js.parseStringPromise(
-      data as string
+      response.data
    )) as UsersResponse;
    return parsedXml;
  }
@@ -272,28 +281,26 @@ class PlexTvAPI extends ExternalAPI {
        this.authToken
      );

-      const params = new URLSearchParams({
-        'X-Plex-Container-Start': offset.toString(),
-        'X-Plex-Container-Size': size.toString(),
-      });
-      const response = await this.fetch(
-        `https://metadata.provider.plex.tv/library/sections/watchlist/all?${params.toString()}`,
+      const response = await this.axios.get<WatchlistResponse>(
+        '/library/sections/watchlist/all',
        {
-          headers: {
-            ...this.defaultHeaders,
-            ...(cachedWatchlist?.etag
-              ? { 'If-None-Match': cachedWatchlist.etag }
-              : {}),
+          params: {
+            'X-Plex-Container-Start': offset,
+            'X-Plex-Container-Size': size,
          },
+          headers: {
+            'If-None-Match': cachedWatchlist?.etag,
+          },
+          baseURL: 'https://metadata.provider.plex.tv',
+          validateStatus: (status) => status < 400, // Allow HTTP 304 to return without error
        }
      );
-      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,
+          etag: response.headers.etag,
+          response: response.data,
        };

        watchlistCache.data.set<PlexWatchlistCache>(
@@ -307,10 +314,9 @@ class PlexTvAPI extends ExternalAPI {
          async (watchlistItem) => {
            const detailedResponse = await this.getRolling<MetadataResponse>(
              `/library/metadata/${watchlistItem.ratingKey}`,
-              {},
-              undefined,
-              {},
-              'https://metadata.provider.plex.tv'
+              {
+                baseURL: 'https://metadata.provider.plex.tv',
+              }
            );

            const metadata = detailedResponse.MediaContainer.Metadata[0];
@@ -361,16 +367,11 @@ 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(),
-          },
-        }
-      );
+      const data: { pong: unknown } = await this.get('/api/v2/ping', {
+        headers: {
+          'X-Plex-Client-Identifier': randomUUID(),
+        },
+      });
      if (!data?.pong) {
        throw new Error('No pong response');
      }
--- a/server/api/pushover.ts
+++ b/server/api/pushover.ts
@@ -1,4 +1,4 @@
-import ExternalAPI from '@server/api/externalapi';
+import ExternalAPI from './externalapi';

 interface PushoverSoundsResponse {
  sounds: {
@@ -26,13 +26,24 @@ export const mapSounds = (sounds: {

 class PushoverAPI extends ExternalAPI {
  constructor() {
-    super('https://api.pushover.net/1');
+    super(
+      'https://api.pushover.net/1',
+      {},
+      {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
+      }
+    );
  }

  public async getSounds(appToken: string): Promise<PushoverSound[]> {
    try {
      const data = await this.get<PushoverSoundsResponse>('/sounds.json', {
-        token: appToken,
+        params: {
+          token: appToken,
+        },
      });

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

  /**
--- a/server/api/rating/rottentomatoes.ts
+++ b/server/api/rating/rottentomatoes.ts
@@ -105,12 +105,15 @@ class RottenTomatoes extends ExternalAPI {
    super(
      'https://79frdp12pn-dsn.algolia.net/1/indexes/*',
      {
-        'x-algolia-agent': 'Algolia for JavaScript (4.14.3); Browser (lite)',
+        'x-algolia-agent':
+          'Algolia%20for%20JavaScript%20(4.14.3)%3B%20Browser%20(lite)',
        'x-algolia-api-key': '175588f6e5f8319b27702e4cc4013561',
        'x-algolia-application-id': '79FRDP12PN',
      },
      {
        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
          'x-algolia-usertoken': settings.clientId,
        },
        nodeCache: cacheManager.getCache('rt').data,
--- a/server/api/servarr/base.ts
+++ b/server/api/servarr/base.ts
@@ -113,9 +113,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {

  public getSystemStatus = async (): Promise<SystemStatus> => {
    try {
-      const data = await this.get<SystemStatus>('/system/status');
+      const response = await this.axios.get<SystemStatus>('/system/status');

-      return data;
+      return response.data;
    } catch (e) {
      throw new Error(
        `[${this.apiName}] Failed to retrieve system status: ${e.message}`
@@ -157,15 +157,16 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {

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

-      return data.records;
+      return response.data.records;
    } catch (e) {
      throw new Error(
        `[${this.apiName}] Failed to retrieve queue: ${e.message}`
@@ -175,9 +176,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {

  public getTags = async (): Promise<Tag[]> => {
    try {
-      const data = await this.get<Tag[]>(`/tag`);
+      const response = await this.axios.get<Tag[]>(`/tag`);

-      return data;
+      return response.data;
    } catch (e) {
      throw new Error(
        `[${this.apiName}] Failed to retrieve tags: ${e.message}`
@@ -187,11 +188,11 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {

  public createTag = async ({ label }: { label: string }): Promise<Tag> => {
    try {
-      const data = await this.post<Tag>(`/tag`, {
+      const response = await this.axios.post<Tag>(`/tag`, {
        label,
      });

-      return data;
+      return response.data;
    } catch (e) {
      throw new Error(`[${this.apiName}] Failed to create tag: ${e.message}`);
    }
@@ -206,15 +207,10 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
    options: Record<string, unknown>
  ): Promise<void> {
    try {
-      await this.post(
-        `/command`,
-        {
-          name: commandName,
-          ...options,
-        },
-        {},
-        0
-      );
+      await this.axios.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
@@ -28,6 +28,39 @@ export interface RadarrMovie {
  qualityProfileId: number;
  added: string;
  hasFile: boolean;
+  tags: number[];
+  movieFile?: {
+    id: number;
+    movieId: number;
+    relativePath?: string;
+    path?: string;
+    size: number;
+    dateAdded: string;
+    sceneName?: string;
+    releaseGroup?: string;
+    edition?: string;
+    indexerFlags?: number;
+    mediaInfo: {
+      id: number;
+      audioBitrate: number;
+      audioChannels: number;
+      audioCodec?: string;
+      audioLanguages?: string;
+      audioStreamCount: number;
+      videoBitDepth: number;
+      videoBitrate: number;
+      videoCodec?: string;
+      videoFps: number;
+      videoDynamicRange?: string;
+      videoDynamicRangeType?: string;
+      resolution?: string;
+      runTime?: string;
+      scanType?: string;
+      subtitles?: string;
+    };
+    originalFilePath?: string;
+    qualityCutoffNotMet: boolean;
+  };
 }

 class RadarrAPI extends ServarrBase<{ movieId: number }> {
@@ -37,9 +70,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {

  public getMovies = async (): Promise<RadarrMovie[]> => {
    try {
-      const data = await this.get<RadarrMovie[]>('/movie');
+      const response = await this.axios.get<RadarrMovie[]>('/movie');

-      return data;
+      return response.data;
    } catch (e) {
      throw new Error(`[Radarr] Failed to retrieve movies: ${e.message}`);
    }
@@ -47,9 +80,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {

  public getMovie = async ({ id }: { id: number }): Promise<RadarrMovie> => {
    try {
-      const data = await this.get<RadarrMovie>(`/movie/${id}`);
+      const response = await this.axios.get<RadarrMovie>(`/movie/${id}`);

-      return data;
+      return response.data;
    } catch (e) {
      throw new Error(`[Radarr] Failed to retrieve movie: ${e.message}`);
    }
@@ -57,15 +90,17 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {

  public async getMovieByTmdbId(id: number): Promise<RadarrMovie> {
    try {
-      const data = await this.get<RadarrMovie[]>('/movie/lookup', {
-        term: `tmdb:${id}`,
+      const response = await this.axios.get<RadarrMovie[]>('/movie/lookup', {
+        params: {
+          term: `tmdb:${id}`,
+        },
      });

-      if (!data[0]) {
+      if (!response.data[0]) {
        throw new Error('Movie not found');
      }

-      return data[0];
+      return response.data[0];
    } catch (e) {
      logger.error('Error retrieving movie by TMDB ID', {
        label: 'Radarr API',
@@ -95,7 +130,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {

      // movie exists in Radarr but is neither downloaded nor monitored
      if (movie.id && !movie.monitored) {
-        const data = await this.put<RadarrMovie>(`/movie`, {
+        const response = await this.axios.put<RadarrMovie>(`/movie`, {
          ...movie,
          title: options.title,
          qualityProfileId: options.qualityProfileId,
@@ -104,7 +139,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
          minimumAvailability: options.minimumAvailability,
          tmdbId: options.tmdbId,
          year: options.year,
-          tags: options.tags,
+          tags: Array.from(new Set([...movie.tags, ...options.tags])),
          rootFolderPath: options.rootFolderPath,
          monitored: options.monitored,
          addOptions: {
@@ -112,25 +147,25 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
          },
        });

-        if (data.monitored) {
+        if (response.data.monitored) {
          logger.info(
            'Found existing title in Radarr and set it to monitored.',
            {
              label: 'Radarr',
-              movieId: data.id,
-              movieTitle: data.title,
+              movieId: response.data.id,
+              movieTitle: response.data.title,
            }
          );
          logger.debug('Radarr update details', {
            label: 'Radarr',
-            movie: data,
+            movie: response.data,
          });

          if (options.searchNow) {
-            this.searchMovie(data.id);
+            this.searchMovie(response.data.id);
          }

-          return data;
+          return response.data;
        } else {
          logger.error('Failed to update existing movie in Radarr.', {
            label: 'Radarr',
@@ -148,7 +183,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
        return movie;
      }

-      const data = await this.post<RadarrMovie>(`/movie`, {
+      const response = await this.axios.post<RadarrMovie>(`/movie`, {
        title: options.title,
        qualityProfileId: options.qualityProfileId,
        profileId: options.profileId,
@@ -164,11 +199,11 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
        },
      });

-      if (data.id) {
+      if (response.data.id) {
        logger.info('Radarr accepted request', { label: 'Radarr' });
        logger.debug('Radarr add details', {
          label: 'Radarr',
-          movie: data,
+          movie: response.data,
        });
      } else {
        logger.error('Failed to add movie to Radarr', {
@@ -177,22 +212,15 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
        });
        throw new Error('Failed to add movie to Radarr');
      }
-      return data;
+      return response.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');
@@ -221,9 +249,11 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
  public removeMovie = async (movieId: number): Promise<void> => {
    try {
      const { id, title } = await this.getMovieByTmdbId(movieId);
-      await this.delete(`/movie/${id}`, {
-        deleteFiles: 'true',
-        addImportExclusion: 'false',
+      await this.axios.delete(`/movie/${id}`, {
+        params: {
+          deleteFiles: true,
+          addImportExclusion: false,
+        },
      });
      logger.info(`[Radarr] Removed movie ${title}`);
    } catch (e) {
--- a/server/api/servarr/sonarr.ts
+++ b/server/api/servarr/sonarr.ts
@@ -117,9 +117,9 @@ class SonarrAPI extends ServarrBase<{

  public async getSeries(): Promise<SonarrSeries[]> {
    try {
-      const data = await this.get<SonarrSeries[]>('/series');
+      const response = await this.axios.get<SonarrSeries[]>('/series');

-      return data;
+      return response.data;
    } catch (e) {
      throw new Error(`[Sonarr] Failed to retrieve series: ${e.message}`);
    }
@@ -127,9 +127,9 @@ class SonarrAPI extends ServarrBase<{

  public async getSeriesById(id: number): Promise<SonarrSeries> {
    try {
-      const data = await this.get<SonarrSeries>(`/series/${id}`);
+      const response = await this.axios.get<SonarrSeries>(`/series/${id}`);

-      return data;
+      return response.data;
    } catch (e) {
      throw new Error(`[Sonarr] Failed to retrieve series by ID: ${e.message}`);
    }
@@ -137,15 +137,17 @@ class SonarrAPI extends ServarrBase<{

  public async getSeriesByTitle(title: string): Promise<SonarrSeries[]> {
    try {
-      const data = await this.get<SonarrSeries[]>('/series/lookup', {
-        term: title,
+      const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
+        params: {
+          term: title,
+        },
      });

-      if (!data[0]) {
+      if (!response.data[0]) {
        throw new Error('No series found');
      }

-      return data;
+      return response.data;
    } catch (e) {
      logger.error('Error retrieving series by series title', {
        label: 'Sonarr API',
@@ -158,15 +160,17 @@ class SonarrAPI extends ServarrBase<{

  public async getSeriesByTvdbId(id: number): Promise<SonarrSeries> {
    try {
-      const data = await this.get<SonarrSeries[]>('/series/lookup', {
-        term: `tvdb:${id}`,
+      const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
+        params: {
+          term: `tvdb:${id}`,
+        },
      });

-      if (!data[0]) {
+      if (!response.data[0]) {
        throw new Error('Series not found');
      }

-      return data[0];
+      return response.data[0];
    } catch (e) {
      logger.error('Error retrieving series by tvdb ID', {
        label: 'Sonarr API',
@@ -184,30 +188,32 @@ class SonarrAPI extends ServarrBase<{
      // If the series already exists, we will simply just update it
      if (series.id) {
        series.monitored = options.monitored ?? series.monitored;
-        series.tags = options.tags ?? series.tags;
+        series.tags = options.tags
+          ? Array.from(new Set([...series.tags, ...options.tags]))
+          : series.tags;
        series.seasons = this.buildSeasonList(options.seasons, series.seasons);

-        const newSeriesData = await this.put<SonarrSeries>(
+        const newSeriesResponse = await this.axios.put<SonarrSeries>(
          '/series',
-          series as any
+          series
        );

-        if (newSeriesData.id) {
+        if (newSeriesResponse.data.id) {
          logger.info('Updated existing series in Sonarr.', {
            label: 'Sonarr',
-            seriesId: newSeriesData.id,
-            seriesTitle: newSeriesData.title,
+            seriesId: newSeriesResponse.data.id,
+            seriesTitle: newSeriesResponse.data.title,
          });
          logger.debug('Sonarr update details', {
            label: 'Sonarr',
-            movie: newSeriesData,
+            series: newSeriesResponse.data,
          });

          if (options.searchNow) {
-            this.searchSeries(newSeriesData.id);
+            this.searchSeries(newSeriesResponse.data.id);
          }

-          return newSeriesData;
+          return newSeriesResponse.data;
        } else {
          logger.error('Failed to update series in Sonarr', {
            label: 'Sonarr',
@@ -217,35 +223,38 @@ class SonarrAPI extends ServarrBase<{
        }
      }

-      const createdSeriesData = await this.post<SonarrSeries>('/series', {
-        tvdbId: options.tvdbid,
-        title: options.title,
-        qualityProfileId: options.profileId,
-        languageProfileId: options.languageProfileId,
-        seasons: this.buildSeasonList(
-          options.seasons,
-          series.seasons.map((season) => ({
-            seasonNumber: season.seasonNumber,
-            // We force all seasons to false if its the first request
-            monitored: false,
-          }))
-        ),
-        tags: options.tags,
-        seasonFolder: options.seasonFolder,
-        monitored: options.monitored,
-        rootFolderPath: options.rootFolderPath,
-        seriesType: options.seriesType,
-        addOptions: {
-          ignoreEpisodesWithFiles: true,
-          searchForMissingEpisodes: options.searchNow,
-        },
-      } as Partial<SonarrSeries>);
+      const createdSeriesResponse = await this.axios.post<SonarrSeries>(
+        '/series',
+        {
+          tvdbId: options.tvdbid,
+          title: options.title,
+          qualityProfileId: options.profileId,
+          languageProfileId: options.languageProfileId,
+          seasons: this.buildSeasonList(
+            options.seasons,
+            series.seasons.map((season) => ({
+              seasonNumber: season.seasonNumber,
+              // We force all seasons to false if its the first request
+              monitored: false,
+            }))
+          ),
+          tags: options.tags,
+          seasonFolder: options.seasonFolder,
+          monitored: options.monitored,
+          rootFolderPath: options.rootFolderPath,
+          seriesType: options.seriesType,
+          addOptions: {
+            ignoreEpisodesWithFiles: true,
+            searchForMissingEpisodes: options.searchNow,
+          },
+        } as Partial<SonarrSeries>
+      );

-      if (createdSeriesData.id) {
+      if (createdSeriesResponse.data.id) {
        logger.info('Sonarr accepted request', { label: 'Sonarr' });
        logger.debug('Sonarr add details', {
          label: 'Sonarr',
-          movie: createdSeriesData,
+          series: createdSeriesResponse.data,
        });
      } else {
        logger.error('Failed to add movie to Sonarr', {
@@ -255,20 +264,13 @@ class SonarrAPI extends ServarrBase<{
        throw new Error('Failed to add series to Sonarr');
      }

-      return createdSeriesData;
+      return createdSeriesResponse.data;
    } 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');
    }
@@ -340,13 +342,14 @@ class SonarrAPI extends ServarrBase<{

    return newSeasons;
  }
-
  public removeSerie = async (serieId: number): Promise<void> => {
    try {
      const { id, title } = await this.getSeriesByTvdbId(serieId);
-      await this.delete(`/series/${id}`, {
-        deleteFiles: 'true',
-        addImportExclusion: 'false',
+      await this.axios.delete(`/series/${id}`, {
+        params: {
+          deleteFiles: true,
+          addImportExclusion: false,
+        },
      });
      logger.info(`[Radarr] Removed serie ${title}`);
    } catch (e) {
--- a/server/api/tautulli.ts
+++ b/server/api/tautulli.ts
@@ -1,7 +1,8 @@
-import ExternalAPI from '@server/api/externalapi';
 import type { User } from '@server/entity/User';
 import type { TautulliSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import type { AxiosInstance } from 'axios';
+import axios from 'axios';
 import { uniqWith } from 'lodash';

 export interface TautulliHistoryRecord {
@@ -112,25 +113,25 @@ interface TautulliInfoResponse {
  };
 }

-class TautulliAPI extends ExternalAPI {
+class TautulliAPI {
+  private axios: AxiosInstance;
+
  constructor(settings: TautulliSettings) {
-    super(
-      `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
+    this.axios = axios.create({
+      baseURL: `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
        settings.port
      }${settings.urlBase ?? ''}`,
-      {
-        apikey: settings.apiKey || '',
-      }
-    );
+      params: { apikey: settings.apiKey },
+    });
  }

  public async getInfo(): Promise<TautulliInfo> {
    try {
      return (
-        await this.get<TautulliInfoResponse>('/api/v2', {
-          cmd: 'get_tautulli_info',
+        await this.axios.get<TautulliInfoResponse>('/api/v2', {
+          params: { cmd: 'get_tautulli_info' },
        })
-      ).response.data;
+      ).data.response.data;
    } catch (e) {
      logger.error('Something went wrong fetching Tautulli server info', {
        label: 'Tautulli API',
@@ -147,12 +148,14 @@ class TautulliAPI extends ExternalAPI {
  ): Promise<TautulliWatchStats[]> {
    try {
      return (
-        await this.get<TautulliWatchStatsResponse>('/api/v2', {
-          cmd: 'get_item_watch_time_stats',
-          rating_key: ratingKey,
-          grouping: '1',
+        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
+          params: {
+            cmd: 'get_item_watch_time_stats',
+            rating_key: ratingKey,
+            grouping: 1,
+          },
        })
-      ).response.data;
+      ).data.response.data;
    } catch (e) {
      logger.error(
        'Something went wrong fetching media watch stats from Tautulli',
@@ -173,12 +176,14 @@ class TautulliAPI extends ExternalAPI {
  ): Promise<TautulliWatchUser[]> {
    try {
      return (
-        await this.get<TautulliWatchUsersResponse>('/api/v2', {
-          cmd: 'get_item_user_stats',
-          rating_key: ratingKey,
-          grouping: '1',
+        await this.axios.get<TautulliWatchUsersResponse>('/api/v2', {
+          params: {
+            cmd: 'get_item_user_stats',
+            rating_key: ratingKey,
+            grouping: 1,
+          },
        })
-      ).response.data;
+      ).data.response.data;
    } catch (e) {
      logger.error(
        'Something went wrong fetching media watch users from Tautulli',
@@ -201,13 +206,15 @@ class TautulliAPI extends ExternalAPI {
      }

      return (
-        await this.get<TautulliWatchStatsResponse>('/api/v2', {
-          cmd: 'get_user_watch_time_stats',
-          user_id: user.plexId.toString(),
-          query_days: '0',
-          grouping: '1',
+        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
+          params: {
+            cmd: 'get_user_watch_time_stats',
+            user_id: user.plexId,
+            query_days: 0,
+            grouping: 1,
+          },
        })
-      ).response.data[0];
+      ).data.response.data[0];
    } catch (e) {
      logger.error(
        'Something went wrong fetching user watch stats from Tautulli',
@@ -238,17 +245,19 @@ class TautulliAPI extends ExternalAPI {

      while (results.length < 20) {
        const tautulliData = (
-          await this.get<TautulliHistoryResponse>('/api/v2', {
-            cmd: 'get_history',
-            grouping: '1',
-            order_column: 'date',
-            order_dir: 'desc',
-            user_id: user.plexId.toString(),
-            media_type: 'movie,episode',
-            length: take.toString(),
-            start: start.toString(),
+          await this.axios.get<TautulliHistoryResponse>('/api/v2', {
+            params: {
+              cmd: 'get_history',
+              grouping: 1,
+              order_column: 'date',
+              order_dir: 'desc',
+              user_id: user.plexId,
+              media_type: 'movie,episode',
+              length: take,
+              start,
+            },
          })
-        ).response.data.data;
+        ).data.response.data.data;

        if (!tautulliData.length) {
          return results;
--- a/server/api/themoviedb/index.ts
+++ b/server/api/themoviedb/index.ts
@@ -1,5 +1,6 @@
 import ExternalAPI from '@server/api/externalapi';
 import cacheManager from '@server/lib/cache';
+import { getSettings } from '@server/lib/settings';
 import { sortBy } from 'lodash';
 import type {
  TmdbCollection,
@@ -37,23 +38,26 @@ interface SingleSearchOptions extends SearchOptions {
  year?: number;
 }

-export type SortOptions =
-  | 'popularity.asc'
-  | 'popularity.desc'
-  | 'release_date.asc'
-  | 'release_date.desc'
-  | 'revenue.asc'
-  | 'revenue.desc'
-  | 'primary_release_date.asc'
-  | 'primary_release_date.desc'
-  | 'original_title.asc'
-  | 'original_title.desc'
-  | 'vote_average.asc'
-  | 'vote_average.desc'
-  | 'vote_count.asc'
-  | 'vote_count.desc'
-  | 'first_air_date.asc'
-  | 'first_air_date.desc';
+export const SortOptionsIterable = [
+  'popularity.desc',
+  'popularity.asc',
+  'release_date.desc',
+  'release_date.asc',
+  'revenue.desc',
+  'revenue.asc',
+  'primary_release_date.desc',
+  'primary_release_date.asc',
+  'original_title.asc',
+  'original_title.desc',
+  'vote_average.desc',
+  'vote_average.asc',
+  'vote_count.desc',
+  'vote_count.asc',
+  'first_air_date.desc',
+  'first_air_date.asc',
+] as const;
+
+export type SortOptions = (typeof SortOptionsIterable)[number];

 interface DiscoverMovieOptions {
  page?: number;
@@ -99,6 +103,7 @@ interface DiscoverTvOptions {
 }

 class TheMovieDb extends ExternalAPI {
+  private locale: string;
  private discoverRegion?: string;
  private originalLanguage?: string;
  constructor({
@@ -113,11 +118,12 @@ class TheMovieDb extends ExternalAPI {
      {
        nodeCache: cacheManager.getCache('tmdb').data,
        rateLimit: {
+          maxRequests: 20,
          maxRPS: 50,
-          id: 'tmdb',
        },
      }
    );
+    this.locale = getSettings().main?.locale || 'en';
    this.discoverRegion = discoverRegion;
    this.originalLanguage = originalLanguage;
  }
@@ -126,14 +132,11 @@ class TheMovieDb extends ExternalAPI {
    query,
    page = 1,
    includeAdult = false,
-    language = 'en',
+    language = this.locale,
  }: SearchOptions): Promise<TmdbSearchMultiResponse> => {
    try {
      const data = await this.get<TmdbSearchMultiResponse>('/search/multi', {
-        query,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
+        params: { query, page, include_adult: includeAdult, language },
      });

      return data;
@@ -151,16 +154,18 @@ class TheMovieDb extends ExternalAPI {
    query,
    page = 1,
    includeAdult = false,
-    language = 'en',
+    language = this.locale,
    year,
  }: SingleSearchOptions): Promise<TmdbSearchMovieResponse> => {
    try {
      const data = await this.get<TmdbSearchMovieResponse>('/search/movie', {
-        query,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
-        primary_release_year: year?.toString() || '',
+        params: {
+          query,
+          page,
+          include_adult: includeAdult,
+          language,
+          primary_release_year: year,
+        },
      });

      return data;
@@ -178,16 +183,18 @@ class TheMovieDb extends ExternalAPI {
    query,
    page = 1,
    includeAdult = false,
-    language = 'en',
+    language = this.locale,
    year,
  }: SingleSearchOptions): Promise<TmdbSearchTvResponse> => {
    try {
      const data = await this.get<TmdbSearchTvResponse>('/search/tv', {
-        query,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
-        first_air_date_year: year?.toString() || '',
+        params: {
+          query,
+          page,
+          include_adult: includeAdult,
+          language,
+          first_air_date_year: year,
+        },
      });

      return data;
@@ -203,14 +210,14 @@ class TheMovieDb extends ExternalAPI {

  public getPerson = async ({
    personId,
-    language = 'en',
+    language = this.locale,
  }: {
    personId: number;
    language?: string;
  }): Promise<TmdbPersonDetails> => {
    try {
      const data = await this.get<TmdbPersonDetails>(`/person/${personId}`, {
-        language,
+        params: { language },
      });

      return data;
@@ -221,7 +228,7 @@ class TheMovieDb extends ExternalAPI {

  public getPersonCombinedCredits = async ({
    personId,
-    language = 'en',
+    language = this.locale,
  }: {
    personId: number;
    language?: string;
@@ -230,7 +237,7 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbPersonCombinedCredits>(
        `/person/${personId}/combined_credits`,
        {
-          language,
+          params: { language },
        }
      );

@@ -244,7 +251,7 @@ class TheMovieDb extends ExternalAPI {

  public getMovie = async ({
    movieId,
-    language = 'en',
+    language = this.locale,
  }: {
    movieId: number;
    language?: string;
@@ -253,9 +260,12 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbMovieDetails>(
        `/movie/${movieId}`,
        {
-          language,
-          append_to_response:
-            'credits,external_ids,videos,keywords,release_dates,watch/providers',
+          params: {
+            language,
+            append_to_response:
+              'credits,external_ids,videos,keywords,release_dates,watch/providers',
+            include_video_language: language + ', en',
+          },
        },
        43200
      );
@@ -268,7 +278,7 @@ class TheMovieDb extends ExternalAPI {

  public getTvShow = async ({
    tvId,
-    language = 'en',
+    language = this.locale,
  }: {
    tvId: number;
    language?: string;
@@ -277,9 +287,12 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbTvDetails>(
        `/tv/${tvId}`,
        {
-          language,
-          append_to_response:
-            'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
+          params: {
+            language,
+            append_to_response:
+              'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
+            include_video_language: language + ', en',
+          },
        },
        43200
      );
@@ -303,8 +316,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSeasonWithEpisodes>(
        `/tv/${tvId}/season/${seasonNumber}`,
        {
-          language: language || '',
-          append_to_response: 'external_ids',
+          params: {
+            language,
+            append_to_response: 'external_ids',
+          },
        }
      );

@@ -317,7 +332,7 @@ class TheMovieDb extends ExternalAPI {
  public async getMovieRecommendations({
    movieId,
    page = 1,
-    language = 'en',
+    language = this.locale,
  }: {
    movieId: number;
    page?: number;
@@ -327,8 +342,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/movie/${movieId}/recommendations`,
        {
-          page: page.toString(),
-          language,
+          params: {
+            page,
+            language,
+          },
        }
      );

@@ -341,7 +358,7 @@ class TheMovieDb extends ExternalAPI {
  public async getMovieSimilar({
    movieId,
    page = 1,
-    language = 'en',
+    language = this.locale,
  }: {
    movieId: number;
    page?: number;
@@ -351,8 +368,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/movie/${movieId}/similar`,
        {
-          page: page.toString(),
-          language,
+          params: {
+            page,
+            language,
+          },
        }
      );

@@ -365,7 +384,7 @@ class TheMovieDb extends ExternalAPI {
  public async getMoviesByKeyword({
    keywordId,
    page = 1,
-    language = 'en',
+    language = this.locale,
  }: {
    keywordId: number;
    page?: number;
@@ -375,8 +394,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/keyword/${keywordId}/movies`,
        {
-          page: page.toString(),
-          language,
+          params: {
+            page,
+            language,
+          },
        }
      );

@@ -389,7 +410,7 @@ class TheMovieDb extends ExternalAPI {
  public async getTvRecommendations({
    tvId,
    page = 1,
-    language = 'en',
+    language = this.locale,
  }: {
    tvId: number;
    page?: number;
@@ -399,8 +420,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchTvResponse>(
        `/tv/${tvId}/recommendations`,
        {
-          page: page.toString(),
-          language,
+          params: {
+            page,
+            language,
+          },
        }
      );

@@ -415,7 +438,7 @@ class TheMovieDb extends ExternalAPI {
  public async getTvSimilar({
    tvId,
    page = 1,
-    language = 'en',
+    language = this.locale,
  }: {
    tvId: number;
    page?: number;
@@ -423,8 +446,10 @@ class TheMovieDb extends ExternalAPI {
  }): Promise<TmdbSearchTvResponse> {
    try {
      const data = await this.get<TmdbSearchTvResponse>(`/tv/${tvId}/similar`, {
-        page: page.toString(),
-        language,
+        params: {
+          page,
+          language,
+        },
      });

      return data;
@@ -437,7 +462,7 @@ class TheMovieDb extends ExternalAPI {
    sortBy = 'popularity.desc',
    page = 1,
    includeAdult = false,
-    language = 'en',
+    language = this.locale,
    primaryReleaseDateGte,
    primaryReleaseDateLte,
    originalLanguage,
@@ -465,38 +490,40 @@ class TheMovieDb extends ExternalAPI {
        .split('T')[0];

      const data = await this.get<TmdbSearchMovieResponse>('/discover/movie', {
-        sort_by: sortBy,
-        page: page.toString(),
-        include_adult: includeAdult ? 'true' : 'false',
-        language,
-        region: this.discoverRegion || '',
-        with_original_language:
-          originalLanguage && originalLanguage !== 'all'
-            ? originalLanguage
-            : originalLanguage === 'all'
-            ? ''
-            : this.originalLanguage || '',
-        // Set our release date values, but check if one is set and not the other,
-        // so we can force a past date or a future date. TMDB Requires both values if one is set!
-        'primary_release_date.gte':
-          !primaryReleaseDateGte && primaryReleaseDateLte
-            ? defaultPastDate
-            : primaryReleaseDateGte || '',
-        'primary_release_date.lte':
-          !primaryReleaseDateLte && primaryReleaseDateGte
-            ? defaultFutureDate
-            : primaryReleaseDateLte || '',
-        with_genres: genre || '',
-        with_companies: studio || '',
-        with_keywords: keywords || '',
-        'with_runtime.gte': withRuntimeGte || '',
-        'with_runtime.lte': withRuntimeLte || '',
-        'vote_average.gte': voteAverageGte || '',
-        'vote_average.lte': voteAverageLte || '',
-        'vote_count.gte': voteCountGte || '',
-        'vote_count.lte': voteCountLte || '',
-        watch_region: watchRegion || '',
-        with_watch_providers: watchProviders || '',
+        params: {
+          sort_by: sortBy,
+          page,
+          include_adult: includeAdult,
+          language,
+          region: this.discoverRegion || '',
+          with_original_language:
+            originalLanguage && originalLanguage !== 'all'
+              ? originalLanguage
+              : originalLanguage === 'all'
+              ? undefined
+              : this.originalLanguage,
+          // Set our release date values, but check if one is set and not the other,
+          // so we can force a past date or a future date. TMDB Requires both values if one is set!
+          'primary_release_date.gte':
+            !primaryReleaseDateGte && primaryReleaseDateLte
+              ? defaultPastDate
+              : primaryReleaseDateGte,
+          'primary_release_date.lte':
+            !primaryReleaseDateLte && primaryReleaseDateGte
+              ? defaultFutureDate
+              : primaryReleaseDateLte,
+          with_genres: genre,
+          with_companies: studio,
+          with_keywords: keywords,
+          'with_runtime.gte': withRuntimeGte,
+          'with_runtime.lte': withRuntimeLte,
+          'vote_average.gte': voteAverageGte,
+          'vote_average.lte': voteAverageLte,
+          'vote_count.gte': voteCountGte,
+          'vote_count.lte': voteCountLte,
+          watch_region: watchRegion,
+          with_watch_providers: watchProviders,
+        },
      });

      return data;
@@ -508,7 +535,7 @@ class TheMovieDb extends ExternalAPI {
  public getDiscoverTv = async ({
    sortBy = 'popularity.desc',
    page = 1,
-    language = 'en',
+    language = this.locale,
    firstAirDateGte,
    firstAirDateLte,
    includeEmptyReleaseDate = false,
@@ -538,41 +565,41 @@ class TheMovieDb extends ExternalAPI {
        .split('T')[0];

      const data = await this.get<TmdbSearchTvResponse>('/discover/tv', {
-        sort_by: sortBy,
-        page: page.toString(),
-        language,
-        region: this.discoverRegion || '',
-        // Set our release date values, but check if one is set and not the other,
-        // so we can force a past date or a future date. TMDB Requires both values if one is set!
-        'first_air_date.gte':
-          !firstAirDateGte && firstAirDateLte
-            ? defaultPastDate
-            : firstAirDateGte || '',
-        'first_air_date.lte':
-          !firstAirDateLte && firstAirDateGte
-            ? defaultFutureDate
-            : firstAirDateLte || '',
-        with_original_language:
-          originalLanguage && originalLanguage !== 'all'
-            ? originalLanguage
-            : originalLanguage === 'all'
-            ? ''
-            : this.originalLanguage || '',
-        include_null_first_air_dates: includeEmptyReleaseDate
-          ? 'true'
-          : 'false',
-        with_genres: genre || '',
-        with_networks: network?.toString() || '',
-        with_keywords: keywords || '',
-        'with_runtime.gte': withRuntimeGte || '',
-        'with_runtime.lte': withRuntimeLte || '',
-        'vote_average.gte': voteAverageGte || '',
-        'vote_average.lte': voteAverageLte || '',
-        'vote_count.gte': voteCountGte || '',
-        'vote_count.lte': voteCountLte || '',
-        with_watch_providers: watchProviders || '',
-        watch_region: watchRegion || '',
-        with_status: withStatus || '',
+        params: {
+          sort_by: sortBy,
+          page,
+          language,
+          region: this.discoverRegion || '',
+          // Set our release date values, but check if one is set and not the other,
+          // so we can force a past date or a future date. TMDB Requires both values if one is set!
+          'first_air_date.gte':
+            !firstAirDateGte && firstAirDateLte
+              ? defaultPastDate
+              : firstAirDateGte,
+          'first_air_date.lte':
+            !firstAirDateLte && firstAirDateGte
+              ? defaultFutureDate
+              : firstAirDateLte,
+          with_original_language:
+            originalLanguage && originalLanguage !== 'all'
+              ? originalLanguage
+              : originalLanguage === 'all'
+              ? undefined
+              : this.originalLanguage,
+          include_null_first_air_dates: includeEmptyReleaseDate,
+          with_genres: genre,
+          with_networks: network,
+          with_keywords: keywords,
+          'with_runtime.gte': withRuntimeGte,
+          'with_runtime.lte': withRuntimeLte,
+          'vote_average.gte': voteAverageGte,
+          'vote_average.lte': voteAverageLte,
+          'vote_count.gte': voteCountGte,
+          'vote_count.lte': voteCountLte,
+          with_watch_providers: watchProviders,
+          watch_region: watchRegion,
+          with_status: withStatus,
+        },
      });

      return data;
@@ -583,7 +610,7 @@ class TheMovieDb extends ExternalAPI {

  public getUpcomingMovies = async ({
    page = 1,
-    language = 'en',
+    language = this.locale,
  }: {
    page: number;
    language: string;
@@ -592,10 +619,12 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbUpcomingMoviesResponse>(
        '/movie/upcoming',
        {
-          page: page.toString(),
-          language,
-          region: this.discoverRegion || '',
-          originalLanguage: this.originalLanguage || '',
+          params: {
+            page,
+            language,
+            region: this.discoverRegion,
+            originalLanguage: this.originalLanguage,
+          },
        }
      );

@@ -608,7 +637,7 @@ class TheMovieDb extends ExternalAPI {
  public getAllTrending = async ({
    page = 1,
    timeWindow = 'day',
-    language = 'en',
+    language = this.locale,
  }: {
    page?: number;
    timeWindow?: 'day' | 'week';
@@ -618,9 +647,11 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMultiResponse>(
        `/trending/all/${timeWindow}`,
        {
-          page: page.toString(),
-          language,
-          region: this.discoverRegion || '',
+          params: {
+            page,
+            language,
+            region: this.discoverRegion,
+          },
        }
      );

@@ -641,7 +672,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/trending/movie/${timeWindow}`,
        {
-          page: page.toString(),
+          params: {
+            page,
+          },
        }
      );

@@ -662,7 +695,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchTvResponse>(
        `/trending/tv/${timeWindow}`,
        {
-          page: page.toString(),
+          params: {
+            page,
+          },
        }
      );

@@ -675,7 +710,7 @@ class TheMovieDb extends ExternalAPI {
  public async getByExternalId({
    externalId,
    type,
-    language = 'en',
+    language = this.locale,
  }:
    | {
        externalId: string;
@@ -691,8 +726,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbExternalIdResponse>(
        `/find/${externalId}`,
        {
-          external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
-          language,
+          params: {
+            external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
+            language,
+          },
        }
      );

@@ -704,7 +741,7 @@ class TheMovieDb extends ExternalAPI {

  public async getMediaByImdbId({
    imdbId,
-    language = 'en',
+    language = this.locale,
  }: {
    imdbId: string;
    language?: string;
@@ -743,7 +780,7 @@ class TheMovieDb extends ExternalAPI {

  public async getShowByTvdbId({
    tvdbId,
-    language = 'en',
+    language = this.locale,
  }: {
    tvdbId: number;
    language?: string;
@@ -773,7 +810,7 @@ class TheMovieDb extends ExternalAPI {

  public async getCollection({
    collectionId,
-    language = 'en',
+    language = this.locale,
  }: {
    collectionId: number;
    language?: string;
@@ -782,7 +819,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbCollection>(
        `/collection/${collectionId}`,
        {
-          language,
+          params: {
+            language,
+          },
        }
      );

@@ -847,7 +886,7 @@ class TheMovieDb extends ExternalAPI {
  }

  public async getMovieGenres({
-    language = 'en',
+    language = this.locale,
  }: {
    language?: string;
  } = {}): Promise<TmdbGenre[]> {
@@ -855,7 +894,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbGenresResult>(
        '/genre/movie/list',
        {
-          language,
+          params: {
+            language,
+          },
        },
        86400 // 24 hours
      );
@@ -867,7 +908,9 @@ class TheMovieDb extends ExternalAPI {
        const englishData = await this.get<TmdbGenresResult>(
          '/genre/movie/list',
          {
-            language: 'en',
+            params: {
+              language: 'en',
+            },
          },
          86400 // 24 hours
        );
@@ -894,7 +937,7 @@ class TheMovieDb extends ExternalAPI {
  }

  public async getTvGenres({
-    language = 'en',
+    language = this.locale,
  }: {
    language?: string;
  } = {}): Promise<TmdbGenre[]> {
@@ -902,7 +945,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbGenresResult>(
        '/genre/tv/list',
        {
-          language,
+          params: {
+            language,
+          },
        },
        86400 // 24 hours
      );
@@ -914,7 +959,9 @@ class TheMovieDb extends ExternalAPI {
        const englishData = await this.get<TmdbGenresResult>(
          '/genre/tv/list',
          {
-            language: 'en',
+            params: {
+              language: 'en',
+            },
          },
          86400 // 24 hours
        );
@@ -969,8 +1016,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbKeywordSearchResponse>(
        '/search/keyword',
        {
-          query,
-          page: page.toString(),
+          params: {
+            query,
+            page,
+          },
        },
        86400 // 24 hours
      );
@@ -992,8 +1041,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbCompanySearchResponse>(
        '/search/company',
        {
-          query,
-          page: page.toString(),
+          params: {
+            query,
+            page,
+          },
        },
        86400 // 24 hours
      );
@@ -1013,7 +1064,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<{ results: TmdbWatchProviderRegion[] }>(
        '/watch/providers/regions',
        {
-          language: language ? this.originalLanguage || '' : '',
+          params: {
+            language: language ?? this.originalLanguage,
+          },
        },
        86400 // 24 hours
      );
@@ -1037,8 +1090,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
        '/watch/providers/movie',
        {
-          language: language ? this.originalLanguage || '' : '',
-          watch_region: watchRegion,
+          params: {
+            language: language ?? this.originalLanguage,
+            watch_region: watchRegion,
+          },
        },
        86400 // 24 hours
      );
@@ -1062,8 +1117,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
        '/watch/providers/tv',
        {
-          language: language ? this.originalLanguage || '' : '',
-          watch_region: watchRegion,
+          params: {
+            language: language ?? this.originalLanguage,
+            watch_region: watchRegion,
+          },
        },
        86400 // 24 hours
      );
--- a/server/constants/error.ts
+++ b/server/constants/error.ts
@@ -7,5 +7,6 @@ export enum ApiErrorCode {
  NoAdminUser = 'NO_ADMIN_USER',
  SyncErrorGroupedFolders = 'SYNC_ERROR_GROUPED_FOLDERS',
  SyncErrorNoLibraries = 'SYNC_ERROR_NO_LIBRARIES',
+  Unauthorized = 'UNAUTHORIZED',
  Unknown = 'UNKNOWN',
 }
--- a/server/entity/Blacklist.ts
+++ b/server/entity/Blacklist.ts
@@ -1,8 +1,9 @@
 import { MediaStatus, type MediaType } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
+import dataSource from '@server/datasource';
 import Media from '@server/entity/Media';
 import { User } from '@server/entity/User';
 import type { BlacklistItem } from '@server/interfaces/api/blacklistInterfaces';
+import type { EntityManager } from 'typeorm';
 import {
  Column,
  CreateDateColumn,
@@ -35,7 +36,7 @@ export class Blacklist implements BlacklistItem {
  @ManyToOne(() => User, (user) => user.id, {
    eager: true,
  })
-  user: User;
+  user?: User;

  @OneToOne(() => Media, (media) => media.blacklist, {
    onDelete: 'CASCADE',
@@ -43,6 +44,9 @@ export class Blacklist implements BlacklistItem {
  @JoinColumn()
  public media: Media;

+  @Column({ nullable: true, type: 'varchar' })
+  public blacklistedTags?: string;
+
  @CreateDateColumn()
  public createdAt: Date;

@@ -50,27 +54,32 @@ export class Blacklist implements BlacklistItem {
    Object.assign(this, init);
  }

-  public static async addToBlacklist({
-    blacklistRequest,
-  }: {
-    blacklistRequest: {
-      mediaType: MediaType;
-      title?: ZodOptional<ZodString>['_output'];
-      tmdbId: ZodNumber['_output'];
-    };
-  }): Promise<void> {
+  public static async addToBlacklist(
+    {
+      blacklistRequest,
+    }: {
+      blacklistRequest: {
+        mediaType: MediaType;
+        title?: ZodOptional<ZodString>['_output'];
+        tmdbId: ZodNumber['_output'];
+        blacklistedTags?: string;
+      };
+    },
+    entityManager?: EntityManager
+  ): Promise<void> {
+    const em = entityManager ?? dataSource;
    const blacklist = new this({
      ...blacklistRequest,
    });

-    const mediaRepository = getRepository(Media);
+    const mediaRepository = em.getRepository(Media);
    let media = await mediaRepository.findOne({
      where: {
        tmdbId: blacklistRequest.tmdbId,
      },
    });

-    const blacklistRepository = getRepository(this);
+    const blacklistRepository = em.getRepository(this);

    await blacklistRepository.save(blacklist);

--- a/server/entity/MediaRequest.ts
+++ b/server/entity/MediaRequest.ts
@@ -734,8 +734,11 @@ export class MediaRequest {
      media.mediaType === MediaType.MOVIE &&
      this.status === MediaRequestStatus.DECLINED
    ) {
-      media[this.is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
-      mediaRepository.save(media);
+      const statusField = this.is4k ? 'status4k' : 'status';
+      await mediaRepository.update(
+        { id: this.media.id },
+        { [statusField]: MediaStatus.UNKNOWN }
+      );
    }

    /**
@@ -752,8 +755,11 @@ export class MediaRequest {
      ).length === 0 &&
      media[this.is4k ? 'status4k' : 'status'] === MediaStatus.PENDING
    ) {
-      media[this.is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
-      mediaRepository.save(media);
+      const statusField = this.is4k ? 'status4k' : 'status';
+      mediaRepository.update(
+        { id: this.media.id },
+        { [statusField]: MediaStatus.UNKNOWN }
+      );
    }

    // Approve child seasons if parent is approved
@@ -955,8 +961,10 @@ export class MediaRequest {
          });

          const requestRepository = getRepository(MediaRequest);
-          this.status = MediaRequestStatus.APPROVED;
-          await requestRepository.save(this);
+
+          await requestRepository.update(this.id, {
+            status: MediaRequestStatus.APPROVED,
+          });
          return;
        }

@@ -986,18 +994,22 @@ export class MediaRequest {
              throw new Error('Media data not found');
            }

-            media[this.is4k ? 'externalServiceId4k' : 'externalServiceId'] =
-              radarrMovie.id;
-            media[this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] =
-              radarrMovie.titleSlug;
-            media[this.is4k ? 'serviceId4k' : 'serviceId'] = radarrSettings?.id;
-            await mediaRepository.save(media);
+            const updateFields = {
+              [this.is4k ? 'externalServiceId4k' : 'externalServiceId']:
+                radarrMovie.id,
+              [this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']:
+                radarrMovie.titleSlug,
+              [this.is4k ? 'serviceId4k' : 'serviceId']: radarrSettings?.id,
+            };
+
+            await mediaRepository.update({ id: this.media.id }, updateFields);
          })
          .catch(async () => {
            const requestRepository = getRepository(MediaRequest);

-            this.status = MediaRequestStatus.FAILED;
-            await requestRepository.save(this);
+            await requestRepository.update(this.id, {
+              status: MediaRequestStatus.FAILED,
+            });

            logger.warn(
              'Something went wrong sending movie request to Radarr, marking status as FAILED',
@@ -1113,8 +1125,9 @@ export class MediaRequest {
          });

          const requestRepository = getRepository(MediaRequest);
-          this.status = MediaRequestStatus.APPROVED;
-          await requestRepository.save(this);
+          await requestRepository.update(this.id, {
+            status: MediaRequestStatus.APPROVED,
+          });
          return;
        }

--- a/server/entity/User.ts
+++ b/server/entity/User.ts
@@ -56,11 +56,11 @@ export class User {
  })
  public email: string;

-  @Column({ nullable: true })
-  public plexUsername?: string;
+  @Column({ type: 'varchar', nullable: true })
+  public plexUsername?: string | null;

-  @Column({ nullable: true })
-  public jellyfinUsername?: string;
+  @Column({ type: 'varchar', nullable: true })
+  public jellyfinUsername?: string | null;

  @Column({ nullable: true })
  public username?: string;
@@ -77,20 +77,20 @@ export class User {
  @Column({ type: 'integer', default: UserType.PLEX })
  public userType: UserType;

-  @Column({ nullable: true, select: true })
-  public plexId?: number;
+  @Column({ type: 'integer', nullable: true, select: true })
+  public plexId?: number | null;

-  @Column({ nullable: true })
-  public jellyfinUserId?: string;
+  @Column({ type: 'varchar', nullable: true })
+  public jellyfinUserId?: string | null;

-  @Column({ nullable: true, select: false })
-  public jellyfinDeviceId?: string;
+  @Column({ type: 'varchar', nullable: true, select: false })
+  public jellyfinDeviceId?: string | null;

-  @Column({ nullable: true, select: false })
-  public jellyfinAuthToken?: string;
+  @Column({ type: 'varchar', nullable: true, select: false })
+  public jellyfinAuthToken?: string | null;

-  @Column({ nullable: true, select: false })
-  public plexToken?: string;
+  @Column({ type: 'varchar', nullable: true, select: false })
+  public plexToken?: string | null;

  @Column({ type: 'integer', default: 0 })
  public permissions = 0;
@@ -98,6 +98,12 @@ export class User {
  @Column()
  public avatar: string;

+  @Column({ type: 'varchar', nullable: true })
+  public avatarETag?: string | null;
+
+  @Column({ type: 'varchar', nullable: true })
+  public avatarVersion?: string | null;
+
  @RelationCount((user: User) => user.requests)
  public requestCount: number;

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

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

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

+  @Column({ nullable: true })
+  public userAgent: string;
+
+  @CreateDateColumn({ nullable: true })
+  public createdAt: Date;
+
  constructor(init?: Partial<UserPushSubscription>) {
    Object.assign(this, init);
  }
--- a/server/index.ts
+++ b/server/index.ts
@@ -1,3 +1,4 @@
+import csurf from '@dr.pogodin/csurf';
 import PlexAPI from '@server/api/plexapi';
 import dataSource, { getRepository, isPgsql } from '@server/datasource';
 import DiscoverSlider from '@server/entity/DiscoverSlider';
@@ -28,22 +29,19 @@ import restartFlag from '@server/utils/restartFlag';
 import { getClientIp } from '@supercharge/request-ip';
 import { TypeormStore } from 'connect-typeorm/out';
 import cookieParser from 'cookie-parser';
-import csurf from 'csurf';
 import type { NextFunction, Request, Response } from 'express';
 import express from 'express';
 import * as OpenApiValidator from 'express-openapi-validator';
 import type { Store } from 'express-session';
 import session from 'express-session';
 import next from 'next';
-import dns from 'node:dns';
-import net from 'node:net';
 import path from 'path';
 import swaggerUi from 'swagger-ui-express';
 import YAML from 'yamljs';

-const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');
+const API_SPEC_PATH = path.join(__dirname, '../jellyseerr-api.yml');

-logger.info(`Starting Overseerr version ${getAppVersion()}`);
+logger.info(`Starting Jellyseerr version ${getAppVersion()}`);
 const dev = process.env.NODE_ENV !== 'production';
 const app = next({ dev });
 const handle = app.getRequestHandler();
@@ -74,21 +72,6 @@ app
    const settings = await getSettings().load();
    restartFlag.initializeSettings(settings);

-    // Check if we force IPv4 first
-    if (
-      process.env.forceIpv4First === 'true' ||
-      settings.network.forceIpv4First
-    ) {
-      dns.setDefaultResultOrder('ipv4first');
-      net.setDefaultAutoSelectFamily(false);
-    }
-
-    if (settings.network.dnsServers.trim() !== '') {
-      dns.setServers(
-        settings.network.dnsServers.split(',').map((server) => server.trim())
-      );
-    }
-
    // Register HTTP proxy
    if (settings.network.proxy.enabled) {
      await createCustomProxyAgent(settings.network.proxy);
--- a/server/interfaces/api/blacklistInterfaces.ts
+++ b/server/interfaces/api/blacklistInterfaces.ts
@@ -6,7 +6,8 @@ export interface BlacklistItem {
  mediaType: 'movie' | 'tv';
  title?: string;
  createdAt?: Date;
-  user: User;
+  user?: User;
+  blacklistedTags?: string;
 }

 export interface BlacklistResultsResponse extends PaginatedResponse {
--- a/server/interfaces/api/requestInterfaces.ts
+++ b/server/interfaces/api/requestInterfaces.ts
@@ -3,7 +3,10 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { NonFunctionProperties, PaginatedResponse } from './common';

 export interface RequestResultsResponse extends PaginatedResponse {
-  results: NonFunctionProperties<MediaRequest>[];
+  results: (NonFunctionProperties<MediaRequest> & {
+    profileName?: string;
+    canRemove?: boolean;
+  })[];
 }

 export type MediaRequestBody = {
--- a/server/interfaces/api/settingsInterfaces.ts
+++ b/server/interfaces/api/settingsInterfaces.ts
@@ -30,6 +30,7 @@ export interface PublicSettingsResponse {
  applicationUrl: string;
  hideAvailable: boolean;
  localLogin: boolean;
+  mediaServerLogin: boolean;
  movie4kEnabled: boolean;
  series4kEnabled: boolean;
  discoverRegion: string;
--- a/server/job/blacklistedTagsProcessor.ts
+++ b/server/job/blacklistedTagsProcessor.ts
@@ -0,0 +1,184 @@
+import type { SortOptions } from '@server/api/themoviedb';
+import { SortOptionsIterable } from '@server/api/themoviedb';
+import type {
+  TmdbSearchMovieResponse,
+  TmdbSearchTvResponse,
+} from '@server/api/themoviedb/interfaces';
+import { MediaType } from '@server/constants/media';
+import dataSource from '@server/datasource';
+import { Blacklist } from '@server/entity/Blacklist';
+import Media from '@server/entity/Media';
+import type {
+  RunnableScanner,
+  StatusBase,
+} from '@server/lib/scanners/baseScanner';
+import { getSettings } from '@server/lib/settings';
+import logger from '@server/logger';
+import { createTmdbWithRegionLanguage } from '@server/routes/discover';
+import type { EntityManager } from 'typeorm';
+
+const TMDB_API_DELAY_MS = 250;
+class AbortTransaction extends Error {}
+
+class BlacklistedTagProcessor implements RunnableScanner<StatusBase> {
+  private running = false;
+  private progress = 0;
+  private total = 0;
+
+  public async run() {
+    this.running = true;
+
+    try {
+      await dataSource.transaction(async (em) => {
+        await this.cleanBlacklist(em);
+        await this.createBlacklistEntries(em);
+      });
+    } catch (err) {
+      if (err instanceof AbortTransaction) {
+        logger.info('Aborting job: Process Blacklisted Tags', {
+          label: 'Jobs',
+        });
+      } else {
+        throw err;
+      }
+    } finally {
+      this.reset();
+    }
+  }
+
+  public status(): StatusBase {
+    return {
+      running: this.running,
+      progress: this.progress,
+      total: this.total,
+    };
+  }
+
+  public cancel() {
+    this.running = false;
+    this.progress = 0;
+    this.total = 0;
+  }
+
+  private reset() {
+    this.cancel();
+  }
+
+  private async createBlacklistEntries(em: EntityManager) {
+    const tmdb = createTmdbWithRegionLanguage();
+
+    const settings = getSettings();
+    const blacklistedTags = settings.main.blacklistedTags;
+    const blacklistedTagsArr = blacklistedTags.split(',');
+
+    const pageLimit = settings.main.blacklistedTagsLimit;
+
+    if (blacklistedTags.length === 0) {
+      return;
+    }
+
+    // The maximum number of queries we're expected to execute
+    this.total =
+      2 * blacklistedTagsArr.length * pageLimit * SortOptionsIterable.length;
+
+    for (const type of [MediaType.MOVIE, MediaType.TV]) {
+      const getDiscover =
+        type === MediaType.MOVIE ? tmdb.getDiscoverMovies : tmdb.getDiscoverTv;
+
+      // Iterate for each tag
+      for (const tag of blacklistedTagsArr) {
+        let queryMax = pageLimit * SortOptionsIterable.length;
+        let fixedSortMode = false; // Set to true when the page limit allows for getting every page of tag
+
+        for (let query = 0; query < queryMax; query++) {
+          const page: number = fixedSortMode
+            ? query + 1
+            : (query % pageLimit) + 1;
+          const sortBy: SortOptions | undefined = fixedSortMode
+            ? undefined
+            : SortOptionsIterable[query % SortOptionsIterable.length];
+
+          if (!this.running) {
+            throw new AbortTransaction();
+          }
+
+          const response = await getDiscover({
+            page,
+            sortBy,
+            keywords: tag,
+          });
+          await this.processResults(response, tag, type, em);
+          await new Promise((res) => setTimeout(res, TMDB_API_DELAY_MS));
+
+          this.progress++;
+          if (page === 1 && response.total_pages <= queryMax) {
+            // We will finish the tag with less queries than expected, move progress accordingly
+            this.progress += queryMax - response.total_pages;
+            fixedSortMode = true;
+            queryMax = response.total_pages;
+          }
+        }
+      }
+    }
+  }
+
+  private async processResults(
+    response: TmdbSearchMovieResponse | TmdbSearchTvResponse,
+    keywordId: string,
+    mediaType: MediaType,
+    em: EntityManager
+  ) {
+    const blacklistRepository = em.getRepository(Blacklist);
+
+    for (const entry of response.results) {
+      const blacklistEntry = await blacklistRepository.findOne({
+        where: { tmdbId: entry.id },
+      });
+
+      if (blacklistEntry) {
+        // Don't mark manual blacklists with tags
+        // If media wasn't previously blacklisted for this tag, add the tag to the media's blacklist
+        if (
+          blacklistEntry.blacklistedTags &&
+          !blacklistEntry.blacklistedTags.includes(`,${keywordId},`)
+        ) {
+          await blacklistRepository.update(blacklistEntry.id, {
+            blacklistedTags: `${blacklistEntry.blacklistedTags}${keywordId},`,
+          });
+        }
+      } else {
+        // Media wasn't previously blacklisted, add it to the blacklist
+        await Blacklist.addToBlacklist(
+          {
+            blacklistRequest: {
+              mediaType,
+              title: 'title' in entry ? entry.title : entry.name,
+              tmdbId: entry.id,
+              blacklistedTags: `,${keywordId},`,
+            },
+          },
+          em
+        );
+      }
+    }
+  }
+
+  private async cleanBlacklist(em: EntityManager) {
+    // Remove blacklist and media entries blacklisted by tags
+    const mediaRepository = em.getRepository(Media);
+    const mediaToRemove = await mediaRepository
+      .createQueryBuilder('media')
+      .innerJoinAndSelect(Blacklist, 'blist', 'blist.tmdbId = media.tmdbId')
+      .where(`blist.blacklistedTags IS NOT NULL`)
+      .getMany();
+
+    // Batch removes so the query doesn't get too large
+    for (let i = 0; i < mediaToRemove.length; i += 500) {
+      await mediaRepository.remove(mediaToRemove.slice(i, i + 500)); // This also deletes the blacklist entries via cascading
+    }
+  }
+}
+
+const blacklistedTagsProcessor = new BlacklistedTagProcessor();
+
+export default blacklistedTagsProcessor;
--- a/server/job/schedule.ts
+++ b/server/job/schedule.ts
@@ -1,4 +1,5 @@
 import { MediaServerType } from '@server/constants/server';
+import blacklistedTagsProcessor from '@server/job/blacklistedTagsProcessor';
 import availabilitySync from '@server/lib/availabilitySync';
 import downloadTracker from '@server/lib/downloadtracker';
 import ImageProxy from '@server/lib/imageproxy';
@@ -21,7 +22,7 @@ interface ScheduledJob {
  job: schedule.Job;
  name: string;
  type: 'process' | 'command';
-  interval: 'seconds' | 'minutes' | 'hours' | 'fixed';
+  interval: 'seconds' | 'minutes' | 'hours' | 'days' | 'fixed';
  cronSchedule: string;
  running?: () => boolean;
  cancelFn?: () => void;
@@ -237,5 +238,21 @@ export const startJobs = (): void => {
    }),
  });

+  scheduledJobs.push({
+    id: 'process-blacklisted-tags',
+    name: 'Process Blacklisted Tags',
+    type: 'process',
+    interval: 'days',
+    cronSchedule: jobs['process-blacklisted-tags'].schedule,
+    job: schedule.scheduleJob(jobs['process-blacklisted-tags'].schedule, () => {
+      logger.info('Starting scheduled job: Process Blacklisted Tags', {
+        label: 'Jobs',
+      });
+      blacklistedTagsProcessor.run();
+    }),
+    running: () => blacklistedTagsProcessor.status().running,
+    cancelFn: () => blacklistedTagsProcessor.cancel(),
+  });
+
  logger.info('Scheduled jobs loaded', { label: 'Jobs' });
 };
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -404,6 +404,34 @@ class AvailabilitySync {
            });
          }

+          if (
+            !showExists &&
+            (media.status === MediaStatus.AVAILABLE ||
+              media.status === MediaStatus.PARTIALLY_AVAILABLE ||
+              media.seasons.some(
+                (season) => season.status === MediaStatus.AVAILABLE
+              ) ||
+              media.seasons.some(
+                (season) => season.status === MediaStatus.PARTIALLY_AVAILABLE
+              ))
+          ) {
+            await this.mediaUpdater(media, false, mediaServerType);
+          }
+
+          if (
+            !showExists4k &&
+            (media.status4k === MediaStatus.AVAILABLE ||
+              media.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
+              media.seasons.some(
+                (season) => season.status4k === MediaStatus.AVAILABLE
+              ) ||
+              media.seasons.some(
+                (season) => season.status4k === MediaStatus.PARTIALLY_AVAILABLE
+              ))
+          ) {
+            await this.mediaUpdater(media, true, mediaServerType);
+          }
+
          // TODO: Figure out how to run seasonUpdater for each season

          if ([...finalSeasons.values()].includes(false)) {
@@ -423,22 +451,6 @@ class AvailabilitySync {
              mediaServerType
            );
          }
-
-          if (
-            !showExists &&
-            (media.status === MediaStatus.AVAILABLE ||
-              media.status === MediaStatus.PARTIALLY_AVAILABLE)
-          ) {
-            await this.mediaUpdater(media, false, mediaServerType);
-          }
-
-          if (
-            !showExists4k &&
-            (media.status4k === MediaStatus.AVAILABLE ||
-              media.status4k === MediaStatus.PARTIALLY_AVAILABLE)
-          ) {
-            await this.mediaUpdater(media, true, mediaServerType);
-          }
        }
      }
    } catch (ex) {
@@ -466,6 +478,10 @@ class AvailabilitySync {
      { status: MediaStatus.PARTIALLY_AVAILABLE },
      { status4k: MediaStatus.AVAILABLE },
      { status4k: MediaStatus.PARTIALLY_AVAILABLE },
+      { seasons: { status: MediaStatus.AVAILABLE } },
+      { seasons: { status: MediaStatus.PARTIALLY_AVAILABLE } },
+      { seasons: { status4k: MediaStatus.AVAILABLE } },
+      { seasons: { status4k: MediaStatus.PARTIALLY_AVAILABLE } },
    ];

    let mediaPage: Media[];
@@ -731,7 +747,11 @@ class AvailabilitySync {
        }

        if (radarr && radarr.hasFile) {
-          existsInRadarr = true;
+          const resolution =
+            radarr?.movieFile?.mediaInfo?.resolution?.split('x');
+          const is4kMovie =
+            resolution?.length === 2 && Number(resolution[0]) >= 2000;
+          existsInRadarr = is4k ? is4kMovie : !is4kMovie;
        }
      } catch (ex) {
        if (!ex.message.includes('404')) {
--- a/server/lib/email/index.ts
+++ b/server/lib/email/index.ts
@@ -50,6 +50,7 @@ class PreparedEmail extends Email {
      },
      send: true,
      transport: transport,
+      preview: false,
    });
  }
 }
--- a/server/lib/imageproxy.ts
+++ b/server/lib/imageproxy.ts
@@ -1,6 +1,6 @@
 import logger from '@server/logger';
-import type { RateLimitOptions } from '@server/utils/rateLimit';
-import rateLimit from '@server/utils/rateLimit';
+import axios from 'axios';
+import rateLimit, { type rateLimitOptions } from 'axios-rate-limit';
 import { createHash } from 'crypto';
 import { promises } from 'fs';
 import mime from 'mime/lite';
@@ -131,33 +131,29 @@ class ImageProxy {
    return 0;
  }

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

  constructor(
    key: string,
    baseUrl: string,
    options: {
      cacheVersion?: number;
-      rateLimitOptions?: RateLimitOptions;
-      headers?: HeadersInit;
+      rateLimitOptions?: rateLimitOptions;
+      headers?: Record<string, string>;
    } = {}
  ) {
    this.cacheVersion = options.cacheVersion ?? 1;
-    this.baseUrl = baseUrl;
    this.key = key;
+    this.axios = axios.create({
+      baseURL: baseUrl,
+      headers: options.headers,
+    });

    if (options.rateLimitOptions) {
-      this.fetch = rateLimit(fetch, {
-        ...options.rateLimitOptions,
-      });
-    } else {
-      this.fetch = fetch;
+      this.axios = rateLimit(this.axios, options.rateLimitOptions);
    }
-    this.headers = options.headers || null;
  }

  public async getImage(
@@ -193,14 +189,34 @@ class ImageProxy {
  public async clearCachedImage(path: string) {
    // find cacheKey
    const cacheKey = this.getCacheKey(path);
+    const directory = join(this.getCacheDirectory(), cacheKey);
+
+    try {
+      await promises.access(directory);
+    } catch (e) {
+      if (e.code === 'ENOENT') {
+        logger.debug(
+          `Cache directory '${cacheKey}' does not exist; nothing to clear.`,
+          {
+            label: 'Image Cache',
+          }
+        );
+        return;
+      } else {
+        logger.error('Error checking cache directory existence', {
+          label: 'Image Cache',
+          message: e.message,
+        });
+        return;
+      }
+    }

    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'`, {
+      logger.debug(`Cleared ${files[0]} from cache 'avatar'`, {
        label: 'Image Cache',
      });
    } catch (e) {
@@ -249,34 +265,22 @@ class ImageProxy {
  ): Promise<ImageResponse | null> {
    try {
      const directory = join(this.getCacheDirectory(), cacheKey);
-      const href =
-        this.baseUrl +
-        (this.baseUrl.length > 0
-          ? this.baseUrl.endsWith('/')
-            ? ''
-            : '/'
-          : '') +
-        (path.startsWith('/') ? path.slice(1) : path);
-      const response = await this.fetch(href, {
-        headers: this.headers || undefined,
+      const response = await this.axios.get(path, {
+        responseType: 'arraybuffer',
      });
-      if (!response.ok) {
-        return null;
-      }
-      const arrayBuffer = await response.arrayBuffer();
-      const buffer = Buffer.from(arrayBuffer);

-      const extension = mime.getExtension(
-        response.headers.get('content-type') ?? ''
-      );
+      const buffer = Buffer.from(response.data, 'binary');
+
+      const contentType = response.headers['content-type'] || '';
+      const extension = mime.getExtension(contentType) || '';

      let maxAge = Number(
-        (response.headers.get('cache-control') ?? '0').split('=')[1]
+        (response.headers['cache-control'] ?? '0').split('=')[1]
      );

      if (!maxAge) maxAge = 86400;
      const expireAt = Date.now() + maxAge * 1000;
-      const etag = (response.headers.get('etag') ?? '').replace(/"/g, '');
+      const etag = (response.headers.etag ?? '').replace(/"/g, '');

      await this.writeToCacheDir(
        directory,
--- a/server/lib/notifications/agents/agent.ts
+++ b/server/lib/notifications/agents/agent.ts
@@ -19,6 +19,8 @@ export interface NotificationPayload {
  request?: MediaRequest;
  issue?: Issue;
  comment?: IssueComment;
+  pendingRequestsCount?: number;
+  isAdmin?: boolean;
 }

 export abstract class BaseAgent<T extends NotificationAgentConfig> {
--- a/server/lib/notifications/agents/discord.ts
+++ b/server/lib/notifications/agents/discord.ts
@@ -4,6 +4,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentDiscord } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
  hasNotificationType,
  Notification,
@@ -110,6 +111,8 @@ class DiscordAgent
  ): DiscordRichEmbed {
    const { applicationUrl } = getSettings().main;

+    const appUrl =
+      applicationUrl || `http://localhost:${process.env.port || 5055}`;
    let color = EmbedColors.DARK_PURPLE;
    const fields: Field[] = [];

@@ -124,7 +127,7 @@ class DiscordAgent
      switch (type) {
        case Notification.MEDIA_PENDING:
          color = EmbedColors.ORANGE;
-          status = 'Pending Approval';
+          status = `[Pending Approval](${appUrl}/requests)`;
          break;
        case Notification.MEDIA_APPROVED:
        case Notification.MEDIA_AUTO_APPROVED:
@@ -295,39 +298,23 @@ class DiscordAgent
        userMentions.push(`<@&${settings.options.webhookRoleId}>`);
      }

-      const response = await fetch(settings.options.webhookUrl, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          username: settings.options.botUsername
-            ? settings.options.botUsername
-            : getSettings().main.applicationTitle,
-          avatar_url: settings.options.botAvatarUrl,
-          embeds: [this.buildEmbed(type, payload)],
-          content: userMentions.join(' '),
-        } as DiscordWebhookPayload),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
+      await axios.post(settings.options.webhookUrl, {
+        username: settings.options.botUsername
+          ? settings.options.botUsername
+          : getSettings().main.applicationTitle,
+        avatar_url: settings.options.botAvatarUrl,
+        embeds: [this.buildEmbed(type, payload)],
+        content: userMentions.join(' '),
+      } as DiscordWebhookPayload);

      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
@@ -2,6 +2,7 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
 import type { NotificationAgentGotify } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -30,7 +31,12 @@ class GotifyAgent
  public shouldSend(): boolean {
    const settings = this.getSettings();

-    if (settings.enabled && settings.options.url && settings.options.token) {
+    if (
+      settings.enabled &&
+      settings.options.url &&
+      settings.options.token &&
+      settings.options.priority
+    ) {
      return true;
    }

@@ -42,15 +48,17 @@ class GotifyAgent
    payload: NotificationPayload
  ): GotifyPayload {
    const { applicationUrl, applicationTitle } = getSettings().main;
-    let priority = 0;
+    const settings = this.getSettings();
+    const priority = settings.options.priority ?? 1;

    const title = payload.event
      ? `${payload.event} - ${payload.subject}`
      : payload.subject;
-    let message = payload.message ?? '';
+
+    let message = payload.message ? `${payload.message}  \n\n` : '';

    if (payload.request) {
-      message += `\n\nRequested By: ${payload.request.requestedBy.displayName}`;
+      message += `\n**Requested By:** ${payload.request.requestedBy.displayName}  `;

      let status = '';
      switch (type) {
@@ -73,29 +81,29 @@ class GotifyAgent
      }

      if (status) {
-        message += `\nRequest Status: ${status}`;
+        message += `\n**Request Status:** ${status}  `;
      }
    } else if (payload.comment) {
-      message += `\nComment from ${payload.comment.user.displayName}:\n${payload.comment.message}`;
+      message += `\nComment from ${payload.comment.user.displayName}:\n${payload.comment.message}  `;
    } else if (payload.issue) {
-      message += `\n\nReported By: ${payload.issue.createdBy.displayName}`;
-      message += `\nIssue Type: ${IssueTypeName[payload.issue.issueType]}`;
-      message += `\nIssue Status: ${
+      message += `\n\n**Reported By:** ${payload.issue.createdBy.displayName}  `;
+      message += `\n**Issue Type:** ${
+        IssueTypeName[payload.issue.issueType]
+      }  `;
+      message += `\n**Issue Status:** ${
        payload.issue.status === IssueStatus.OPEN ? 'Open' : 'Resolved'
-      }`;
-
-      if (type == Notification.ISSUE_CREATED) {
-        priority = 1;
-      }
+      }  `;
    }

    for (const extra of payload.extra ?? []) {
-      message += `\n\n**${extra.name}**\n${extra.value}`;
+      message += `\n\n**${extra.name}**\n${extra.value}  `;
    }

    if (applicationUrl && payload.media) {
      const actionUrl = `${applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
-      message += `\n\nOpen in ${applicationTitle}(${actionUrl})`;
+      const displayUrl =
+        actionUrl.length > 40 ? `${actionUrl.slice(0, 41)}...` : actionUrl;
+      message += `\n\n**Open in ${applicationTitle}:** [${displayUrl}](${actionUrl})  `;
    }

    return {
@@ -132,32 +140,16 @@ class GotifyAgent
      const endpoint = `${settings.options.url}/message?token=${settings.options.token}`;
      const notificationPayload = this.getNotificationPayload(type, payload);

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

      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
@@ -3,6 +3,7 @@ import { MediaStatus } from '@server/constants/media';
 import type { NotificationAgentLunaSea } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -100,39 +101,28 @@ class LunaSeaAgent
    });

    try {
-      const response = await fetch(settings.options.webhookUrl, {
-        method: 'POST',
-        headers: settings.options.profileName
+      await axios.post(
+        settings.options.webhookUrl,
+        this.buildPayload(type, payload),
+        settings.options.profileName
          ? {
-              'Content-Type': 'application/json',
+              headers: {
+                Authorization: `Basic ${Buffer.from(
+                  `${settings.options.profileName}:`
+                ).toString('base64')}`,
+              },
            }
-          : {
-              'Content-Type': 'application/json',
-              Authorization: `Basic ${Buffer.from(
-                `${settings.options.profileName}:`
-              ).toString('base64')}`,
-            },
-        body: JSON.stringify(this.buildPayload(type, payload)),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
+          : undefined
+      );

      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
@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentPushbullet } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
  hasNotificationType,
  Notification,
@@ -122,34 +123,22 @@ class PushbulletAgent
      });

      try {
-        const response = await fetch(endpoint, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'Access-Token': settings.options.accessToken,
-          },
-          body: JSON.stringify({
-            ...notificationPayload,
-            channel_tag: settings.options.channelTag,
-          }),
-        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
+        await axios.post(
+          endpoint,
+          { ...notificationPayload, channel_tag: settings.options.channelTag },
+          {
+            headers: {
+              'Access-Token': settings.options.accessToken,
+            },
+          }
+        );
      } 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,32 +163,19 @@ class PushbulletAgent
        });

        try {
-          const response = await fetch(endpoint, {
-            method: 'POST',
+          await axios.post(endpoint, notificationPayload, {
            headers: {
-              'Content-Type': 'application/json',
              'Access-Token': payload.notifyUser.settings.pushbulletAccessToken,
            },
-            body: JSON.stringify(notificationPayload),
          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
        } catch (e) {
-          let errorData;
-          try {
-            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,32 +211,19 @@ class PushbulletAgent
              });

              try {
-                const response = await fetch(endpoint, {
-                  method: 'POST',
+                await axios.post(endpoint, notificationPayload, {
                  headers: {
-                    'Content-Type': 'application/json',
                    'Access-Token': user.settings.pushbulletAccessToken,
                  },
-                  body: JSON.stringify(notificationPayload),
                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
              } catch (e) {
-                let errorData;
-                try {
-                  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
@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentPushover } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
  hasNotificationType,
  Notification,
@@ -51,15 +52,12 @@ class PushoverAgent
    imageUrl: string
  ): 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 response = await axios.get(imageUrl, {
+        responseType: 'arraybuffer',
+      });
+      const base64 = Buffer.from(response.data, 'binary').toString('base64');
      const contentType = (
-        response.headers.get('Content-Type') ||
-        response.headers.get('content-type')
+        response.headers['Content-Type'] || response.headers['content-type']
      )?.toString();

      return {
@@ -67,17 +65,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,35 +201,19 @@ class PushoverAgent
      });

      try {
-        const response = await fetch(endpoint, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            ...notificationPayload,
-            token: settings.options.accessToken,
-            user: settings.options.userToken,
-            sound: settings.options.sound,
-          } as PushoverPayload),
-        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
+        await axios.post(endpoint, {
+          ...notificationPayload,
+          token: settings.options.accessToken,
+          user: settings.options.userToken,
+          sound: settings.options.sound,
+        } as PushoverPayload);
      } 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,36 +241,20 @@ class PushoverAgent
        });

        try {
-          const response = await fetch(endpoint, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-              ...notificationPayload,
-              token: payload.notifyUser.settings.pushoverApplicationToken,
-              user: payload.notifyUser.settings.pushoverUserKey,
-              sound: payload.notifyUser.settings.pushoverSound,
-            } as PushoverPayload),
-          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
+          await axios.post(endpoint, {
+            ...notificationPayload,
+            token: payload.notifyUser.settings.pushoverApplicationToken,
+            user: payload.notifyUser.settings.pushoverUserKey,
+            sound: payload.notifyUser.settings.pushoverSound,
+          } as PushoverPayload);
        } 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,35 +291,19 @@ class PushoverAgent
              });

              try {
-                const response = await fetch(endpoint, {
-                  method: 'POST',
-                  headers: {
-                    'Content-Type': 'application/json',
-                  },
-                  body: JSON.stringify({
-                    ...notificationPayload,
-                    token: user.settings.pushoverApplicationToken,
-                    user: user.settings.pushoverUserKey,
-                  } as PushoverPayload),
-                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
+                await axios.post(endpoint, {
+                  ...notificationPayload,
+                  token: user.settings.pushoverApplicationToken,
+                  user: user.settings.pushoverUserKey,
+                } as PushoverPayload);
              } 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
@@ -2,6 +2,7 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
 import type { NotificationAgentSlack } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -188,7 +189,7 @@ class SlackAgent
        type: 'actions',
        elements: [
          {
-            action_id: 'open-in-overseerr',
+            action_id: 'open-in-jellyseerr',
            type: 'button',
            url,
            text: {
@@ -237,32 +238,19 @@ class SlackAgent
      subject: payload.subject,
    });
    try {
-      const response = await fetch(settings.options.webhookUrl, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(this.buildEmbed(type, payload)),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
+      await axios.post(
+        settings.options.webhookUrl,
+        this.buildEmbed(type, payload)
+      );

      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
@@ -5,6 +5,7 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentTelegram } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import {
  hasNotificationType,
  Notification,
@@ -176,35 +177,19 @@ class TelegramAgent
      });

      try {
-        const response = await fetch(endpoint, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            ...notificationPayload,
-            chat_id: settings.options.chatId,
-            message_thread_id: settings.options.messageThreadId,
-            disable_notification: !!settings.options.sendSilently,
-          } as TelegramMessagePayload | TelegramPhotoPayload),
-        });
-        if (!response.ok) {
-          throw new Error(response.statusText, { cause: response });
-        }
+        await axios.post(endpoint, {
+          ...notificationPayload,
+          chat_id: settings.options.chatId,
+          message_thread_id: settings.options.messageThreadId,
+          disable_notification: !!settings.options.sendSilently,
+        } as TelegramMessagePayload | TelegramPhotoPayload);
      } 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;
@@ -228,38 +213,22 @@ class TelegramAgent
        });

        try {
-          const response = await fetch(endpoint, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-              ...notificationPayload,
-              chat_id: payload.notifyUser.settings.telegramChatId,
-              message_thread_id:
-                payload.notifyUser.settings.telegramMessageThreadId,
-              disable_notification:
-                !!payload.notifyUser.settings.telegramSendSilently,
-            } as TelegramMessagePayload | TelegramPhotoPayload),
-          });
-          if (!response.ok) {
-            throw new Error(response.statusText, { cause: response });
-          }
+          await axios.post(endpoint, {
+            ...notificationPayload,
+            chat_id: payload.notifyUser.settings.telegramChatId,
+            message_thread_id:
+              payload.notifyUser.settings.telegramMessageThreadId,
+            disable_notification:
+              !!payload.notifyUser.settings.telegramSendSilently,
+          } as TelegramMessagePayload | TelegramPhotoPayload);
        } 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;
@@ -293,36 +262,20 @@ class TelegramAgent
              });

              try {
-                const response = await fetch(endpoint, {
-                  method: 'POST',
-                  headers: {
-                    'Content-Type': 'application/json',
-                  },
-                  body: JSON.stringify({
-                    ...notificationPayload,
-                    chat_id: user.settings.telegramChatId,
-                    message_thread_id: user.settings.telegramMessageThreadId,
-                    disable_notification: !!user.settings?.telegramSendSilently,
-                  } as TelegramMessagePayload | TelegramPhotoPayload),
-                });
-                if (!response.ok) {
-                  throw new Error(response.statusText, { cause: response });
-                }
+                await axios.post(endpoint, {
+                  ...notificationPayload,
+                  chat_id: user.settings.telegramChatId,
+                  message_thread_id: user.settings.telegramMessageThreadId,
+                  disable_notification: !!user.settings?.telegramSendSilently,
+                } as TelegramMessagePayload | TelegramPhotoPayload);
              } 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
@@ -3,6 +3,7 @@ import { MediaStatus } from '@server/constants/media';
 import type { NotificationAgentWebhook } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import { get } from 'lodash';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
@@ -177,35 +178,26 @@ class WebhookAgent
    });

    try {
-      const response = await fetch(settings.options.webhookUrl, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          ...(settings.options.authHeader
-            ? { Authorization: settings.options.authHeader }
-            : {}),
-        },
-        body: JSON.stringify(this.buildPayload(type, payload)),
-      });
-      if (!response.ok) {
-        throw new Error(response.statusText, { cause: response });
-      }
+      await axios.post(
+        settings.options.webhookUrl,
+        this.buildPayload(type, payload),
+        settings.options.authHeader
+          ? {
+              headers: {
+                Authorization: settings.options.authHeader,
+              },
+            }
+          : undefined
+      );

      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/notifications/agents/webpush.ts
+++ b/server/lib/notifications/agents/webpush.ts
@@ -1,6 +1,7 @@
 import { IssueType, IssueTypeName } from '@server/constants/issue';
-import { MediaType } from '@server/constants/media';
+import { MediaRequestStatus, MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
+import MediaRequest from '@server/entity/MediaRequest';
 import { User } from '@server/entity/User';
 import { UserPushSubscription } from '@server/entity/UserPushSubscription';
 import type { NotificationAgentConfig } from '@server/lib/settings';
@@ -19,6 +20,8 @@ interface PushNotificationPayload {
  actionUrl?: string;
  actionUrlTitle?: string;
  requestId?: number;
+  pendingRequestsCount?: number;
+  isAdmin?: boolean;
 }

 class WebPushAgent
@@ -129,6 +132,8 @@ class WebPushAgent
      requestId: payload.request?.id,
      actionUrl,
      actionUrlTitle,
+      pendingRequestsCount: payload.pendingRequestsCount,
+      isAdmin: payload.isAdmin,
    };
  }

@@ -152,6 +157,51 @@ class WebPushAgent

    const mainUser = await userRepository.findOne({ where: { id: 1 } });

+    const requestRepository = getRepository(MediaRequest);
+
+    const pendingRequests = await requestRepository.find({
+      where: { status: MediaRequestStatus.PENDING },
+    });
+
+    const webPushNotification = async (
+      pushSub: UserPushSubscription,
+      notificationPayload: Buffer
+    ) => {
+      logger.debug('Sending web push notification', {
+        label: 'Notifications',
+        recipient: pushSub.user.displayName,
+        type: Notification[type],
+        subject: payload.subject,
+      });
+
+      try {
+        await webpush.sendNotification(
+          {
+            endpoint: pushSub.endpoint,
+            keys: {
+              auth: pushSub.auth,
+              p256dh: pushSub.p256dh,
+            },
+          },
+          notificationPayload
+        );
+      } catch (e) {
+        logger.error(
+          'Error sending web push notification; removing subscription',
+          {
+            label: 'Notifications',
+            recipient: pushSub.user.displayName,
+            type: Notification[type],
+            subject: payload.subject,
+            errorMessage: e.message,
+          }
+        );
+
+        // Failed to send notification so we need to remove the subscription
+        userPushSubRepository.remove(pushSub);
+      }
+    };
+
    if (
      payload.notifyUser &&
      // Check if user has webpush notifications enabled and fallback to true if undefined
@@ -169,7 +219,11 @@ class WebPushAgent
      pushSubs.push(...notifySubs);
    }

-    if (payload.notifyAdmin) {
+    if (
+      payload.notifyAdmin ||
+      type === Notification.MEDIA_APPROVED ||
+      type === Notification.MEDIA_DECLINED
+    ) {
      const users = await userRepository.find();

      const manageUsers = users.filter(
@@ -192,7 +246,42 @@ class WebPushAgent
        })
        .getMany();

-      pushSubs.push(...allSubs);
+      // We only want to send the custom notification when type is approved or declined
+      // Otherwise, default to the normal notification
+      if (
+        type === Notification.MEDIA_APPROVED ||
+        type === Notification.MEDIA_DECLINED
+      ) {
+        if (mainUser && allSubs.length > 0) {
+          webpush.setVapidDetails(
+            `mailto:${mainUser.email}`,
+            settings.vapidPublic,
+            settings.vapidPrivate
+          );
+
+          // Custom payload only for updating the app badge
+          const notificationBadgePayload = Buffer.from(
+            JSON.stringify(
+              this.getNotificationPayload(type, {
+                subject: payload.subject,
+                notifySystem: false,
+                notifyAdmin: true,
+                isAdmin: true,
+                pendingRequestsCount: pendingRequests.length,
+              })
+            ),
+            'utf-8'
+          );
+
+          await Promise.all(
+            allSubs.map(async (sub) => {
+              webPushNotification(sub, notificationBadgePayload);
+            })
+          );
+        }
+      } else {
+        pushSubs.push(...allSubs);
+      }
    }

    if (mainUser && pushSubs.length > 0) {
@@ -202,6 +291,10 @@ class WebPushAgent
        settings.vapidPrivate
      );

+      if (type === Notification.MEDIA_PENDING) {
+        payload = { ...payload, pendingRequestsCount: pendingRequests.length };
+      }
+
      const notificationPayload = Buffer.from(
        JSON.stringify(this.getNotificationPayload(type, payload)),
        'utf-8'
@@ -209,39 +302,7 @@ class WebPushAgent

      await Promise.all(
        pushSubs.map(async (sub) => {
-          logger.debug('Sending web push notification', {
-            label: 'Notifications',
-            recipient: sub.user.displayName,
-            type: Notification[type],
-            subject: payload.subject,
-          });
-
-          try {
-            await webpush.sendNotification(
-              {
-                endpoint: sub.endpoint,
-                keys: {
-                  auth: sub.auth,
-                  p256dh: sub.p256dh,
-                },
-              },
-              notificationPayload
-            );
-          } catch (e) {
-            logger.error(
-              'Error sending web push notification; removing subscription',
-              {
-                label: 'Notifications',
-                recipient: sub.user.displayName,
-                type: Notification[type],
-                subject: payload.subject,
-                errorMessage: e.message,
-              }
-            );
-
-            // Failed to send notification so we need to remove the subscription
-            userPushSubRepository.remove(sub);
-          }
+          webPushNotification(sub, notificationPayload);
        })
      );
    }
--- a/server/lib/scanners/jellyfin/index.ts
+++ b/server/lib/scanners/jellyfin/index.ts
@@ -65,8 +65,8 @@ class JellyfinScanner {

      if (!metadata?.Id) {
        logger.debug('No Id metadata for this title. Skipping', {
-          label: 'Plex Sync',
-          ratingKey: jellyfinitem.Id,
+          label: 'Jellyfin Sync',
+          jellyfinItemId: jellyfinitem.Id,
        });
        return;
      }
@@ -204,8 +204,8 @@ class JellyfinScanner {

      if (!metadata?.Id) {
        logger.debug('No Id metadata for this title. Skipping', {
-          label: 'Plex Sync',
-          ratingKey: jellyfinitem.Id,
+          label: 'Jellyfin Sync',
+          jellyfinItemId: jellyfinitem.Id,
        });
        return;
      }
--- a/server/lib/settings/index.ts
+++ b/server/lib/settings/index.ts
@@ -123,10 +123,13 @@ export interface MainSettings {
  };
  hideAvailable: boolean;
  localLogin: boolean;
+  mediaServerLogin: boolean;
  newPlexLogin: boolean;
  discoverRegion: string;
  streamingRegion: string;
  originalLanguage: string;
+  blacklistedTags: string;
+  blacklistedTagsLimit: number;
  mediaServerType: number;
  partialRequestsEnabled: boolean;
  enableSpecialEpisodes: boolean;
@@ -135,8 +138,6 @@ export interface MainSettings {

 export interface NetworkSettings {
  csrfProtection: boolean;
-  forceIpv4First: boolean;
-  dnsServers: string;
  trustProxy: boolean;
  proxy: ProxySettings;
 }
@@ -150,6 +151,7 @@ interface FullPublicSettings extends PublicSettings {
  applicationUrl: string;
  hideAvailable: boolean;
  localLogin: boolean;
+  mediaServerLogin: boolean;
  movie4kEnabled: boolean;
  series4kEnabled: boolean;
  discoverRegion: string;
@@ -253,6 +255,7 @@ export interface NotificationAgentGotify extends NotificationAgentConfig {
  options: {
    url: string;
    token: string;
+    priority: number;
  };
 }

@@ -301,7 +304,8 @@ export type JobId =
  | 'jellyfin-recently-added-scan'
  | 'jellyfin-full-scan'
  | 'image-cache-cleanup'
-  | 'availability-sync';
+  | 'availability-sync'
+  | 'process-blacklisted-tags';

 export interface AllSettings {
  clientId: string;
@@ -343,10 +347,13 @@ class Settings {
        },
        hideAvailable: false,
        localLogin: true,
+        mediaServerLogin: true,
        newPlexLogin: true,
        discoverRegion: '',
        streamingRegion: '',
        originalLanguage: '',
+        blacklistedTags: '',
+        blacklistedTagsLimit: 50,
        mediaServerType: MediaServerType.NOT_CONFIGURED,
        partialRequestsEnabled: true,
        enableSpecialEpisodes: false,
@@ -461,6 +468,7 @@ class Settings {
            options: {
              url: '',
              token: '',
+              priority: 0,
            },
          },
        },
@@ -502,12 +510,13 @@ class Settings {
        'image-cache-cleanup': {
          schedule: '0 0 5 * * *',
        },
+        'process-blacklisted-tags': {
+          schedule: '0 30 1 */7 * *',
+        },
      },
      network: {
        csrfProtection: false,
        trustProxy: false,
-        forceIpv4First: false,
-        dnsServers: '',
        proxy: {
          enabled: false,
          hostname: '',
@@ -588,6 +597,8 @@ class Settings {
      applicationUrl: this.data.main.applicationUrl,
      hideAvailable: this.data.main.hideAvailable,
      localLogin: this.data.main.localLogin,
+      mediaServerLogin: this.data.main.mediaServerLogin,
+      jellyfinExternalHost: this.data.jellyfin.externalHostname,
      jellyfinForgotPasswordUrl: this.data.jellyfin.jellyfinForgotPasswordUrl,
      movie4kEnabled: this.data.radarr.some(
        (radarr) => radarr.is4k && radarr.isDefault
--- a/server/lib/settings/migrations/0005_migrate_network_settings.ts
+++ b/server/lib/settings/migrations/0005_migrate_network_settings.ts
@@ -10,7 +10,6 @@ const migrateNetworkSettings = (settings: any): AllSettings => {
    csrfProtection: settings.main.csrfProtection ?? false,
    trustProxy: settings.main.trustProxy ?? false,
    forceIpv4First: settings.main.forceIpv4First ?? false,
-    dnsServers: settings.main.dnsServers ?? '',
    proxy: settings.main.proxy ?? {
      enabled: false,
      hostname: '',
@@ -25,7 +24,6 @@ const migrateNetworkSettings = (settings: any): AllSettings => {
  delete settings.main.csrfProtection;
  delete settings.main.trustProxy;
  delete settings.main.forceIpv4First;
-  delete settings.main.dnsServers;
  delete settings.main.proxy;
  return newSettings;
 };
--- a/server/lib/watchlistsync.ts
+++ b/server/lib/watchlistsync.ts
@@ -130,7 +130,7 @@ class WatchlistSync {

        switch (e.constructor) {
          // During watchlist sync, these errors aren't necessarily
-          // a problem with Overseerr. Since we are auto syncing these constantly, it's
+          // a problem with Jellyseerr. Since we are auto syncing these constantly, it's
          // possible they are unexpectedly at their quota limit, for example. So we'll
          // instead log these as debug messages.
          case RequestPermissionError:
--- a/server/logger.ts
+++ b/server/logger.ts
@@ -43,14 +43,14 @@ const logger = winston.createLogger({
    }),
    new winston.transports.DailyRotateFile({
      filename: process.env.CONFIG_DIRECTORY
-        ? `${process.env.CONFIG_DIRECTORY}/logs/overseerr-%DATE%.log`
-        : path.join(__dirname, '../config/logs/overseerr-%DATE%.log'),
+        ? `${process.env.CONFIG_DIRECTORY}/logs/jellyseerr-%DATE%.log`
+        : path.join(__dirname, '../config/logs/jellyseerr-%DATE%.log'),
      datePattern: 'YYYY-MM-DD',
      zippedArchive: true,
      maxSize: '20m',
      maxFiles: '7d',
      createSymlink: true,
-      symlinkName: 'overseerr.log',
+      symlinkName: 'jellyseerr.log',
    }),
    new winston.transports.DailyRotateFile({
      filename: process.env.CONFIG_DIRECTORY
--- a/server/migration/postgres/1737320080282-AddBlacklistTagsColumn.ts
+++ b/server/migration/postgres/1737320080282-AddBlacklistTagsColumn.ts
@@ -0,0 +1,17 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddBlacklistTagsColumn1737320080282 implements MigrationInterface {
+  name = 'AddBlacklistTagsColumn1737320080282';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" ADD blacklistedTags character varying`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" DROP COLUMN blacklistedTags`
+    );
+  }
+}
--- a/server/migration/postgres/1743023615532-UpdateWebPush.ts
+++ b/server/migration/postgres/1743023615532-UpdateWebPush.ts
@@ -0,0 +1,29 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateWebPush1743023615532 implements MigrationInterface {
+  name = 'UpdateWebPush1743023615532';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" ADD "userAgent" character varying`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" ADD "createdAt" TIMESTAMP DEFAULT now()`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" DROP CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b"`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" ADD CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth")`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" DROP COLUMN "createdAt"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" DROP COLUMN "userAgent"`
+    );
+  }
+}
--- a/server/migration/postgres/1743107707465-AddUserAvatarCacheFields.ts
+++ b/server/migration/postgres/1743107707465-AddUserAvatarCacheFields.ts
@@ -0,0 +1,21 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddUserAvatarCacheFields1743107707465
+  implements MigrationInterface
+{
+  name = 'AddUserAvatarCacheFields1743107707465';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user" ADD "avatarETag" character varying`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user" ADD "avatarVersion" character varying`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarVersion"`);
+    await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarETag"`);
+  }
+}
--- a/server/migration/sqlite/1737320080282-AddBlacklistTagsColumn.ts
+++ b/server/migration/sqlite/1737320080282-AddBlacklistTagsColumn.ts
@@ -0,0 +1,34 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddBlacklistTagsColumn1737320080282 implements MigrationInterface {
+  name = 'AddBlacklistTagsColumn1737320080282';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "temporary_blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "blacklistedTags" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "userId" integer, "mediaId" integer, CONSTRAINT "UQ_6bbafa28411e6046421991ea21c" UNIQUE ("tmdbId"), CONSTRAINT "REL_62b7ade94540f9f8d8bede54b9" UNIQUE ("mediaId"), CONSTRAINT "FK_53c1ab62c3e5875bc3ac474823e" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "FK_62b7ade94540f9f8d8bede54b99" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_blacklist"("id", "mediaType", "title", "tmdbId", "blacklistedTags", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "blacklistedTags", "createdAt", "userId", "mediaId" FROM "blacklist"`
+    );
+    await queryRunner.query(`DROP TABLE "blacklist"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_blacklist" RENAME TO "blacklist"`
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" RENAME TO "temporary_blacklist"`
+    );
+    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"), CONSTRAINT "REL_62b7ade94540f9f8d8bede54b9" UNIQUE ("mediaId"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "temporary_blacklist"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_blacklist"`);
+  }
+}
--- a/server/migration/sqlite/1743023610704-UpdateWebPush.ts
+++ b/server/migration/sqlite/1743023610704-UpdateWebPush.ts
@@ -0,0 +1,203 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateWebPush1743023610704 implements MigrationInterface {
+  name = 'UpdateWebPush1743023610704';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "temporary_user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId") SELECT "id", "endpoint", "p256dh", "auth", "userId" FROM "user_push_subscription"`
+    );
+    await queryRunner.query(`DROP TABLE "user_push_subscription"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_user_push_subscription" RENAME TO "user_push_subscription"`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "temporary_user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "user_push_subscription"`
+    );
+    await queryRunner.query(`DROP TABLE "user_push_subscription"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_user_push_subscription" RENAME TO "user_push_subscription"`
+    );
+    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
+    await queryRunner.query(
+      `CREATE TABLE "temporary_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)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "blacklist"`
+    );
+    await queryRunner.query(`DROP TABLE "blacklist"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_blacklist" RENAME TO "blacklist"`
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
+    );
+    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
+    await queryRunner.query(
+      `CREATE TABLE "temporary_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_5f933c8ed6ad2c31739e6b94886" UNIQUE ("tmdbId"), CONSTRAINT "UQ_e49b27917899e01d7aca6b0b15c" UNIQUE ("mediaId"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "blacklist"`
+    );
+    await queryRunner.query(`DROP TABLE "blacklist"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_blacklist" RENAME TO "blacklist"`
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
+    );
+    await queryRunner.query(`DROP INDEX "IDX_7ff2d11f6a83cb52386eaebe74"`);
+    await queryRunner.query(`DROP INDEX "IDX_41a289eb1fa489c1bc6f38d9c3"`);
+    await queryRunner.query(`DROP INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5"`);
+    await queryRunner.query(
+      `CREATE TABLE "temporary_media" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "tmdbId" integer NOT NULL, "tvdbId" integer, "imdbId" varchar, "status" integer NOT NULL DEFAULT (1), "status4k" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "lastSeasonChange" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "mediaAddedAt" datetime DEFAULT (CURRENT_TIMESTAMP), "serviceId" integer, "serviceId4k" integer, "externalServiceId" integer, "externalServiceId4k" integer, "externalServiceSlug" varchar, "externalServiceSlug4k" varchar, "ratingKey" varchar, "ratingKey4k" varchar, "jellyfinMediaId" varchar, "jellyfinMediaId4k" varchar, CONSTRAINT "UQ_41a289eb1fa489c1bc6f38d9c3c" UNIQUE ("tvdbId"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_media"("id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "status4k", "createdAt", "updatedAt", "lastSeasonChange", "mediaAddedAt", "serviceId", "serviceId4k", "externalServiceId", "externalServiceId4k", "externalServiceSlug", "externalServiceSlug4k", "ratingKey", "ratingKey4k", "jellyfinMediaId", "jellyfinMediaId4k") SELECT "id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "status4k", "createdAt", "updatedAt", "lastSeasonChange", "mediaAddedAt", "serviceId", "serviceId4k", "externalServiceId", "externalServiceId4k", "externalServiceSlug", "externalServiceSlug4k", "ratingKey", "ratingKey4k", "jellyfinMediaId", "jellyfinMediaId4k" FROM "media"`
+    );
+    await queryRunner.query(`DROP TABLE "media"`);
+    await queryRunner.query(`ALTER TABLE "temporary_media" RENAME TO "media"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7ff2d11f6a83cb52386eaebe74" ON "media" ("imdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_41a289eb1fa489c1bc6f38d9c3" ON "media" ("tvdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5" ON "media" ("tmdbId") `
+    );
+    await queryRunner.query(`DROP INDEX "IDX_939f205946256cc0d2a1ac51a8"`);
+    await queryRunner.query(
+      `CREATE TABLE "temporary_watchlist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "ratingKey" varchar NOT NULL, "mediaType" varchar NOT NULL, "title" varchar NOT NULL, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "requestedById" integer, "mediaId" integer, CONSTRAINT "UNIQUE_USER_DB" UNIQUE ("tmdbId", "requestedById"), CONSTRAINT "FK_ae34e6b153a90672eb9dc4857d7" FOREIGN KEY ("requestedById") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_6641da8d831b93dfcb429f8b8bc" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_watchlist"("id", "ratingKey", "mediaType", "title", "tmdbId", "createdAt", "updatedAt", "requestedById", "mediaId") SELECT "id", "ratingKey", "mediaType", "title", "tmdbId", "createdAt", "updatedAt", "requestedById", "mediaId" FROM "watchlist"`
+    );
+    await queryRunner.query(`DROP TABLE "watchlist"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_watchlist" RENAME TO "watchlist"`
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_939f205946256cc0d2a1ac51a8" ON "watchlist" ("tmdbId") `
+    );
+    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
+    await queryRunner.query(
+      `CREATE TABLE "temporary_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_5f933c8ed6ad2c31739e6b94886" UNIQUE ("tmdbId"), CONSTRAINT "UQ_e49b27917899e01d7aca6b0b15c" UNIQUE ("mediaId"), CONSTRAINT "FK_53c1ab62c3e5875bc3ac474823e" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "FK_62b7ade94540f9f8d8bede54b99" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "blacklist"`
+    );
+    await queryRunner.query(`DROP TABLE "blacklist"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_blacklist" RENAME TO "blacklist"`
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" RENAME TO "temporary_blacklist"`
+    );
+    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_5f933c8ed6ad2c31739e6b94886" UNIQUE ("tmdbId"), CONSTRAINT "UQ_e49b27917899e01d7aca6b0b15c" UNIQUE ("mediaId"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "temporary_blacklist"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_blacklist"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
+    );
+    await queryRunner.query(`DROP INDEX "IDX_939f205946256cc0d2a1ac51a8"`);
+    await queryRunner.query(
+      `ALTER TABLE "watchlist" RENAME TO "temporary_watchlist"`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "watchlist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "ratingKey" varchar NOT NULL, "mediaType" varchar NOT NULL, "title" varchar NOT NULL, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "requestedById" integer, "mediaId" integer, CONSTRAINT "UNIQUE_USER_DB" UNIQUE ("tmdbId", "requestedById"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "watchlist"("id", "ratingKey", "mediaType", "title", "tmdbId", "createdAt", "updatedAt", "requestedById", "mediaId") SELECT "id", "ratingKey", "mediaType", "title", "tmdbId", "createdAt", "updatedAt", "requestedById", "mediaId" FROM "temporary_watchlist"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_watchlist"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_939f205946256cc0d2a1ac51a8" ON "watchlist" ("tmdbId") `
+    );
+    await queryRunner.query(`DROP INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5"`);
+    await queryRunner.query(`DROP INDEX "IDX_41a289eb1fa489c1bc6f38d9c3"`);
+    await queryRunner.query(`DROP INDEX "IDX_7ff2d11f6a83cb52386eaebe74"`);
+    await queryRunner.query(`ALTER TABLE "media" RENAME TO "temporary_media"`);
+    await queryRunner.query(
+      `CREATE TABLE "media" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "tmdbId" integer NOT NULL, "tvdbId" integer, "imdbId" varchar, "status" integer NOT NULL DEFAULT (1), "status4k" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "lastSeasonChange" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "mediaAddedAt" datetime, "serviceId" integer, "serviceId4k" integer, "externalServiceId" integer, "externalServiceId4k" integer, "externalServiceSlug" varchar, "externalServiceSlug4k" varchar, "ratingKey" varchar, "ratingKey4k" varchar, "jellyfinMediaId" varchar, "jellyfinMediaId4k" varchar, CONSTRAINT "UQ_41a289eb1fa489c1bc6f38d9c3c" UNIQUE ("tvdbId"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "media"("id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "status4k", "createdAt", "updatedAt", "lastSeasonChange", "mediaAddedAt", "serviceId", "serviceId4k", "externalServiceId", "externalServiceId4k", "externalServiceSlug", "externalServiceSlug4k", "ratingKey", "ratingKey4k", "jellyfinMediaId", "jellyfinMediaId4k") SELECT "id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "status4k", "createdAt", "updatedAt", "lastSeasonChange", "mediaAddedAt", "serviceId", "serviceId4k", "externalServiceId", "externalServiceId4k", "externalServiceSlug", "externalServiceSlug4k", "ratingKey", "ratingKey4k", "jellyfinMediaId", "jellyfinMediaId4k" FROM "temporary_media"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_media"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5" ON "media" ("tmdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_41a289eb1fa489c1bc6f38d9c3" ON "media" ("tvdbId") `
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_7ff2d11f6a83cb52386eaebe74" ON "media" ("imdbId") `
+    );
+    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" RENAME TO "temporary_blacklist"`
+    );
+    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)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "temporary_blacklist"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_blacklist"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
+    );
+    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" RENAME TO "temporary_blacklist"`
+    );
+    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(
+      `INSERT INTO "blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "temporary_blacklist"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_blacklist"`);
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
+    );
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" RENAME TO "temporary_user_push_subscription"`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "temporary_user_push_subscription"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_user_push_subscription"`);
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" RENAME TO "temporary_user_push_subscription"`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId") SELECT "id", "endpoint", "p256dh", "auth", "userId" FROM "temporary_user_push_subscription"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_user_push_subscription"`);
+  }
+}
--- a/server/migration/sqlite/1743107645301-AddUserAvatarCacheFields.ts
+++ b/server/migration/sqlite/1743107645301-AddUserAvatarCacheFields.ts
@@ -0,0 +1,69 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddUserAvatarCacheFields1743107645301
+  implements MigrationInterface
+{
+  name = 'AddUserAvatarCacheFields1743107645301';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "temporary_user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "user_push_subscription"`
+    );
+    await queryRunner.query(`DROP TABLE "user_push_subscription"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_user_push_subscription" RENAME TO "user_push_subscription"`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "temporary_user" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "username" varchar, "plexId" integer, "plexToken" varchar, "permissions" integer NOT NULL DEFAULT (0), "avatar" varchar NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "password" varchar, "userType" integer NOT NULL DEFAULT (1), "plexUsername" varchar, "resetPasswordGuid" varchar, "recoveryLinkExpirationDate" date, "movieQuotaLimit" integer, "movieQuotaDays" integer, "tvQuotaLimit" integer, "tvQuotaDays" integer, "jellyfinUsername" varchar, "jellyfinAuthToken" varchar, "jellyfinUserId" varchar, "jellyfinDeviceId" varchar, "avatarETag" varchar, "avatarVersion" varchar, CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_user"("id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate", "movieQuotaLimit", "movieQuotaDays", "tvQuotaLimit", "tvQuotaDays", "jellyfinUsername", "jellyfinAuthToken", "jellyfinUserId", "jellyfinDeviceId") SELECT "id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate", "movieQuotaLimit", "movieQuotaDays", "tvQuotaLimit", "tvQuotaDays", "jellyfinUsername", "jellyfinAuthToken", "jellyfinUserId", "jellyfinDeviceId" FROM "user"`
+    );
+    await queryRunner.query(`DROP TABLE "user"`);
+    await queryRunner.query(`ALTER TABLE "temporary_user" RENAME TO "user"`);
+    await queryRunner.query(
+      `CREATE TABLE "temporary_user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "temporary_user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "user_push_subscription"`
+    );
+    await queryRunner.query(`DROP TABLE "user_push_subscription"`);
+    await queryRunner.query(
+      `ALTER TABLE "temporary_user_push_subscription" RENAME TO "user_push_subscription"`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" RENAME TO "temporary_user_push_subscription"`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "temporary_user_push_subscription"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_user_push_subscription"`);
+    await queryRunner.query(`ALTER TABLE "user" RENAME TO "temporary_user"`);
+    await queryRunner.query(
+      `CREATE TABLE "user" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "username" varchar, "plexId" integer, "plexToken" varchar, "permissions" integer NOT NULL DEFAULT (0), "avatar" varchar NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "password" varchar, "userType" integer NOT NULL DEFAULT (1), "plexUsername" varchar, "resetPasswordGuid" varchar, "recoveryLinkExpirationDate" date, "movieQuotaLimit" integer, "movieQuotaDays" integer, "tvQuotaLimit" integer, "tvQuotaDays" integer, "jellyfinUsername" varchar, "jellyfinAuthToken" varchar, "jellyfinUserId" varchar, "jellyfinDeviceId" varchar, CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"))`
+    );
+    await queryRunner.query(
+      `INSERT INTO "user"("id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate", "movieQuotaLimit", "movieQuotaDays", "tvQuotaLimit", "tvQuotaDays", "jellyfinUsername", "jellyfinAuthToken", "jellyfinUserId", "jellyfinDeviceId") SELECT "id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate", "movieQuotaLimit", "movieQuotaDays", "tvQuotaLimit", "tvQuotaDays", "jellyfinUsername", "jellyfinAuthToken", "jellyfinUserId", "jellyfinDeviceId" FROM "temporary_user"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_user"`);
+    await queryRunner.query(
+      `ALTER TABLE "user_push_subscription" RENAME TO "temporary_user_push_subscription"`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
+    );
+    await queryRunner.query(
+      `INSERT INTO "user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "temporary_user_push_subscription"`
+    );
+    await queryRunner.query(`DROP TABLE "temporary_user_push_subscription"`);
+  }
+}
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -10,6 +10,7 @@ import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
+import { checkAvatarChanged } from '@server/routes/avatarproxy';
 import { ApiError } from '@server/types/error';
 import { getHostname } from '@server/utils/getHostname';
 import * as EmailValidator from 'email-validator';
@@ -56,8 +57,9 @@ authRoutes.post('/plex', async (req, res, next) => {
  }

  if (
-    settings.main.mediaServerType != MediaServerType.PLEX &&
-    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED
+    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED &&
+    (settings.main.mediaServerLogin === false ||
+      settings.main.mediaServerType != MediaServerType.PLEX)
  ) {
    return res.status(500).json({ error: 'Plex login is disabled' });
  }
@@ -157,7 +159,7 @@ authRoutes.post('/plex', async (req, res, next) => {
          });
        } else {
          logger.info(
-            'Sign-in attempt from Plex user with access to the media server; creating new Overseerr user',
+            'Sign-in attempt from Plex user with access to the media server; creating new Jellyseerr user',
            {
              label: 'API',
              ip: req.ip,
@@ -215,6 +217,10 @@ authRoutes.post('/plex', async (req, res, next) => {
  }
 });

+function getUserAvatarUrl(user: User): string {
+  return `/avatarproxy/${user.jellyfinUserId}?v=${user.avatarVersion}`;
+}
+
 authRoutes.post('/jellyfin', async (req, res, next) => {
  const settings = getSettings();
  const userRepository = getRepository(User);
@@ -231,10 +237,13 @@ authRoutes.post('/jellyfin', async (req, res, next) => {

  //Make sure jellyfin login is enabled, but only if jellyfin && Emby is not already configured
  if (
-    settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
-    settings.main.mediaServerType !== MediaServerType.EMBY &&
+    // media server not configured, allow login for setup
    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED &&
-    settings.jellyfin.ip !== ''
+    (settings.main.mediaServerLogin === false ||
+      // media server is neither jellyfin or emby
+      (settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
+        settings.main.mediaServerType !== MediaServerType.EMBY &&
+        settings.jellyfin.ip !== ''))
  ) {
    return res.status(500).json({ error: 'Jellyfin login is disabled' });
  }
@@ -270,7 +279,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
    if (user) {
      deviceId = user.jellyfinDeviceId ?? '';
    } else {
-      deviceId = Buffer.from(`BOT_overseerr_${body.username ?? ''}`).toString(
+      deviceId = Buffer.from(`BOT_jellyseerr_${body.username ?? ''}`).toString(
        'base64'
      );
    }
@@ -339,12 +348,12 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
          jellyfinDeviceId: deviceId,
          jellyfinAuthToken: account.AccessToken,
          permissions: Permission.ADMIN,
-          avatar: `/avatarproxy/${account.User.Id}`,
          userType:
            body.serverType === MediaServerType.JELLYFIN
              ? UserType.JELLYFIN
              : UserType.EMBY,
        });
+        user.avatar = getUserAvatarUrl(user);

        await userRepository.save(user);
      } else {
@@ -371,7 +380,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        user.jellyfinDeviceId = deviceId;
        user.jellyfinAuthToken = account.AccessToken;
        user.permissions = Permission.ADMIN;
-        user.avatar = `/avatarproxy/${account.User.Id}`;
+        user.avatar = getUserAvatarUrl(user);
        user.userType =
          body.serverType === MediaServerType.JELLYFIN
            ? UserType.JELLYFIN
@@ -418,7 +427,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
          jellyfinUsername: account.User.Name,
        }
      );
-      user.avatar = `/avatarproxy/${account.User.Id}`;
+      user.avatar = getUserAvatarUrl(user);
      user.jellyfinUsername = account.User.Name;

      if (user.username === account.User.Name) {
@@ -442,7 +451,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      });
    } else if (!user) {
      logger.info(
-        'Sign-in attempt from Jellyfin user with access to the media server; creating new Overseerr user',
+        'Sign-in attempt from Jellyfin user with access to the media server; creating new Jellyseerr user',
        {
          label: 'API',
          ip: req.ip,
@@ -456,12 +465,12 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        jellyfinUserId: account.User.Id,
        jellyfinDeviceId: deviceId,
        permissions: settings.main.defaultPermissions,
-        avatar: `/avatarproxy/${account.User.Id}`,
        userType:
          settings.main.mediaServerType === MediaServerType.JELLYFIN
            ? UserType.JELLYFIN
            : UserType.EMBY,
      });
+      user.avatar = getUserAvatarUrl(user);

      //initialize Jellyfin/Emby users with local login
      const passedExplicitPassword = body.password && body.password.length > 0;
@@ -471,6 +480,26 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      await userRepository.save(user);
    }

+    if (user && user.jellyfinUserId) {
+      try {
+        const { changed } = await checkAvatarChanged(user);
+
+        if (changed) {
+          user.avatar = getUserAvatarUrl(user);
+          await userRepository.save(user);
+          logger.debug('Avatar updated during login', {
+            userId: user.id,
+            jellyfinUserId: user.jellyfinUserId,
+          });
+        }
+      } catch (error) {
+        logger.error('Error handling avatar during login', {
+          label: 'Auth',
+          errorMessage: error.message,
+        });
+      }
+    }
+
    // Set logged in session
    if (req.session) {
      req.session.userId = user?.id;
@@ -580,7 +609,7 @@ authRoutes.post('/local', async (req, res, next) => {
      .getOne();

    if (!user || !(await user.passwordMatch(body.password))) {
-      logger.warn('Failed sign-in attempt using invalid Overseerr password', {
+      logger.warn('Failed sign-in attempt using invalid Jellyseerr password', {
        label: 'API',
        ip: req.ip,
        email: body.email,
@@ -670,7 +699,7 @@ authRoutes.post('/local', async (req, res, next) => {
    return res.status(200).json(user?.filter() ?? {});
  } catch (e) {
    logger.error(
-      'Something went wrong authenticating with Overseerr password',
+      'Something went wrong authenticating with Jellyseerr password',
      {
        label: 'API',
        errorMessage: e.message,
--- a/server/routes/avatarproxy.ts
+++ b/server/routes/avatarproxy.ts
@@ -6,12 +6,15 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { getAppVersion } from '@server/utils/appVersion';
 import { getHostname } from '@server/utils/getHostname';
+import axios from 'axios';
 import { Router } from 'express';
 import gravatarUrl from 'gravatar-url';
+import { createHash } from 'node:crypto';

 const router = Router();

 let _avatarImageProxy: ImageProxy | null = null;
+
 async function initAvatarImageProxy() {
  if (!_avatarImageProxy) {
    const userRepository = getRepository(User);
@@ -31,6 +34,83 @@ async function initAvatarImageProxy() {
  return _avatarImageProxy;
 }

+function getJellyfinAvatarUrl(userId: string) {
+  const settings = getSettings();
+  return settings.main.mediaServerType === MediaServerType.JELLYFIN
+    ? `${getHostname()}/UserImage?UserId=${userId}`
+    : `${getHostname()}/Users/${userId}/Images/Primary?quality=90`;
+}
+
+function computeImageHash(buffer: Buffer): string {
+  return createHash('sha256').update(buffer).digest('hex');
+}
+
+export async function checkAvatarChanged(
+  user: User
+): Promise<{ changed: boolean; etag?: string }> {
+  try {
+    if (!user || !user.jellyfinUserId) {
+      return { changed: false };
+    }
+
+    const jellyfinAvatarUrl = getJellyfinAvatarUrl(user.jellyfinUserId);
+
+    let headResponse;
+    try {
+      headResponse = await axios.head(jellyfinAvatarUrl);
+      if (headResponse.status !== 200) {
+        return { changed: false };
+      }
+    } catch (error) {
+      return { changed: false };
+    }
+
+    const settings = getSettings();
+    let remoteVersion: string;
+    if (settings.main.mediaServerType === MediaServerType.JELLYFIN) {
+      const remoteLastModifiedStr = headResponse.headers['last-modified'] || '';
+      remoteVersion = (
+        Date.parse(remoteLastModifiedStr) || Date.now()
+      ).toString();
+    } else if (settings.main.mediaServerType === MediaServerType.EMBY) {
+      remoteVersion =
+        headResponse.headers['etag']?.replace(/"/g, '') ||
+        Date.now().toString();
+    } else {
+      remoteVersion = Date.now().toString();
+    }
+
+    if (user.avatarVersion && user.avatarVersion === remoteVersion) {
+      return { changed: false, etag: user.avatarETag ?? undefined };
+    }
+
+    const avatarImageCache = await initAvatarImageProxy();
+    await avatarImageCache.clearCachedImage(jellyfinAvatarUrl);
+    const imageData = await avatarImageCache.getImage(
+      jellyfinAvatarUrl,
+      gravatarUrl(user.email || 'none', { default: 'mm', size: 200 })
+    );
+
+    const newHash = computeImageHash(imageData.imageBuffer);
+
+    const hasChanged = user.avatarETag !== newHash;
+
+    user.avatarVersion = remoteVersion;
+    if (hasChanged) {
+      user.avatarETag = newHash;
+    }
+
+    await getRepository(User).save(user);
+
+    return { changed: hasChanged, etag: newHash };
+  } catch (error) {
+    logger.error('Error checking avatar changes', {
+      errorMessage: error.message,
+    });
+    return { changed: false };
+  }
+}
+
 router.get('/:jellyfinUserId', async (req, res) => {
  try {
    if (!req.params.jellyfinUserId.match(/^[a-f0-9]{32}$/)) {
@@ -46,6 +126,10 @@ router.get('/:jellyfinUserId', async (req, res) => {

    const avatarImageCache = await initAvatarImageProxy();

+    const userEtag = req.headers['if-none-match'];
+
+    const versionParam = req.query.v;
+
    const user = await getRepository(User).findOne({
      where: { jellyfinUserId: req.params.jellyfinUserId },
    });
@@ -55,13 +139,7 @@ router.get('/:jellyfinUserId', async (req, res) => {
      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`;
+    const jellyfinAvatarUrl = getJellyfinAvatarUrl(req.params.jellyfinUserId);

    let imageData = await avatarImageCache.getImage(
      jellyfinAvatarUrl,
@@ -73,10 +151,15 @@ router.get('/:jellyfinUserId', async (req, res) => {
      imageData = await avatarImageCache.getImage(fallbackUrl);
    }

+    if (userEtag && userEtag === `"${imageData.meta.etag}"` && !versionParam) {
+      return res.status(304).end();
+    }
+
    res.writeHead(200, {
      'Content-Type': `image/${imageData.meta.extension}`,
      'Content-Length': imageData.imageBuffer.length,
      'Cache-Control': `public, max-age=${imageData.meta.curRevalidate}`,
+      ETag: `"${imageData.meta.etag}"`,
      'OS-Cache-Key': imageData.meta.cacheKey,
      'OS-Cache-Status': imageData.meta.cacheMiss ? 'MISS' : 'HIT',
    });
--- a/server/routes/blacklist.ts
+++ b/server/routes/blacklist.ts
@@ -19,39 +19,54 @@ export const blacklistAdd = z.object({
  user: z.coerce.number(),
 });

+const blacklistGet = z.object({
+  take: z.coerce.number().int().positive().default(25),
+  skip: z.coerce.number().int().nonnegative().default(0),
+  search: z.string().optional(),
+  filter: z.enum(['all', 'manual', 'blacklistedTags']).optional(),
+});
+
 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) ?? '';
+    const { take, skip, search, filter } = blacklistGet.parse(req.query);

    try {
      let query = getRepository(Blacklist)
        .createQueryBuilder('blacklist')
-        .leftJoinAndSelect('blacklist.user', 'user');
+        .leftJoinAndSelect('blacklist.user', 'user')
+        .where('1 = 1'); // Allow use of andWhere later

-      if (search.length > 0) {
-        query = query.where('blacklist.title like :title', {
+      switch (filter) {
+        case 'manual':
+          query = query.andWhere('blacklist.blacklistedTags IS NULL');
+          break;
+        case 'blacklistedTags':
+          query = query.andWhere('blacklist.blacklistedTags IS NOT NULL');
+          break;
+      }
+
+      if (search) {
+        query = query.andWhere('blacklist.title like :title', {
          title: `%${search}%`,
        });
      }

      const [blacklistedItems, itemsCount] = await query
        .orderBy('blacklist.createdAt', 'DESC')
-        .take(pageSize)
+        .take(take)
        .skip(skip)
        .getManyAndCount();

      return res.status(200).json({
        pageInfo: {
-          pages: Math.ceil(itemsCount / pageSize),
-          pageSize,
+          pages: Math.ceil(itemsCount / take),
+          pageSize: take,
          results: itemsCount,
-          page: Math.ceil(skip / pageSize) + 1,
+          page: Math.ceil(skip / take) + 1,
        },
        results: blacklistedItems,
      } as BlacklistResultsResponse);
--- a/server/routes/discover.ts
+++ b/server/routes/discover.ts
@@ -837,7 +837,8 @@ discoverRoutes.get<Record<string, unknown>, WatchlistResponse>(
      select: ['id', 'plexToken'],
    });

-    if (activeUser) {
+    if (activeUser && !activeUser?.plexToken) {
+      // Non-Plex users can only see their own watchlist
      const [result, total] = await getRepository(Watchlist).findAndCount({
        where: { requestedBy: { id: activeUser?.id } },
        relations: {
@@ -866,6 +867,7 @@ discoverRoutes.get<Record<string, unknown>, WatchlistResponse>(
      });
    }

+    // List watchlist from Plex
    const plexTV = new PlexTvAPI(activeUser.plexToken);

    const watchlist = await plexTV.getWatchlist({ offset });
--- a/server/routes/imageproxy.ts
+++ b/server/routes/imageproxy.ts
@@ -5,6 +5,7 @@ import { Router } from 'express';
 const router = Router();
 const tmdbImageProxy = new ImageProxy('tmdb', 'https://image.tmdb.org', {
  rateLimitOptions: {
+    maxRequests: 20,
    maxRPS: 50,
  },
 });
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -55,7 +55,7 @@ router.get<unknown, StatusResponse>('/status', async (req, res) => {
  let commitsBehind = 0;

  if (currentVersion.startsWith('develop-') && commitTag !== 'local') {
-    const commits = await githubApi.getOverseerrCommits();
+    const commits = await githubApi.getJellyseerrCommits();

    if (commits.length) {
      const filteredCommits = commits.filter(
@@ -74,7 +74,7 @@ router.get<unknown, StatusResponse>('/status', async (req, res) => {
      }
    }
  } else if (commitTag !== 'local') {
-    const releases = await githubApi.getOverseerrReleases();
+    const releases = await githubApi.getJellyseerrReleases();

    if (releases.length) {
      const latestVersion = releases[0];
@@ -403,7 +403,7 @@ router.get('/watchproviders/tv', async (req, res, next) => {

 router.get('/', (_req, res) => {
  return res.status(200).json({
-    api: 'Overseerr API',
+    api: 'Jellyseerr API',
    version: '1.0',
  });
 });
--- a/server/routes/request.ts
+++ b/server/routes/request.ts
@@ -189,7 +189,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
      );

      // add profile names to the media requests, with undefined if not found
-      const requestsWithProfileNames = requests.map((r) => {
+      let mappedRequests = requests.map((r) => {
        switch (r.type) {
          case MediaType.MOVIE: {
            const profileName = radarrServers
@@ -212,6 +212,36 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
        }
      });

+      // add canRemove prop if user has permission
+      if (req.user?.hasPermission(Permission.MANAGE_REQUESTS)) {
+        mappedRequests = mappedRequests.map((r) => {
+          switch (r.type) {
+            case MediaType.MOVIE: {
+              return {
+                ...r,
+                // check if the radarr server for this request is configured
+                canRemove: radarrServers.some(
+                  (server) =>
+                    server.id ===
+                    (r.is4k ? r.media.serviceId4k : r.media.serviceId)
+                ),
+              };
+            }
+            case MediaType.TV: {
+              return {
+                ...r,
+                // check if the sonarr server for this request is configured
+                canRemove: sonarrServers.some(
+                  (server) =>
+                    server.id ===
+                    (r.is4k ? r.media.serviceId4k : r.media.serviceId)
+                ),
+              };
+            }
+          }
+        });
+      }
+
      return res.status(200).json({
        pageInfo: {
          pages: Math.ceil(requestCount / pageSize),
@@ -219,7 +249,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
          results: requestCount,
          page: Math.ceil(skip / pageSize) + 1,
        },
-        results: requestsWithProfileNames,
+        results: mappedRequests,
      });
    } catch (e) {
      next({ status: 500, message: e.message });
@@ -539,6 +569,31 @@ requestRoutes.delete('/:requestId', async (req, res, next) => {

    await requestRepository.remove(request);

+    const mediaRepository = getRepository(Media);
+
+    const media = await mediaRepository.findOne({
+      where: { id: request.media.id },
+      relations: { requests: true },
+    });
+
+    if (media) {
+      if (
+        !media.requests.some((r) => !r.is4k) &&
+        media.status !== MediaStatus.AVAILABLE
+      ) {
+        media.status = MediaStatus.UNKNOWN;
+      }
+
+      if (
+        !media.requests.some((r) => r.is4k) &&
+        media.status4k !== MediaStatus.AVAILABLE
+      ) {
+        media.status4k = MediaStatus.UNKNOWN;
+      }
+
+      await mediaRepository.save(media);
+    }
+
    return res.status(204).send();
  } catch (e) {
    logger.error('Something went wrong deleting a request.', {
--- a/server/routes/settings/index.ts
+++ b/server/routes/settings/index.ts
@@ -352,7 +352,7 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
      const account = await jellyfinClient.getUser();

      // Automatic Library grouping is not supported when user views are used to get library
-      if (account.Configuration.GroupedFolders.length > 0) {
+      if (account.Configuration.GroupedFolders?.length > 0) {
        return next({
          status: 501,
          message: ApiErrorCode.SyncErrorGroupedFolders,
--- a/server/routes/user/index.ts
+++ b/server/routes/user/index.ts
@@ -32,7 +32,14 @@ const router = Router();

 router.get('/', async (req, res, next) => {
  try {
-    const pageSize = req.query.take ? Number(req.query.take) : 10;
+    const includeIds = [
+      ...new Set(
+        req.query.includeIds ? req.query.includeIds.toString().split(',') : []
+      ),
+    ];
+    const pageSize = req.query.take
+      ? Number(req.query.take)
+      : Math.max(10, includeIds.length);
    const skip = req.query.skip ? Number(req.query.skip) : 0;
    const q = req.query.q ? req.query.q.toString().toLowerCase() : '';
    let query = getRepository(User).createQueryBuilder('user');
@@ -44,27 +51,33 @@ router.get('/', async (req, res, next) => {
      );
    }

+    if (includeIds.length > 0) {
+      query.andWhereInIds(includeIds);
+    }
+
    switch (req.query.sort) {
      case 'updated':
        query = query.orderBy('user.updatedAt', 'DESC');
        break;
      case 'displayname':
-        query = query.orderBy(
-          `CASE WHEN (user.username IS NULL OR user.username = '') THEN (
-             CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN (
-               CASE WHEN (user.jellyfinUsername IS NULL OR user.jellyfinUsername = '') THEN
-                 "user"."email"
-               ELSE
-                 LOWER(user.jellyfinUsername)
-               END)
-             ELSE
-               LOWER(user.jellyfinUsername)
-             END)
-           ELSE
-             LOWER(user.username)
-           END`,
-          'ASC'
-        );
+        query = query
+          .addSelect(
+            `CASE WHEN (user.username IS NULL OR user.username = '') THEN (
+              CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN (
+                CASE WHEN (user.jellyfinUsername IS NULL OR user.jellyfinUsername = '') THEN
+                  "user"."email"
+                ELSE
+                  LOWER(user.jellyfinUsername)
+                END)
+              ELSE
+                LOWER(user.jellyfinUsername)
+              END)
+            ELSE
+              LOWER(user.username)
+            END`,
+            'displayname_sort_key'
+          )
+          .orderBy('displayname_sort_key', 'ASC');
        break;
      case 'requests':
        query = query
@@ -84,6 +97,7 @@ router.get('/', async (req, res, next) => {
    const [users, userCount] = await query
      .take(pageSize)
      .skip(skip)
+      .distinct(true)
      .getManyAndCount();

    return res.status(200).json({
@@ -170,13 +184,15 @@ router.post<
    endpoint: string;
    p256dh: string;
    auth: string;
+    userAgent: string;
  }
 >('/registerPushSubscription', async (req, res, next) => {
  try {
    const userPushSubRepository = getRepository(UserPushSubscription);

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

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

@@ -205,6 +222,79 @@ router.post<
  }
 });

+router.get<{ userId: number }>(
+  '/:userId/pushSubscriptions',
+  async (req, res, next) => {
+    try {
+      const userPushSubRepository = getRepository(UserPushSubscription);
+
+      const userPushSubs = await userPushSubRepository.find({
+        relations: { user: true },
+        where: { user: { id: req.params.userId } },
+      });
+
+      return res.status(200).json(userPushSubs);
+    } catch (e) {
+      next({ status: 404, message: 'User subscriptions not found.' });
+    }
+  }
+);
+
+router.get<{ userId: number; key: string }>(
+  '/:userId/pushSubscription/:key',
+  async (req, res, next) => {
+    try {
+      const userPushSubRepository = getRepository(UserPushSubscription);
+
+      const userPushSub = await userPushSubRepository.findOneOrFail({
+        relations: {
+          user: true,
+        },
+        where: {
+          user: { id: req.params.userId },
+          p256dh: req.params.key,
+        },
+      });
+
+      return res.status(200).json(userPushSub);
+    } catch (e) {
+      next({ status: 404, message: 'User subscription not found.' });
+    }
+  }
+);
+
+router.delete<{ userId: number; key: string }>(
+  '/:userId/pushSubscription/:key',
+  async (req, res, next) => {
+    try {
+      const userPushSubRepository = getRepository(UserPushSubscription);
+
+      const userPushSub = await userPushSubRepository.findOneOrFail({
+        relations: {
+          user: true,
+        },
+        where: {
+          user: { id: req.params.userId },
+          p256dh: req.params.key,
+        },
+      });
+
+      await userPushSubRepository.remove(userPushSub);
+      return res.status(204).send();
+    } catch (e) {
+      logger.error('Something went wrong deleting the user push subcription', {
+        label: 'API',
+        key: req.params.key,
+        errorMessage: e.message,
+      });
+      return next({
+        status: 500,
+        message: 'User push subcription not found',
+      });
+    }
+  }
+);
+
 router.get<{ id: string }>('/:id', async (req, res, next) => {
  try {
    const userRepository = getRepository(User);
--- a/server/routes/user/usersettings.ts
+++ b/server/routes/user/usersettings.ts
@@ -1,4 +1,7 @@
+import JellyfinAPI from '@server/api/jellyfin';
+import PlexTvAPI from '@server/api/plextv';
 import { ApiErrorCode } from '@server/constants/error';
+import { MediaServerType } from '@server/constants/server';
 import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
 import { User } from '@server/entity/User';
@@ -12,9 +15,23 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
 import { ApiError } from '@server/types/error';
+import { getHostname } from '@server/utils/getHostname';
 import { Router } from 'express';
+import net from 'net';
 import { canMakePermissionsChange } from '.';

+const isOwnProfile = (): Middleware => {
+  return (req, res, next) => {
+    if (req.user?.id !== Number(req.params.id)) {
+      return next({
+        status: 403,
+        message: "You do not have permission to view this user's settings.",
+      });
+    }
+    next();
+  };
+};
+
 const isOwnProfileOrAdmin = (): Middleware => {
  const authMiddleware: Middleware = (req, res, next) => {
    if (
@@ -102,28 +119,10 @@ userSettingsRoutes.post<
    }

    const oldEmail = user.email;
-    const oldUsername = user.username;
    user.username = req.body.username;
-    if (user.jellyfinUsername) {
+    if (user.userType !== UserType.PLEX) {
      user.email = req.body.email || user.jellyfinUsername || user.email;
    }
-    // Edge case for local users, because they have no Jellyfin username to fall back on
-    // if the email is not provided
-    if (user.userType === UserType.LOCAL) {
-      if (req.body.email) {
-        user.email = req.body.email;
-        if (
-          !user.username &&
-          user.email !== oldEmail &&
-          !oldEmail.includes('@')
-        ) {
-          user.username = oldEmail;
-        }
-      } else if (req.body.username) {
-        user.email = oldUsername || user.email;
-        user.username = req.body.username;
-      }
-    }

    const existingUser = await userRepository.findOne({
      where: { email: user.email },
@@ -183,9 +182,8 @@ userSettingsRoutes.post<
        status: e.statusCode,
        message: e.errorCode,
      });
-    } else {
-      return next({ status: 500, message: e.message });
    }
+    return next({ status: 500, message: e.message });
  }
 });

@@ -290,6 +288,260 @@ userSettingsRoutes.post<
  }
 });

+userSettingsRoutes.post<{ authToken: string }>(
+  '/linked-accounts/plex',
+  isOwnProfile(),
+  async (req, res) => {
+    const settings = getSettings();
+    const userRepository = getRepository(User);
+
+    if (!req.user) {
+      return res.status(404).json({ code: ApiErrorCode.Unauthorized });
+    }
+    // Make sure Plex login is enabled
+    if (settings.main.mediaServerType !== MediaServerType.PLEX) {
+      return res.status(500).json({ message: 'Plex login is disabled' });
+    }
+
+    // First we need to use this auth token to get the user's email from plex.tv
+    const plextv = new PlexTvAPI(req.body.authToken);
+    const account = await plextv.getUser();
+
+    // Do not allow linking of an already linked account
+    if (await userRepository.exist({ where: { plexId: account.id } })) {
+      return res.status(422).json({
+        message: 'This Plex account is already linked to a Jellyseerr user',
+      });
+    }
+
+    const user = req.user;
+
+    // Emails do not match
+    if (user.email !== account.email) {
+      return res.status(422).json({
+        message:
+          'This Plex account is registered under a different email address.',
+      });
+    }
+
+    // valid plex user found, link to current user
+    user.userType = UserType.PLEX;
+    user.plexId = account.id;
+    user.plexUsername = account.username;
+    user.plexToken = account.authToken;
+    await userRepository.save(user);
+
+    return res.status(204).send();
+  }
+);
+
+userSettingsRoutes.delete<{ id: string }>(
+  '/linked-accounts/plex',
+  isOwnProfileOrAdmin(),
+  async (req, res) => {
+    const settings = getSettings();
+    const userRepository = getRepository(User);
+
+    // Make sure Plex login is enabled
+    if (settings.main.mediaServerType !== MediaServerType.PLEX) {
+      return res.status(500).json({ message: 'Plex login is disabled' });
+    }
+
+    try {
+      const user = await userRepository
+        .createQueryBuilder('user')
+        .addSelect('user.password')
+        .where({
+          id: Number(req.params.id),
+        })
+        .getOne();
+
+      if (!user) {
+        return res.status(404).json({ message: 'User not found.' });
+      }
+
+      if (user.id === 1) {
+        return res.status(400).json({
+          message:
+            'Cannot unlink media server accounts for the primary administrator.',
+        });
+      }
+
+      if (!user.email || !user.password) {
+        return res.status(400).json({
+          message: 'User does not have a local email or password set.',
+        });
+      }
+
+      user.userType = UserType.LOCAL;
+      user.plexId = null;
+      user.plexUsername = null;
+      user.plexToken = null;
+      await userRepository.save(user);
+
+      return res.status(204).send();
+    } catch (e) {
+      return res.status(500).json({ message: e.message });
+    }
+  }
+);
+
+userSettingsRoutes.post<{ username: string; password: string }>(
+  '/linked-accounts/jellyfin',
+  isOwnProfile(),
+  async (req, res) => {
+    const settings = getSettings();
+    const userRepository = getRepository(User);
+
+    if (!req.user) {
+      return res.status(401).json({ code: ApiErrorCode.Unauthorized });
+    }
+    // Make sure jellyfin login is enabled
+    if (
+      settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
+      settings.main.mediaServerType !== MediaServerType.EMBY
+    ) {
+      return res
+        .status(500)
+        .json({ message: 'Jellyfin/Emby login is disabled' });
+    }
+
+    // Do not allow linking of an already linked account
+    if (
+      await userRepository.exist({
+        where: { jellyfinUsername: req.body.username },
+      })
+    ) {
+      return res.status(422).json({
+        message: 'The specified account is already linked to a Jellyseerr user',
+      });
+    }
+
+    const hostname = getHostname();
+    const deviceId = Buffer.from(
+      `BOT_jellyseerr_${req.user.username ?? ''}`
+    ).toString('base64');
+
+    const jellyfinserver = new JellyfinAPI(hostname, undefined, deviceId);
+
+    const ip = req.ip;
+    let clientIp: string | undefined;
+    if (ip) {
+      if (net.isIPv4(ip)) {
+        clientIp = ip;
+      } else if (net.isIPv6(ip)) {
+        clientIp = ip.startsWith('::ffff:') ? ip.substring(7) : ip;
+      }
+    }
+
+    try {
+      const account = await jellyfinserver.login(
+        req.body.username,
+        req.body.password,
+        clientIp
+      );
+
+      // Do not allow linking of an already linked account
+      if (
+        await userRepository.exist({
+          where: { jellyfinUserId: account.User.Id },
+        })
+      ) {
+        return res.status(422).json({
+          message:
+            'The specified account is already linked to a Jellyseerr user',
+        });
+      }
+
+      const user = req.user;
+
+      // valid jellyfin user found, link to current user
+      user.userType =
+        settings.main.mediaServerType === MediaServerType.EMBY
+          ? UserType.EMBY
+          : UserType.JELLYFIN;
+      user.jellyfinUserId = account.User.Id;
+      user.jellyfinUsername = account.User.Name;
+      user.jellyfinAuthToken = account.AccessToken;
+      user.jellyfinDeviceId = deviceId;
+      await userRepository.save(user);
+
+      return res.status(204).send();
+    } catch (e) {
+      logger.error('Failed to link account to user.', {
+        label: 'API',
+        ip: req.ip,
+        error: e,
+      });
+      if (
+        e instanceof ApiError &&
+        e.errorCode === ApiErrorCode.InvalidCredentials
+      ) {
+        return res.status(401).json({ code: e.errorCode });
+      }
+
+      return res.status(500).send();
+    }
+  }
+);
+
+userSettingsRoutes.delete<{ id: string }>(
+  '/linked-accounts/jellyfin',
+  isOwnProfileOrAdmin(),
+  async (req, res) => {
+    const settings = getSettings();
+    const userRepository = getRepository(User);
+
+    // Make sure jellyfin login is enabled
+    if (
+      settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
+      settings.main.mediaServerType !== MediaServerType.EMBY
+    ) {
+      return res
+        .status(500)
+        .json({ message: 'Jellyfin/Emby login is disabled' });
+    }
+
+    try {
+      const user = await userRepository
+        .createQueryBuilder('user')
+        .addSelect('user.password')
+        .where({
+          id: Number(req.params.id),
+        })
+        .getOne();
+
+      if (!user) {
+        return res.status(404).json({ message: 'User not found.' });
+      }
+
+      if (user.id === 1) {
+        return res.status(400).json({
+          message:
+            'Cannot unlink media server accounts for the primary administrator.',
+        });
+      }
+
+      if (!user.email || !user.password) {
+        return res.status(400).json({
+          message: 'User does not have a local email or password set.',
+        });
+      }
+
+      user.userType = UserType.LOCAL;
+      user.jellyfinUserId = null;
+      user.jellyfinUsername = null;
+      user.jellyfinAuthToken = null;
+      user.jellyfinDeviceId = null;
+      await userRepository.save(user);
+
+      return res.status(204).send();
+    } catch (e) {
+      return res.status(500).json({ message: e.message });
+    }
+  }
+);
+
 userSettingsRoutes.get<{ id: string }, UserSettingsNotificationsResponse>(
  '/notifications',
  isOwnProfileOrAdmin(),
--- a/server/types/custom.d.ts
+++ b/server/types/custom.d.ts
@@ -0,0 +1,4 @@
+declare module '@dr.pogodin/csurf' {
+  import csrf = require('csurf');
+  export = csrf;
+}
--- a/server/utils/customProxyAgent.ts
+++ b/server/utils/customProxyAgent.ts
@@ -1,5 +1,6 @@
 import type { ProxySettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import axios from 'axios';
 import type { Dispatcher } from 'undici';
 import { Agent, ProxyAgent, setGlobalDispatcher } from 'undici';

@@ -8,8 +9,9 @@ export default async function createCustomProxyAgent(
 ) {
  const defaultAgent = new Agent({ keepAliveTimeout: 5000 });

-  const skipUrl = (url: string) => {
-    const hostname = new URL(url).hostname;
+  const skipUrl = (url: string | URL) => {
+    const hostname =
+      typeof url === 'string' ? new URL(url).hostname : url.hostname;

    if (proxySettings.bypassLocalAddresses && isLocalAddress(hostname)) {
      return true;
@@ -38,8 +40,7 @@ export default async function createCustomProxyAgent(
    dispatch: Dispatcher['dispatch']
  ): Dispatcher['dispatch'] => {
    return (opts, handler) => {
-      const url = opts.origin?.toString();
-      return url && skipUrl(url)
+      return opts.origin && skipUrl(opts.origin)
        ? defaultAgent.dispatch(opts, handler)
        : dispatch(opts, handler);
    };
@@ -60,13 +61,10 @@ export default async function createCustomProxyAgent(
        ':' +
        proxySettings.port,
      token,
-      interceptors: {
-        Client: [noProxyInterceptor],
-      },
      keepAliveTimeout: 5000,
    });

-    setGlobalDispatcher(proxyAgent);
+    setGlobalDispatcher(proxyAgent.compose(noProxyInterceptor));
  } catch (e) {
    logger.error('Failed to connect to the proxy: ' + e.message, {
      label: 'Proxy',
@@ -76,15 +74,8 @@ export default async function createCustomProxyAgent(
  }

  try {
-    const res = await fetch('https://www.google.com', { method: 'HEAD' });
-    if (res.ok) {
-      logger.debug('HTTP(S) proxy connected successfully', { label: 'Proxy' });
-    } else {
-      logger.error('Proxy responded, but with a non-OK status: ' + res.status, {
-        label: 'Proxy',
-      });
-      setGlobalDispatcher(defaultAgent);
-    }
+    await axios.head('https://www.google.com');
+    logger.debug('HTTP(S) proxy connected successfully', { label: 'Proxy' });
  } catch (e) {
    logger.error(
      'Failed to connect to the proxy: ' + e.message + ': ' + e.cause,
@@ -95,7 +86,11 @@ export default async function createCustomProxyAgent(
 }

 function isLocalAddress(hostname: string) {
-  if (hostname === 'localhost' || hostname === '127.0.0.1') {
+  if (
+    hostname === 'localhost' ||
+    hostname === '127.0.0.1' ||
+    hostname === '::1'
+  ) {
    return true;
  }

--- a/server/utils/rateLimit.ts
+++ b/server/utils/rateLimit.ts
@@ -1,68 +0,0 @@
-export type RateLimitOptions = {
-  maxRPS: number;
-  id?: string;
-};
-
-type RateLimiteState<T extends (...args: Parameters<T>) => Promise<U>, U> = {
-  queue: {
-    args: Parameters<T>;
-    resolve: (value: U) => void;
-    reject: (reason?: unknown) => void;
-  }[];
-  lastTimestamps: number[];
-  timeout: ReturnType<typeof setTimeout>;
-};
-
-const rateLimitById: Record<string, unknown> = {};
-
-/**
- * Add a rate limit to a function so it doesn't exceed a maximum number of requests per second. Function calls exceeding the rate will be delayed.
- * @param fn The function to rate limit
- * @param options.maxRPS Maximum number of Requests Per Second
- * @param options.id An ID to share between rate limits, so it uses the same request queue.
- * @returns The function with a rate limit
- */
-export default function rateLimit<
-  T extends (...args: Parameters<T>) => Promise<U>,
-  U
->(fn: T, options: RateLimitOptions): (...args: Parameters<T>) => Promise<U> {
-  const state: RateLimiteState<T, U> = (rateLimitById[
-    options.id || ''
-  ] as RateLimiteState<T, U>) || { queue: [], lastTimestamps: [] };
-  if (options.id) {
-    rateLimitById[options.id] = state;
-  }
-
-  const processQueue = () => {
-    // remove old timestamps
-    state.lastTimestamps = state.lastTimestamps.filter(
-      (timestamp) => Date.now() - timestamp < 1000
-    );
-
-    if (state.lastTimestamps.length < options.maxRPS) {
-      // process requests if RPS not exceeded
-      const item = state.queue.shift();
-      if (!item) return;
-      state.lastTimestamps.push(Date.now());
-      const { args, resolve, reject } = item;
-      fn(...args)
-        .then(resolve)
-        .catch(reject);
-      processQueue();
-    } else {
-      // rerun once the oldest item in queue is older than 1s
-      if (state.timeout) clearTimeout(state.timeout);
-      state.timeout = setTimeout(
-        processQueue,
-        1000 - (Date.now() - state.lastTimestamps[0])
-      );
-    }
-  };
-
-  return (...args: Parameters<T>): Promise<U> => {
-    return new Promise<U>((resolve, reject) => {
-      state.queue.push({ args, resolve, reject });
-      processQueue();
-    });
-  };
-}
--- a/server/utils/restartFlag.ts
+++ b/server/utils/restartFlag.ts
@@ -17,9 +17,7 @@ class RestartFlag {
    return (
      this.networkSettings.csrfProtection !== networkSettings.csrfProtection ||
      this.networkSettings.trustProxy !== networkSettings.trustProxy ||
-      this.networkSettings.proxy.enabled !== networkSettings.proxy.enabled ||
-      this.networkSettings.forceIpv4First !== networkSettings.forceIpv4First ||
-      this.networkSettings.dnsServers !== networkSettings.dnsServers
+      this.networkSettings.proxy.enabled !== networkSettings.proxy.enabled
    );
  }
 }
--- a/src/assets/services/jellyfin-icon.svg
+++ b/src/assets/services/jellyfin-icon.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+  - Part of the Jellyfin project (https://jellyfin.media)
+  - 
+  - All copyright belongs to the Jellyfin contributors; a full list can
+  - be found in the file CONTRIBUTORS.md
+  - 
+  - This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
+  - To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.
+- ***** END LICENSE BLOCK ***** -->
+<svg version="1.1" id="icon-transparent" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 512 512">
+	<defs>
+		<linearGradient id="linear-gradient" gradientUnits="userSpaceOnUse" x1="110.25" y1="213.3" x2="496.14" y2="436.09">
+			<stop offset="0" style="stop-color:#AA5CC3"/>
+			<stop offset="1" style="stop-color:#00A4DC"/>
+		</linearGradient>
+	</defs>
+	<title>icon-transparent</title>
+	<g id="icon-transparent">
+		<path id="inner-shape" d="M256,201.6c-20.4,0-86.2,119.3-76.2,139.4s142.5,19.9,152.4,0S276.5,201.6,256,201.6z" fill="url(#linear-gradient)"/>
+		<path id="outer-shape" d="M256,23.3c-61.6,0-259.8,359.4-229.6,420.1s429.3,60,459.2,0S317.6,23.3,256,23.3z
+		M406.5,390.8c-19.6,39.3-281.1,39.8-300.9,0s110.1-275.3,150.4-275.3S426.1,351.4,406.5,390.8z" fill="url(#linear-gradient)"/>
+	</g>
+</svg>
--- a/src/assets/services/plex.svg
+++ b/src/assets/services/plex.svg
@@ -1,85 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 26.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 361 157">
+  <defs>
+    <style>
+      .cls-1 {
+      fill: #fff;
+      }

-<svg
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:cc="http://creativecommons.org/ns#"
-  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:svg="http://www.w3.org/2000/svg"
-  xmlns="http://www.w3.org/2000/svg"
-  xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-  xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-  version="1.1"
-  id="plex-logo"
-  x="0px"
-  y="0px"
-  viewBox="0 0 1000 460.89727"
-  xml:space="preserve"
-  sodipodi:docname="plex-logo.svg"
-  inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
-   id="metadata25"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs23">
-	</defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#111111"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1920"
-   inkscape:window-height="1017"
-   id="namedview21"
-   showgrid="false"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"
-   inkscape:zoom="0.27956081"
-   inkscape:cx="783.06912"
-   inkscape:cy="-132.85701"
-   inkscape:window-x="1912"
-   inkscape:window-y="-8"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="plex-logo" />
-<style
-   type="text/css"
-   id="style2">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#EBAF00;}
-</style>
-<path
-   class="st0"
-   d="m 164.18919,82.43243 c -39.86487,0 -65.540543,11.48648 -87.162163,38.51351 V 91.21621 H 0 v 366.21621 c 0,0 1.3513514,0.67567 5.4054053,1.35135 5.4054057,1.35135 33.7837827,7.43243 54.7297287,-10.13514 18.243244,-15.54054 22.297295,-33.78378 22.297295,-54.05405 v -52.7027 c 22.297301,23.64864 47.297301,33.78378 82.432431,33.78378 75.67567,0 133.78378,-61.48648 133.78378,-143.24323 0,-88.51352 -56.08108,-150 -134.45945,-150 z m -14.86487,223.64864 c -42.56756,0 -76.351351,-35.13513 -76.351351,-77.7027 0,-41.89189 39.864871,-75.67567 76.351351,-75.67567 43.24324,0 76.35135,33.1081 76.35135,76.35135 0,43.24324 -33.78378,77.02702 -76.35135,77.02702 z"
-   id="path4"
-   inkscape:connector-curvature="0"
-   style="fill:#ffffff;stroke-width:6.75675678" /><path
-   class="st0"
-   d="m 408.1081,223.64864 c 0,31.75676 3.37838,70.27027 34.45946,112.16216 0.67567,0.67567 2.02702,2.7027 2.02702,2.7027 -12.83783,21.62162 -28.37837,36.48648 -49.32432,36.48648 -16.21622,0 -32.43243,-8.78378 -45.94595,-23.64864 -14.18918,-16.21622 -20.94594,-37.16216 -20.94594,-59.45946 V 0 h 79.05405 z"
-   id="path6"
-   inkscape:connector-curvature="0"
-   style="fill:#ffffff;stroke-width:6.75675678" /><polygon
-   class="st1"
-   points="117.9,33.9 104.1,13.5 118.3,13.5 132,33.9 118.3,54.2 104.1,54.2 "
-   id="polygon8"
-   style="fill:#ebaf00"
-   transform="scale(6.7567568)" /><polygon
-   class="st0"
-   points="135.7,31.6 148,13.5 133.8,13.5 128.7,21 "
-   id="polygon10"
-   style="fill:#ffffff"
-   transform="scale(6.7567568)" /><path
-   class="st0"
-   d="m 869.59458,316.2162 c 0,0 16.2162,22.2973 16.2162,22.2973 15.54058,24.32432 35.8108,36.48648 59.45949,36.48648 25,-0.67567 42.56752,-22.29729 49.3243,-30.4054 0,0 -12.16218,-10.81081 -27.7027,-29.05405 -20.94598,-24.32432 -48.64868,-68.91892 -49.3243,-70.94594 z"
-   id="path12"
-   inkscape:connector-curvature="0"
-   style="fill:#ffffff;stroke-width:6.75675678" /><path
-   style="fill:#ffffff;stroke-width:6.75675678"
-   inkscape:connector-curvature="0"
-   id="path16"
-   d="m 632.43242,287.16215 c -16.21622,14.86486 -27.02703,22.97297 -49.32432,22.97297 -39.86487,0 -62.83784,-28.37837 -66.21622,-59.45945 h 211.4865 c 1.35131,-4.05406 2.027,-9.45946 2.027,-18.24324 0,-85.81082 -62.83783,-150 -145.27026,-150 -78.37837,0 -142.56756,65.54054 -142.56756,147.29729 0,81.08108 64.18919,145.27026 144.59459,145.27026 56.08108,0 104.72973,-31.75675 131.08105,-87.83783 z M 585.8108,147.29729 c 35.13513,0 61.48648,22.97297 67.56756,53.37838 H 519.59458 c 6.75676,-31.75676 31.75676,-53.37838 66.21622,-53.37838 z"
-   class="st0" />
+      .cls-2 {
+      fill: #eaaf20;
+      }
+    </style>
+  </defs>
+  <!-- Generator: Adobe Illustrator 28.7.1, SVG Export Plug-In . SVG Version: 1.2.0 Build 142)  -->
+  <g>
+    <g id="Layer_1">
+      <path id="path4" class="cls-1"
+        d="M60.6,28.8c-14.3,0-23.5,3.9-31.3,13v-10H1.6v123.7s.5.2,1.9.5c1.9.5,12.1,2.5,19.6-3.4,6.5-5.3,8-11.4,8-18.3v-17.8c8,8,17,11.4,29.6,11.4,27.2,0,48-20.8,48-48.4s-20.1-50.7-48.3-50.7h0ZM55.2,104.3c-15.3,0-27.4-11.9-27.4-26.3s14.3-25.6,27.4-25.6,27.4,11.2,27.4,25.8-12.1,26-27.4,26Z" />
+      <path id="path6" class="cls-1"
+        d="M148.1,76.5c0,10.7,1.2,23.7,12.4,37.9.2.2.7.9.7.9-4.6,7.3-10.2,12.3-17.7,12.3s-11.6-3-16.5-8c-5.1-5.5-7.5-12.6-7.5-20.1V.9h28.4l.2,75.6Z" />
+      <polygon id="polygon8" class="cls-2"
+        points="287.6 78.3 254.1 31.7 288.6 31.7 321.8 78.3 288.6 124.6 254.1 124.6 287.6 78.3" />
+      <polygon id="polygon10" class="cls-1"
+        points="330.8 73 360.6 31.7 326.2 31.7 313.8 48.9 330.8 73" />
+      <path id="path12" class="cls-1"
+        d="M313.8,107.7l5.8,7.5c5.6,8.2,12.9,12.3,21.3,12.3,9-.2,15.3-7.5,17.7-10.3,0,0-4.4-3.7-9.9-9.8-7.5-8.2-17.5-23.3-17.7-24l-17.2,24.2Z" />
+      <path id="path16" class="cls-1"
+        d="M228.7,97.9c-5.8,5-9.7,7.8-17.7,7.8-14.3,0-22.6-9.6-23.8-20.1h75.9c.5-1.4.7-3.2.7-6.2,0-29-22.6-50.7-52.2-50.7s-51.2,22.1-51.2,49.8,23,49.1,51.9,49.1,37.6-10.7,47.1-29.7h-30.8ZM211.9,50.7c12.6,0,22.1,7.8,24.3,18h-48c2.4-10.7,11.4-18,23.8-18h0Z" />
+      <path id="path4-2" data-name="path4" class="cls-1"
+        d="M59.3,28.2c-14.3,0-23.5,3.9-31.3,13v-10H.4v123.7s.5.2,1.9.5c1.9.5,12.1,2.5,19.6-3.4,6.5-5.3,8-11.4,8-18.3v-17.8c8,8,17,11.4,29.6,11.4,27.2,0,48-20.8,48-48.4s-20.1-50.7-48.3-50.7h0ZM54,103.8c-15.3,0-27.4-11.9-27.4-26.3s14.3-25.6,27.4-25.6,27.4,11.2,27.4,25.8-12.1,26-27.4,26Z" />
+      <path id="path6-2" data-name="path6" class="cls-1"
+        d="M146.9,75.9c0,10.7,1.2,23.7,12.4,37.9.2.2.7.9.7.9-4.6,7.3-10.2,12.3-17.7,12.3s-11.6-3-16.5-8c-5.1-5.5-7.5-12.6-7.5-20.1V.4h28.4l.2,75.6Z" />
+      <polygon id="polygon8-2" data-name="polygon8" class="cls-2"
+        points="286.4 77.8 252.9 31.2 287.3 31.2 320.6 77.8 287.3 124.1 252.9 124.1 286.4 77.8" />
+      <polygon id="polygon10-2" data-name="polygon10" class="cls-1"
+        points="329.5 72.5 359.4 31.2 324.9 31.2 312.6 48.3 329.5 72.5" />
+      <path id="path12-2" data-name="path12" class="cls-1"
+        d="M312.6,107.2l5.8,7.5c5.6,8.2,12.9,12.3,21.3,12.3,9-.2,15.3-7.5,17.7-10.3,0,0-4.4-3.7-9.9-9.8-7.5-8.2-17.5-23.3-17.7-24l-17.2,24.2Z" />
+      <path id="path16-2" data-name="path16" class="cls-1"
+        d="M227.4,97.4c-5.8,5-9.7,7.8-17.7,7.8-14.3,0-22.6-9.6-23.8-20.1h75.9c.5-1.4.7-3.2.7-6.2,0-29-22.6-50.7-52.2-50.7s-51.2,22.1-51.2,49.8,23,49.1,51.9,49.1,37.6-10.7,47.1-29.7h-30.8ZM210.7,50.1c12.6,0,22.1,7.8,24.3,18h-48c2.4-10.7,11.4-18,23.8-18h0Z" />
+    </g>
+  </g>
 </svg>
--- a/src/components/AirDateBadge/index.tsx
+++ b/src/components/AirDateBadge/index.tsx
@@ -17,13 +17,10 @@ const AirDateBadge = ({ airDate }: AirDateBadgeProps) => {
  const dAirDate = new Date(airDate);
  const nowDate = new Date();
  const alreadyAired = dAirDate.getTime() < nowDate.getTime();
-
  const compareWeek = new Date(
    alreadyAired ? Date.now() - WEEK : Date.now() + WEEK
  );
-
  let showRelative = false;
-
  if (
    (alreadyAired && dAirDate.getTime() > compareWeek.getTime()) ||
    (!alreadyAired && dAirDate.getTime() < compareWeek.getTime())
@@ -31,6 +28,10 @@ const AirDateBadge = ({ airDate }: AirDateBadgeProps) => {
    showRelative = true;
  }

+  const diffInDays = Math.round(
+    (dAirDate.getTime() - nowDate.getTime()) / (1000 * 60 * 60 * 24)
+  );
+
  return (
    <div className="flex items-center space-x-2">
      <Badge badgeType="light">
@@ -48,9 +49,9 @@ const AirDateBadge = ({ airDate }: AirDateBadgeProps) => {
            {
              relativeTime: (
                <FormattedRelativeTime
-                  value={(dAirDate.getTime() - Date.now()) / 1000}
+                  value={diffInDays}
+                  unit="day"
                  numeric="auto"
-                  updateIntervalInSeconds={1}
                />
              ),
            }
--- a/src/components/Blacklist/index.tsx
+++ b/src/components/Blacklist/index.tsx
@@ -1,3 +1,4 @@
+import BlacklistedTagsBadge from '@app/components/BlacklistedTagsBadge';
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
@@ -14,6 +15,7 @@ import defineMessages from '@app/utils/defineMessages';
 import {
  ChevronLeftIcon,
  ChevronRightIcon,
+  FunnelIcon,
  MagnifyingGlassIcon,
  TrashIcon,
 } from '@heroicons/react/24/solid';
@@ -23,6 +25,7 @@ import type {
 } from '@server/interfaces/api/blacklistInterfaces';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import type { ChangeEvent } from 'react';
@@ -41,8 +44,17 @@ const messages = defineMessages('components.Blacklist', {
  blacklistdate: 'date',
  blacklistedby: '{date} by {user}',
  blacklistNotFoundError: '<strong>{title}</strong> is not blacklisted.',
+  filterManual: 'Manual',
+  filterBlacklistedTags: 'Blacklisted Tags',
+  showAllBlacklisted: 'Show All Blacklisted Media',
 });

+enum Filter {
+  ALL = 'all',
+  MANUAL = 'manual',
+  BLACKLISTEDTAGS = 'blacklistedTags',
+}
+
 const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
  return (movie as MovieDetails).title !== undefined;
 };
@@ -51,6 +63,7 @@ const Blacklist = () => {
  const [currentPageSize, setCurrentPageSize] = useState<number>(10);
  const [searchFilter, debouncedSearchFilter, setSearchFilter] =
    useDebouncedState('');
+  const [currentFilter, setCurrentFilter] = useState<Filter>(Filter.MANUAL);
  const router = useRouter();
  const intl = useIntl();

@@ -63,9 +76,11 @@ const Blacklist = () => {
    error,
    mutate: revalidate,
  } = useSWR<BlacklistResultsResponse>(
-    `/api/v1/blacklist/?take=${currentPageSize}
-    &skip=${pageIndex * currentPageSize}
-    ${debouncedSearchFilter ? `&search=${debouncedSearchFilter}` : ''}`,
+    `/api/v1/blacklist/?take=${currentPageSize}&skip=${
+      pageIndex * currentPageSize
+    }&filter=${currentFilter}${
+      debouncedSearchFilter ? `&search=${debouncedSearchFilter}` : ''
+    }`,
    {
      refreshInterval: 0,
      revalidateOnFocus: false,
@@ -93,19 +108,52 @@ const Blacklist = () => {
  return (
    <>
      <PageTitle title={[intl.formatMessage(globalMessages.blacklist)]} />
-      <Header>{intl.formatMessage(globalMessages.blacklist)}</Header>
+      <div className="mb-4 flex flex-col justify-between lg:flex-row lg:items-end">
+        <Header>{intl.formatMessage(globalMessages.blacklist)}</Header>

-      <div className="mt-2 flex flex-grow flex-col sm:flex-grow-0 sm:flex-row sm:justify-end">
-        <div className="mb-2 flex flex-grow sm:mb-0 sm:mr-2 md:flex-grow-0">
-          <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-sm text-gray-100">
-            <MagnifyingGlassIcon className="h-6 w-6" />
-          </span>
-          <input
-            type="text"
-            className="rounded-r-only"
-            value={searchFilter}
-            onChange={(e) => searchItem(e)}
-          />
+        <div className="mt-2 flex flex-grow flex-col sm:flex-row lg:flex-grow-0">
+          <div className="mb-2 flex flex-grow sm:mb-0 sm:mr-2 lg:flex-grow-0">
+            <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-sm text-gray-100">
+              <FunnelIcon className="h-6 w-6" />
+            </span>
+            <select
+              id="filter"
+              name="filter"
+              onChange={(e) => {
+                setCurrentFilter(e.target.value as Filter);
+                router.push({
+                  pathname: router.pathname,
+                  query: router.query.userId
+                    ? { userId: router.query.userId }
+                    : {},
+                });
+              }}
+              value={currentFilter}
+              className="rounded-r-only"
+            >
+              <option value="all">
+                {intl.formatMessage(globalMessages.all)}
+              </option>
+              <option value="manual">
+                {intl.formatMessage(messages.filterManual)}
+              </option>
+              <option value="blacklistedTags">
+                {intl.formatMessage(messages.filterBlacklistedTags)}
+              </option>
+            </select>
+          </div>
+
+          <div className="mb-2 flex flex-grow sm:mb-0 sm:mr-2 md:flex-grow-0">
+            <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-sm text-gray-100">
+              <MagnifyingGlassIcon className="h-6 w-6" />
+            </span>
+            <input
+              type="text"
+              className="rounded-r-only"
+              value={searchFilter}
+              onChange={(e) => searchItem(e)}
+            />
+          </div>
        </div>
      </div>

@@ -116,6 +164,16 @@ const Blacklist = () => {
          <span className="text-2xl text-gray-400">
            {intl.formatMessage(globalMessages.noresults)}
          </span>
+          {currentFilter !== Filter.ALL && (
+            <div className="mt-4">
+              <Button
+                buttonType="primary"
+                onClick={() => setCurrentFilter(Filter.ALL)}
+              >
+                {intl.formatMessage(messages.showAllBlacklisted)}
+              </Button>
+            </div>
+          )}
        </div>
      ) : (
        data.results.map((item: BlacklistItem) => {
@@ -238,11 +296,9 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
  const removeFromBlacklist = async (tmdbId: number, title?: string) => {
    setIsUpdating(true);

-    const res = await fetch('/api/v1/blacklist/' + tmdbId, {
-      method: 'DELETE',
-    });
+    try {
+      await axios.delete(`/api/v1/blacklist/${tmdbId}`);

-    if (res.status === 204) {
      addToast(
        <span>
          {intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
@@ -252,7 +308,7 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
        </span>,
        { appearance: 'success', autoDismiss: true }
      );
-    } else {
+    } catch {
      addToast(intl.formatMessage(globalMessages.blacklistError), {
        appearance: 'error',
        autoDismiss: true,
@@ -298,7 +354,7 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
              src={
                title?.posterPath
                  ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
-                  : '/images/overseerr_poster_not_found.png'
+                  : '/images/jellyseerr_poster_not_found.png'
              }
              alt=""
              sizes="100vw"
@@ -353,7 +409,7 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
                      numeric="auto"
                    />
                  ),
-                  user: (
+                  user: item.user ? (
                    <Link href={`/users/${item.user.id}`}>
                      <span className="group flex items-center truncate">
                        <CachedImage
@@ -370,6 +426,14 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
                        </span>
                      </span>
                    </Link>
+                  ) : item.blacklistedTags ? (
+                    <span className="ml-1">
+                      <BlacklistedTagsBadge data={item} />
+                    </span>
+                  ) : (
+                    <span className="ml-1 truncate text-sm font-semibold">
+                      ???
+                    </span>
                  ),
                })}
              </span>
--- a/src/components/BlacklistBlock/index.tsx
+++ b/src/components/BlacklistBlock/index.tsx
@@ -1,3 +1,4 @@
+import BlacklistedTagsBadge from '@app/components/BlacklistedTagsBadge';
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import LoadingSpinner from '@app/components/Common/LoadingSpinner';
@@ -7,6 +8,7 @@ import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { CalendarIcon, TrashIcon, UserIcon } from '@heroicons/react/24/solid';
 import type { Blacklist } from '@server/entity/Blacklist';
+import axios from 'axios';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -38,11 +40,9 @@ const BlacklistBlock = ({
  const removeFromBlacklist = async (tmdbId: number, title?: string) => {
    setIsUpdating(true);

-    const res = await fetch('/api/v1/blacklist/' + tmdbId, {
-      method: 'DELETE',
-    });
+    try {
+      await axios.delete('/api/v1/blacklist/' + tmdbId);

-    if (res.status === 204) {
      addToast(
        <span>
          {intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
@@ -52,7 +52,7 @@ const BlacklistBlock = ({
        </span>,
        { appearance: 'success', autoDismiss: true }
      );
-    } else {
+    } catch {
      addToast(intl.formatMessage(globalMessages.blacklistError), {
        appearance: 'error',
        autoDismiss: true,
@@ -78,22 +78,33 @@ const BlacklistBlock = ({
      <div className="flex items-center justify-between">
        <div className="mr-6 min-w-0 flex-1 flex-col items-center text-sm leading-5">
          <div className="white mb-1 flex flex-nowrap">
-            <Tooltip content={intl.formatMessage(messages.blacklistedby)}>
-              <UserIcon className="mr-1.5 h-5 w-5 min-w-0 flex-shrink-0" />
-            </Tooltip>
-            <span className="w-40 truncate md:w-auto">
-              <Link
-                href={
-                  data.user.id === user?.id
-                    ? '/profile'
-                    : `/users/${data.user.id}`
-                }
-              >
-                <span className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline">
-                  {data.user.displayName}
+            {data.user ? (
+              <>
+                <Tooltip content={intl.formatMessage(messages.blacklistedby)}>
+                  <UserIcon className="mr-1.5 h-5 w-5 min-w-0 flex-shrink-0" />
+                </Tooltip>
+                <span className="w-40 truncate md:w-auto">
+                  <Link
+                    href={
+                      data.user.id === user?.id
+                        ? '/profile'
+                        : `/users/${data.user.id}`
+                    }
+                  >
+                    <span className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline">
+                      {data.user.displayName}
+                    </span>
+                  </Link>
                </span>
-              </Link>
-            </span>
+              </>
+            ) : data.blacklistedTags ? (
+              <>
+                <span className="w-40 truncate md:w-auto">
+                  {intl.formatMessage(messages.blacklistedby)}:&nbsp;
+                </span>
+                <BlacklistedTagsBadge data={data} />
+              </>
+            ) : null}
          </div>
        </div>
        <div className="ml-2 flex flex-shrink-0 flex-wrap">
--- a/src/components/BlacklistModal/index.tsx
+++ b/src/components/BlacklistModal/index.tsx
@@ -4,6 +4,7 @@ import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import axios from 'axios';
 import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';

@@ -44,12 +45,8 @@ const BlacklistModal = ({
      if (!show) return;
      try {
        setError(null);
-        const response = await fetch(`/api/v1/${type}/${tmdbId}`);
-        if (!response.ok) {
-          throw new Error();
-        }
-        const result = await response.json();
-        setData(result);
+        const response = await axios.get(`/api/v1/${type}/${tmdbId}`);
+        setData(response.data);
      } catch (err) {
        setError(err);
      }
--- a/src/components/BlacklistedTagsBadge/index.tsx
+++ b/src/components/BlacklistedTagsBadge/index.tsx
@@ -0,0 +1,62 @@
+import Badge from '@app/components/Common/Badge';
+import Tooltip from '@app/components/Common/Tooltip';
+import defineMessages from '@app/utils/defineMessages';
+import { TagIcon } from '@heroicons/react/20/solid';
+import type { BlacklistItem } from '@server/interfaces/api/blacklistInterfaces';
+import type { Keyword } from '@server/models/common';
+import axios from 'axios';
+import { useEffect, useState } from 'react';
+import { useIntl } from 'react-intl';
+
+const messages = defineMessages('components.Settings', {
+  blacklistedTagsText: 'Blacklisted Tags',
+});
+
+interface BlacklistedTagsBadgeProps {
+  data: BlacklistItem;
+}
+
+const BlacklistedTagsBadge = ({ data }: BlacklistedTagsBadgeProps) => {
+  const [tagNamesBlacklistedFor, setTagNamesBlacklistedFor] =
+    useState<string>('Loading...');
+  const intl = useIntl();
+
+  useEffect(() => {
+    if (!data.blacklistedTags) {
+      return;
+    }
+
+    const keywordIds = data.blacklistedTags.slice(1, -1).split(',');
+    Promise.all(
+      keywordIds.map(async (keywordId) => {
+        try {
+          const { data } = await axios.get<Keyword>(
+            `/api/v1/keyword/${keywordId}`
+          );
+          return data.name;
+        } catch (err) {
+          return '';
+        }
+      })
+    ).then((keywords) => {
+      setTagNamesBlacklistedFor(keywords.join(', '));
+    });
+  }, [data.blacklistedTags]);
+
+  return (
+    <Tooltip
+      content={tagNamesBlacklistedFor}
+      tooltipConfig={{ followCursor: false }}
+    >
+      <Badge
+        badgeType="dark"
+        className="items-center border border-red-500 !text-red-400"
+      >
+        <TagIcon className="mr-1 h-4" />
+        {intl.formatMessage(messages.blacklistedTagsText)}
+      </Badge>
+    </Tooltip>
+  );
+};
+
+export default BlacklistedTagsBadge;
--- a/src/components/BlacklistedTagsSelector/index.tsx
+++ b/src/components/BlacklistedTagsSelector/index.tsx
@@ -0,0 +1,402 @@
+import Modal from '@app/components/Common/Modal';
+import Tooltip from '@app/components/Common/Tooltip';
+import CopyButton from '@app/components/Settings/CopyButton';
+import { encodeURIExtraParams } from '@app/hooks/useDiscover';
+import defineMessages from '@app/utils/defineMessages';
+import { Transition } from '@headlessui/react';
+import { ArrowDownIcon } from '@heroicons/react/24/solid';
+import type { TmdbKeywordSearchResponse } from '@server/api/themoviedb/interfaces';
+import type { Keyword } from '@server/models/common';
+import axios from 'axios';
+import { useFormikContext } from 'formik';
+import {
+  forwardRef,
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useRef,
+  useState,
+} from 'react';
+import { useIntl } from 'react-intl';
+import type { ClearIndicatorProps, GroupBase, MultiValue } from 'react-select';
+import { components } from 'react-select';
+import AsyncSelect from 'react-select/async';
+
+const messages = defineMessages('components.Settings', {
+  copyBlacklistedTags: 'Copied blacklisted tags to clipboard.',
+  copyBlacklistedTagsTip: 'Copy blacklisted tag configuration',
+  copyBlacklistedTagsEmpty: 'Nothing to copy',
+  importBlacklistedTagsTip: 'Import blacklisted tag configuration',
+  clearBlacklistedTagsConfirm:
+    'Are you sure you want to clear the blacklisted tags?',
+  yes: 'Yes',
+  no: 'No',
+  searchKeywords: 'Search keywords…',
+  starttyping: 'Starting typing to search.',
+  nooptions: 'No results.',
+  blacklistedTagImportTitle: 'Import Blacklisted Tag Configuration',
+  blacklistedTagImportInstructions: 'Paste blacklist tag configuration below.',
+  valueRequired: 'You must provide a value.',
+  noSpecialCharacters:
+    'Configuration must be a comma delimited list of TMDB keyword ids, and must not start or end with a comma.',
+  invalidKeyword: '{keywordId} is not a TMDB keyword.',
+});
+
+type SingleVal = {
+  label: string;
+  value: number;
+};
+
+type BlacklistedTagsSelectorProps = {
+  defaultValue?: string;
+};
+
+const BlacklistedTagsSelector = ({
+  defaultValue,
+}: BlacklistedTagsSelectorProps) => {
+  const { setFieldValue } = useFormikContext();
+  const [value, setValue] = useState<string | undefined>(defaultValue);
+  const intl = useIntl();
+  const [selectorValue, setSelectorValue] =
+    useState<MultiValue<SingleVal> | null>(null);
+
+  const update = useCallback(
+    (value: MultiValue<SingleVal> | null) => {
+      const strVal = value?.map((v) => v.value).join(',');
+      setSelectorValue(value);
+      setValue(strVal);
+      setFieldValue('blacklistedTags', strVal);
+    },
+    [setSelectorValue, setValue, setFieldValue]
+  );
+
+  const copyDisabled = value === null || value?.length === 0;
+
+  return (
+    <>
+      <ControlledKeywordSelector
+        value={selectorValue}
+        onChange={update}
+        defaultValue={defaultValue}
+        components={{
+          DropdownIndicator: undefined,
+          IndicatorSeparator: undefined,
+          ClearIndicator: VerifyClearIndicator,
+        }}
+      />
+
+      <CopyButton
+        textToCopy={value ?? ''}
+        disabled={copyDisabled}
+        toastMessage={intl.formatMessage(messages.copyBlacklistedTags)}
+        tooltipContent={intl.formatMessage(
+          copyDisabled
+            ? messages.copyBlacklistedTagsEmpty
+            : messages.copyBlacklistedTagsTip
+        )}
+        tooltipConfig={{ followCursor: false }}
+      />
+      <BlacklistedTagsImportButton setSelector={update} />
+    </>
+  );
+};
+
+type BaseSelectorMultiProps = {
+  defaultValue?: string;
+  value: MultiValue<SingleVal> | null;
+  onChange: (value: MultiValue<SingleVal> | null) => void;
+  components?: Partial<typeof components>;
+};
+
+const ControlledKeywordSelector = ({
+  defaultValue,
+  onChange,
+  components,
+  value,
+}: BaseSelectorMultiProps) => {
+  const intl = useIntl();
+
+  useEffect(() => {
+    const loadDefaultKeywords = async (): Promise<void> => {
+      if (!defaultValue) {
+        return;
+      }
+
+      const keywords = await Promise.all(
+        defaultValue.split(',').map(async (keywordId) => {
+          const { data } = await axios.get<Keyword>(
+            `/api/v1/keyword/${keywordId}`
+          );
+          return data;
+        })
+      );
+
+      onChange(
+        keywords.map((keyword) => ({
+          label: keyword.name,
+          value: keyword.id,
+        }))
+      );
+    };
+
+    loadDefaultKeywords();
+  }, [defaultValue, onChange]);
+
+  const loadKeywordOptions = async (inputValue: string) => {
+    const { data } = await axios.get<TmdbKeywordSearchResponse>(
+      `/api/v1/search/keyword?query=${encodeURIExtraParams(inputValue)}`
+    );
+
+    return data.results.map((result) => ({
+      label: result.name,
+      value: result.id,
+    }));
+  };
+
+  return (
+    <AsyncSelect
+      key={`keyword-select-blacklistedTags`}
+      inputId="data"
+      isMulti
+      className="react-select-container"
+      classNamePrefix="react-select"
+      noOptionsMessage={({ inputValue }) =>
+        inputValue === ''
+          ? intl.formatMessage(messages.starttyping)
+          : intl.formatMessage(messages.nooptions)
+      }
+      value={value}
+      loadOptions={loadKeywordOptions}
+      placeholder={intl.formatMessage(messages.searchKeywords)}
+      onChange={onChange}
+      components={components}
+    />
+  );
+};
+
+type BlacklistedTagsImportButtonProps = {
+  setSelector: (value: MultiValue<SingleVal>) => void;
+};
+
+const BlacklistedTagsImportButton = ({
+  setSelector,
+}: BlacklistedTagsImportButtonProps) => {
+  const [show, setShow] = useState(false);
+  const formRef = useRef<HTMLFormElement>(null);
+  const intl = useIntl();
+
+  const onConfirm = useCallback(async () => {
+    if (formRef.current) {
+      if (await formRef.current.submitForm()) {
+        setShow(false);
+      }
+    }
+  }, []);
+
+  const onClick = useCallback((event: React.MouseEvent) => {
+    event.stopPropagation();
+    setShow(true);
+  }, []);
+
+  return (
+    <>
+      <Transition
+        as="div"
+        enter="transition-opacity duration-300"
+        enterFrom="opacity-0"
+        enterTo="opacity-100"
+        leave="transition-opacity duration-300"
+        leaveFrom="opacity-100"
+        leaveTo="opacity-0"
+        show={show}
+      >
+        <Modal
+          title={intl.formatMessage(messages.blacklistedTagImportTitle)}
+          okText="Confirm"
+          onOk={onConfirm}
+          onCancel={() => setShow(false)}
+        >
+          <BlacklistedTagImportForm ref={formRef} setSelector={setSelector} />
+        </Modal>
+      </Transition>
+
+      <Tooltip
+        content={intl.formatMessage(messages.importBlacklistedTagsTip)}
+        tooltipConfig={{ followCursor: false }}
+      >
+        <button className="input-action" onClick={onClick} type="button">
+          <ArrowDownIcon />
+        </button>
+      </Tooltip>
+    </>
+  );
+};
+
+type BlacklistedTagImportFormProps = BlacklistedTagsImportButtonProps;
+
+const BlacklistedTagImportForm = forwardRef<
+  Partial<HTMLFormElement>,
+  BlacklistedTagImportFormProps
+>((props, ref) => {
+  const { setSelector } = props;
+  const intl = useIntl();
+  const [formValue, setFormValue] = useState('');
+  const [errors, setErrors] = useState<string[]>([]);
+
+  useImperativeHandle(ref, () => ({
+    submitForm: handleSubmit,
+    formValue,
+  }));
+
+  const validate = async () => {
+    if (formValue.length === 0) {
+      setErrors([intl.formatMessage(messages.valueRequired)]);
+      return false;
+    }
+
+    if (!/^(?:\d+,)*\d+$/.test(formValue)) {
+      setErrors([intl.formatMessage(messages.noSpecialCharacters)]);
+      return false;
+    }
+
+    const keywords = await Promise.allSettled(
+      formValue.split(',').map(async (keywordId) => {
+        try {
+          const { data } = await axios.get<Keyword>(
+            `/api/v1/keyword/${keywordId}`
+          );
+          return {
+            label: data.name,
+            value: data.id,
+          };
+        } catch (err) {
+          throw intl.formatMessage(messages.invalidKeyword, { keywordId });
+        }
+      })
+    );
+
+    const failures = keywords.filter(
+      (res) => res.status === 'rejected'
+    ) as PromiseRejectedResult[];
+    if (failures.length > 0) {
+      setErrors(failures.map((failure) => `${failure.reason}`));
+      return false;
+    }
+
+    setSelector(
+      (keywords as PromiseFulfilledResult<SingleVal>[]).map(
+        (keyword) => keyword.value
+      )
+    );
+
+    setErrors([]);
+    return true;
+  };
+
+  const handleSubmit = validate;
+
+  return (
+    <form onSubmit={handleSubmit}>
+      <div>
+        <label htmlFor="value">
+          {intl.formatMessage(messages.blacklistedTagImportInstructions)}
+        </label>
+        <textarea
+          id="value"
+          value={formValue}
+          onChange={(e) => setFormValue(e.target.value)}
+          className="h-20"
+        />
+        {errors.length > 0 && (
+          <div className="error">
+            {errors.map((error) => (
+              <div key={error}>{error}</div>
+            ))}
+          </div>
+        )}
+      </div>
+    </form>
+  );
+});
+
+const VerifyClearIndicator = <
+  Option,
+  IsMuti extends boolean,
+  Group extends GroupBase<Option>
+>(
+  props: ClearIndicatorProps<Option, IsMuti, Group>
+) => {
+  const { clearValue } = props;
+  const [show, setShow] = useState(false);
+  const intl = useIntl();
+
+  const openForm = useCallback(() => {
+    setShow(true);
+  }, [setShow]);
+
+  const openFormKey = useCallback(
+    (event: React.KeyboardEvent) => {
+      if (show) return;
+
+      if (event.key === 'Enter' || event.key === 'Space') {
+        setShow(true);
+      }
+    },
+    [setShow, show]
+  );
+
+  const acceptForm = useCallback(
+    (event: KeyboardEvent) => {
+      if (event.key === 'Enter') {
+        event.stopPropagation();
+        event.preventDefault();
+        clearValue();
+      }
+    },
+    [clearValue]
+  );
+
+  useEffect(() => {
+    if (show) {
+      window.addEventListener('keydown', acceptForm);
+    }
+
+    return () => window.removeEventListener('keydown', acceptForm);
+  }, [show, acceptForm]);
+
+  return (
+    <>
+      <button
+        type="button"
+        onClick={openForm}
+        onKeyDown={openFormKey}
+        className="react-select__indicator react-select__clear-indicator css-1xc3v61-indicatorContainer cursor-pointer"
+      >
+        <components.CrossIcon />
+      </button>
+      <Transition
+        as="div"
+        enter="transition-opacity duration-300"
+        enterFrom="opacity-0"
+        enterTo="opacity-100"
+        leave="transition-opacity duration-300"
+        leaveFrom="opacity-100"
+        leaveTo="opacity-0"
+        show={show}
+      >
+        <Modal
+          subTitle={intl.formatMessage(messages.clearBlacklistedTagsConfirm)}
+          okText={intl.formatMessage(messages.yes)}
+          cancelText={intl.formatMessage(messages.no)}
+          onOk={clearValue}
+          onCancel={() => setShow(false)}
+        >
+          <form />{' '}
+          {/* Form prevents accidentally saving settings when pressing enter */}
+        </Modal>
+      </Transition>
+    </>
+  );
+};
+
+export default BlacklistedTagsSelector;
--- a/src/components/CollectionDetails/index.tsx
+++ b/src/components/CollectionDetails/index.tsx
@@ -233,7 +233,7 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
            src={
              data.posterPath
                ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`
-                : '/images/overseerr_poster_not_found.png'
+                : '/images/jellyseerr_poster_not_found.png'
            }
            alt=""
            sizes="100vw"
--- a/src/components/Common/Button/index.tsx
+++ b/src/components/Common/Button/index.tsx
@@ -1,5 +1,6 @@
 import type { ForwardedRef } from 'react';
 import React from 'react';
+import { twMerge } from 'tailwind-merge';

 export type ButtonType =
  | 'default'
@@ -97,7 +98,7 @@ function Button<P extends ElementTypes = 'button'>(
  if (as === 'a') {
    return (
      <a
-        className={buttonStyle.join(' ')}
+        className={twMerge(buttonStyle)}
        {...(props as React.ComponentProps<'a'>)}
        ref={ref as ForwardedRef<HTMLAnchorElement>}
      >
@@ -107,7 +108,7 @@ function Button<P extends ElementTypes = 'button'>(
  } else {
    return (
      <button
-        className={buttonStyle.join(' ')}
+        className={twMerge(buttonStyle)}
        {...(props as React.ComponentProps<'button'>)}
        ref={ref as ForwardedRef<HTMLButtonElement>}
      >
--- a/Show More
+++ b/Show More