refactor(userlist): streamline user sorting logic and improve performance

feat(userlist): implement local user sorting and update sorting logic
This prevents useless API calls when changing sorting filters.
2025-12-29 21:19:17 -05:00 · 2025-06-17 20:02:25 +02:00 · 2025-06-17 19:39:03 +02:00 · 2025-06-17 19:39:03 +02:00 · 2025-06-17 19:39:03 +02:00 · 2025-06-17 19:39:03 +02:00
139 changed files with 6839 additions and 3177 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -277,7 +277,8 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/13810742?v=4",
      "profile": "https://athfan.com",
      "contributions": [
-        "doc"
+        "doc",
+        "code"
      ]
    },
    {
@@ -295,7 +296,8 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/13354331?v=4",
      "profile": "https://github.com/xeruf",
      "contributions": [
-        "doc"
+        "doc",
+        "code"
      ]
    },
    {
@@ -380,33 +382,6 @@
        "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": "mobihen",
      "name": "Nir Israel Hen",
@@ -452,69 +427,6 @@
        "security"
      ]
    },
-    {
-      "login": "j0srisk",
-      "name": "Joseph Risk",
-      "avatar_url": "https://avatars.githubusercontent.com/u/18372584?v=4",
-      "profile": "http://josephrisk.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Loetwiek",
-      "name": "Loetwiek",
-      "avatar_url": "https://avatars.githubusercontent.com/u/79059734?v=4",
-      "profile": "https://github.com/Loetwiek",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Fuochi",
-      "name": "Fuochi",
-      "avatar_url": "https://avatars.githubusercontent.com/u/4720478?v=4",
-      "profile": "https://github.com/Fuochi",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "demrich",
-      "name": "David Emrich",
-      "avatar_url": "https://avatars.githubusercontent.com/u/30092389?v=4",
-      "profile": "https://github.com/demrich",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "maxnatamo",
-      "name": "Max T. Kristiansen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5898152?v=4",
-      "profile": "https://maxtrier.dk",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "DamsDev1",
-      "name": "Damien Fajole",
-      "avatar_url": "https://avatars.githubusercontent.com/u/60252259?v=4",
-      "profile": "https://damsdev.me",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "AhmedNSidd",
-      "name": "Ahmed Siddiqui",
-      "avatar_url": "https://avatars.githubusercontent.com/u/36286128?v=4",
-      "profile": "https://github.com/AhmedNSidd",
-      "contributions": [
-        "code"
-      ]
-    },
    {
      "login": "Zariel",
      "name": "Chris Bannister",
@@ -623,87 +535,6 @@
        "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",
@@ -713,105 +544,6 @@
        "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",
@@ -847,6 +579,69 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "vfaergestad",
+      "name": "vfaergestad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/49147564?v=4",
+      "profile": "https://github.com/vfaergestad",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "wolffman122",
+      "name": "wolffman122",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19178872?v=4",
+      "profile": "https://github.com/wolffman122",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Schrottfresser",
+      "name": "Schrottfresser",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39998368?v=4",
+      "profile": "https://github.com/Schrottfresser",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DillionLowry",
+      "name": "Dillion",
+      "avatar_url": "https://avatars.githubusercontent.com/u/91228469?v=4",
+      "profile": "https://github.com/DillionLowry",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JamsRepos",
+      "name": "Jam",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1347620?v=4",
+      "profile": "https://github.com/JamsRepos",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "joelowrance",
+      "name": "Joe Lowrance",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63176?v=4",
+      "profile": "http://www.joelowrance.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "0xSysR3ll",
+      "name": "0xsysr3ll",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31414959?v=4",
+      "profile": "https://github.com/0xSysR3ll",
+      "contributions": [
+        "code"
+      ]
    }
  ]
 }
--- a/.github/workflows/snap.yaml.disabled
+++ b/.github/workflows/snap.yaml.disabled
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -19,5 +19,6 @@
  "typescript.preferences.importModuleSpecifier": "non-relative",
  "files.associations": {
    "globals.css": "tailwindcss"
-  }
+  },
+  "i18n-ally.localesPaths": ["src/i18n/locale"]
 }
--- a/14
+++ b/14
@@ -42,13 +42,13 @@ FROM node:22-alpine
 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"
+  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-92-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-69-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/)**.
@@ -122,9 +122,9 @@ 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/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>
    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://athfan.com"><img src="https://avatars.githubusercontent.com/u/13810742?v=4?s=100" width="100px;" alt="Athfan Khaleel"/><br /><sub><b>Athfan Khaleel</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=athphane" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://athfan.com"><img src="https://avatars.githubusercontent.com/u/13810742?v=4?s=100" width="100px;" alt="Athfan Khaleel"/><br /><sub><b>Athfan Khaleel</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=athphane" title="Documentation">📖</a> <a href="https://github.com/fallenbagel/jellyseerr/commits?author=athphane" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mdll23"><img src="https://avatars.githubusercontent.com/u/142844478?v=4?s=100" width="100px;" alt="Michael Dallinger"/><br /><sub><b>Michael Dallinger</b></sub></a><br /><a href="#translation-mdll23" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xeruf"><img src="https://avatars.githubusercontent.com/u/13354331?v=4?s=100" width="100px;" alt="Janek"/><br /><sub><b>Janek</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=xeruf" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xeruf"><img src="https://avatars.githubusercontent.com/u/13354331?v=4?s=100" width="100px;" alt="Janek"/><br /><sub><b>Janek</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=xeruf" title="Documentation">📖</a> <a href="https://github.com/fallenbagel/jellyseerr/commits?author=xeruf" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://aleksasiriski.dev"><img src="https://avatars.githubusercontent.com/u/31509435?v=4?s=100" width="100px;" alt="Aleksa Siriški"/><br /><sub><b>Aleksa Siriški</b></sub></a><br /><a href="#infra-aleksasiriski" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
      <td align="center" valign="top" width="14.28%"><a href="http://danishhumair.com"><img src="https://avatars.githubusercontent.com/u/121830048?v=4?s=100" width="100px;" alt="Danish Humair"/><br /><sub><b>Danish Humair</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Danish-H" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://arm0.red"><img src="https://avatars.githubusercontent.com/u/16858514?v=4?s=100" width="100px;" alt="Stephen Harris"/><br /><sub><b>Stephen Harris</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=trackmastersteve" title="Documentation">📖</a></td>
@@ -136,74 +136,43 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://joaquinolivero.com"><img src="https://avatars.githubusercontent.com/u/66050823?v=4?s=100" width="100px;" alt="Joaquin Olivero"/><br /><sub><b>Joaquin Olivero</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=JoaquinOlivero" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Bretterteig"><img src="https://avatars.githubusercontent.com/u/47298401?v=4?s=100" width="100px;" alt="Julian Behr"/><br /><sub><b>Julian Behr</b></sub></a><br /><a href="#translation-Bretterteig" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ThowZzy"><img src="https://avatars.githubusercontent.com/u/61882536?v=4?s=100" width="100px;" alt="ThowZzy"/><br /><sub><b>ThowZzy</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=ThowZzy" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://josephrisk.com"><img src="https://avatars.githubusercontent.com/u/18372584?v=4?s=100" width="100px;" alt="Joseph Risk"/><br /><sub><b>Joseph Risk</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=j0srisk" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Loetwiek"><img src="https://avatars.githubusercontent.com/u/79059734?v=4?s=100" width="100px;" alt="Loetwiek"/><br /><sub><b>Loetwiek</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Loetwiek" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuochi"><img src="https://avatars.githubusercontent.com/u/4720478?v=4?s=100" width="100px;" alt="Fuochi"/><br /><sub><b>Fuochi</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Fuochi" title="Documentation">📖</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://mobihen.com"><img src="https://avatars.githubusercontent.com/u/35529491?v=4?s=100" width="100px;" alt="Nir Israel Hen"/><br /><sub><b>Nir Israel Hen</b></sub></a><br /><a href="#translation-mobihen" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/XDark187"><img src="https://avatars.githubusercontent.com/u/39034192?v=4?s=100" width="100px;" alt="Baraa"/><br /><sub><b>Baraa</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=XDark187" title="Code">💻</a></td>
+    </tr>
+    <tr>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/franciscofsales"><img src="https://avatars.githubusercontent.com/u/7977645?v=4?s=100" width="100px;" alt="Francisco Sales"/><br /><sub><b>Francisco Sales</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=franciscofsales" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/myselfolli"><img src="https://avatars.githubusercontent.com/u/37535998?v=4?s=100" width="100px;" alt="Oliver Laing"/><br /><sub><b>Oliver Laing</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=myselfolli" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/M0NsTeRRR"><img src="https://avatars.githubusercontent.com/u/37785089?v=4?s=100" width="100px;" alt="Ludovic Ortega"/><br /><sub><b>Ludovic Ortega</b></sub></a><br /><a href="#security-M0NsTeRRR" title="Security">🛡️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://josephrisk.com"><img src="https://avatars.githubusercontent.com/u/18372584?v=4?s=100" width="100px;" alt="Joseph Risk"/><br /><sub><b>Joseph Risk</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=j0srisk" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Loetwiek"><img src="https://avatars.githubusercontent.com/u/79059734?v=4?s=100" width="100px;" alt="Loetwiek"/><br /><sub><b>Loetwiek</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Loetwiek" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuochi"><img src="https://avatars.githubusercontent.com/u/4720478?v=4?s=100" width="100px;" alt="Fuochi"/><br /><sub><b>Fuochi</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Fuochi" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/demrich"><img src="https://avatars.githubusercontent.com/u/30092389?v=4?s=100" width="100px;" alt="David Emrich"/><br /><sub><b>David Emrich</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=demrich" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://maxtrier.dk"><img src="https://avatars.githubusercontent.com/u/5898152?v=4?s=100" width="100px;" alt="Max T. Kristiansen"/><br /><sub><b>Max T. Kristiansen</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=maxnatamo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://damsdev.me"><img src="https://avatars.githubusercontent.com/u/60252259?v=4?s=100" width="100px;" alt="Damien Fajole"/><br /><sub><b>Damien Fajole</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=DamsDev1" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AhmedNSidd"><img src="https://avatars.githubusercontent.com/u/36286128?v=4?s=100" width="100px;" alt="Ahmed Siddiqui"/><br /><sub><b>Ahmed Siddiqui</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=AhmedNSidd" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Zariel"><img src="https://avatars.githubusercontent.com/u/2213?v=4?s=100" width="100px;" alt="Chris Bannister"/><br /><sub><b>Chris Bannister</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Zariel" title="Code">💻</a></td>
-    </tr>
-    <tr>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/C4J3"><img src="https://avatars.githubusercontent.com/u/13005453?v=4?s=100" width="100px;" alt="Joe"/><br /><sub><b>Joe</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=C4J3" title="Documentation">📖</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://me.garnx.fr"><img src="https://avatars.githubusercontent.com/u/37373941?v=4?s=100" width="100px;" alt="Guillaume ARNOUX"/><br /><sub><b>Guillaume ARNOUX</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=guillaumearnx" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dr-carrot"><img src="https://avatars.githubusercontent.com/u/17272571?v=4?s=100" width="100px;" alt="dr-carrot"/><br /><sub><b>dr-carrot</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=dr-carrot" title="Code">💻</a></td>
+    </tr>
+    <tr>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gageorsburn"><img src="https://avatars.githubusercontent.com/u/4692734?v=4?s=100" width="100px;" alt="Gage Orsburn"/><br /><sub><b>Gage Orsburn</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=gageorsburn" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/GkhnGRBZ"><img src="https://avatars.githubusercontent.com/u/127258824?v=4?s=100" width="100px;" alt="GkhnGRBZ"/><br /><sub><b>GkhnGRBZ</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=GkhnGRBZ" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="http://benhaney.com"><img src="https://avatars.githubusercontent.com/u/31331498?v=4?s=100" width="100px;" alt="Ben Haney"/><br /><sub><b>Ben Haney</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=benhaney" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Wunderharke"><img src="https://avatars.githubusercontent.com/u/5105672?v=4?s=100" width="100px;" alt="Wunderharke"/><br /><sub><b>Wunderharke</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Wunderharke" title="Documentation">📖</a></td>
-    </tr>
-    <tr>
      <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>
+    </tr>
+    <tr>
      <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>
+      <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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vfaergestad"><img src="https://avatars.githubusercontent.com/u/49147564?v=4?s=100" width="100px;" alt="vfaergestad"/><br /><sub><b>vfaergestad</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=vfaergestad" 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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/wolffman122"><img src="https://avatars.githubusercontent.com/u/19178872?v=4?s=100" width="100px;" alt="wolffman122"/><br /><sub><b>wolffman122</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=wolffman122" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Schrottfresser"><img src="https://avatars.githubusercontent.com/u/39998368?v=4?s=100" width="100px;" alt="Schrottfresser"/><br /><sub><b>Schrottfresser</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Schrottfresser" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/DillionLowry"><img src="https://avatars.githubusercontent.com/u/91228469?v=4?s=100" width="100px;" alt="Dillion"/><br /><sub><b>Dillion</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=DillionLowry" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JamsRepos"><img src="https://avatars.githubusercontent.com/u/1347620?v=4?s=100" width="100px;" alt="Jam"/><br /><sub><b>Jam</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=JamsRepos" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.joelowrance.com"><img src="https://avatars.githubusercontent.com/u/63176?v=4?s=100" width="100px;" alt="Joe Lowrance"/><br /><sub><b>Joe Lowrance</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=joelowrance" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/0xSysR3ll"><img src="https://avatars.githubusercontent.com/u/31414959?v=4?s=100" width="100px;" alt="0xsysr3ll"/><br /><sub><b>0xsysr3ll</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=0xSysR3ll" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
@@ -338,7 +307,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://izaacj.me"><img src="https://avatars.githubusercontent.com/u/711323?v=4?s=100" width="100px;" alt="Izaac Brånn"/><br /><sub><b>Izaac Brånn</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=IzaacJ" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SalmanTariq"><img src="https://avatars.githubusercontent.com/u/13284494?v=4?s=100" width="100px;" alt="Salman Tariq"/><br /><sub><b>Salman Tariq</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=SalmanTariq" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andrew-kennedy"><img src="https://avatars.githubusercontent.com/u/2387159?v=4?s=100" width="100px;" alt="Andrew Kennedy"/><br /><sub><b>Andrew Kennedy</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=andrew-kennedy" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fallenbagel"><img src="https://avatars.githubusercontent.com/u/98979876?v=4?s=100" width="100px;" alt="Fallenbagel"/><br /><sub><b>Fallenbagel</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Fallenbagel" title="Jellyseerr">🪼⌨️</a> <a href="https://github.com/sct/overseerr/commits?author=Fallenbagel" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fallenbagel"><img src="https://avatars.githubusercontent.com/u/98979876?v=4?s=100" width="100px;" alt="Fallenbagel"/><br /><sub><b>Fallenbagel</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Fallenbagel" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="http://aidoge.xyz"><img src="https://avatars.githubusercontent.com/u/9427639?v=4?s=100" width="100px;" alt="Anton K. (ai Doge)"/><br /><sub><b>Anton K. (ai Doge)</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=scorp200" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://marcofaggian.com"><img src="https://avatars.githubusercontent.com/u/19221001?v=4?s=100" width="100px;" alt="Marco Faggian"/><br /><sub><b>Marco Faggian</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=marcofaggian" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="http://nemchik.com/"><img src="https://avatars.githubusercontent.com/u/725456?v=4?s=100" width="100px;" alt="Eric Nemchik"/><br /><sub><b>Eric Nemchik</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=nemchik" title="Code">💻</a></td>
@@ -358,6 +327,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vfaergestad"><img src="https://avatars.githubusercontent.com/u/49147564?v=4?s=100" width="100px;" alt="vfaergestad"/><br /><sub><b>vfaergestad</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=vfaergestad" 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.3.3
-appVersion: "2.5.2"
+version: 2.5.0
+appVersion: "2.6.0"
 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.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)
+![Version: 2.5.0](https://img.shields.io/badge/Version-2.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square)

 Jellyseerr helm chart for Kubernetes

@@ -52,6 +52,9 @@ Kubernetes: `>=1.23.0-0`
 | podAnnotations | object | `{}` |  |
 | podLabels | object | `{}` |  |
 | podSecurityContext | object | `{}` |  |
+| probes.livenessProbe | object | `{}` | Configure liveness probe |
+| probes.readinessProbe | object | `{}` | Configure readiness probe |
+| probes.startupProbe | string | `nil` | Configure startup probe |
 | replicaCount | int | `1` |  |
 | resources | object | `{}` |  |
 | securityContext | object | `{}` |  |
--- a/charts/jellyseerr-chart/templates/deployment.yaml
+++ b/charts/jellyseerr-chart/templates/deployment.yaml
@@ -48,10 +48,44 @@ spec:
            httpGet:
              path: /
              port: http
+            {{- if .Values.probes.livenessProbe.initialDelaySeconds }}
+            initialDelaySeconds: {{ .Values.probes.livenessProbe.initialDelaySeconds }}
+            {{- end }}
+            {{- if .Values.probes.livenessProbe.periodSeconds }}
+            periodSeconds: {{ .Values.probes.livenessProbe.periodSeconds }}
+            {{- end }}
+            {{- if .Values.probes.livenessProbe.timeoutSeconds }}
+            timeoutSeconds: {{ .Values.probes.livenessProbe.timeoutSeconds }}
+            {{- end }}
+            {{- if .Values.probes.livenessProbe.successThreshold }}
+            successThreshold: {{ .Values.probes.livenessProbe.successThreshold }}
+            {{- end }}
+            {{- if .Values.probes.livenessProbe.failureThreshold }}
+            failureThreshold: {{ .Values.probes.livenessProbe.failureThreshold }}
+            {{- end }}
          readinessProbe:
            httpGet:
              path: /
              port: http
+            {{- if .Values.probes.readinessProbe.initialDelaySeconds }}
+            initialDelaySeconds: {{ .Values.probes.readinessProbe.initialDelaySeconds }}
+            {{- end }}
+            {{- if .Values.probes.readinessProbe.periodSeconds }}
+            periodSeconds: {{ .Values.probes.readinessProbe.periodSeconds }}
+            {{- end }}
+            {{- if .Values.probes.readinessProbe.timeoutSeconds }}
+            timeoutSeconds: {{ .Values.probes.readinessProbe.timeoutSeconds }}
+            {{- end }}
+            {{- if .Values.probes.readinessProbe.successThreshold }}
+            successThreshold: {{ .Values.probes.readinessProbe.successThreshold }}
+            {{- end }}
+            {{- if .Values.probes.readinessProbe.failureThreshold }}
+            failureThreshold: {{ .Values.probes.readinessProbe.failureThreshold }}
+            {{- end }}
+          {{- if .Values.probes.startupProbe }}
+          startupProbe:
+            {{- toYaml .Values.probes.startupProbe | nindent 12 }}
+          {{- end }}
          resources:
            {{- toYaml .Values.resources | nindent 12 }}
          {{- with .Values.extraEnv }}
--- a/charts/jellyseerr-chart/values.yaml
+++ b/charts/jellyseerr-chart/values.yaml
@@ -16,6 +16,27 @@ fullnameOverride: ""
 strategy:
  type: Recreate

+# Liveness / Readiness / Startup Probes
+probes:
+  # -- Configure liveness probe
+  livenessProbe: {}
+  # initialDelaySeconds: 60
+  # periodSeconds: 30
+  # timeoutSeconds: 5
+  # successThreshold: 1
+  # failureThreshold: 5
+  # -- Configure readiness probe
+  readinessProbe: {}
+  # initialDelaySeconds: 60
+  # periodSeconds: 30
+  # timeoutSeconds: 5
+  # successThreshold: 1
+  # failureThreshold: 5
+  # -- Configure startup probe
+  startupProbe: null
+  #  tcpSocket:
+  #    port: http
+
 # -- Environment variables to add to the jellyseerr pods
 extraEnv: []
 # -- Environment variables from secrets or configmaps to add to the jellyseerr pods
@@ -36,15 +57,15 @@ podAnnotations: {}
 podLabels: {}

 podSecurityContext: {}
-  # fsGroup: 2000
+# fsGroup: 2000

 securityContext: {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
+# capabilities:
+#   drop:
+#   - ALL
+# readOnlyRootFilesystem: true
+# runAsNonRoot: true
+# runAsUser: 1000

 service:
  type: ClusterIP
@@ -70,8 +91,8 @@ ingress:
  enabled: false
  ingressClassName: ""
  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
+  #  kubernetes.io/ingress.class: nginx
+  #  kubernetes.io/tls-acme: "true"
  hosts:
    - host: chart-example.local
      paths:
@@ -83,16 +104,16 @@ ingress:
  #      - chart-example.local

 resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
+# We usually recommend not to specify default resources and to leave this as a conscious
+# choice for the user. This also increases chances charts run on environments with little
+# resources, such as Minikube. If you do want to specify resources, uncomment the following
+# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+# limits:
+#   cpu: 100m
+#   memory: 128Mi
+# requests:
+#   cpu: 100m
+#   memory: 128Mi

 # -- Additional volumes on the output Deployment definition.
 volumes: []
--- a/cypress/config/settings.cypress.json
+++ b/cypress/config/settings.cypress.json
@@ -142,6 +142,14 @@
          "token": "",
          "priority": 0
        }
+      },
+      "ntfy": {
+        "enabled": false,
+        "types": 0,
+        "options": {
+          "url": "",
+          "topic": ""
+        }
      }
    }
  },
--- a/cypress/e2e/user/user-list.cy.ts
+++ b/cypress/e2e/user/user-list.cy.ts
@@ -36,7 +36,7 @@ describe('User List', () => {
    cy.get('#email').type(testUser.emailAddress);
    cy.get('#password').type(testUser.password);

-    cy.intercept('/api/v1/user?take=10&skip=0&sort=displayname').as('user');
+    cy.intercept('/api/v1/user*').as('user');

    cy.get('[data-testid=modal-ok-button]').click();

@@ -56,7 +56,7 @@ describe('User List', () => {

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

-    cy.intercept('/api/v1/user?take=10&skip=0&sort=displayname').as('user');
+    cy.intercept('/api/v1/user*').as('user');

    cy.get('[data-testid=modal-ok-button]').should('contain', 'Delete').click();

--- a/docs/getting-started/docker.mdx
+++ b/docs/getting-started/docker.mdx
@@ -37,13 +37,8 @@ docker run -d \
  -p 5055:5055 \
  -v /path/to/appdata/config:/app/config \
  --restart unless-stopped \
-  ghcr.io/fallenbagel/jellyseerr
+  fallenbagel/jellyseerr
 ```
-:::tip
-If you are using emby, make sure to set the `JELLYFIN_TYPE` environment variable to `emby`.
-
-`-e JELLYFIN_TYPE=emby`
-:::

 To run the container as a specific user/group, you may optionally add `--user=[ user | user:group | uid | uid:gid | user:gid | uid:group ]` to the above command.

@@ -55,7 +50,7 @@ docker stop jellyseerr && docker rm Jellyseerr
 ```
 Pull the latest image:
 ```bash
-docker pull ghcr.io/fallenbagel/jellyseerr
+docker pull fallenbagel/jellyseerr
 ```
 Finally, run the container with the same parameters originally used to create the container:
 ```bash
@@ -78,7 +73,7 @@ Define the `jellyseerr` service in your `compose.yaml` as follows:
 ---
 services:
  jellyseerr:
-    image: ghcr.io/fallenbagel/jellyseerr:latest
+    image: fallenbagel/jellyseerr:latest
    container_name: jellyseerr
    environment:
      - LOG_LEVEL=debug
@@ -90,9 +85,6 @@ services:
      - /path/to/appdata/config:/app/config
    restart: unless-stopped
 ```
-:::tip
-If you are using emby, make sure to set the `JELLYFIN_TYPE` environment variable to `emby`.
-:::

 Then, start all services defined in the Compose file:
 ```bash
@@ -121,8 +113,7 @@ You may alternatively use a third-party mechanism like [dockge](https://github.c
 2. Inside the **Community Applications** app store, search for **Jellyseerr**.
 3. Click the **Install Button**.
 4. On the following **Add Container** screen, make changes to the **Host Port** and **Host Path 1** \(Appdata\) as needed.
-5. If you want to use emby, make sure to set the `JELLYFIN_TYPE` environment variable to `emby`. Otherwise, remove the variable.
-6. Click apply and access "Jellyseerr" at your `<ServerIP:HostPort>` in a web browser.
+5. Click apply and access "Jellyseerr" at your `<ServerIP:HostPort>` in a web browser.

 ## Windows

@@ -146,7 +137,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 ghcr.io/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 fallenbagel/jellyseerr:latest
 ```

 #### Updating:
@@ -193,12 +184,6 @@ docker compose up -d
  </TabItem>
 </Tabs>

-:::tip
-If you are using a named volume, then you can safely **ignore** the warning about the `/app/config` folder being incorrectly mounted.
-
-If you are using emby, make sure to set the `JELLYFIN_TYPE` environment variable to `emby`.
-:::
-
 To access the files inside the volume created above, navigate to `\\wsl$\docker-desktop-data\version-pack-data\community\docker\volumes\jellyseerr-data\_data` using File Explorer.

 :::info
--- a/docs/troubleshooting.mdx
+++ b/docs/troubleshooting.mdx
@@ -146,3 +146,26 @@ In a PowerShell window:

 If you can't get a response, then your server can't reach the TMDB API.
 This is usually due to a network configuration issue or a firewall blocking the connection.
+
+## Account does not have admin privileges
+
+If your admin account no longer has admin privileges, this is typically because your Jellyfin/Emby user ID has changed on the server side.
+
+This can happen if you have a new installation of Jellyfin/Emby or if you have changed the user ID of your admin account.
+
+### Solution: Reset admin access
+
+1. Back up your `settings.json` file (located in your Jellyseerr data directory)
+2. Stop the Jellyseerr container/service
+3. Delete the `settings.json` file
+4. Start Jellyseerr again
+5. This will force the setup page to appear
+6. Go through the setup process with the same login details
+7. You can skip the services setup
+8. Once you reach the discover page, stop Jellyseerr
+9. Restore your backed-up `settings.json` file
+10. Start Jellyseerr again
+
+This process should restore your admin privileges while preserving your settings.
+
+If you still encounter issues, please reach out on our support channels.
--- a/docs/using-jellyseerr/settings/general.md
+++ b/docs/using-jellyseerr/settings/general.md
@@ -78,6 +78,12 @@ Available media will still appear in search results, however, so it is possible

 This setting is **disabled** by default.

+## Hide Blacklisted Items
+
+When enabled, media that has been blacklisted will not appear on the "Discover" home page, for all administrators. This can be useful to hide content that you don't want to see, such as content with specific tags or content that has been manually blacklisted when you have the "Manage Blacklist" permission.
+
+This setting is **disabled** by default.
+
 ## Allow Partial Series Requests

 When enabled, users will be able to submit requests for specific seasons of TV series. If disabled, users will only be able to submit requests for all unavailable seasons.
--- a/jellyseerr-api.yml
+++ b/jellyseerr-api.yml
@@ -1157,7 +1157,7 @@ components:
        status:
          type: number
          example: 0
-          description: Availability of the media. 1 = `UNKNOWN`, 2 = `PENDING`, 3 = `PROCESSING`, 4 = `PARTIALLY_AVAILABLE`, 5 = `AVAILABLE`
+          description: Availability of the media. 1 = `UNKNOWN`, 2 = `PENDING`, 3 = `PROCESSING`, 4 = `PARTIALLY_AVAILABLE`, 5 = `AVAILABLE`, 6 = `DELETED`
        requests:
          type: array
          readOnly: true
@@ -1399,6 +1399,32 @@ components:
              type: string
            token:
              type: string
+    NtfySettings:
+      type: object
+      properties:
+        enabled:
+          type: boolean
+          example: false
+        types:
+          type: number
+          example: 2
+        options:
+          type: object
+          properties:
+            url:
+              type: string
+            topic:
+              type: string
+            authMethodUsernamePassword:
+              type: boolean
+            username:
+              type: string
+            password:
+              type: string
+            authMethodToken:
+              type: boolean
+            token:
+              type: string
    LunaSeaSettings:
      type: object
      properties:
@@ -1950,6 +1976,41 @@ components:
      properties:
        id:
          type: string
+    Certification:
+      type: object
+      properties:
+        certification:
+          type: string
+          example: 'PG-13'
+        meaning:
+          type: string
+          example: 'Some material may be inappropriate for children under 13.'
+          nullable: true
+        order:
+          type: number
+          example: 3
+          nullable: true
+      required:
+        - certification
+
+    CertificationResponse:
+      type: object
+      properties:
+        certifications:
+          type: object
+          additionalProperties:
+            type: array
+            items:
+              $ref: '#/components/schemas/Certification'
+      example:
+        certifications:
+          US:
+            - certification: 'G'
+              meaning: 'All ages admitted'
+              order: 1
+            - certification: 'PG'
+              meaning: 'Some material may not be suitable for children under 10.'
+              order: 2
  securitySchemes:
    cookieAuth:
      type: apiKey
@@ -3249,6 +3310,52 @@ paths:
      responses:
        '204':
          description: Test notification attempted
+  /settings/notifications/ntfy:
+    get:
+      summary: Get ntfy.sh notification settings
+      description: Returns current ntfy.sh notification settings in a JSON object.
+      tags:
+        - settings
+      responses:
+        '200':
+          description: Returned ntfy.sh settings
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/NtfySettings'
+    post:
+      summary: Update ntfy.sh notification settings
+      description: Update ntfy.sh notification settings with the provided values.
+      tags:
+        - settings
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/NtfySettings'
+      responses:
+        '200':
+          description: 'Values were sucessfully updated'
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/NtfySettings'
+  /settings/notifications/ntfy/test:
+    post:
+      summary: Test ntfy.sh settings
+      description: Sends a test notification to the ntfy.sh agent.
+      tags:
+        - settings
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/NtfySettings'
+      responses:
+        '204':
+          description: Test notification attempted
  /settings/notifications/slack:
    get:
      summary: Get Slack notification settings
@@ -3802,8 +3909,14 @@ paths:
          name: sort
          schema:
            type: string
-            enum: [created, updated, requests, displayname]
+            enum: [created, updated, requests, displayname, usertype, role]
            default: created
+        - in: query
+          name: sortDirection
+          schema:
+            type: string
+            enum: [asc, desc]
+            default: desc
        - in: query
          name: q
          required: false
@@ -4000,7 +4113,7 @@ paths:
                    type: string
                  userAgent:
                    type: string
-  /user/{userId}/pushSubscription/{key}:
+  /user/{userId}/pushSubscription/{endpoint}:
    get:
      summary: Get web push notification settings for a user
      description: |
@@ -4014,7 +4127,7 @@ paths:
          schema:
            type: number
        - in: path
-          name: key
+          name: endpoint
          required: true
          schema:
            type: string
@@ -4046,7 +4159,7 @@ paths:
          schema:
            type: number
        - in: path
-          name: key
+          name: endpoint
          required: true
          schema:
            type: string
@@ -4954,6 +5067,37 @@ paths:
          schema:
            type: string
            example: 8|9
+        - in: query
+          name: certification
+          schema:
+            type: string
+            example: PG-13
+          description: Exact certification to filter by (used when certificationMode is 'exact')
+        - in: query
+          name: certificationGte
+          schema:
+            type: string
+            example: G
+          description: Minimum certification to filter by (used when certificationMode is 'range')
+        - in: query
+          name: certificationLte
+          schema:
+            type: string
+            example: PG-13
+          description: Maximum certification to filter by (used when certificationMode is 'range')
+        - in: query
+          name: certificationCountry
+          schema:
+            type: string
+            example: US
+          description: Country code for the certification system (e.g., US, GB, CA)
+        - in: query
+          name: certificationMode
+          schema:
+            type: string
+            enum: [exact, range]
+            example: exact
+          description: Determines whether to use exact certification matching or a certification range (internal use only, not sent to TMDB API)
      responses:
        '200':
          description: Results
@@ -5248,6 +5392,37 @@ paths:
          schema:
            type: string
            example: 3|4
+        - in: query
+          name: certification
+          schema:
+            type: string
+            example: TV-14
+          description: Exact certification to filter by (used when certificationMode is 'exact')
+        - in: query
+          name: certificationGte
+          schema:
+            type: string
+            example: TV-PG
+          description: Minimum certification to filter by (used when certificationMode is 'range')
+        - in: query
+          name: certificationLte
+          schema:
+            type: string
+            example: TV-MA
+          description: Maximum certification to filter by (used when certificationMode is 'range')
+        - in: query
+          name: certificationCountry
+          schema:
+            type: string
+            example: US
+          description: Country code for the certification system (e.g., US, GB, CA)
+        - in: query
+          name: certificationMode
+          schema:
+            type: string
+            enum: [exact, range]
+            example: exact
+          description: Determines whether to use exact certification matching or a certification range (internal use only, not sent to TMDB API)
      responses:
        '200':
          description: Results
@@ -5676,6 +5851,8 @@ paths:
                processing,
                unavailable,
                failed,
+                deleted,
+                completed,
              ]
        - in: query
          name: sort
@@ -5696,6 +5873,13 @@ paths:
            type: number
            nullable: true
            example: 1
+        - in: query
+          name: mediaType
+          schema:
+            type: string
+            enum: [movie, tv, all]
+            nullable: true
+            default: all
      responses:
        '200':
          description: Requests returned
@@ -6422,7 +6606,16 @@ paths:
          schema:
            type: string
            nullable: true
-            enum: [all, available, partial, allavailable, processing, pending]
+            enum:
+              [
+                all,
+                available,
+                partial,
+                allavailable,
+                processing,
+                pending,
+                deleted,
+              ]
        - in: query
          name: sort
          schema:
@@ -6498,7 +6691,7 @@ paths:
          example: available
          schema:
            type: string
-            enum: [available, partial, processing, pending, unknown]
+            enum: [available, partial, processing, pending, unknown, deleted]
      requestBody:
        content:
          application/json:
@@ -7210,6 +7403,64 @@ paths:
                type: array
                items:
                  $ref: '#/components/schemas/WatchProviderDetails'
+  /certifications/movie:
+    get:
+      summary: Get movie certifications
+      description: Returns list of movie certifications from TMDB.
+      tags:
+        - other
+      security:
+        - cookieAuth: []
+        - apiKey: []
+      responses:
+        '200':
+          description: Movie certifications returned
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CertificationResponse'
+        '500':
+          description: Unable to retrieve movie certifications
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    type: number
+                    example: 500
+                  message:
+                    type: string
+                    example: Unable to retrieve movie certifications.
+  /certifications/tv:
+    get:
+      summary: Get TV certifications
+      description: Returns list of TV show certifications from TMDB.
+      tags:
+        - other
+      security:
+        - cookieAuth: []
+        - apiKey: []
+      responses:
+        '200':
+          description: TV certifications returned
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/CertificationResponse'
+        '500':
+          description: Unable to retrieve TV certifications
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    type: number
+                    example: 500
+                  message:
+                    type: string
+                    example: Unable to retrieve TV certifications.
  /overrideRule:
    get:
      summary: Get override rules
--- a/package.json
+++ b/package.json
@@ -43,8 +43,8 @@
    "@supercharge/request-ip": "1.2.0",
    "@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",
+    "@types/wink-jaro-distance": "^2.0.2",
    "ace-builds": "1.15.2",
    "axios": "1.3.4",
    "axios-rate-limit": "1.3.0",
@@ -65,6 +65,8 @@
    "express-session": "1.17.3",
    "formik": "^2.4.6",
    "gravatar-url": "3.1.0",
+    "http-proxy-agent": "^7.0.2",
+    "https-proxy-agent": "^7.0.6",
    "lodash": "4.17.21",
    "mime": "3",
    "next": "^14.2.25",
@@ -100,9 +102,9 @@
    "swagger-ui-express": "4.6.2",
    "swr": "2.2.5",
    "tailwind-merge": "^2.6.0",
-    "typeorm": "0.3.11",
-    "undici": "^7.3.0",
+    "typeorm": "0.3.12",
    "ua-parser-js": "^1.0.35",
+    "undici": "^7.3.0",
    "web-push": "3.5.0",
    "wink-jaro-distance": "^2.0.0",
    "winston": "3.8.2",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -64,7 +64,7 @@ importers:
        version: 2.11.0
      connect-typeorm:
        specifier: 1.1.4
-        version: 1.1.4(typeorm@0.3.11(pg@8.11.0)(sqlite3@5.1.7)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5)))
+        version: 1.1.4(typeorm@0.3.12(pg@8.11.0)(sqlite3@5.1.7)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5)))
      cookie-parser:
        specifier: 1.4.7
        version: 1.4.7
@@ -107,6 +107,12 @@ importers:
      gravatar-url:
        specifier: 3.1.0
        version: 3.1.0
+      http-proxy-agent:
+        specifier: ^7.0.2
+        version: 7.0.2
+      https-proxy-agent:
+        specifier: ^7.0.6
+        version: 7.0.6
      lodash:
        specifier: 4.17.21
        version: 4.17.21
@@ -213,8 +219,8 @@ importers:
        specifier: ^2.6.0
        version: 2.6.0
      typeorm:
-        specifier: 0.3.11
-        version: 0.3.11(pg@8.11.0)(sqlite3@5.1.7)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5))
+        specifier: 0.3.12
+        version: 0.3.12(pg@8.11.0)(sqlite3@5.1.7)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5))
      ua-parser-js:
        specifier: ^1.0.35
        version: 1.0.40
@@ -3626,6 +3632,10 @@ packages:
    resolution: {integrity: sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==}
    engines: {node: '>= 14'}

+  agent-base@7.1.3:
+    resolution: {integrity: sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==}
+    engines: {node: '>= 14'}
+
  agentkeepalive@4.5.0:
    resolution: {integrity: sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==}
    engines: {node: '>= 8.0.0'}
@@ -5788,8 +5798,8 @@ packages:
    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
    engines: {node: '>= 6'}

-  https-proxy-agent@7.0.5:
-    resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==}
+  https-proxy-agent@7.0.6:
+    resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
    engines: {node: '>= 14'}

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

+  mkdirp@2.1.6:
+    resolution: {integrity: sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==}
+    engines: {node: '>=10'}
+    hasBin: true
+
  modify-values@1.0.1:
    resolution: {integrity: sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==}
    engines: {node: '>=0.10.0'}
@@ -9190,8 +9205,8 @@ packages:
  typedarray@0.0.6:
    resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}

-  typeorm@0.3.11:
-    resolution: {integrity: sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==}
+  typeorm@0.3.12:
+    resolution: {integrity: sha512-sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA==}
    engines: {node: '>= 12.9.0'}
    hasBin: true
    peerDependencies:
@@ -9202,7 +9217,7 @@ packages:
      ioredis: ^5.0.4
      mongodb: ^3.6.0
      mssql: ^7.3.0
-      mysql2: ^2.2.5
+      mysql2: ^2.2.5 || ^3.0.1
      oracledb: ^5.1.0
      pg: ^8.5.1
      pg-native: ^3.0.0
@@ -11117,7 +11132,7 @@ snapshots:
      '@babel/helper-split-export-declaration': 7.24.7
      '@babel/parser': 7.24.7
      '@babel/types': 7.24.7
-      debug: 4.3.5
+      debug: 4.4.0(supports-color@5.5.0)
      globals: 11.12.0
    transitivePeerDependencies:
      - supports-color
@@ -13334,7 +13349,7 @@ snapshots:
      fs-extra: 11.2.0
      globby: 11.1.0
      http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.5
+      https-proxy-agent: 7.0.6
      issue-parser: 6.0.0
      lodash: 4.17.21
      mime: 3.0.0
@@ -13956,7 +13971,7 @@ snapshots:
    dependencies:
      '@typescript-eslint/types': 7.2.0
      '@typescript-eslint/visitor-keys': 7.2.0
-      debug: 4.3.5
+      debug: 4.4.0(supports-color@5.5.0)
      globby: 11.1.0
      is-glob: 4.0.3
      minimatch: 9.0.3
@@ -14047,10 +14062,12 @@ snapshots:

  agent-base@7.1.1:
    dependencies:
-      debug: 4.3.5
+      debug: 4.4.0(supports-color@5.5.0)
    transitivePeerDependencies:
      - supports-color

+  agent-base@7.1.3: {}
+
  agentkeepalive@4.5.0:
    dependencies:
      humanize-ms: 1.2.1
@@ -14913,13 +14930,13 @@ snapshots:
      ini: 1.3.8
      proto-list: 1.2.4

-  connect-typeorm@1.1.4(typeorm@0.3.11(pg@8.11.0)(sqlite3@5.1.7)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5))):
+  connect-typeorm@1.1.4(typeorm@0.3.12(pg@8.11.0)(sqlite3@5.1.7)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5))):
    dependencies:
      '@types/debug': 0.0.31
      '@types/express-session': 1.17.6
      debug: 4.4.0(supports-color@5.5.0)
      express-session: 1.17.3
-      typeorm: 0.3.11(pg@8.11.0)(sqlite3@5.1.7)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5))
+      typeorm: 0.3.12(pg@8.11.0)(sqlite3@5.1.7)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5))
    transitivePeerDependencies:
      - supports-color

@@ -15794,7 +15811,7 @@ snapshots:
      debug: 4.3.5
      enhanced-resolve: 5.17.0
      eslint: 8.35.0
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.35.0))(eslint@8.35.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.35.0)
      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.54.0(eslint@8.35.0)(typescript@4.9.5))(eslint@8.35.0)
      fast-glob: 3.3.2
      get-tsconfig: 4.7.5
@@ -15816,7 +15833,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.35.0))(eslint@8.35.0):
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.35.0):
    dependencies:
      debug: 3.2.7(supports-color@8.1.1)
    optionalDependencies:
@@ -16816,7 +16833,7 @@ snapshots:
  http-proxy-agent@7.0.2:
    dependencies:
      agent-base: 7.1.1
-      debug: 4.3.5
+      debug: 4.4.0(supports-color@5.5.0)
    transitivePeerDependencies:
      - supports-color

@@ -16843,10 +16860,10 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  https-proxy-agent@7.0.5:
+  https-proxy-agent@7.0.6:
    dependencies:
-      agent-base: 7.1.1
-      debug: 4.3.5
+      agent-base: 7.1.3
+      debug: 4.4.0(supports-color@5.5.0)
    transitivePeerDependencies:
      - supports-color

@@ -18282,6 +18299,8 @@ snapshots:

  mkdirp@1.0.4: {}

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

  moment@2.30.1: {}
@@ -20699,7 +20718,7 @@ snapshots:

  typedarray@0.0.6: {}

-  typeorm@0.3.11(pg@8.11.0)(sqlite3@5.1.7)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5)):
+  typeorm@0.3.12(pg@8.11.0)(sqlite3@5.1.7)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5)):
    dependencies:
      '@sqltools/formatter': 1.2.5
      app-root-path: 3.1.0
@@ -20707,15 +20726,15 @@ snapshots:
      chalk: 4.1.2
      cli-highlight: 2.1.11
      date-fns: 2.29.3
-      debug: 4.3.5
+      debug: 4.4.0(supports-color@5.5.0)
      dotenv: 16.4.5
-      glob: 7.2.3
+      glob: 8.1.0
      js-yaml: 4.1.0
-      mkdirp: 1.0.4
+      mkdirp: 2.1.6
      reflect-metadata: 0.1.13
      sha.js: 2.4.11
-      tslib: 2.6.3
-      uuid: 8.3.2
+      tslib: 2.8.1
+      uuid: 9.0.1
      xml2js: 0.4.23
      yargs: 17.7.2
    optionalDependencies:
@@ -20884,8 +20903,7 @@ snapshots:

  uuid@8.3.2: {}

-  uuid@9.0.1:
-    optional: true
+  uuid@9.0.1: {}

  uvu@0.5.6:
    dependencies:
--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -22,6 +22,23 @@ export interface JellyfinUserResponse {
  PrimaryImageTag?: string;
 }

+export interface JellyfinDevice {
+  Id: string;
+  Name: string;
+  LastUserName: string;
+  AppName: string;
+  AppVersion: string;
+  LastUserId: string;
+  DateLastActivity: string;
+  Capabilities: Record<string, unknown>;
+}
+
+export interface JellyfinDevicesResponse {
+  Items: JellyfinDevice[];
+  TotalRecordCount: number;
+  StartIndex: number;
+}
+
 export interface JellyfinLoginResponse {
  User: JellyfinUserResponse;
  AccessToken: string;
@@ -113,9 +130,7 @@ class JellyfinAPI extends ExternalAPI {
    const safeDeviceId =
      deviceId && deviceId.length > 0
        ? deviceId
-        : Buffer.from(`BOT_jellyseerr_fallback_${Date.now()}`).toString(
-            'base64'
-          );
+        : Buffer.from('BOT_jellyseerr').toString('base64');

    let authHeaderVal: string;
    if (authToken) {
--- a/server/api/plextv.ts
+++ b/server/api/plextv.ts
@@ -367,12 +367,12 @@ class PlexTvAPI extends ExternalAPI {

  public async pingToken() {
    try {
-      const data: { pong: unknown } = await this.get('/api/v2/ping', {
+      const response = await this.axios.get('/api/v2/ping', {
        headers: {
          'X-Plex-Client-Identifier': randomUUID(),
        },
      });
-      if (!data?.pong) {
+      if (!response?.data?.pong) {
        throw new Error('No pong response');
      }
    } catch (e) {
--- a/server/api/themoviedb/index.ts
+++ b/server/api/themoviedb/index.ts
@@ -59,6 +59,16 @@ export const SortOptionsIterable = [

 export type SortOptions = (typeof SortOptionsIterable)[number];

+export interface TmdbCertificationResponse {
+  certifications: {
+    [country: string]: {
+      certification: string;
+      meaning?: string;
+      order?: number;
+    }[];
+  };
+}
+
 interface DiscoverMovieOptions {
  page?: number;
  includeAdult?: boolean;
@@ -78,6 +88,10 @@ interface DiscoverMovieOptions {
  sortBy?: SortOptions;
  watchRegion?: string;
  watchProviders?: string;
+  certification?: string;
+  certificationGte?: string;
+  certificationLte?: string;
+  certificationCountry?: string;
 }

 interface DiscoverTvOptions {
@@ -100,6 +114,10 @@ interface DiscoverTvOptions {
  watchRegion?: string;
  watchProviders?: string;
  withStatus?: string; // Returning Series: 0 Planned: 1 In Production: 2 Ended: 3 Cancelled: 4 Pilot: 5
+  certification?: string;
+  certificationGte?: string;
+  certificationLte?: string;
+  certificationCountry?: string;
 }

 class TheMovieDb extends ExternalAPI {
@@ -477,6 +495,10 @@ class TheMovieDb extends ExternalAPI {
    voteCountLte,
    watchProviders,
    watchRegion,
+    certification,
+    certificationGte,
+    certificationLte,
+    certificationCountry,
  }: DiscoverMovieOptions = {}): Promise<TmdbSearchMovieResponse> => {
    try {
      const defaultFutureDate = new Date(
@@ -523,6 +545,10 @@ class TheMovieDb extends ExternalAPI {
          'vote_count.lte': voteCountLte,
          watch_region: watchRegion,
          with_watch_providers: watchProviders,
+          certification: certification,
+          'certification.gte': certificationGte,
+          'certification.lte': certificationLte,
+          certification_country: certificationCountry,
        },
      });

@@ -552,6 +578,10 @@ class TheMovieDb extends ExternalAPI {
    watchProviders,
    watchRegion,
    withStatus,
+    certification,
+    certificationGte,
+    certificationLte,
+    certificationCountry,
  }: DiscoverTvOptions = {}): Promise<TmdbSearchTvResponse> => {
    try {
      const defaultFutureDate = new Date(
@@ -599,6 +629,10 @@ class TheMovieDb extends ExternalAPI {
          with_watch_providers: watchProviders,
          watch_region: watchRegion,
          with_status: withStatus,
+          certification: certification,
+          'certification.gte': certificationGte,
+          'certification.lte': certificationLte,
+          certification_country: certificationCountry,
        },
      });

@@ -987,6 +1021,35 @@ class TheMovieDb extends ExternalAPI {
    }
  }

+  public getMovieCertifications =
+    async (): Promise<TmdbCertificationResponse> => {
+      try {
+        const data = await this.get<TmdbCertificationResponse>(
+          '/certification/movie/list',
+          {},
+          604800 // 7 days
+        );
+
+        return data;
+      } catch (e) {
+        throw new Error(`[TMDB] Failed to fetch movie certifications: ${e}`);
+      }
+    };
+
+  public getTvCertifications = async (): Promise<TmdbCertificationResponse> => {
+    try {
+      const data = await this.get<TmdbCertificationResponse>(
+        '/certification/tv/list',
+        {},
+        604800 // 7 days
+      );
+
+      return data;
+    } catch (e) {
+      throw new Error(`[TMDB] Failed to fetch TV certifications: ${e.message}`);
+    }
+  };
+
  public async getKeywordDetails({
    keywordId,
  }: {
--- a/server/constants/media.ts
+++ b/server/constants/media.ts
@@ -3,6 +3,7 @@ export enum MediaRequestStatus {
  APPROVED,
  DECLINED,
  FAILED,
+  COMPLETED,
 }

 export enum MediaType {
@@ -17,4 +18,5 @@ export enum MediaStatus {
  PARTIALLY_AVAILABLE,
  AVAILABLE,
  BLACKLISTED,
+  DELETED,
 }
--- a/server/entity/Blacklist.ts
+++ b/server/entity/Blacklist.ts
@@ -3,10 +3,10 @@ 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 { DbAwareColumn } from '@server/utils/DbColumnHelper';
 import type { EntityManager } from 'typeorm';
 import {
  Column,
-  CreateDateColumn,
  Entity,
  Index,
  JoinColumn,
@@ -47,7 +47,7 @@ export class Blacklist implements BlacklistItem {
  @Column({ nullable: true, type: 'varchar' })
  public blacklistedTags?: string;

-  @CreateDateColumn()
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public createdAt: Date;

  constructor(init?: Partial<Blacklist>) {
--- a/server/entity/DiscoverSlider.ts
+++ b/server/entity/DiscoverSlider.ts
@@ -2,13 +2,8 @@ import type { DiscoverSliderType } from '@server/constants/discover';
 import { defaultSliders } from '@server/constants/discover';
 import { getRepository } from '@server/datasource';
 import logger from '@server/logger';
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';

@Entity()
 class DiscoverSlider {
@@ -55,10 +50,14 @@ class DiscoverSlider {
  @Column({ nullable: true })
  public data?: string;

-  @CreateDateColumn()
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public createdAt: Date;

-  @UpdateDateColumn()
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    onUpdate: 'CURRENT_TIMESTAMP',
+  })
  public updatedAt: Date;

  constructor(init?: Partial<DiscoverSlider>) {
--- a/server/entity/Issue.ts
+++ b/server/entity/Issue.ts
@@ -1,13 +1,13 @@
 import type { IssueType } from '@server/constants/issue';
 import { IssueStatus } from '@server/constants/issue';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
 import {
+  AfterLoad,
  Column,
-  CreateDateColumn,
  Entity,
  ManyToOne,
  OneToMany,
  PrimaryGeneratedColumn,
-  UpdateDateColumn,
 } from 'typeorm';
 import IssueComment from './IssueComment';
 import Media from './Media';
@@ -55,12 +55,21 @@ class Issue {
  })
  public comments: IssueComment[];

-  @CreateDateColumn()
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public createdAt: Date;

-  @UpdateDateColumn()
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    onUpdate: 'CURRENT_TIMESTAMP',
+  })
  public updatedAt: Date;

+  @AfterLoad()
+  sortComments() {
+    this.comments?.sort((a, b) => a.id - b.id);
+  }
+
  constructor(init?: Partial<Issue>) {
    Object.assign(this, init);
  }
--- a/server/entity/IssueComment.ts
+++ b/server/entity/IssueComment.ts
@@ -1,11 +1,5 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 import Issue from './Issue';
 import { User } from './User';

@@ -28,10 +22,14 @@ class IssueComment {
  @Column({ type: 'text' })
  public message: string;

-  @CreateDateColumn()
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public createdAt: Date;

-  @UpdateDateColumn()
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    onUpdate: 'CURRENT_TIMESTAMP',
+  })
  public updatedAt: Date;

  constructor(init?: Partial<IssueComment>) {
--- a/server/entity/Media.ts
+++ b/server/entity/Media.ts
@@ -15,13 +15,11 @@ import { getHostname } from '@server/utils/getHostname';
 import {
  AfterLoad,
  Column,
-  CreateDateColumn,
  Entity,
  Index,
  OneToMany,
  OneToOne,
  PrimaryGeneratedColumn,
-  UpdateDateColumn,
 } from 'typeorm';
 import Issue from './Issue';
 import { MediaRequest } from './MediaRequest';
@@ -108,7 +106,9 @@ class Media {
  @Column({ type: 'int', default: MediaStatus.UNKNOWN })
  public status4k: MediaStatus;

-  @OneToMany(() => MediaRequest, (request) => request.media, { cascade: true })
+  @OneToMany(() => MediaRequest, (request) => request.media, {
+    cascade: ['insert', 'remove'],
+  })
  public requests: MediaRequest[];

  @OneToMany(() => Watchlist, (watchlist) => watchlist.media)
@@ -126,10 +126,14 @@ class Media {
  @OneToOne(() => Blacklist, (blacklist) => blacklist.media)
  public blacklist: Promise<Blacklist>;

-  @CreateDateColumn()
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public createdAt: Date;

-  @UpdateDateColumn()
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    onUpdate: 'CURRENT_TIMESTAMP',
+  })
  public updatedAt: Date;

  /**
--- a/server/entity/MediaRequest.ts
+++ b/server/entity/MediaRequest.ts
@@ -1,10 +1,3 @@
-import type { RadarrMovieOptions } from '@server/api/servarr/radarr';
-import RadarrAPI from '@server/api/servarr/radarr';
-import type {
-  AddSeriesOptions,
-  SonarrSeries,
-} from '@server/api/servarr/sonarr';
-import SonarrAPI from '@server/api/servarr/sonarr';
 import TheMovieDb from '@server/api/themoviedb';
 import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
 import type { TmdbKeyword } from '@server/api/themoviedb/interfaces';
@@ -20,19 +13,18 @@ import notificationManager, { Notification } from '@server/lib/notifications';
 import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import { isEqual, truncate } from 'lodash';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
+import { truncate } from 'lodash';
 import {
  AfterInsert,
-  AfterRemove,
+  AfterLoad,
  AfterUpdate,
  Column,
-  CreateDateColumn,
  Entity,
  ManyToOne,
  OneToMany,
  PrimaryGeneratedColumn,
  RelationCount,
-  UpdateDateColumn,
 } from 'typeorm';
 import Media from './Media';
 import SeasonRequest from './SeasonRequest';
@@ -181,7 +173,8 @@ export class MediaRequest {
      // If there is an existing movie request that isn't declined, don't allow a new one.
      if (
        requestBody.mediaType === MediaType.MOVIE &&
-        existing[0].status !== MediaRequestStatus.DECLINED
+        existing[0].status !== MediaRequestStatus.DECLINED &&
+        existing[0].status !== MediaRequestStatus.COMPLETED
      ) {
        logger.warn('Duplicate request for media blocked', {
          tmdbId: tmdbMedia.id,
@@ -388,7 +381,9 @@ export class MediaRequest {
      >;
      let requestedSeasons =
        requestBody.seasons === 'all'
-          ? tmdbMediaShow.seasons.map((season) => season.season_number)
+          ? tmdbMediaShow.seasons
+              .filter((season) => season.season_number !== 0)
+              .map((season) => season.season_number)
          : (requestBody.seasons as number[]);
      if (!settings.main.enableSpecialEpisodes) {
        requestedSeasons = requestedSeasons.filter((sn) => sn > 0);
@@ -404,7 +399,8 @@ export class MediaRequest {
          .filter(
            (request) =>
              request.is4k === requestBody.is4k &&
-              request.status !== MediaRequestStatus.DECLINED
+              request.status !== MediaRequestStatus.DECLINED &&
+              request.status !== MediaRequestStatus.COMPLETED
          )
          .reduce((seasons, request) => {
            const combinedSeasons = request.seasons.map(
@@ -423,7 +419,9 @@ export class MediaRequest {
            .filter(
              (season) =>
                season[requestBody.is4k ? 'status4k' : 'status'] !==
-                MediaStatus.UNKNOWN
+                  MediaStatus.UNKNOWN &&
+                season[requestBody.is4k ? 'status4k' : 'status'] !==
+                  MediaStatus.DELETED
            )
            .map((season) => season.seasonNumber),
        ];
@@ -537,10 +535,14 @@ export class MediaRequest {
  })
  public modifiedBy?: User;

-  @CreateDateColumn()
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public createdAt: Date;

-  @UpdateDateColumn()
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    onUpdate: 'CURRENT_TIMESTAMP',
+  })
  public updatedAt: Date;

  @Column({ type: 'varchar' })
@@ -608,12 +610,6 @@ export class MediaRequest {
    Object.assign(this, init);
  }

-  @AfterUpdate()
-  @AfterInsert()
-  public async sendMedia(): Promise<void> {
-    await Promise.all([this.sendToRadarr(), this.sendToSonarr()]);
-  }
-
  @AfterInsert()
  public async notifyNewRequest(): Promise<void> {
    if (this.status === MediaRequestStatus.PENDING) {
@@ -630,10 +626,14 @@ export class MediaRequest {
        return;
      }

-      this.sendNotification(media, Notification.MEDIA_PENDING);
+      MediaRequest.sendNotification(this, media, Notification.MEDIA_PENDING);

      if (this.isAutoRequest) {
-        this.sendNotification(media, Notification.MEDIA_AUTO_REQUESTED);
+        MediaRequest.sendNotification(
+          this,
+          media,
+          Notification.MEDIA_AUTO_REQUESTED
+        );
      }
    }
  }
@@ -671,7 +671,8 @@ export class MediaRequest {
        return;
      }

-      this.sendNotification(
+      MediaRequest.sendNotification(
+        this,
        media,
        this.status === MediaRequestStatus.APPROVED
          ? autoApproved
@@ -685,7 +686,11 @@ export class MediaRequest {
        autoApproved &&
        this.isAutoRequest
      ) {
-        this.sendNotification(media, Notification.MEDIA_AUTO_REQUESTED);
+        MediaRequest.sendNotification(
+          this,
+          media,
+          Notification.MEDIA_AUTO_REQUESTED
+        );
      }
    }
  }
@@ -697,699 +702,63 @@ export class MediaRequest {
    }
  }

-  @AfterUpdate()
-  @AfterInsert()
-  public async updateParentStatus(): Promise<void> {
-    const mediaRepository = getRepository(Media);
-    const media = await mediaRepository.findOne({
-      where: { id: this.media.id },
-      relations: { requests: true },
-    });
-    if (!media) {
-      logger.error('Media data not found', {
-        label: 'Media Request',
-        requestId: this.id,
-        mediaId: this.media.id,
-      });
-      return;
-    }
-    const seasonRequestRepository = getRepository(SeasonRequest);
-    if (
-      this.status === MediaRequestStatus.APPROVED &&
-      // Do not update the status if the item is already partially available or available
-      media[this.is4k ? 'status4k' : 'status'] !== MediaStatus.AVAILABLE &&
-      media[this.is4k ? 'status4k' : 'status'] !==
-        MediaStatus.PARTIALLY_AVAILABLE &&
-      media[this.is4k ? 'status4k' : 'status'] !== MediaStatus.PROCESSING
-    ) {
-      const statusField = this.is4k ? 'status4k' : 'status';
-
-      await mediaRepository.update(
-        { id: this.media.id },
-        { [statusField]: MediaStatus.PROCESSING }
-      );
-    }
-
-    if (
-      media.mediaType === MediaType.MOVIE &&
-      this.status === MediaRequestStatus.DECLINED
-    ) {
-      const statusField = this.is4k ? 'status4k' : 'status';
-      await mediaRepository.update(
-        { id: this.media.id },
-        { [statusField]: MediaStatus.UNKNOWN }
-      );
-    }
-
-    /**
-     * If the media type is TV, and we are declining a request,
-     * we must check if its the only pending request and that
-     * there the current media status is just pending (meaning no
-     * other requests have yet to be approved)
-     */
-    if (
-      media.mediaType === MediaType.TV &&
-      this.status === MediaRequestStatus.DECLINED &&
-      media.requests.filter(
-        (request) => request.status === MediaRequestStatus.PENDING
-      ).length === 0 &&
-      media[this.is4k ? 'status4k' : 'status'] === MediaStatus.PENDING
-    ) {
-      const statusField = this.is4k ? 'status4k' : 'status';
-      mediaRepository.update(
-        { id: this.media.id },
-        { [statusField]: MediaStatus.UNKNOWN }
-      );
-    }
-
-    // Approve child seasons if parent is approved
-    if (
-      media.mediaType === MediaType.TV &&
-      this.status === MediaRequestStatus.APPROVED
-    ) {
-      this.seasons.forEach((season) => {
-        season.status = MediaRequestStatus.APPROVED;
-        seasonRequestRepository.save(season);
-      });
+  @AfterLoad()
+  private sortSeasons() {
+    if (Array.isArray(this.seasons)) {
+      this.seasons.sort((a, b) => a.id - b.id);
    }
  }

-  @AfterRemove()
-  public async handleRemoveParentUpdate(): Promise<void> {
-    const mediaRepository = getRepository(Media);
-    const fullMedia = await mediaRepository.findOneOrFail({
-      where: { id: this.media.id },
-      relations: { requests: true },
-    });
-
-    if (
-      !fullMedia.requests.some((request) => !request.is4k) &&
-      fullMedia.status !== MediaStatus.AVAILABLE
-    ) {
-      fullMedia.status = MediaStatus.UNKNOWN;
-    }
-
-    if (
-      !fullMedia.requests.some((request) => request.is4k) &&
-      fullMedia.status4k !== MediaStatus.AVAILABLE
-    ) {
-      fullMedia.status4k = MediaStatus.UNKNOWN;
-    }
-
-    mediaRepository.save(fullMedia);
-  }
-
-  public async sendToRadarr(): Promise<void> {
-    if (
-      this.status === MediaRequestStatus.APPROVED &&
-      this.type === MediaType.MOVIE
-    ) {
-      try {
-        const mediaRepository = getRepository(Media);
-        const settings = getSettings();
-        if (settings.radarr.length === 0 && !settings.radarr[0]) {
-          logger.info(
-            'No Radarr server configured, skipping request processing',
-            {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-            }
-          );
-          return;
-        }
-
-        let radarrSettings = settings.radarr.find(
-          (radarr) => radarr.isDefault && radarr.is4k === this.is4k
-        );
-
-        if (
-          this.serverId !== null &&
-          this.serverId >= 0 &&
-          radarrSettings?.id !== this.serverId
-        ) {
-          radarrSettings = settings.radarr.find(
-            (radarr) => radarr.id === this.serverId
-          );
-          logger.info(
-            `Request has an override server: ${radarrSettings?.name}`,
-            {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-            }
-          );
-        }
-
-        if (!radarrSettings) {
-          logger.warn(
-            `There is no default ${
-              this.is4k ? '4K ' : ''
-            }Radarr server configured. Did you set any of your ${
-              this.is4k ? '4K ' : ''
-            }Radarr servers as default?`,
-            {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-            }
-          );
-          return;
-        }
-
-        let rootFolder = radarrSettings.activeDirectory;
-        let qualityProfile = radarrSettings.activeProfileId;
-        let tags = radarrSettings.tags ? [...radarrSettings.tags] : [];
-
-        if (
-          this.rootFolder &&
-          this.rootFolder !== '' &&
-          this.rootFolder !== radarrSettings.activeDirectory
-        ) {
-          rootFolder = this.rootFolder;
-          logger.info(`Request has an override root folder: ${rootFolder}`, {
-            label: 'Media Request',
-            requestId: this.id,
-            mediaId: this.media.id,
-          });
-        }
-
-        if (
-          this.profileId &&
-          this.profileId !== radarrSettings.activeProfileId
-        ) {
-          qualityProfile = this.profileId;
-          logger.info(
-            `Request has an override quality profile ID: ${qualityProfile}`,
-            {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-            }
-          );
-        }
-
-        if (this.tags && !isEqual(this.tags, radarrSettings.tags)) {
-          tags = this.tags;
-          logger.info(`Request has override tags`, {
-            label: 'Media Request',
-            requestId: this.id,
-            mediaId: this.media.id,
-            tagIds: tags,
-          });
-        }
-
-        const tmdb = new TheMovieDb();
-        const radarr = new RadarrAPI({
-          apiKey: radarrSettings.apiKey,
-          url: RadarrAPI.buildUrl(radarrSettings, '/api/v3'),
-        });
-        const movie = await tmdb.getMovie({ movieId: this.media.tmdbId });
-
-        const media = await mediaRepository.findOne({
-          where: { id: this.media.id },
-        });
-
-        if (!media) {
-          logger.error('Media data not found', {
-            label: 'Media Request',
-            requestId: this.id,
-            mediaId: this.media.id,
-          });
-          return;
-        }
-
-        if (radarrSettings.tagRequests) {
-          let userTag = (await radarr.getTags()).find((v) =>
-            v.label.startsWith(this.requestedBy.id + ' - ')
-          );
-          if (!userTag) {
-            logger.info(`Requester has no active tag. Creating new`, {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-              userId: this.requestedBy.id,
-              newTag:
-                this.requestedBy.id + ' - ' + this.requestedBy.displayName,
-            });
-            userTag = await radarr.createTag({
-              label: this.requestedBy.id + ' - ' + this.requestedBy.displayName,
-            });
-          }
-          if (userTag.id) {
-            if (!tags?.find((v) => v === userTag?.id)) {
-              tags?.push(userTag.id);
-            }
-          } else {
-            logger.warn(`Requester has no tag and failed to add one`, {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-              userId: this.requestedBy.id,
-              radarrServer: radarrSettings.hostname + ':' + radarrSettings.port,
-            });
-          }
-        }
-
-        if (
-          media[this.is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
-        ) {
-          logger.warn('Media already exists, marking request as APPROVED', {
-            label: 'Media Request',
-            requestId: this.id,
-            mediaId: this.media.id,
-          });
-
-          const requestRepository = getRepository(MediaRequest);
-
-          await requestRepository.update(this.id, {
-            status: MediaRequestStatus.APPROVED,
-          });
-          return;
-        }
-
-        const radarrMovieOptions: RadarrMovieOptions = {
-          profileId: qualityProfile,
-          qualityProfileId: qualityProfile,
-          rootFolderPath: rootFolder,
-          minimumAvailability: radarrSettings.minimumAvailability,
-          title: movie.title,
-          tmdbId: movie.id,
-          year: Number(movie.release_date.slice(0, 4)),
-          monitored: true,
-          tags,
-          searchNow: !radarrSettings.preventSearch,
-        };
-
-        // Run this asynchronously so we don't wait for it on the UI side
-        radarr
-          .addMovie(radarrMovieOptions)
-          .then(async (radarrMovie) => {
-            // We grab media again here to make sure we have the latest version of it
-            const media = await mediaRepository.findOne({
-              where: { id: this.media.id },
-            });
-
-            if (!media) {
-              throw new Error('Media data not found');
-            }
-
-            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);
-
-            await requestRepository.update(this.id, {
-              status: MediaRequestStatus.FAILED,
-            });
-
-            logger.warn(
-              'Something went wrong sending movie request to Radarr, marking status as FAILED',
-              {
-                label: 'Media Request',
-                requestId: this.id,
-                mediaId: this.media.id,
-                radarrMovieOptions,
-              }
-            );
-
-            this.sendNotification(media, Notification.MEDIA_FAILED);
-          })
-          .finally(() => {
-            radarr.clearCache({
-              tmdbId: movie.id,
-              externalId: this.is4k
-                ? media.externalServiceId4k
-                : media.externalServiceId,
-            });
-          });
-        logger.info('Sent request to Radarr', {
-          label: 'Media Request',
-          requestId: this.id,
-          mediaId: this.media.id,
-        });
-      } catch (e) {
-        logger.error('Something went wrong sending request to Radarr', {
-          label: 'Media Request',
-          errorMessage: e.message,
-          requestId: this.id,
-          mediaId: this.media.id,
-        });
-        throw new Error(e.message);
-      }
-    }
-  }
-
-  public async sendToSonarr(): Promise<void> {
-    if (
-      this.status === MediaRequestStatus.APPROVED &&
-      this.type === MediaType.TV
-    ) {
-      try {
-        const mediaRepository = getRepository(Media);
-        const settings = getSettings();
-        if (settings.sonarr.length === 0 && !settings.sonarr[0]) {
-          logger.warn(
-            'No Sonarr server configured, skipping request processing',
-            {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-            }
-          );
-          return;
-        }
-
-        let sonarrSettings = settings.sonarr.find(
-          (sonarr) => sonarr.isDefault && sonarr.is4k === this.is4k
-        );
-
-        if (
-          this.serverId !== null &&
-          this.serverId >= 0 &&
-          sonarrSettings?.id !== this.serverId
-        ) {
-          sonarrSettings = settings.sonarr.find(
-            (sonarr) => sonarr.id === this.serverId
-          );
-          logger.info(
-            `Request has an override server: ${sonarrSettings?.name}`,
-            {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-            }
-          );
-        }
-
-        if (!sonarrSettings) {
-          logger.warn(
-            `There is no default ${
-              this.is4k ? '4K ' : ''
-            }Sonarr server configured. Did you set any of your ${
-              this.is4k ? '4K ' : ''
-            }Sonarr servers as default?`,
-            {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-            }
-          );
-          return;
-        }
-
-        const media = await mediaRepository.findOne({
-          where: { id: this.media.id },
-          relations: { requests: true },
-        });
-
-        if (!media) {
-          throw new Error('Media data not found');
-        }
-
-        if (
-          media[this.is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
-        ) {
-          logger.warn('Media already exists, marking request as APPROVED', {
-            label: 'Media Request',
-            requestId: this.id,
-            mediaId: this.media.id,
-          });
-
-          const requestRepository = getRepository(MediaRequest);
-          await requestRepository.update(this.id, {
-            status: MediaRequestStatus.APPROVED,
-          });
-          return;
-        }
-
-        const tmdb = new TheMovieDb();
-        const sonarr = new SonarrAPI({
-          apiKey: sonarrSettings.apiKey,
-          url: SonarrAPI.buildUrl(sonarrSettings, '/api/v3'),
-        });
-        const series = await tmdb.getTvShow({ tvId: media.tmdbId });
-        const tvdbId = series.external_ids.tvdb_id ?? media.tvdbId;
-
-        if (!tvdbId) {
-          const requestRepository = getRepository(MediaRequest);
-          await mediaRepository.remove(media);
-          await requestRepository.remove(this);
-          throw new Error('TVDB ID not found');
-        }
-
-        let seriesType: SonarrSeries['seriesType'] = 'standard';
-
-        // Change series type to anime if the anime keyword is present on tmdb
-        if (
-          series.keywords.results.some(
-            (keyword) => keyword.id === ANIME_KEYWORD_ID
-          )
-        ) {
-          seriesType = sonarrSettings.animeSeriesType ?? 'anime';
-        }
-
-        let rootFolder =
-          seriesType === 'anime' && sonarrSettings.activeAnimeDirectory
-            ? sonarrSettings.activeAnimeDirectory
-            : sonarrSettings.activeDirectory;
-        let qualityProfile =
-          seriesType === 'anime' && sonarrSettings.activeAnimeProfileId
-            ? sonarrSettings.activeAnimeProfileId
-            : sonarrSettings.activeProfileId;
-        let languageProfile =
-          seriesType === 'anime' && sonarrSettings.activeAnimeLanguageProfileId
-            ? sonarrSettings.activeAnimeLanguageProfileId
-            : sonarrSettings.activeLanguageProfileId;
-        let tags =
-          seriesType === 'anime'
-            ? sonarrSettings.animeTags
-              ? [...sonarrSettings.animeTags]
-              : []
-            : sonarrSettings.tags
-            ? [...sonarrSettings.tags]
-            : [];
-
-        if (
-          this.rootFolder &&
-          this.rootFolder !== '' &&
-          this.rootFolder !== rootFolder
-        ) {
-          rootFolder = this.rootFolder;
-          logger.info(`Request has an override root folder: ${rootFolder}`, {
-            label: 'Media Request',
-            requestId: this.id,
-            mediaId: this.media.id,
-          });
-        }
-
-        if (this.profileId && this.profileId !== qualityProfile) {
-          qualityProfile = this.profileId;
-          logger.info(
-            `Request has an override quality profile ID: ${qualityProfile}`,
-            {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-            }
-          );
-        }
-
-        if (
-          this.languageProfileId &&
-          this.languageProfileId !== languageProfile
-        ) {
-          languageProfile = this.languageProfileId;
-          logger.info(
-            `Request has an override language profile ID: ${languageProfile}`,
-            {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-            }
-          );
-        }
-
-        if (this.tags && !isEqual(this.tags, tags)) {
-          tags = this.tags;
-          logger.info(`Request has override tags`, {
-            label: 'Media Request',
-            requestId: this.id,
-            mediaId: this.media.id,
-            tagIds: tags,
-          });
-        }
-
-        if (sonarrSettings.tagRequests) {
-          let userTag = (await sonarr.getTags()).find((v) =>
-            v.label.startsWith(this.requestedBy.id + ' - ')
-          );
-          if (!userTag) {
-            logger.info(`Requester has no active tag. Creating new`, {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-              userId: this.requestedBy.id,
-              newTag:
-                this.requestedBy.id + ' - ' + this.requestedBy.displayName,
-            });
-            userTag = await sonarr.createTag({
-              label: this.requestedBy.id + ' - ' + this.requestedBy.displayName,
-            });
-          }
-          if (userTag.id) {
-            if (!tags?.find((v) => v === userTag?.id)) {
-              tags?.push(userTag.id);
-            }
-          } else {
-            logger.warn(`Requester has no tag and failed to add one`, {
-              label: 'Media Request',
-              requestId: this.id,
-              mediaId: this.media.id,
-              userId: this.requestedBy.id,
-              sonarrServer: sonarrSettings.hostname + ':' + sonarrSettings.port,
-            });
-          }
-        }
-
-        const sonarrSeriesOptions: AddSeriesOptions = {
-          profileId: qualityProfile,
-          languageProfileId: languageProfile,
-          rootFolderPath: rootFolder,
-          title: series.name,
-          tvdbid: tvdbId,
-          seasons: this.seasons.map((season) => season.seasonNumber),
-          seasonFolder: sonarrSettings.enableSeasonFolders,
-          seriesType,
-          tags,
-          monitored: true,
-          searchNow: !sonarrSettings.preventSearch,
-        };
-
-        // Run this asynchronously so we don't wait for it on the UI side
-        sonarr
-          .addSeries(sonarrSeriesOptions)
-          .then(async (sonarrSeries) => {
-            // We grab media again here to make sure we have the latest version of it
-            const media = await mediaRepository.findOne({
-              where: { id: this.media.id },
-              relations: { requests: true },
-            });
-
-            if (!media) {
-              throw new Error('Media data not found');
-            }
-
-            const updateFields = {
-              [this.is4k ? 'externalServiceId4k' : 'externalServiceId']:
-                sonarrSeries.id,
-              [this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']:
-                sonarrSeries.titleSlug,
-              [this.is4k ? 'serviceId4k' : 'serviceId']: sonarrSettings?.id,
-            };
-
-            await mediaRepository.update({ id: this.media.id }, updateFields);
-          })
-          .catch(async () => {
-            const requestRepository = getRepository(MediaRequest);
-
-            await requestRepository.update(
-              { id: this.id },
-              { status: MediaRequestStatus.FAILED }
-            );
-
-            logger.warn(
-              'Something went wrong sending series request to Sonarr, marking status as FAILED',
-              {
-                label: 'Media Request',
-                requestId: this.id,
-                mediaId: this.media.id,
-                sonarrSeriesOptions,
-              }
-            );
-
-            this.sendNotification(media, Notification.MEDIA_FAILED);
-          })
-          .finally(() => {
-            sonarr.clearCache({
-              tvdbId,
-              externalId: this.is4k
-                ? media.externalServiceId4k
-                : media.externalServiceId,
-              title: series.name,
-            });
-          });
-        logger.info('Sent request to Sonarr', {
-          label: 'Media Request',
-          requestId: this.id,
-          mediaId: this.media.id,
-        });
-      } catch (e) {
-        logger.error('Something went wrong sending request to Sonarr', {
-          label: 'Media Request',
-          errorMessage: e.message,
-          requestId: this.id,
-          mediaId: this.media.id,
-        });
-        throw new Error(e.message);
-      }
-    }
-  }
-
-  private async sendNotification(media: Media, type: Notification) {
+  static async sendNotification(
+    entity: MediaRequest,
+    media: Media,
+    type: Notification
+  ) {
    const tmdb = new TheMovieDb();

    try {
-      const mediaType = this.type === MediaType.MOVIE ? 'Movie' : 'Series';
+      const mediaType = entity.type === MediaType.MOVIE ? 'Movie' : 'Series';
      let event: string | undefined;
      let notifyAdmin = true;
      let notifySystem = true;

      switch (type) {
        case Notification.MEDIA_APPROVED:
-          event = `${this.is4k ? '4K ' : ''}${mediaType} Request Approved`;
+          event = `${entity.is4k ? '4K ' : ''}${mediaType} Request Approved`;
          notifyAdmin = false;
          break;
        case Notification.MEDIA_DECLINED:
-          event = `${this.is4k ? '4K ' : ''}${mediaType} Request Declined`;
+          event = `${entity.is4k ? '4K ' : ''}${mediaType} Request Declined`;
          notifyAdmin = false;
          break;
        case Notification.MEDIA_PENDING:
-          event = `New ${this.is4k ? '4K ' : ''}${mediaType} Request`;
+          event = `New ${entity.is4k ? '4K ' : ''}${mediaType} Request`;
          break;
        case Notification.MEDIA_AUTO_REQUESTED:
          event = `${
-            this.is4k ? '4K ' : ''
+            entity.is4k ? '4K ' : ''
          }${mediaType} Request Automatically Submitted`;
          notifyAdmin = false;
          notifySystem = false;
          break;
        case Notification.MEDIA_AUTO_APPROVED:
          event = `${
-            this.is4k ? '4K ' : ''
+            entity.is4k ? '4K ' : ''
          }${mediaType} Request Automatically Approved`;
          break;
        case Notification.MEDIA_FAILED:
-          event = `${this.is4k ? '4K ' : ''}${mediaType} Request Failed`;
+          event = `${entity.is4k ? '4K ' : ''}${mediaType} Request Failed`;
          break;
      }

-      if (this.type === MediaType.MOVIE) {
+      if (entity.type === MediaType.MOVIE) {
        const movie = await tmdb.getMovie({ movieId: media.tmdbId });
        notificationManager.sendNotification(type, {
          media,
-          request: this,
+          request: entity,
          notifyAdmin,
          notifySystem,
-          notifyUser: notifyAdmin ? undefined : this.requestedBy,
+          notifyUser: notifyAdmin ? undefined : entity.requestedBy,
          event,
          subject: `${movie.title}${
            movie.release_date ? ` (${movie.release_date.slice(0, 4)})` : ''
@@ -1401,14 +770,14 @@ export class MediaRequest {
          }),
          image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
        });
-      } else if (this.type === MediaType.TV) {
+      } else if (entity.type === MediaType.TV) {
        const tv = await tmdb.getTvShow({ tvId: media.tmdbId });
        notificationManager.sendNotification(type, {
          media,
-          request: this,
+          request: entity,
          notifyAdmin,
          notifySystem,
-          notifyUser: notifyAdmin ? undefined : this.requestedBy,
+          notifyUser: notifyAdmin ? undefined : entity.requestedBy,
          event,
          subject: `${tv.name}${
            tv.first_air_date ? ` (${tv.first_air_date.slice(0, 4)})` : ''
@@ -1422,7 +791,7 @@ export class MediaRequest {
          extra: [
            {
              name: 'Requested Seasons',
-              value: this.seasons
+              value: entity.seasons
                .map((season) => season.seasonNumber)
                .join(', '),
            },
@@ -1433,8 +802,8 @@ export class MediaRequest {
      logger.error('Something went wrong sending media notification(s)', {
        label: 'Notifications',
        errorMessage: e.message,
-        requestId: this.id,
-        mediaId: this.media.id,
+        requestId: entity.id,
+        mediaId: entity.media.id,
      });
    }
  }
--- a/server/entity/OverrideRule.ts
+++ b/server/entity/OverrideRule.ts
@@ -1,10 +1,5 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';

@Entity()
 class OverrideRule {
@@ -38,10 +33,14 @@ class OverrideRule {
  @Column({ nullable: true })
  public tags?: string;

-  @CreateDateColumn()
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public createdAt: Date;

-  @UpdateDateColumn()
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    onUpdate: 'CURRENT_TIMESTAMP',
+  })
  public updatedAt: Date;

  constructor(init?: Partial<OverrideRule>) {
--- a/server/entity/Season.ts
+++ b/server/entity/Season.ts
@@ -1,12 +1,6 @@
 import { MediaStatus } from '@server/constants/media';
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 import Media from './Media';

@Entity()
@@ -28,10 +22,14 @@ class Season {
  })
  public media: Promise<Media>;

-  @CreateDateColumn()
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public createdAt: Date;

-  @UpdateDateColumn()
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    onUpdate: 'CURRENT_TIMESTAMP',
+  })
  public updatedAt: Date;

  constructor(init?: Partial<Season>) {
--- a/server/entity/SeasonRequest.ts
+++ b/server/entity/SeasonRequest.ts
@@ -1,14 +1,6 @@
 import { MediaRequestStatus } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
-import {
-  AfterRemove,
-  Column,
-  CreateDateColumn,
-  Entity,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-} from 'typeorm';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 import { MediaRequest } from './MediaRequest';

@Entity()
@@ -27,27 +19,19 @@ class SeasonRequest {
  })
  public request: MediaRequest;

-  @CreateDateColumn()
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public createdAt: Date;

-  @UpdateDateColumn()
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    onUpdate: 'CURRENT_TIMESTAMP',
+  })
  public updatedAt: Date;

  constructor(init?: Partial<SeasonRequest>) {
    Object.assign(this, init);
  }
-
-  @AfterRemove()
-  public async handleRemoveParent(): Promise<void> {
-    const mediaRequestRepository = getRepository(MediaRequest);
-    const requestToBeDeleted = await mediaRequestRepository.findOneOrFail({
-      where: { id: this.request.id },
-    });
-
-    if (requestToBeDeleted.seasons.length === 0) {
-      await mediaRequestRepository.delete({ id: this.request.id });
-    }
-  }
 }

 export default SeasonRequest;
--- a/server/entity/User.ts
+++ b/server/entity/User.ts
@@ -9,6 +9,7 @@ import { hasPermission, Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { AfterDate } from '@server/utils/dateHelpers';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
 import bcrypt from 'bcrypt';
 import { randomUUID } from 'crypto';
 import path from 'path';
@@ -16,14 +17,12 @@ import { default as generatePassword } from 'secure-random-password';
 import {
  AfterLoad,
  Column,
-  CreateDateColumn,
  Entity,
  Not,
  OneToMany,
  OneToOne,
  PrimaryGeneratedColumn,
  RelationCount,
-  UpdateDateColumn,
 } from 'typeorm';
 import Issue from './Issue';
 import { MediaRequest } from './MediaRequest';
@@ -138,10 +137,14 @@ export class User {
  @OneToMany(() => Issue, (issue) => issue.createdBy, { cascade: true })
  public createdIssues: Issue[];

-  @CreateDateColumn()
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public createdAt: Date;

-  @UpdateDateColumn()
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    onUpdate: 'CURRENT_TIMESTAMP',
+  })
  public updatedAt: Date;

  public warnings: string[] = [];
--- a/server/entity/UserPushSubscription.ts
+++ b/server/entity/UserPushSubscription.ts
@@ -1,10 +1,5 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-} from 'typeorm';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 import { User } from './User';

@Entity()
@@ -30,7 +25,11 @@ export class UserPushSubscription {
  @Column({ nullable: true })
  public userAgent: string;

-  @CreateDateColumn({ nullable: true })
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    nullable: true,
+  })
  public createdAt: Date;

  constructor(init?: Partial<UserPushSubscription>) {
--- a/server/entity/Watchlist.ts
+++ b/server/entity/Watchlist.ts
@@ -5,15 +5,14 @@ import Media from '@server/entity/Media';
 import { User } from '@server/entity/User';
 import type { WatchlistItem } from '@server/interfaces/api/discoverInterfaces';
 import logger from '@server/logger';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
 import {
  Column,
-  CreateDateColumn,
  Entity,
  Index,
  ManyToOne,
  PrimaryGeneratedColumn,
  Unique,
-  UpdateDateColumn,
 } from 'typeorm';
 import type { ZodNumber, ZodOptional, ZodString } from 'zod';

@@ -56,10 +55,14 @@ export class Watchlist implements WatchlistItem {
  })
  public media: Media;

-  @CreateDateColumn()
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
  public createdAt: Date;

-  @UpdateDateColumn()
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    onUpdate: 'CURRENT_TIMESTAMP',
+  })
  public updatedAt: Date;

  constructor(init?: Partial<Watchlist>) {
--- a/server/index.ts
+++ b/server/index.ts
@@ -10,6 +10,7 @@ import DiscordAgent from '@server/lib/notifications/agents/discord';
 import EmailAgent from '@server/lib/notifications/agents/email';
 import GotifyAgent from '@server/lib/notifications/agents/gotify';
 import LunaSeaAgent from '@server/lib/notifications/agents/lunasea';
+import NtfyAgent from '@server/lib/notifications/agents/ntfy';
 import PushbulletAgent from '@server/lib/notifications/agents/pushbullet';
 import PushoverAgent from '@server/lib/notifications/agents/pushover';
 import SlackAgent from '@server/lib/notifications/agents/slack';
@@ -103,6 +104,7 @@ app
      new DiscordAgent(),
      new EmailAgent(),
      new GotifyAgent(),
+      new NtfyAgent(),
      new LunaSeaAgent(),
      new PushbulletAgent(),
      new PushoverAgent(),
--- a/server/interfaces/api/settingsInterfaces.ts
+++ b/server/interfaces/api/settingsInterfaces.ts
@@ -29,6 +29,7 @@ export interface PublicSettingsResponse {
  applicationTitle: string;
  applicationUrl: string;
  hideAvailable: boolean;
+  hideBlacklisted: boolean;
  localLogin: boolean;
  mediaServerLogin: boolean;
  movie4kEnabled: boolean;
@@ -45,6 +46,7 @@ export interface PublicSettingsResponse {
  locale: string;
  emailEnabled: boolean;
  newPlexLogin: boolean;
+  youtubeUrl: string;
 }

 export interface CacheItem {
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -11,7 +11,6 @@ import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import MediaRequest from '@server/entity/MediaRequest';
 import type Season from '@server/entity/Season';
-import SeasonRequest from '@server/entity/SeasonRequest';
 import { User } from '@server/entity/User';
 import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
@@ -42,7 +41,7 @@ class AvailabilitySync {

    try {
      logger.info(`Starting availability sync...`, {
-        label: 'AvailabilitySync',
+        label: 'Availability Sync',
      });
      const pageSize = 50;

@@ -456,11 +455,11 @@ class AvailabilitySync {
    } catch (ex) {
      logger.error('Failed to complete availability sync.', {
        errorMessage: ex.message,
-        label: 'AvailabilitySync',
+        label: 'Availability Sync',
      });
    } finally {
      logger.info(`Availability sync complete.`, {
-        label: 'AvailabilitySync',
+        label: 'Availability Sync',
      });
      this.running = false;
    }
@@ -496,98 +495,66 @@ class AvailabilitySync {
    } while (mediaPage.length > 0);
  }

-  private findMediaStatus(
-    requests: MediaRequest[],
-    is4k: boolean
-  ): MediaStatus {
-    const filteredRequests = requests.filter(
-      (request) => request.is4k === is4k
-    );
-
-    let mediaStatus: MediaStatus;
-
-    if (
-      filteredRequests.some(
-        (request) => request.status === MediaRequestStatus.APPROVED
-      )
-    ) {
-      mediaStatus = MediaStatus.PROCESSING;
-    } else if (
-      filteredRequests.some(
-        (request) => request.status === MediaRequestStatus.PENDING
-      )
-    ) {
-      mediaStatus = MediaStatus.PENDING;
-    } else {
-      mediaStatus = MediaStatus.UNKNOWN;
-    }
-
-    return mediaStatus;
-  }
-
  private async mediaUpdater(
    media: Media,
    is4k: boolean,
    mediaServerType: MediaServerType
  ): Promise<void> {
    const mediaRepository = getRepository(Media);
-    const requestRepository = getRepository(MediaRequest);

    try {
-      // Find all related requests only if
-      // the related media has an available status
-      const requests = await requestRepository
-        .createQueryBuilder('request')
-        .leftJoinAndSelect('request.media', 'media')
-        .where('(media.id = :id)', {
-          id: media.id,
-        })
-        .andWhere(
-          `(request.is4k = :is4k AND media.${
-            is4k ? 'status4k' : 'status'
-          } IN (:...mediaStatus))`,
-          {
-            mediaStatus: [
-              MediaStatus.AVAILABLE,
-              MediaStatus.PARTIALLY_AVAILABLE,
-            ],
-            is4k: is4k,
-          }
-        )
-        .getMany();
-
-      // Check if a season is processing or pending to
-      // make sure we set the media to the correct status
-      let mediaStatus = MediaStatus.UNKNOWN;
+      // If media type is tv, check if a season is processing
+      // to see if we need to keep the external metadata
+      let isMediaProcessing = false;

      if (media.mediaType === 'tv') {
-        mediaStatus = this.findMediaStatus(requests, is4k);
+        const requestRepository = getRepository(MediaRequest);
+
+        const request = await requestRepository
+          .createQueryBuilder('request')
+          .leftJoinAndSelect('request.media', 'media')
+          .where('(media.id = :id)', {
+            id: media.id,
+          })
+          .andWhere(
+            '(request.is4k = :is4k AND request.status = :requestStatus)',
+            {
+              requestStatus: MediaRequestStatus.APPROVED,
+              is4k: is4k,
+            }
+          )
+          .getOne();
+
+        if (request) {
+          isMediaProcessing = true;
+        }
      }

-      media[is4k ? 'status4k' : 'status'] = mediaStatus;
-      media[is4k ? 'serviceId4k' : 'serviceId'] =
-        mediaStatus === MediaStatus.PROCESSING
-          ? media[is4k ? 'serviceId4k' : 'serviceId']
-          : null;
+      // Set the non-4K or 4K media to deleted
+      // and change related columns to null if media
+      // is not processing
+      media[is4k ? 'status4k' : 'status'] = MediaStatus.DELETED;
+      media[is4k ? 'serviceId4k' : 'serviceId'] = isMediaProcessing
+        ? media[is4k ? 'serviceId4k' : 'serviceId']
+        : null;
      media[is4k ? 'externalServiceId4k' : 'externalServiceId'] =
-        mediaStatus === MediaStatus.PROCESSING
+        isMediaProcessing
          ? media[is4k ? 'externalServiceId4k' : 'externalServiceId']
          : null;
      media[is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] =
-        mediaStatus === MediaStatus.PROCESSING
+        isMediaProcessing
          ? media[is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']
          : null;
      if (mediaServerType === MediaServerType.PLEX) {
-        media[is4k ? 'ratingKey4k' : 'ratingKey'] =
-          mediaStatus === MediaStatus.PROCESSING
-            ? media[is4k ? 'ratingKey4k' : 'ratingKey']
-            : null;
+        media[is4k ? 'ratingKey4k' : 'ratingKey'] = isMediaProcessing
+          ? media[is4k ? 'ratingKey4k' : 'ratingKey']
+          : null;
      } else if (
        mediaServerType === MediaServerType.JELLYFIN ||
        mediaServerType === MediaServerType.EMBY
      ) {
        media[is4k ? 'jellyfinMediaId4k' : 'jellyfinMediaId'] =
-          mediaStatus === MediaStatus.PROCESSING
+          isMediaProcessing
            ? media[is4k ? 'jellyfinMediaId4k' : 'jellyfinMediaId']
            : null;
      }
@@ -602,18 +569,11 @@ class AvailabilitySync {
            : mediaServerType === MediaServerType.JELLYFIN
            ? 'jellyfin'
            : 'emby'
-        } instance. Status will be changed to unknown.`,
+        } instance. Status will be changed to deleted.`,
        { label: 'AvailabilitySync' }
      );

-      await mediaRepository.save({ media, ...media });
-
-      // Only delete media request if type is movie.
-      // Type tv request deletion is handled
-      // in the season request entity
-      if (requests.length > 0 && media.mediaType === 'movie') {
-        await requestRepository.remove(requests);
-      }
+      await mediaRepository.save(media);
    } catch (ex) {
      logger.debug(
        `Failure updating the ${is4k ? '4K' : 'non-4K'} ${
@@ -621,7 +581,7 @@ class AvailabilitySync {
        } [TMDB ID ${media.tmdbId}].`,
        {
          errorMessage: ex.message,
-          label: 'AvailabilitySync',
+          label: 'Availability Sync',
        }
      );
    }
@@ -634,61 +594,44 @@ class AvailabilitySync {
    mediaServerType: MediaServerType
  ): Promise<void> {
    const mediaRepository = getRepository(Media);
-    const seasonRequestRepository = getRepository(SeasonRequest);

+    // Filter out only the values that are false
+    // (media that should be deleted)
    const seasonsPendingRemoval = new Map(
      // Disabled linter as only the value is needed from the filter
      // eslint-disable-next-line @typescript-eslint/no-unused-vars
      [...seasons].filter(([_, exists]) => !exists)
    );
+    // Retrieve the season keys to pass into our log
    const seasonKeys = [...seasonsPendingRemoval.keys()];

    // let isSeasonRemoved = false;

    try {
-      // Need to check and see if there are any related season
-      // requests. If they are, we will need to delete them.
-      const seasonRequests = await seasonRequestRepository
-        .createQueryBuilder('seasonRequest')
-        .leftJoinAndSelect('seasonRequest.request', 'request')
-        .leftJoinAndSelect('request.media', 'media')
-        .where('(media.id = :id)', { id: media.id })
-        .andWhere(
-          '(request.is4k = :is4k AND seasonRequest.seasonNumber IN (:...seasonNumbers))',
-          {
-            seasonNumbers: seasonKeys,
-            is4k: is4k,
-          }
-        )
-        .getMany();
-
      for (const mediaSeason of media.seasons) {
        if (seasonsPendingRemoval.has(mediaSeason.seasonNumber)) {
-          mediaSeason[is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
+          mediaSeason[is4k ? 'status4k' : 'status'] = MediaStatus.DELETED;
        }
      }

-      if (media.status === MediaStatus.AVAILABLE) {
+      if (media.status === MediaStatus.AVAILABLE && !is4k) {
        media.status = MediaStatus.PARTIALLY_AVAILABLE;
        logger.info(
          `Marking the non-4K show [TMDB ID ${media.tmdbId}] as PARTIALLY_AVAILABLE because season removal has occurred.`,
-          { label: 'AvailabilitySync' }
+          { label: 'Availability Sync' }
        );
      }

-      if (media.status4k === MediaStatus.AVAILABLE) {
+      if (media.status4k === MediaStatus.AVAILABLE && is4k) {
        media.status4k = MediaStatus.PARTIALLY_AVAILABLE;
        logger.info(
          `Marking the 4K show [TMDB ID ${media.tmdbId}] as PARTIALLY_AVAILABLE because season removal has occurred.`,
-          { label: 'AvailabilitySync' }
+          { label: 'Availability Sync' }
        );
      }

-      await mediaRepository.save({ media, ...media });
-
-      if (seasonRequests.length > 0) {
-        await seasonRequestRepository.remove(seasonRequests);
-      }
+      media.lastSeasonChange = new Date();
+      await mediaRepository.save(media);

      logger.info(
        `The ${is4k ? '4K' : 'non-4K'} season(s) [${seasonKeys}] [TMDB ID ${
@@ -701,7 +644,7 @@ class AvailabilitySync {
            : mediaServerType === MediaServerType.JELLYFIN
            ? 'jellyfin'
            : 'emby'
-        } instance. Status will be changed to unknown.`,
+        } instance. Status will be changed to deleted.`,
        { label: 'AvailabilitySync' }
      );
    } catch (ex) {
@@ -711,7 +654,7 @@ class AvailabilitySync {
        } season(s) [${seasonKeys}], TMDB ID ${media.tmdbId}.`,
        {
          errorMessage: ex.message,
-          label: 'AvailabilitySync',
+          label: 'Availability Sync',
        }
      );
    }
@@ -725,7 +668,9 @@ class AvailabilitySync {

    // Check for availability in all of the available radarr servers
    // If any find the media, we will assume the media exists
-    for (const server of this.radarrServers) {
+    for (const server of this.radarrServers.filter(
+      (server) => server.is4k === is4k
+    )) {
      const radarrAPI = new RadarrAPI({
        apiKey: server.apiKey,
        url: RadarrAPI.buildUrl(server, '/api/v3'),
@@ -734,13 +679,13 @@ class AvailabilitySync {
      try {
        let radarr: RadarrMovie | undefined;

-        if (!server.is4k && media.externalServiceId && !is4k) {
+        if (media.externalServiceId && !is4k) {
          radarr = await radarrAPI.getMovie({
            id: media.externalServiceId,
          });
        }

-        if (server.is4k && media.externalServiceId4k && is4k) {
+        if (media.externalServiceId4k && is4k) {
          radarr = await radarrAPI.getMovie({
            id: media.externalServiceId4k,
          });
@@ -762,7 +707,7 @@ class AvailabilitySync {
            }] from Radarr.`,
            {
              errorMessage: ex.message,
-              label: 'AvailabilitySync',
+              label: 'Availability Sync',
            }
          );
        }
@@ -781,7 +726,9 @@ class AvailabilitySync {

    // Check for availability in all of the available sonarr servers
    // If any find the media, we will assume the media exists
-    for (const server of this.sonarrServers) {
+    for (const server of this.sonarrServers.filter((server) => {
+      return server.is4k === is4k;
+    })) {
      const sonarrAPI = new SonarrAPI({
        apiKey: server.apiKey,
        url: SonarrAPI.buildUrl(server, '/api/v3'),
@@ -790,13 +737,13 @@ class AvailabilitySync {
      try {
        let sonarr: SonarrSeries | undefined;

-        if (!server.is4k && media.externalServiceId && !is4k) {
+        if (media.externalServiceId && !is4k) {
          sonarr = await sonarrAPI.getSeriesById(media.externalServiceId);
          this.sonarrSeasonsCache[`${server.id}-${media.externalServiceId}`] =
            sonarr.seasons;
        }

-        if (server.is4k && media.externalServiceId4k && is4k) {
+        if (media.externalServiceId4k && is4k) {
          sonarr = await sonarrAPI.getSeriesById(media.externalServiceId4k);
          this.sonarrSeasonsCache[`${server.id}-${media.externalServiceId4k}`] =
            sonarr.seasons;
@@ -815,7 +762,7 @@ class AvailabilitySync {
            }] from Sonarr.`,
            {
              errorMessage: ex.message,
-              label: 'AvailabilitySync',
+              label: 'Availability Sync',
            }
          );
        }
@@ -861,7 +808,9 @@ class AvailabilitySync {
    // Check each sonarr instance to see if the media still exists
    // If found, we will assume the media exists and prevent removal
    // We can use the cache we built when we fetched the series with mediaExistsInSonarr
-    for (const server of this.sonarrServers) {
+    for (const server of this.sonarrServers.filter(
+      (server) => server.is4k === is4k
+    )) {
      let sonarrSeasons: SonarrSeason[] | undefined;

      if (media.externalServiceId && !is4k) {
@@ -936,7 +885,7 @@ class AvailabilitySync {
          } [TMDB ID ${media.tmdbId}] from Plex.`,
          {
            errorMessage: ex.message,
-            label: 'AvailabilitySync',
+            label: 'Availability Sync',
          }
        );
      }
@@ -1125,4 +1074,5 @@ class AvailabilitySync {
 }

 const availabilitySync = new AvailabilitySync();
+
 export default availabilitySync;
--- a/server/lib/notifications/agents/ntfy.ts
+++ b/server/lib/notifications/agents/ntfy.ts
@@ -0,0 +1,164 @@
+import { IssueStatus, IssueTypeName } from '@server/constants/issue';
+import type { NotificationAgentNtfy } 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';
+
+class NtfyAgent
+  extends BaseAgent<NotificationAgentNtfy>
+  implements NotificationAgent
+{
+  protected getSettings(): NotificationAgentNtfy {
+    if (this.settings) {
+      return this.settings;
+    }
+
+    const settings = getSettings();
+
+    return settings.notifications.agents.ntfy;
+  }
+
+  private buildPayload(type: Notification, payload: NotificationPayload) {
+    const { applicationUrl } = getSettings().main;
+
+    const topic = this.getSettings().options.topic;
+    const priority = 3;
+
+    const title = payload.event
+      ? `${payload.event} - ${payload.subject}`
+      : payload.subject;
+    let message = payload.message ?? '';
+
+    if (payload.request) {
+      message += `\n\nRequested By: ${payload.request.requestedBy.displayName}`;
+
+      let status = '';
+      switch (type) {
+        case Notification.MEDIA_PENDING:
+          status = 'Pending Approval';
+          break;
+        case Notification.MEDIA_APPROVED:
+        case Notification.MEDIA_AUTO_APPROVED:
+          status = 'Processing';
+          break;
+        case Notification.MEDIA_AVAILABLE:
+          status = 'Available';
+          break;
+        case Notification.MEDIA_DECLINED:
+          status = 'Declined';
+          break;
+        case Notification.MEDIA_FAILED:
+          status = 'Failed';
+          break;
+      }
+
+      if (status) {
+        message += `\nRequest Status: ${status}`;
+      }
+    } else if (payload.comment) {
+      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: ${
+        payload.issue.status === IssueStatus.OPEN ? 'Open' : 'Resolved'
+      }`;
+    }
+
+    for (const extra of payload.extra ?? []) {
+      message += `\n\n**${extra.name}**\n${extra.value}`;
+    }
+
+    const attach = payload.image;
+
+    let click;
+    if (applicationUrl && payload.media) {
+      click = `${applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
+    }
+
+    return {
+      topic,
+      priority,
+      title,
+      message,
+      attach,
+      click,
+    };
+  }
+
+  public shouldSend(): boolean {
+    const settings = this.getSettings();
+
+    if (settings.enabled && settings.options.url && settings.options.topic) {
+      return true;
+    }
+
+    return false;
+  }
+
+  public async send(
+    type: Notification,
+    payload: NotificationPayload
+  ): Promise<boolean> {
+    const settings = this.getSettings();
+
+    if (
+      !payload.notifySystem ||
+      !hasNotificationType(type, settings.types ?? 0)
+    ) {
+      return true;
+    }
+
+    logger.debug('Sending ntfy notification', {
+      label: 'Notifications',
+      type: Notification[type],
+      subject: payload.subject,
+    });
+
+    try {
+      let authHeader;
+      if (
+        settings.options.authMethodUsernamePassword &&
+        settings.options.username &&
+        settings.options.password
+      ) {
+        const encodedAuth = Buffer.from(
+          `${settings.options.username}:${settings.options.password}`
+        ).toString('base64');
+
+        authHeader = `Basic ${encodedAuth}`;
+      } else if (settings.options.authMethodToken) {
+        authHeader = `Bearer ${settings.options.token}`;
+      }
+
+      await axios.post(
+        settings.options.url,
+        this.buildPayload(type, payload),
+        authHeader
+          ? {
+              headers: {
+                Authorization: authHeader,
+              },
+            }
+          : undefined
+      );
+
+      return true;
+    } catch (e) {
+      logger.error('Error sending ntfy notification', {
+        label: 'Notifications',
+        type: Notification[type],
+        subject: payload.subject,
+        errorMessage: e.message,
+        response: e?.response?.data,
+      });
+
+      return false;
+    }
+  }
+}
+
+export default NtfyAgent;
--- a/server/lib/notifications/agents/pushover.ts
+++ b/server/lib/notifications/agents/pushover.ts
@@ -68,7 +68,7 @@ class PushoverAgent
      logger.error('Error getting image payload', {
        label: 'Notifications',
        errorMessage: e.message,
-        response: e?.response?.data,
+        response: e.response?.data,
      });
      return {};
    }
--- a/server/lib/notifications/agents/webpush.ts
+++ b/server/lib/notifications/agents/webpush.ts
@@ -241,7 +241,7 @@ class WebPushAgent
      const allSubs = await userPushSubRepository
        .createQueryBuilder('pushSub')
        .leftJoinAndSelect('pushSub.user', 'user')
-        .where('pushSub.userId IN (:users)', {
+        .where('pushSub.userId IN (:...users)', {
          users: manageUsers.map((user) => user.id),
        })
        .getMany();
--- a/server/lib/scanners/baseScanner.ts
+++ b/server/lib/scanners/baseScanner.ts
@@ -281,7 +281,9 @@ class BaseScanner<T> {
              ? MediaStatus.AVAILABLE
              : season.episodes > 0
              ? MediaStatus.PARTIALLY_AVAILABLE
-              : !season.is4kOverride && season.processing
+              : !season.is4kOverride &&
+                season.processing &&
+                existingSeason.status !== MediaStatus.DELETED
              ? MediaStatus.PROCESSING
              : existingSeason.status;

@@ -294,7 +296,9 @@ class BaseScanner<T> {
              ? MediaStatus.AVAILABLE
              : this.enable4kShow && season.episodes4k > 0
              ? MediaStatus.PARTIALLY_AVAILABLE
-              : season.is4kOverride && season.processing
+              : season.is4kOverride &&
+                season.processing &&
+                existingSeason.status4k !== MediaStatus.DELETED
              ? MediaStatus.PROCESSING
              : existingSeason.status4k;
        } else {
@@ -324,19 +328,25 @@ class BaseScanner<T> {
        }
      }

+      // We want to skip specials when checking if a show is available
      const isAllStandardSeasons =
        seasons.length &&
-        seasons.every(
-          (season) =>
-            season.episodes === season.totalEpisodes && season.episodes > 0
-        );
+        seasons
+          .filter((season) => season.seasonNumber !== 0)
+          .every(
+            (season) =>
+              season.episodes === season.totalEpisodes && season.episodes > 0
+          );

      const isAll4kSeasons =
        seasons.length &&
-        seasons.every(
-          (season) =>
-            season.episodes4k === season.totalEpisodes && season.episodes4k > 0
-        );
+        seasons
+          .filter((season) => season.seasonNumber !== 0)
+          .every(
+            (season) =>
+              season.episodes4k === season.totalEpisodes &&
+              season.episodes4k > 0
+          );

      if (media) {
        media.seasons = [...media.seasons, ...newSeasons];
@@ -398,16 +408,23 @@ class BaseScanner<T> {
        }

        // If the show is already available, and there are no new seasons, dont adjust
-        // the status
+        // the status. Skip specials when performing availability check
        const shouldStayAvailable =
          media.status === MediaStatus.AVAILABLE &&
-          newSeasons.filter((season) => season.status !== MediaStatus.UNKNOWN)
-            .length === 0;
+          newSeasons.filter(
+            (season) =>
+              season.status !== MediaStatus.UNKNOWN &&
+              season.status !== MediaStatus.DELETED &&
+              season.seasonNumber !== 0
+          ).length === 0;
        const shouldStayAvailable4k =
          media.status4k === MediaStatus.AVAILABLE &&
-          newSeasons.filter((season) => season.status4k !== MediaStatus.UNKNOWN)
-            .length === 0;
-
+          newSeasons.filter(
+            (season) =>
+              season.status4k !== MediaStatus.UNKNOWN &&
+              season.status4k !== MediaStatus.DELETED &&
+              season.seasonNumber !== 0
+          ).length === 0;
        media.status =
          isAllStandardSeasons || shouldStayAvailable
            ? MediaStatus.AVAILABLE
@@ -417,11 +434,13 @@ class BaseScanner<T> {
                  season.status === MediaStatus.AVAILABLE
              )
            ? MediaStatus.PARTIALLY_AVAILABLE
-            : !seasons.length ||
+            : (!seasons.length && media.status !== MediaStatus.DELETED) ||
              media.seasons.some(
                (season) => season.status === MediaStatus.PROCESSING
              )
            ? MediaStatus.PROCESSING
+            : media.status === MediaStatus.DELETED
+            ? MediaStatus.DELETED
            : MediaStatus.UNKNOWN;
        media.status4k =
          (isAll4kSeasons || shouldStayAvailable4k) && this.enable4kShow
@@ -433,11 +452,13 @@ class BaseScanner<T> {
                  season.status4k === MediaStatus.AVAILABLE
              )
            ? MediaStatus.PARTIALLY_AVAILABLE
-            : !seasons.length ||
+            : (!seasons.length && media.status4k !== MediaStatus.DELETED) ||
              media.seasons.some(
                (season) => season.status4k === MediaStatus.PROCESSING
              )
            ? MediaStatus.PROCESSING
+            : media.status4k === MediaStatus.DELETED
+            ? MediaStatus.DELETED
            : MediaStatus.UNKNOWN;
        await mediaRepository.save(media);
        this.log(`Updating existing title: ${title}`);
--- a/server/lib/settings/index.ts
+++ b/server/lib/settings/index.ts
@@ -122,6 +122,7 @@ export interface MainSettings {
    tv: Quota;
  };
  hideAvailable: boolean;
+  hideBlacklisted: boolean;
  localLogin: boolean;
  mediaServerLogin: boolean;
  newPlexLogin: boolean;
@@ -134,6 +135,7 @@ export interface MainSettings {
  partialRequestsEnabled: boolean;
  enableSpecialEpisodes: boolean;
  locale: string;
+  youtubeUrl: string;
 }

 export interface NetworkSettings {
@@ -150,6 +152,7 @@ interface FullPublicSettings extends PublicSettings {
  applicationTitle: string;
  applicationUrl: string;
  hideAvailable: boolean;
+  hideBlacklisted: boolean;
  localLogin: boolean;
  mediaServerLogin: boolean;
  movie4kEnabled: boolean;
@@ -170,6 +173,7 @@ interface FullPublicSettings extends PublicSettings {
  emailEnabled: boolean;
  userEmailRequired: boolean;
  newPlexLogin: boolean;
+  youtubeUrl: string;
 }

 export interface NotificationAgentConfig {
@@ -259,10 +263,23 @@ export interface NotificationAgentGotify extends NotificationAgentConfig {
  };
 }

+export interface NotificationAgentNtfy extends NotificationAgentConfig {
+  options: {
+    url: string;
+    topic: string;
+    authMethodUsernamePassword?: boolean;
+    username?: string;
+    password?: string;
+    authMethodToken?: boolean;
+    token?: string;
+  };
+}
+
 export enum NotificationAgentKey {
  DISCORD = 'discord',
  EMAIL = 'email',
  GOTIFY = 'gotify',
+  NTFY = 'ntfy',
  PUSHBULLET = 'pushbullet',
  PUSHOVER = 'pushover',
  SLACK = 'slack',
@@ -275,6 +292,7 @@ interface NotificationAgents {
  discord: NotificationAgentDiscord;
  email: NotificationAgentEmail;
  gotify: NotificationAgentGotify;
+  ntfy: NotificationAgentNtfy;
  lunasea: NotificationAgentLunaSea;
  pushbullet: NotificationAgentPushbullet;
  pushover: NotificationAgentPushover;
@@ -346,6 +364,7 @@ class Settings {
          tv: {},
        },
        hideAvailable: false,
+        hideBlacklisted: false,
        localLogin: true,
        mediaServerLogin: true,
        newPlexLogin: true,
@@ -358,6 +377,7 @@ class Settings {
        partialRequestsEnabled: true,
        enableSpecialEpisodes: false,
        locale: 'en',
+        youtubeUrl: '',
      },
      plex: {
        name: '',
@@ -471,6 +491,14 @@ class Settings {
              priority: 0,
            },
          },
+          ntfy: {
+            enabled: false,
+            types: 0,
+            options: {
+              url: '',
+              topic: '',
+            },
+          },
        },
      },
      jobs: {
@@ -596,6 +624,7 @@ class Settings {
      applicationTitle: this.data.main.applicationTitle,
      applicationUrl: this.data.main.applicationUrl,
      hideAvailable: this.data.main.hideAvailable,
+      hideBlacklisted: this.data.main.hideBlacklisted,
      localLogin: this.data.main.localLogin,
      mediaServerLogin: this.data.main.mediaServerLogin,
      jellyfinExternalHost: this.data.jellyfin.externalHostname,
@@ -620,6 +649,7 @@ class Settings {
      userEmailRequired:
        this.data.notifications.agents.email.options.userEmailRequired,
      newPlexLogin: this.data.main.newPlexLogin,
+      youtubeUrl: this.data.main.youtubeUrl,
    };
  }

--- a/server/migration/postgres/1745492376568-UpdateWebPush.ts
+++ b/server/migration/postgres/1745492376568-UpdateWebPush.ts
@@ -0,0 +1,17 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateWebPush1745492376568 implements MigrationInterface {
+  name = 'UpdateWebPush1745492376568';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" RENAME COLUMN "blacklistedtags" TO "blacklistedTags"`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "blacklist" RENAME COLUMN "blacklistedTags" TO "blacklistedtags"`
+    );
+  }
+}
--- a/server/migration/postgres/1746811308203-FixIssueTimestamps.ts
+++ b/server/migration/postgres/1746811308203-FixIssueTimestamps.ts
@@ -0,0 +1,231 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class FixIssueTimestamps1746811308203 implements MigrationInterface {
+  name = 'FixIssueTimestamps1746811308203';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+        ALTER TABLE "watchlist"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "watchlist"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "override_rule"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "override_rule"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "season_request"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "season_request"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "media_request"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "media_request"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "user_push_subscription"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "user"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "user"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "blacklist"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "season"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "season"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "media"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "media"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "issue"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "issue"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "issue_comment"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "issue_comment"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "discover_slider"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "discover_slider"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP WITH TIME ZONE
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+        ALTER TABLE "discover_slider"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "discover_slider"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "issue_comment"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "issue_comment"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "issue"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "issue"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "media"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "media"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "season"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "season"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "blacklist"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "user"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "user"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "user_push_subscription"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "media_request"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "media_request"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "season_request"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "season_request"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "override_rule"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "override_rule"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "watchlist"
+        ALTER COLUMN "updatedAt" TYPE TIMESTAMP
+        USING "updatedAt" AT TIME ZONE 'UTC'
+      `);
+    await queryRunner.query(`
+        ALTER TABLE "watchlist"
+        ALTER COLUMN "createdAt" TYPE TIMESTAMP
+        USING "createdAt" AT TIME ZONE 'UTC'
+      `);
+  }
+}
--- a/server/migration/sqlite/1745492372230-UpdateWebPush.ts
+++ b/server/migration/sqlite/1745492372230-UpdateWebPush.ts
@@ -0,0 +1,79 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class UpdateWebPush1745492372230 implements MigrationInterface {
+  name = 'UpdateWebPush1745492372230';
+
+  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(`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, "blacklistedTags" varchar, CONSTRAINT "UQ_e49b27917899e01d7aca6b0b15c" UNIQUE ("mediaId"), CONSTRAINT "UQ_5f933c8ed6ad2c31739e6b94886" UNIQUE ("tmdbId"), CONSTRAINT "FK_62b7ade94540f9f8d8bede54b99" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_53c1ab62c3e5875bc3ac474823e" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE NO ACTION 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") `
+    );
+    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(`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_e49b27917899e01d7aca6b0b15c" UNIQUE ("mediaId"), CONSTRAINT "UQ_5f933c8ed6ad2c31739e6b94886" UNIQUE ("tmdbId"), CONSTRAINT "FK_62b7ade94540f9f8d8bede54b99" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_53c1ab62c3e5875bc3ac474823e" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION)`
+    );
+    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"`);
+  }
+}
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -12,7 +12,9 @@ import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
 import { checkAvatarChanged } from '@server/routes/avatarproxy';
 import { ApiError } from '@server/types/error';
+import { getAppVersion } from '@server/utils/appVersion';
 import { getHostname } from '@server/utils/getHostname';
+import axios from 'axios';
 import * as EmailValidator from 'email-validator';
 import { Router } from 'express';
 import net from 'net';
@@ -275,11 +277,14 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      select: { id: true, jellyfinDeviceId: true },
    });

-    let deviceId = '';
-    if (user) {
-      deviceId = user.jellyfinDeviceId ?? '';
-    } else {
-      deviceId = Buffer.from(`BOT_jellyseerr_${body.username ?? ''}`).toString(
+    let deviceId = 'BOT_jellyseerr';
+    if (user && user.id === 1) {
+      // Admin is always BOT_jellyseerr
+      deviceId = 'BOT_jellyseerr';
+    } else if (user && user.jellyfinDeviceId) {
+      deviceId = user.jellyfinDeviceId;
+    } else if (body.username) {
+      deviceId = Buffer.from(`BOT_jellyseerr_${body.username}`).toString(
        'base64'
      );
    }
@@ -511,7 +516,9 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      case ApiErrorCode.InvalidUrl:
        logger.error(
          `The provided ${
-            process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin'
+            settings.main.mediaServerType === MediaServerType.JELLYFIN
+              ? ServerType.JELLYFIN
+              : ServerType.EMBY
          } is invalid or the server is not reachable.`,
          {
            label: 'Auth',
@@ -714,17 +721,79 @@ authRoutes.post('/local', async (req, res, next) => {
  }
 });

-authRoutes.post('/logout', (req, res, next) => {
-  req.session?.destroy((err) => {
-    if (err) {
-      return next({
-        status: 500,
-        message: 'Something went wrong.',
-      });
+authRoutes.post('/logout', async (req, res, next) => {
+  try {
+    const userId = req.session?.userId;
+    if (!userId) {
+      return res.status(200).json({ status: 'ok' });
    }

-    return res.status(200).json({ status: 'ok' });
-  });
+    const settings = getSettings();
+    const isJellyfinOrEmby =
+      settings.main.mediaServerType === MediaServerType.JELLYFIN ||
+      settings.main.mediaServerType === MediaServerType.EMBY;
+
+    if (isJellyfinOrEmby) {
+      const user = await getRepository(User)
+        .createQueryBuilder('user')
+        .addSelect(['user.jellyfinUserId', 'user.jellyfinDeviceId'])
+        .where('user.id = :id', { id: userId })
+        .getOne();
+
+      if (user?.jellyfinUserId && user.jellyfinDeviceId) {
+        try {
+          const baseUrl = getHostname();
+          try {
+            await axios.delete(`${baseUrl}/Devices`, {
+              params: { Id: user.jellyfinDeviceId },
+              headers: {
+                'X-Emby-Authorization': `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="jellyseerr", Version="${getAppVersion()}", Token="${
+                  settings.jellyfin.apiKey
+                }"`,
+              },
+            });
+          } catch (error) {
+            logger.error('Failed to delete Jellyfin device', {
+              label: 'Auth',
+              error: error instanceof Error ? error.message : 'Unknown error',
+              userId: user.id,
+              jellyfinUserId: user.jellyfinUserId,
+            });
+          }
+        } catch (error) {
+          logger.error('Failed to delete Jellyfin device', {
+            label: 'Auth',
+            error: error instanceof Error ? error.message : 'Unknown error',
+            userId: user.id,
+            jellyfinUserId: user.jellyfinUserId,
+          });
+        }
+      }
+    }
+
+    req.session?.destroy((err: Error | null) => {
+      if (err) {
+        logger.error('Failed to destroy session', {
+          label: 'Auth',
+          error: err.message,
+          userId,
+        });
+        return next({ status: 500, message: 'Failed to destroy session.' });
+      }
+      logger.info('Successfully logged out user', {
+        label: 'Auth',
+        userId,
+      });
+      res.status(200).json({ status: 'ok' });
+    });
+  } catch (error) {
+    logger.error('Error during logout process', {
+      label: 'Auth',
+      error: error instanceof Error ? error.message : 'Unknown error',
+      userId: req.session?.userId,
+    });
+    next({ status: 500, message: 'Error during logout process.' });
+  }
 });

 authRoutes.post('/reset-password', async (req, res, next) => {
--- a/server/routes/avatarproxy.ts
+++ b/server/routes/avatarproxy.ts
@@ -23,7 +23,7 @@ async function initAvatarImageProxy() {
      select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
      order: { id: 'ASC' },
    });
-    const deviceId = admin?.jellyfinDeviceId;
+    const deviceId = admin?.jellyfinDeviceId || 'BOT_jellyseerr';
    const authToken = getSettings().jellyfin.apiKey;
    _avatarImageProxy = new ImageProxy('avatar', '', {
      headers: {
--- a/server/routes/discover.ts
+++ b/server/routes/discover.ts
@@ -72,16 +72,25 @@ const QueryFilterOptions = z.object({
  watchProviders: z.coerce.string().optional(),
  watchRegion: z.coerce.string().optional(),
  status: z.coerce.string().optional(),
+  certification: z.coerce.string().optional(),
+  certificationGte: z.coerce.string().optional(),
+  certificationLte: z.coerce.string().optional(),
+  certificationCountry: z.coerce.string().optional(),
+  certificationMode: z.enum(['exact', 'range']).optional(),
 });

 export type FilterOptions = z.infer<typeof QueryFilterOptions>;
+const ApiQuerySchema = QueryFilterOptions.omit({
+  certificationMode: true,
+});

 discoverRoutes.get('/movies', async (req, res, next) => {
  const tmdb = createTmdbWithRegionLanguage(req.user);

  try {
-    const query = QueryFilterOptions.parse(req.query);
+    const query = ApiQuerySchema.parse(req.query);
    const keywords = query.keywords;
+
    const data = await tmdb.getDiscoverMovies({
      page: Number(query.page),
      sortBy: query.sortBy as SortOptions,
@@ -104,6 +113,10 @@ discoverRoutes.get('/movies', async (req, res, next) => {
      voteCountLte: query.voteCountLte,
      watchProviders: query.watchProviders,
      watchRegion: query.watchRegion,
+      certification: query.certification,
+      certificationGte: query.certificationGte,
+      certificationLte: query.certificationLte,
+      certificationCountry: query.certificationCountry,
    });

    const media = await Media.getRelatedMedia(
@@ -362,7 +375,7 @@ discoverRoutes.get('/tv', async (req, res, next) => {
  const tmdb = createTmdbWithRegionLanguage(req.user);

  try {
-    const query = QueryFilterOptions.parse(req.query);
+    const query = ApiQuerySchema.parse(req.query);
    const keywords = query.keywords;
    const data = await tmdb.getDiscoverTv({
      page: Number(query.page),
@@ -387,6 +400,10 @@ discoverRoutes.get('/tv', async (req, res, next) => {
      watchProviders: query.watchProviders,
      watchRegion: query.watchRegion,
      withStatus: query.status,
+      certification: query.certification,
+      certificationGte: query.certificationGte,
+      certificationLte: query.certificationLte,
+      certificationCountry: query.certificationCountry,
    });

    const media = await Media.getRelatedMedia(
--- a/server/routes/imageproxy.ts
+++ b/server/routes/imageproxy.ts
@@ -3,20 +3,36 @@ import logger from '@server/logger';
 import { Router } from 'express';

 const router = Router();
+
 const tmdbImageProxy = new ImageProxy('tmdb', 'https://image.tmdb.org', {
  rateLimitOptions: {
    maxRequests: 20,
    maxRPS: 50,
  },
 });
+const tvdbImageProxy = new ImageProxy('tvdb', 'https://artworks.thetvdb.com', {
+  rateLimitOptions: {
+    maxRequests: 20,
+    maxRPS: 50,
+  },
+});

-/**
- * Image Proxy
- */
-router.get('/*', async (req, res) => {
-  const imagePath = req.path.replace('/image', '');
+router.get('/:type/*', async (req, res) => {
+  const imagePath = req.path.replace(/^\/\w+/, '');
  try {
-    const imageData = await tmdbImageProxy.getImage(imagePath);
+    let imageData;
+    if (req.params.type === 'tmdb') {
+      imageData = await tmdbImageProxy.getImage(imagePath);
+    } else if (req.params.type === 'tvdb') {
+      imageData = await tvdbImageProxy.getImage(imagePath);
+    } else {
+      logger.error('Unsupported image type', {
+        imagePath,
+        type: req.params.type,
+      });
+      res.status(400).send('Unsupported image type');
+      return;
+    }

    res.writeHead(200, {
      'Content-Type': `image/${imageData.meta.extension}`,
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -401,6 +401,48 @@ router.get('/watchproviders/tv', async (req, res, next) => {
  }
 });

+router.get(
+  '/certifications/movie',
+  isAuthenticated(),
+  async (req, res, next) => {
+    const tmdb = new TheMovieDb();
+
+    try {
+      const certifications = await tmdb.getMovieCertifications();
+
+      return res.status(200).json(certifications);
+    } catch (e) {
+      logger.error('Something went wrong retrieving movie certifications', {
+        label: 'API',
+        errorMessage: e.message,
+      });
+      return next({
+        status: 500,
+        message: 'Unable to retrieve movie certifications.',
+      });
+    }
+  }
+);
+
+router.get('/certifications/tv', isAuthenticated(), async (req, res, next) => {
+  const tmdb = new TheMovieDb();
+
+  try {
+    const certifications = await tmdb.getTvCertifications();
+
+    return res.status(200).json(certifications);
+  } catch (e) {
+    logger.debug('Something went wrong retrieving TV certifications', {
+      label: 'API',
+      errorMessage: e.message,
+    });
+    return next({
+      status: 500,
+      message: 'Unable to retrieve TV certifications.',
+    });
+  }
+});
+
 router.get('/', (_req, res) => {
  return res.status(200).json({
    api: 'Jellyseerr API',
--- a/server/routes/media.ts
+++ b/server/routes/media.ts
@@ -5,6 +5,7 @@ import TheMovieDb from '@server/api/themoviedb';
 import { MediaStatus, MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
+import Season from '@server/entity/Season';
 import { User } from '@server/entity/User';
 import type {
  MediaResultsResponse,
@@ -101,6 +102,7 @@ mediaRoutes.post<
  isAuthenticated(Permission.MANAGE_REQUESTS),
  async (req, res, next) => {
    const mediaRepository = getRepository(Media);
+    const seasonRepository = getRepository(Season);

    const media = await mediaRepository.findOne({
      where: { id: Number(req.params.id) },
@@ -115,11 +117,25 @@ mediaRoutes.post<
    switch (req.params.status) {
      case 'available':
        media[is4k ? 'status4k' : 'status'] = MediaStatus.AVAILABLE;
+
        if (media.mediaType === MediaType.TV) {
-          // Mark all seasons available
-          media.seasons.forEach((season) => {
+          const expectedSeasons = req.body.seasons ?? [];
+
+          for (const expectedSeason of expectedSeasons) {
+            let season = media.seasons.find(
+              (s) => s.seasonNumber === expectedSeason?.seasonNumber
+            );
+
+            if (!season) {
+              // Create the season if it doesn't exist
+              season = seasonRepository.create({
+                seasonNumber: expectedSeason?.seasonNumber,
+              });
+              media.seasons.push(season);
+            }
+
            season[is4k ? 'status4k' : 'status'] = MediaStatus.AVAILABLE;
-          });
+          }
        }
        break;
      case 'partial':
--- a/server/routes/request.ts
+++ b/server/routes/request.ts
@@ -38,13 +38,13 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
      const requestedBy = req.query.requestedBy
        ? Number(req.query.requestedBy)
        : null;
+      const mediaType = (req.query.mediaType as MediaType | 'all') || 'all';

      let statusFilter: MediaRequestStatus[];

      switch (req.query.filter) {
        case 'approved':
        case 'processing':
-        case 'available':
          statusFilter = [MediaRequestStatus.APPROVED];
          break;
        case 'pending':
@@ -59,12 +59,18 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
        case 'failed':
          statusFilter = [MediaRequestStatus.FAILED];
          break;
+        case 'completed':
+        case 'available':
+        case 'deleted':
+          statusFilter = [MediaRequestStatus.COMPLETED];
+          break;
        default:
          statusFilter = [
            MediaRequestStatus.PENDING,
            MediaRequestStatus.APPROVED,
            MediaRequestStatus.DECLINED,
            MediaRequestStatus.FAILED,
+            MediaRequestStatus.COMPLETED,
          ];
      }

@@ -83,6 +89,9 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
            MediaStatus.PARTIALLY_AVAILABLE,
          ];
          break;
+        case 'deleted':
+          mediaStatusFilter = [MediaStatus.DELETED];
+          break;
        default:
          mediaStatusFilter = [
            MediaStatus.UNKNOWN,
@@ -90,6 +99,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
            MediaStatus.PROCESSING,
            MediaStatus.PARTIALLY_AVAILABLE,
            MediaStatus.AVAILABLE,
+            MediaStatus.DELETED,
          ];
      }

@@ -150,6 +160,21 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
        });
      }

+      switch (mediaType) {
+        case 'all':
+          break;
+        case 'movie':
+          query = query.andWhere('request.type = :type', {
+            type: MediaType.MOVIE,
+          });
+          break;
+        case 'tv':
+          query = query.andWhere('request.type = :type', {
+            type: MediaType.TV,
+          });
+          break;
+      }
+
      const [requests, requestCount] = await query
        .orderBy(sortFilter, sortDirection)
        .take(pageSize)
@@ -298,7 +323,7 @@ requestRoutes.get('/count', async (_req, res, next) => {
  try {
    const query = requestRepository
      .createQueryBuilder('request')
-      .leftJoinAndSelect('request.media', 'media');
+      .innerJoinAndSelect('request.media', 'media');

    const totalCount = await query.getCount();

@@ -492,7 +517,8 @@ requestRoutes.put<{ requestId: string }>(
            (r) =>
              r.is4k === request.is4k &&
              r.id !== request.id &&
-              r.status !== MediaRequestStatus.DECLINED
+              r.status !== MediaRequestStatus.DECLINED &&
+              r.status !== MediaRequestStatus.COMPLETED
          )
          .reduce((seasons, r) => {
            const combinedSeasons = r.seasons.map(
--- a/server/routes/settings/notifications.ts
+++ b/server/routes/settings/notifications.ts
@@ -5,6 +5,7 @@ import DiscordAgent from '@server/lib/notifications/agents/discord';
 import EmailAgent from '@server/lib/notifications/agents/email';
 import GotifyAgent from '@server/lib/notifications/agents/gotify';
 import LunaSeaAgent from '@server/lib/notifications/agents/lunasea';
+import NtfyAgent from '@server/lib/notifications/agents/ntfy';
 import PushbulletAgent from '@server/lib/notifications/agents/pushbullet';
 import PushoverAgent from '@server/lib/notifications/agents/pushover';
 import SlackAgent from '@server/lib/notifications/agents/slack';
@@ -413,4 +414,38 @@ notificationRoutes.post('/gotify/test', async (req, res, next) => {
  }
 });

+notificationRoutes.get('/ntfy', (_req, res) => {
+  const settings = getSettings();
+
+  res.status(200).json(settings.notifications.agents.ntfy);
+});
+
+notificationRoutes.post('/ntfy', async (req, res) => {
+  const settings = getSettings();
+
+  settings.notifications.agents.ntfy = req.body;
+  await settings.save();
+
+  res.status(200).json(settings.notifications.agents.ntfy);
+});
+
+notificationRoutes.post('/ntfy/test', async (req, res, next) => {
+  if (!req.user) {
+    return next({
+      status: 500,
+      message: 'User information is missing from the request.',
+    });
+  }
+
+  const ntfyAgent = new NtfyAgent(req.body);
+  if (await sendTestNotification(ntfyAgent, req.user)) {
+    return res.status(204).send();
+  } else {
+    return next({
+      status: 500,
+      message: 'Failed to send ntfy notification.',
+    });
+  }
+});
+
 export default notificationRoutes;
--- a/server/routes/user/index.ts
+++ b/server/routes/user/index.ts
@@ -42,6 +42,9 @@ router.get('/', async (req, res, next) => {
      : 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() : '';
+    const sortDirection =
+      (req.query.sortDirection as string) === 'asc' ? 'ASC' : 'DESC';
+
    let query = getRepository(User).createQueryBuilder('user');

    if (q) {
@@ -56,28 +59,31 @@ router.get('/', async (req, res, next) => {
    }

    switch (req.query.sort) {
+      case 'created':
+        query = query.orderBy('user.createdAt', sortDirection);
+        break;
      case 'updated':
-        query = query.orderBy('user.updatedAt', 'DESC');
+        query = query.orderBy('user.updatedAt', sortDirection);
        break;
      case 'displayname':
        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"
+                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)
+                  LOWER(user.plexUsername)
                END)
              ELSE
-                LOWER(user.jellyfinUsername)
-              END)
-            ELSE
-              LOWER(user.username)
-            END`,
+                LOWER(user.username)
+              END`,
            'displayname_sort_key'
          )
-          .orderBy('displayname_sort_key', 'ASC');
+          .orderBy('displayname_sort_key', sortDirection);
        break;
      case 'requests':
        query = query
@@ -87,10 +93,16 @@ router.get('/', async (req, res, next) => {
              .from(MediaRequest, 'request')
              .where('request.requestedBy.id = user.id');
          }, 'request_count')
-          .orderBy('request_count', 'DESC');
+          .orderBy('request_count', sortDirection);
+        break;
+      case 'usertype':
+        query = query.orderBy('user.userType', sortDirection);
+        break;
+      case 'role':
+        query = query.orderBy('user.permissions', sortDirection);
        break;
      default:
-        query = query.orderBy('user.id', 'ASC');
+        query = query.orderBy('user.id', sortDirection);
        break;
    }

@@ -240,8 +252,8 @@ router.get<{ userId: number }>(
  }
 );

-router.get<{ userId: number; key: string }>(
-  '/:userId/pushSubscription/:key',
+router.get<{ userId: number; endpoint: string }>(
+  '/:userId/pushSubscription/:endpoint',
  async (req, res, next) => {
    try {
      const userPushSubRepository = getRepository(UserPushSubscription);
@@ -252,7 +264,7 @@ router.get<{ userId: number; key: string }>(
        },
        where: {
          user: { id: req.params.userId },
-          p256dh: req.params.key,
+          endpoint: req.params.endpoint,
        },
      });

@@ -263,8 +275,8 @@ router.get<{ userId: number; key: string }>(
  }
 );

-router.delete<{ userId: number; key: string }>(
-  '/:userId/pushSubscription/:key',
+router.delete<{ userId: number; endpoint: string }>(
+  '/:userId/pushSubscription/:endpoint',
  async (req, res, next) => {
    try {
      const userPushSubRepository = getRepository(UserPushSubscription);
@@ -275,7 +287,7 @@ router.delete<{ userId: number; key: string }>(
        },
        where: {
          user: { id: req.params.userId },
-          p256dh: req.params.key,
+          endpoint: req.params.endpoint,
        },
      });

@@ -284,7 +296,7 @@ router.delete<{ userId: number; key: string }>(
    } catch (e) {
      logger.error('Something went wrong deleting the user push subcription', {
        label: 'API',
-        key: req.params.key,
+        endpoint: req.params.endpoint,
        errorMessage: e.message,
      });
      return next({
--- a/server/routes/user/usersettings.ts
+++ b/server/routes/user/usersettings.ts
@@ -18,6 +18,7 @@ import { ApiError } from '@server/types/error';
 import { getHostname } from '@server/utils/getHostname';
 import { Router } from 'express';
 import net from 'net';
+import { Not } from 'typeorm';
 import { canMakePermissionsChange } from '.';

 const isOwnProfile = (): Middleware => {
@@ -125,8 +126,9 @@ userSettingsRoutes.post<
    }

    const existingUser = await userRepository.findOne({
-      where: { email: user.email },
+      where: { email: user.email, id: Not(user.id) },
    });
+
    if (oldEmail !== user.email && existingUser) {
      throw new ApiError(400, ApiErrorCode.InvalidEmail);
    }
@@ -419,7 +421,9 @@ userSettingsRoutes.post<{ username: string; password: string }>(

    const hostname = getHostname();
    const deviceId = Buffer.from(
-      `BOT_jellyseerr_${req.user.username ?? ''}`
+      req.user?.id === 1
+        ? 'BOT_jellyseerr'
+        : `BOT_jellyseerr_${req.user.username ?? ''}`
    ).toString('base64');

    const jellyfinserver = new JellyfinAPI(hostname, undefined, deviceId);
--- a/server/subscriber/MediaRequestSubscriber.ts
+++ b/server/subscriber/MediaRequestSubscriber.ts
@@ -0,0 +1,818 @@
+import type { RadarrMovieOptions } from '@server/api/servarr/radarr';
+import RadarrAPI from '@server/api/servarr/radarr';
+import type {
+  AddSeriesOptions,
+  SonarrSeries,
+} from '@server/api/servarr/sonarr';
+import SonarrAPI from '@server/api/servarr/sonarr';
+import TheMovieDb from '@server/api/themoviedb';
+import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
+import {
+  MediaRequestStatus,
+  MediaStatus,
+  MediaType,
+} from '@server/constants/media';
+import { getRepository } from '@server/datasource';
+import Media from '@server/entity/Media';
+import { MediaRequest } from '@server/entity/MediaRequest';
+import SeasonRequest from '@server/entity/SeasonRequest';
+import notificationManager, { Notification } from '@server/lib/notifications';
+import { getSettings } from '@server/lib/settings';
+import logger from '@server/logger';
+import { isEqual, truncate } from 'lodash';
+import type {
+  EntityManager,
+  EntitySubscriberInterface,
+  InsertEvent,
+  RemoveEvent,
+  UpdateEvent,
+} from 'typeorm';
+import { EventSubscriber } from 'typeorm';
+
+@EventSubscriber()
+export class MediaRequestSubscriber
+  implements EntitySubscriberInterface<MediaRequest>
+{
+  private async notifyAvailableMovie(entity: MediaRequest) {
+    if (
+      entity.media[entity.is4k ? 'status4k' : 'status'] ===
+      MediaStatus.AVAILABLE
+    ) {
+      const tmdb = new TheMovieDb();
+
+      try {
+        const movie = await tmdb.getMovie({
+          movieId: entity.media.tmdbId,
+        });
+
+        notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
+          event: `${entity.is4k ? '4K ' : ''}Movie Request Now Available`,
+          notifyAdmin: false,
+          notifySystem: true,
+          notifyUser: entity.requestedBy,
+          subject: `${movie.title}${
+            movie.release_date ? ` (${movie.release_date.slice(0, 4)})` : ''
+          }`,
+          message: truncate(movie.overview, {
+            length: 500,
+            separator: /\s/,
+            omission: '…',
+          }),
+          media: entity.media,
+          image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
+          request: entity,
+        });
+      } catch (e) {
+        logger.error('Something went wrong sending media notification(s)', {
+          label: 'Notifications',
+          errorMessage: e.message,
+          mediaId: entity.id,
+        });
+      }
+    }
+  }
+
+  private async notifyAvailableSeries(entity: MediaRequest) {
+    // Find all seasons in the related media entity
+    // and see if they are available, then we can check
+    // if the request contains the same seasons
+    const requestedSeasons =
+      entity.seasons?.map((entitySeason) => entitySeason.seasonNumber) ?? [];
+    const availableSeasons = entity.media.seasons.filter(
+      (season) =>
+        season[entity.is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE &&
+        requestedSeasons.includes(season.seasonNumber)
+    );
+    const isMediaAvailable =
+      availableSeasons.length > 0 &&
+      availableSeasons.length === requestedSeasons.length;
+
+    if (isMediaAvailable) {
+      const tmdb = new TheMovieDb();
+
+      try {
+        const tv = await tmdb.getTvShow({ tvId: entity.media.tmdbId });
+
+        notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
+          event: `${entity.is4k ? '4K ' : ''}Series Request Now Available`,
+          subject: `${tv.name}${
+            tv.first_air_date ? ` (${tv.first_air_date.slice(0, 4)})` : ''
+          }`,
+          message: truncate(tv.overview, {
+            length: 500,
+            separator: /\s/,
+            omission: '…',
+          }),
+          notifyAdmin: false,
+          notifySystem: true,
+          notifyUser: entity.requestedBy,
+          image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${tv.poster_path}`,
+          media: entity.media,
+          extra: [
+            {
+              name: 'Requested Seasons',
+              value: entity.seasons
+                .map((season) => season.seasonNumber)
+                .join(', '),
+            },
+          ],
+          request: entity,
+        });
+      } catch (e) {
+        logger.error('Something went wrong sending media notification(s)', {
+          label: 'Notifications',
+          errorMessage: e.message,
+          mediaId: entity.id,
+        });
+      }
+    }
+  }
+
+  public async sendToRadarr(entity: MediaRequest): Promise<void> {
+    if (
+      entity.status === MediaRequestStatus.APPROVED &&
+      entity.type === MediaType.MOVIE
+    ) {
+      try {
+        const mediaRepository = getRepository(Media);
+        const settings = getSettings();
+        if (settings.radarr.length === 0 && !settings.radarr[0]) {
+          logger.info(
+            'No Radarr server configured, skipping request processing',
+            {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+            }
+          );
+          return;
+        }
+
+        let radarrSettings = settings.radarr.find(
+          (radarr) => radarr.isDefault && radarr.is4k === entity.is4k
+        );
+
+        if (
+          entity.serverId !== null &&
+          entity.serverId >= 0 &&
+          radarrSettings?.id !== entity.serverId
+        ) {
+          radarrSettings = settings.radarr.find(
+            (radarr) => radarr.id === entity.serverId
+          );
+          logger.info(
+            `Request has an override server: ${radarrSettings?.name}`,
+            {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+            }
+          );
+        }
+
+        if (!radarrSettings) {
+          logger.warn(
+            `There is no default ${
+              entity.is4k ? '4K ' : ''
+            }Radarr server configured. Did you set any of your ${
+              entity.is4k ? '4K ' : ''
+            }Radarr servers as default?`,
+            {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+            }
+          );
+          return;
+        }
+
+        let rootFolder = radarrSettings.activeDirectory;
+        let qualityProfile = radarrSettings.activeProfileId;
+        let tags = radarrSettings.tags ? [...radarrSettings.tags] : [];
+
+        if (
+          entity.rootFolder &&
+          entity.rootFolder !== '' &&
+          entity.rootFolder !== radarrSettings.activeDirectory
+        ) {
+          rootFolder = entity.rootFolder;
+          logger.info(`Request has an override root folder: ${rootFolder}`, {
+            label: 'Media Request',
+            requestId: entity.id,
+            mediaId: entity.media.id,
+          });
+        }
+
+        if (
+          entity.profileId &&
+          entity.profileId !== radarrSettings.activeProfileId
+        ) {
+          qualityProfile = entity.profileId;
+          logger.info(
+            `Request has an override quality profile ID: ${qualityProfile}`,
+            {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+            }
+          );
+        }
+
+        if (entity.tags && !isEqual(entity.tags, radarrSettings.tags)) {
+          tags = entity.tags;
+          logger.info(`Request has override tags`, {
+            label: 'Media Request',
+            requestId: entity.id,
+            mediaId: entity.media.id,
+            tagIds: tags,
+          });
+        }
+
+        const tmdb = new TheMovieDb();
+        const radarr = new RadarrAPI({
+          apiKey: radarrSettings.apiKey,
+          url: RadarrAPI.buildUrl(radarrSettings, '/api/v3'),
+        });
+        const movie = await tmdb.getMovie({ movieId: entity.media.tmdbId });
+
+        const media = await mediaRepository.findOne({
+          where: { id: entity.media.id },
+        });
+
+        if (!media) {
+          logger.error('Media data not found', {
+            label: 'Media Request',
+            requestId: entity.id,
+            mediaId: entity.media.id,
+          });
+          return;
+        }
+
+        if (radarrSettings.tagRequests) {
+          let userTag = (await radarr.getTags()).find((v) =>
+            v.label.startsWith(entity.requestedBy.id + ' - ')
+          );
+          if (!userTag) {
+            logger.info(`Requester has no active tag. Creating new`, {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+              userId: entity.requestedBy.id,
+              newTag:
+                entity.requestedBy.id + ' - ' + entity.requestedBy.displayName,
+            });
+            userTag = await radarr.createTag({
+              label:
+                entity.requestedBy.id + ' - ' + entity.requestedBy.displayName,
+            });
+          }
+          if (userTag.id) {
+            if (!tags?.find((v) => v === userTag?.id)) {
+              tags?.push(userTag.id);
+            }
+          } else {
+            logger.warn(`Requester has no tag and failed to add one`, {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+              userId: entity.requestedBy.id,
+              radarrServer: radarrSettings.hostname + ':' + radarrSettings.port,
+            });
+          }
+        }
+
+        if (
+          media[entity.is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
+        ) {
+          logger.warn('Media already exists, marking request as APPROVED', {
+            label: 'Media Request',
+            requestId: entity.id,
+            mediaId: entity.media.id,
+          });
+
+          const requestRepository = getRepository(MediaRequest);
+          entity.status = MediaRequestStatus.APPROVED;
+          await requestRepository.save(entity);
+          return;
+        }
+
+        const radarrMovieOptions: RadarrMovieOptions = {
+          profileId: qualityProfile,
+          qualityProfileId: qualityProfile,
+          rootFolderPath: rootFolder,
+          minimumAvailability: radarrSettings.minimumAvailability,
+          title: movie.title,
+          tmdbId: movie.id,
+          year: Number(movie.release_date.slice(0, 4)),
+          monitored: true,
+          tags,
+          searchNow: !radarrSettings.preventSearch,
+        };
+
+        // Run entity asynchronously so we don't wait for it on the UI side
+        radarr
+          .addMovie(radarrMovieOptions)
+          .then(async (radarrMovie) => {
+            // We grab media again here to make sure we have the latest version of it
+            const media = await mediaRepository.findOne({
+              where: { id: entity.media.id },
+            });
+
+            if (!media) {
+              throw new Error('Media data not found');
+            }
+
+            media[entity.is4k ? 'externalServiceId4k' : 'externalServiceId'] =
+              radarrMovie.id;
+            media[
+              entity.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'
+            ] = radarrMovie.titleSlug;
+            media[entity.is4k ? 'serviceId4k' : 'serviceId'] =
+              radarrSettings?.id;
+            await mediaRepository.save(media);
+          })
+          .catch(async () => {
+            const requestRepository = getRepository(MediaRequest);
+
+            entity.status = MediaRequestStatus.FAILED;
+            requestRepository.save(entity);
+
+            logger.warn(
+              'Something went wrong sending movie request to Radarr, marking status as FAILED',
+              {
+                label: 'Media Request',
+                requestId: entity.id,
+                mediaId: entity.media.id,
+                radarrMovieOptions,
+              }
+            );
+
+            MediaRequest.sendNotification(
+              entity,
+              media,
+              Notification.MEDIA_FAILED
+            );
+          })
+          .finally(() => {
+            radarr.clearCache({
+              tmdbId: movie.id,
+              externalId: entity.is4k
+                ? media.externalServiceId4k
+                : media.externalServiceId,
+            });
+          });
+        logger.info('Sent request to Radarr', {
+          label: 'Media Request',
+          requestId: entity.id,
+          mediaId: entity.media.id,
+        });
+      } catch (e) {
+        logger.error('Something went wrong sending request to Radarr', {
+          label: 'Media Request',
+          errorMessage: e.message,
+          requestId: entity.id,
+          mediaId: entity.media.id,
+        });
+        throw new Error(e.message);
+      }
+    }
+  }
+
+  public async sendToSonarr(entity: MediaRequest): Promise<void> {
+    if (
+      entity.status === MediaRequestStatus.APPROVED &&
+      entity.type === MediaType.TV
+    ) {
+      try {
+        const mediaRepository = getRepository(Media);
+        const settings = getSettings();
+        if (settings.sonarr.length === 0 && !settings.sonarr[0]) {
+          logger.warn(
+            'No Sonarr server configured, skipping request processing',
+            {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+            }
+          );
+          return;
+        }
+
+        let sonarrSettings = settings.sonarr.find(
+          (sonarr) => sonarr.isDefault && sonarr.is4k === entity.is4k
+        );
+
+        if (
+          entity.serverId !== null &&
+          entity.serverId >= 0 &&
+          sonarrSettings?.id !== entity.serverId
+        ) {
+          sonarrSettings = settings.sonarr.find(
+            (sonarr) => sonarr.id === entity.serverId
+          );
+          logger.info(
+            `Request has an override server: ${sonarrSettings?.name}`,
+            {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+            }
+          );
+        }
+
+        if (!sonarrSettings) {
+          logger.warn(
+            `There is no default ${
+              entity.is4k ? '4K ' : ''
+            }Sonarr server configured. Did you set any of your ${
+              entity.is4k ? '4K ' : ''
+            }Sonarr servers as default?`,
+            {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+            }
+          );
+          return;
+        }
+
+        const media = await mediaRepository.findOne({
+          where: { id: entity.media.id },
+          relations: { requests: true },
+        });
+
+        if (!media) {
+          throw new Error('Media data not found');
+        }
+
+        if (
+          media[entity.is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
+        ) {
+          logger.warn('Media already exists, marking request as APPROVED', {
+            label: 'Media Request',
+            requestId: entity.id,
+            mediaId: entity.media.id,
+          });
+
+          const requestRepository = getRepository(MediaRequest);
+          entity.status = MediaRequestStatus.APPROVED;
+          await requestRepository.save(entity);
+          return;
+        }
+
+        const tmdb = new TheMovieDb();
+        const sonarr = new SonarrAPI({
+          apiKey: sonarrSettings.apiKey,
+          url: SonarrAPI.buildUrl(sonarrSettings, '/api/v3'),
+        });
+        const series = await tmdb.getTvShow({ tvId: media.tmdbId });
+        const tvdbId = series.external_ids.tvdb_id ?? media.tvdbId;
+
+        if (!tvdbId) {
+          const requestRepository = getRepository(MediaRequest);
+          await mediaRepository.remove(media);
+          await requestRepository.remove(entity);
+          throw new Error('TVDB ID not found');
+        }
+
+        let seriesType: SonarrSeries['seriesType'] = 'standard';
+
+        // Change series type to anime if the anime keyword is present on tmdb
+        if (
+          series.keywords.results.some(
+            (keyword) => keyword.id === ANIME_KEYWORD_ID
+          )
+        ) {
+          seriesType = sonarrSettings.animeSeriesType ?? 'anime';
+        }
+
+        let rootFolder =
+          seriesType === 'anime' && sonarrSettings.activeAnimeDirectory
+            ? sonarrSettings.activeAnimeDirectory
+            : sonarrSettings.activeDirectory;
+        let qualityProfile =
+          seriesType === 'anime' && sonarrSettings.activeAnimeProfileId
+            ? sonarrSettings.activeAnimeProfileId
+            : sonarrSettings.activeProfileId;
+        let languageProfile =
+          seriesType === 'anime' && sonarrSettings.activeAnimeLanguageProfileId
+            ? sonarrSettings.activeAnimeLanguageProfileId
+            : sonarrSettings.activeLanguageProfileId;
+        let tags =
+          seriesType === 'anime'
+            ? sonarrSettings.animeTags
+              ? [...sonarrSettings.animeTags]
+              : []
+            : sonarrSettings.tags
+            ? [...sonarrSettings.tags]
+            : [];
+
+        if (
+          entity.rootFolder &&
+          entity.rootFolder !== '' &&
+          entity.rootFolder !== rootFolder
+        ) {
+          rootFolder = entity.rootFolder;
+          logger.info(`Request has an override root folder: ${rootFolder}`, {
+            label: 'Media Request',
+            requestId: entity.id,
+            mediaId: entity.media.id,
+          });
+        }
+
+        if (entity.profileId && entity.profileId !== qualityProfile) {
+          qualityProfile = entity.profileId;
+          logger.info(
+            `Request has an override quality profile ID: ${qualityProfile}`,
+            {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+            }
+          );
+        }
+
+        if (
+          entity.languageProfileId &&
+          entity.languageProfileId !== languageProfile
+        ) {
+          languageProfile = entity.languageProfileId;
+          logger.info(
+            `Request has an override language profile ID: ${languageProfile}`,
+            {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+            }
+          );
+        }
+
+        if (entity.tags && !isEqual(entity.tags, tags)) {
+          tags = entity.tags;
+          logger.info(`Request has override tags`, {
+            label: 'Media Request',
+            requestId: entity.id,
+            mediaId: entity.media.id,
+            tagIds: tags,
+          });
+        }
+
+        if (sonarrSettings.tagRequests) {
+          let userTag = (await sonarr.getTags()).find((v) =>
+            v.label.startsWith(entity.requestedBy.id + ' - ')
+          );
+          if (!userTag) {
+            logger.info(`Requester has no active tag. Creating new`, {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+              userId: entity.requestedBy.id,
+              newTag:
+                entity.requestedBy.id + ' - ' + entity.requestedBy.displayName,
+            });
+            userTag = await sonarr.createTag({
+              label:
+                entity.requestedBy.id + ' - ' + entity.requestedBy.displayName,
+            });
+          }
+          if (userTag.id) {
+            if (!tags?.find((v) => v === userTag?.id)) {
+              tags?.push(userTag.id);
+            }
+          } else {
+            logger.warn(`Requester has no tag and failed to add one`, {
+              label: 'Media Request',
+              requestId: entity.id,
+              mediaId: entity.media.id,
+              userId: entity.requestedBy.id,
+              sonarrServer: sonarrSettings.hostname + ':' + sonarrSettings.port,
+            });
+          }
+        }
+
+        const sonarrSeriesOptions: AddSeriesOptions = {
+          profileId: qualityProfile,
+          languageProfileId: languageProfile,
+          rootFolderPath: rootFolder,
+          title: series.name,
+          tvdbid: tvdbId,
+          seasons: entity.seasons.map((season) => season.seasonNumber),
+          seasonFolder: sonarrSettings.enableSeasonFolders,
+          seriesType,
+          tags,
+          monitored: true,
+          searchNow: !sonarrSettings.preventSearch,
+        };
+
+        // Run entity asynchronously so we don't wait for it on the UI side
+        sonarr
+          .addSeries(sonarrSeriesOptions)
+          .then(async (sonarrSeries) => {
+            // We grab media again here to make sure we have the latest version of it
+            const media = await mediaRepository.findOne({
+              where: { id: entity.media.id },
+              relations: { requests: true },
+            });
+
+            if (!media) {
+              throw new Error('Media data not found');
+            }
+
+            media[entity.is4k ? 'externalServiceId4k' : 'externalServiceId'] =
+              sonarrSeries.id;
+            media[
+              entity.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'
+            ] = sonarrSeries.titleSlug;
+            media[entity.is4k ? 'serviceId4k' : 'serviceId'] =
+              sonarrSettings?.id;
+            await mediaRepository.save(media);
+          })
+          .catch(async () => {
+            const requestRepository = getRepository(MediaRequest);
+
+            entity.status = MediaRequestStatus.FAILED;
+            requestRepository.save(entity);
+
+            logger.warn(
+              'Something went wrong sending series request to Sonarr, marking status as FAILED',
+              {
+                label: 'Media Request',
+                requestId: entity.id,
+                mediaId: entity.media.id,
+                sonarrSeriesOptions,
+              }
+            );
+
+            MediaRequest.sendNotification(
+              entity,
+              media,
+              Notification.MEDIA_FAILED
+            );
+          })
+          .finally(() => {
+            sonarr.clearCache({
+              tvdbId,
+              externalId: entity.is4k
+                ? media.externalServiceId4k
+                : media.externalServiceId,
+              title: series.name,
+            });
+          });
+        logger.info('Sent request to Sonarr', {
+          label: 'Media Request',
+          requestId: entity.id,
+          mediaId: entity.media.id,
+        });
+      } catch (e) {
+        logger.error('Something went wrong sending request to Sonarr', {
+          label: 'Media Request',
+          errorMessage: e.message,
+          requestId: entity.id,
+          mediaId: entity.media.id,
+        });
+        throw new Error(e.message);
+      }
+    }
+  }
+
+  public async updateParentStatus(entity: MediaRequest): Promise<void> {
+    const mediaRepository = getRepository(Media);
+    const media = await mediaRepository.findOne({
+      where: { id: entity.media.id },
+      relations: { requests: true },
+    });
+    if (!media) {
+      logger.error('Media data not found', {
+        label: 'Media Request',
+        requestId: entity.id,
+        mediaId: entity.media.id,
+      });
+      return;
+    }
+    const seasonRequestRepository = getRepository(SeasonRequest);
+    if (
+      entity.status === MediaRequestStatus.APPROVED &&
+      // Do not update the status if the item is already partially available or available
+      media[entity.is4k ? 'status4k' : 'status'] !== MediaStatus.AVAILABLE &&
+      media[entity.is4k ? 'status4k' : 'status'] !==
+        MediaStatus.PARTIALLY_AVAILABLE &&
+      media[entity.is4k ? 'status4k' : 'status'] !== MediaStatus.PROCESSING
+    ) {
+      media[entity.is4k ? 'status4k' : 'status'] = MediaStatus.PROCESSING;
+      mediaRepository.save(media);
+    }
+
+    if (
+      media.mediaType === MediaType.MOVIE &&
+      entity.status === MediaRequestStatus.DECLINED &&
+      media[entity.is4k ? 'status4k' : 'status'] !== MediaStatus.DELETED
+    ) {
+      media[entity.is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
+      mediaRepository.save(media);
+    }
+
+    /**
+     * If the media type is TV, and we are declining a request,
+     * we must check if its the only pending request and that
+     * there the current media status is just pending (meaning no
+     * other requests have yet to be approved)
+     */
+    if (
+      media.mediaType === MediaType.TV &&
+      entity.status === MediaRequestStatus.DECLINED &&
+      media.requests.filter(
+        (request) => request.status === MediaRequestStatus.PENDING
+      ).length === 0 &&
+      media[entity.is4k ? 'status4k' : 'status'] === MediaStatus.PENDING &&
+      media[entity.is4k ? 'status4k' : 'status'] !== MediaStatus.DELETED
+    ) {
+      media[entity.is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
+      mediaRepository.save(media);
+    }
+
+    // Approve child seasons if parent is approved
+    if (
+      media.mediaType === MediaType.TV &&
+      entity.status === MediaRequestStatus.APPROVED
+    ) {
+      entity.seasons.forEach((season) => {
+        season.status = MediaRequestStatus.APPROVED;
+        seasonRequestRepository.save(season);
+      });
+    }
+  }
+
+  public async handleRemoveParentUpdate(
+    manager: EntityManager,
+    entity: MediaRequest
+  ): Promise<void> {
+    const fullMedia = await manager.findOneOrFail(Media, {
+      where: { id: entity.media.id },
+      relations: { requests: true },
+    });
+
+    if (!fullMedia) return;
+
+    if (
+      !fullMedia.requests.some((request) => !request.is4k) &&
+      fullMedia.status !== MediaStatus.AVAILABLE
+    ) {
+      fullMedia.status = MediaStatus.UNKNOWN;
+    }
+
+    if (
+      !fullMedia.requests.some((request) => request.is4k) &&
+      fullMedia.status4k !== MediaStatus.AVAILABLE
+    ) {
+      fullMedia.status4k = MediaStatus.UNKNOWN;
+    }
+
+    await manager.save(fullMedia);
+  }
+
+  public afterUpdate(event: UpdateEvent<MediaRequest>): void {
+    if (!event.entity) {
+      return;
+    }
+
+    this.sendToRadarr(event.entity as MediaRequest);
+    this.sendToSonarr(event.entity as MediaRequest);
+
+    this.updateParentStatus(event.entity as MediaRequest);
+
+    if (event.entity.status === MediaRequestStatus.COMPLETED) {
+      if (event.entity.media.mediaType === MediaType.MOVIE) {
+        this.notifyAvailableMovie(event.entity as MediaRequest);
+      }
+      if (event.entity.media.mediaType === MediaType.TV) {
+        this.notifyAvailableSeries(event.entity as MediaRequest);
+      }
+    }
+  }
+
+  public afterInsert(event: InsertEvent<MediaRequest>): void {
+    if (!event.entity) {
+      return;
+    }
+
+    this.sendToRadarr(event.entity as MediaRequest);
+    this.sendToSonarr(event.entity as MediaRequest);
+
+    this.updateParentStatus(event.entity as MediaRequest);
+  }
+
+  public async afterRemove(event: RemoveEvent<MediaRequest>): Promise<void> {
+    if (!event.entity) {
+      return;
+    }
+
+    await this.handleRemoveParentUpdate(
+      event.manager as EntityManager,
+      event.entity as MediaRequest
+    );
+  }
+
+  public listenTo(): typeof MediaRequest {
+    return MediaRequest;
+  }
+}
--- a/server/subscriber/MediaSubscriber.ts
+++ b/server/subscriber/MediaSubscriber.ts
@@ -1,4 +1,3 @@
-import TheMovieDb from '@server/api/themoviedb';
 import {
  MediaRequestStatus,
  MediaStatus,
@@ -8,172 +7,12 @@ import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import { MediaRequest } from '@server/entity/MediaRequest';
 import Season from '@server/entity/Season';
-import notificationManager, { Notification } from '@server/lib/notifications';
-import logger from '@server/logger';
-import { truncate } from 'lodash';
+import SeasonRequest from '@server/entity/SeasonRequest';
 import type { EntitySubscriberInterface, UpdateEvent } from 'typeorm';
-import { EventSubscriber, In, Not } from 'typeorm';
+import { EventSubscriber } from 'typeorm';

@EventSubscriber()
 export class MediaSubscriber implements EntitySubscriberInterface<Media> {
-  private async notifyAvailableMovie(
-    entity: Media,
-    dbEntity: Media,
-    is4k: boolean
-  ) {
-    if (
-      entity[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE &&
-      dbEntity[is4k ? 'status4k' : 'status'] !== MediaStatus.AVAILABLE
-    ) {
-      if (entity.mediaType === MediaType.MOVIE) {
-        const requestRepository = getRepository(MediaRequest);
-        const relatedRequests = await requestRepository.find({
-          where: {
-            media: {
-              id: entity.id,
-            },
-            is4k,
-            status: Not(MediaRequestStatus.DECLINED),
-          },
-        });
-
-        if (relatedRequests.length > 0) {
-          const tmdb = new TheMovieDb();
-
-          try {
-            const movie = await tmdb.getMovie({ movieId: entity.tmdbId });
-
-            relatedRequests.forEach((request) => {
-              notificationManager.sendNotification(
-                Notification.MEDIA_AVAILABLE,
-                {
-                  event: `${is4k ? '4K ' : ''}Movie Request Now Available`,
-                  notifyAdmin: false,
-                  notifySystem: true,
-                  notifyUser: request.requestedBy,
-                  subject: `${movie.title}${
-                    movie.release_date
-                      ? ` (${movie.release_date.slice(0, 4)})`
-                      : ''
-                  }`,
-                  message: truncate(movie.overview, {
-                    length: 500,
-                    separator: /\s/,
-                    omission: '…',
-                  }),
-                  media: entity,
-                  image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
-                  request,
-                }
-              );
-            });
-          } catch (e) {
-            logger.error('Something went wrong sending media notification(s)', {
-              label: 'Notifications',
-              errorMessage: e.message,
-              mediaId: entity.id,
-            });
-          }
-        }
-      }
-    }
-  }
-
-  private async notifyAvailableSeries(
-    entity: Media,
-    dbEntity: Media,
-    is4k: boolean
-  ) {
-    const seasonRepository = getRepository(Season);
-    const newAvailableSeasons = entity.seasons
-      .filter(
-        (season) =>
-          season[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
-      )
-      .map((season) => season.seasonNumber);
-    const oldSeasonIds = dbEntity.seasons.map((season) => season.id);
-    const oldSeasons = await seasonRepository.findBy({ id: In(oldSeasonIds) });
-    const oldAvailableSeasons = oldSeasons
-      .filter(
-        (season) =>
-          season[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
-      )
-      .map((season) => season.seasonNumber);
-
-    const changedSeasons = newAvailableSeasons.filter(
-      (seasonNumber) => !oldAvailableSeasons.includes(seasonNumber)
-    );
-
-    if (changedSeasons.length > 0) {
-      const tmdb = new TheMovieDb();
-      const requestRepository = getRepository(MediaRequest);
-      const processedSeasons: number[] = [];
-
-      for (const changedSeasonNumber of changedSeasons) {
-        const requests = await requestRepository.find({
-          where: {
-            media: {
-              id: entity.id,
-            },
-            is4k,
-            status: Not(MediaRequestStatus.DECLINED),
-          },
-        });
-        const request = requests.find(
-          (request) =>
-            // Check if the season is complete AND it contains the current season that was just marked available
-            request.seasons.every((season) =>
-              newAvailableSeasons.includes(season.seasonNumber)
-            ) &&
-            request.seasons.some(
-              (season) => season.seasonNumber === changedSeasonNumber
-            )
-        );
-
-        if (request && !processedSeasons.includes(changedSeasonNumber)) {
-          processedSeasons.push(
-            ...request.seasons.map((season) => season.seasonNumber)
-          );
-
-          try {
-            const tv = await tmdb.getTvShow({ tvId: entity.tmdbId });
-            notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
-              event: `${is4k ? '4K ' : ''}Series Request Now Available`,
-              subject: `${tv.name}${
-                tv.first_air_date ? ` (${tv.first_air_date.slice(0, 4)})` : ''
-              }`,
-              message: truncate(tv.overview, {
-                length: 500,
-                separator: /\s/,
-                omission: '…',
-              }),
-              notifyAdmin: false,
-              notifySystem: true,
-              notifyUser: request.requestedBy,
-              image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${tv.poster_path}`,
-              media: entity,
-              extra: [
-                {
-                  name: 'Requested Seasons',
-                  value: request.seasons
-                    .map((season) => season.seasonNumber)
-                    .join(', '),
-                },
-              ],
-              request,
-            });
-          } catch (e) {
-            logger.error('Something went wrong sending media notification(s)', {
-              label: 'Notifications',
-              errorMessage: e.message,
-              mediaId: entity.id,
-            });
-          }
-        }
-      }
-    }
-  }
-
  private async updateChildRequestStatus(event: Media, is4k: boolean) {
    const requestRepository = getRepository(MediaRequest);

@@ -192,57 +31,101 @@ export class MediaSubscriber implements EntitySubscriberInterface<Media> {
    }
  }

-  public beforeUpdate(event: UpdateEvent<Media>): void {
+  private async updateRelatedMediaRequest(
+    event: Media,
+    databaseEvent: Media,
+    is4k: boolean
+  ) {
+    const requestRepository = getRepository(MediaRequest);
+    const seasonRequestRepository = getRepository(SeasonRequest);
+
+    const relatedRequests = await requestRepository.find({
+      relations: {
+        media: true,
+      },
+      where: {
+        media: { id: event.id },
+        status: MediaRequestStatus.APPROVED,
+        is4k,
+      },
+    });
+
+    // Check the media entity status and if available
+    // or deleted, set the related request to completed
+    if (relatedRequests.length > 0) {
+      const completedRequests: MediaRequest[] = [];
+
+      for (const request of relatedRequests) {
+        let shouldComplete = false;
+
+        if (
+          (event[request.is4k ? 'status4k' : 'status'] ===
+            MediaStatus.AVAILABLE ||
+            event[request.is4k ? 'status4k' : 'status'] ===
+              MediaStatus.DELETED) &&
+          event.mediaType === MediaType.MOVIE
+        ) {
+          shouldComplete = true;
+        } else if (event.mediaType === 'tv') {
+          const allSeasonResults = await Promise.all(
+            request.seasons.map(async (requestSeason) => {
+              const matchingSeason = event.seasons.find(
+                (mediaSeason) =>
+                  mediaSeason.seasonNumber === requestSeason.seasonNumber
+              );
+              const matchingOldSeason = databaseEvent.seasons.find(
+                (oldSeason) =>
+                  oldSeason.seasonNumber === requestSeason.seasonNumber
+              );
+
+              if (!matchingSeason) {
+                return false;
+              }
+
+              const currentSeasonStatus =
+                matchingSeason[request.is4k ? 'status4k' : 'status'];
+              const previousSeasonStatus =
+                matchingOldSeason?.[request.is4k ? 'status4k' : 'status'];
+
+              const hasStatusChanged =
+                currentSeasonStatus !== previousSeasonStatus;
+
+              const shouldUpdate =
+                (hasStatusChanged ||
+                  requestSeason.status === MediaRequestStatus.COMPLETED) &&
+                (currentSeasonStatus === MediaStatus.AVAILABLE ||
+                  currentSeasonStatus === MediaStatus.DELETED);
+
+              if (shouldUpdate) {
+                requestSeason.status = MediaRequestStatus.COMPLETED;
+                await seasonRequestRepository.save(requestSeason);
+
+                return true;
+              }
+
+              return false;
+            })
+          );
+
+          const allSeasonsReady = allSeasonResults.every((result) => result);
+          shouldComplete = allSeasonsReady;
+        }
+
+        if (shouldComplete) {
+          request.status = MediaRequestStatus.COMPLETED;
+          completedRequests.push(request);
+        }
+      }
+
+      await requestRepository.save(completedRequests);
+    }
+  }
+
+  public async beforeUpdate(event: UpdateEvent<Media>): Promise<void> {
    if (!event.entity) {
      return;
    }

-    if (
-      event.entity.mediaType === MediaType.MOVIE &&
-      event.entity.status === MediaStatus.AVAILABLE
-    ) {
-      this.notifyAvailableMovie(
-        event.entity as Media,
-        event.databaseEntity,
-        false
-      );
-    }
-
-    if (
-      event.entity.mediaType === MediaType.MOVIE &&
-      event.entity.status4k === MediaStatus.AVAILABLE
-    ) {
-      this.notifyAvailableMovie(
-        event.entity as Media,
-        event.databaseEntity,
-        true
-      );
-    }
-
-    if (
-      event.entity.mediaType === MediaType.TV &&
-      (event.entity.status === MediaStatus.AVAILABLE ||
-        event.entity.status === MediaStatus.PARTIALLY_AVAILABLE)
-    ) {
-      this.notifyAvailableSeries(
-        event.entity as Media,
-        event.databaseEntity,
-        false
-      );
-    }
-
-    if (
-      event.entity.mediaType === MediaType.TV &&
-      (event.entity.status4k === MediaStatus.AVAILABLE ||
-        event.entity.status4k === MediaStatus.PARTIALLY_AVAILABLE)
-    ) {
-      this.notifyAvailableSeries(
-        event.entity as Media,
-        event.databaseEntity,
-        true
-      );
-    }
-
    if (
      event.entity.status === MediaStatus.AVAILABLE &&
      event.databaseEntity.status === MediaStatus.PENDING
@@ -256,6 +139,65 @@ export class MediaSubscriber implements EntitySubscriberInterface<Media> {
    ) {
      this.updateChildRequestStatus(event.entity as Media, true);
    }
+
+    // Manually load related seasons into databaseEntity
+    // for seasonStatusCheck in afterUpdate
+    const seasons = await event.manager
+      .getRepository(Season)
+      .createQueryBuilder('season')
+      .leftJoin('season.media', 'media')
+      .where('media.id = :id', { id: event.databaseEntity.id })
+      .getMany();
+
+    event.databaseEntity.seasons = seasons;
+  }
+
+  public async afterUpdate(event: UpdateEvent<Media>): Promise<void> {
+    if (!event.entity) {
+      return;
+    }
+
+    const validStatuses = [
+      MediaStatus.PARTIALLY_AVAILABLE,
+      MediaStatus.AVAILABLE,
+      MediaStatus.DELETED,
+    ];
+
+    const seasonStatusCheck = (is4k: boolean) => {
+      return event.entity?.seasons?.some((season: Season, index: number) => {
+        const previousSeason = event.databaseEntity.seasons[index];
+
+        return (
+          season[is4k ? 'status4k' : 'status'] !==
+          previousSeason?.[is4k ? 'status4k' : 'status']
+        );
+      });
+    };
+
+    if (
+      (event.entity.status !== event.databaseEntity?.status ||
+        (event.entity.mediaType === MediaType.TV &&
+          seasonStatusCheck(false))) &&
+      validStatuses.includes(event.entity.status)
+    ) {
+      this.updateRelatedMediaRequest(
+        event.entity as Media,
+        event.databaseEntity as Media,
+        false
+      );
+    }
+
+    if (
+      (event.entity.status4k !== event.databaseEntity?.status4k ||
+        (event.entity.mediaType === MediaType.TV && seasonStatusCheck(true))) &&
+      validStatuses.includes(event.entity.status4k)
+    ) {
+      this.updateRelatedMediaRequest(
+        event.entity as Media,
+        event.databaseEntity as Media,
+        true
+      );
+    }
  }

  public listenTo(): typeof Media {
--- a/server/utils/customProxyAgent.ts
+++ b/server/utils/customProxyAgent.ts
@@ -1,6 +1,8 @@
 import type { ProxySettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import axios from 'axios';
+import { HttpProxyAgent } from 'http-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import type { Dispatcher } from 'undici';
 import { Agent, ProxyAgent, setGlobalDispatcher } from 'undici';

@@ -54,17 +56,29 @@ export default async function createCustomProxyAgent(
      : undefined;

  try {
+    const proxyUrl =
+      (proxySettings.useSsl ? 'https://' : 'http://') +
+      proxySettings.hostname +
+      ':' +
+      proxySettings.port;
+
    const proxyAgent = new ProxyAgent({
-      uri:
-        (proxySettings.useSsl ? 'https://' : 'http://') +
-        proxySettings.hostname +
-        ':' +
-        proxySettings.port,
+      uri: proxyUrl,
      token,
      keepAliveTimeout: 5000,
    });

    setGlobalDispatcher(proxyAgent.compose(noProxyInterceptor));
+
+    axios.defaults.httpAgent = new HttpProxyAgent(proxyUrl);
+    axios.defaults.httpsAgent = new HttpsProxyAgent(proxyUrl);
+    axios.interceptors.request.use((config) => {
+      if (config.url && skipUrl(config.url)) {
+        config.httpAgent = false;
+        config.httpsAgent = false;
+      }
+      return config;
+    });
  } catch (e) {
    logger.error('Failed to connect to the proxy: ' + e.message, {
      label: 'Proxy',
--- a/src/assets/extlogos/ntfy.svg
+++ b/src/assets/extlogos/ntfy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50"><g fill="currentColor"><path d="M50.4 46.883c-9.168 0-17.023 7.214-17.023 16.387v.007l.09 71.37-2.303 16.992 31.313-8.319h77.841c9.17 0 17.024-7.224 17.024-16.396V63.27c0-9.17-7.85-16.383-17.016-16.387h-.008zm0 11.566h89.926c3.222.004 5.45 2.347 5.45 4.82v63.655c0 2.475-2.232 4.82-5.457 4.82h-79.54l-15.908 4.807.162-.938-.088-72.343c0-2.476 2.23-4.82 5.455-4.82z" transform="scale(.26458)"/><path d="M88.2 95.309H64.92c-1.601 0-2.91 1.236-2.91 2.746l.022 18.602-.435 2.506 6.231-1.881H88.2c1.6 0 2.91-1.236 2.91-2.747v-16.48c0-1.51-1.31-2.746-2.91-2.746z" transform="translate(-51.147 -81.516)"/><path d="M50.4 46.883c-9.168 0-17.023 7.214-17.023 16.387v.007l.09 71.37-2.303 16.992 31.313-8.319h77.841c9.17 0 17.024-7.224 17.024-16.396V63.27c0-9.17-7.85-16.383-17.016-16.387h-.008zm0 11.566h89.926c3.222.004 5.45 2.347 5.45 4.82v63.655c0 2.475-2.232 4.82-5.457 4.82h-79.54l-15.908 4.807.162-.938-.088-72.343c0-2.476 2.23-4.82 5.455-4.82z" transform="scale(.26458)"/><path d="M62.57 116.77v-1.312l3.28-1.459q.159-.068.306-.102.158-.045.283-.068l.271-.022v-.09q-.136-.012-.271-.046-.125-.023-.283-.057-.147-.045-.306-.113l-3.28-1.459v-1.323l5.068 2.319v1.413z" transform="matrix(1.45366 0 0 1.72815 -75.122 -171.953)"/><path d="M62.309 110.31v1.903l3.437 1.53.022.007-.022.008-3.437 1.53v1.892l.37-.17 5.221-2.39v-1.75zm.525.817 4.541 2.08v1.076l-4.541 2.078v-.732l3.12-1.389.003-.002a1.56 1.56 0 0 1 .258-.086h.006l.008-.002c.094-.027.176-.047.246-.06l.498-.041v-.574l-.24-.02a1.411 1.411 0 0 1-.231-.04l-.008-.001-.008-.002a9.077 9.077 0 0 1-.263-.053 2.781 2.781 0 0 1-.266-.097l-.004-.002-3.119-1.39z" transform="matrix(1.45366 0 0 1.72815 -75.122 -171.953)"/><path d="M69.171 117.754h5.43v1.278h-5.43Z" transform="matrix(1.44935 0 0 1.66414 -74.104 -166.906)"/><path d="M68.908 117.492v1.802h5.955v-1.802zm.526.524h4.904v.754h-4.904z" transform="matrix(1.44935 0 0 1.66414 -74.104 -166.906)"/></g></svg>
--- a/src/components/Common/CachedImage/index.tsx
+++ b/src/components/Common/CachedImage/index.tsx
@@ -6,7 +6,7 @@ const imageLoader: ImageLoader = ({ src }) => src;

 export type CachedImageProps = ImageProps & {
  src: string;
-  type: 'tmdb' | 'avatar';
+  type: 'tmdb' | 'avatar' | 'tvdb';
 };

 /**
@@ -22,7 +22,15 @@ const CachedImage = ({ src, type, ...props }: CachedImageProps) => {
    // tmdb stuff
    imageUrl =
      currentSettings.cacheImages && !src.startsWith('/')
-        ? src.replace(/^https:\/\/image\.tmdb\.org\//, '/imageproxy/')
+        ? src.replace(/^https:\/\/image\.tmdb\.org\//, '/imageproxy/tmdb/')
+        : src;
+  } else if (type === 'tvdb') {
+    imageUrl =
+      currentSettings.cacheImages && !src.startsWith('/')
+        ? src.replace(
+            /^https:\/\/artworks\.thetvdb\.com\//,
+            '/imageproxy/tvdb/'
+          )
        : src;
  } else if (type === 'avatar') {
    // jellyfin avatar (if any)
--- a/src/components/Common/StatusBadgeMini/index.tsx
+++ b/src/components/Common/StatusBadgeMini/index.tsx
@@ -5,6 +5,7 @@ import {
  ClockIcon,
  EyeSlashIcon,
  MinusSmallIcon,
+  TrashIcon,
 } from '@heroicons/react/24/solid';
 import { MediaStatus } from '@server/constants/media';

@@ -59,6 +60,10 @@ const StatusBadgeMini = ({
      );
      indicatorIcon = <MinusSmallIcon />;
      break;
+    case MediaStatus.DELETED:
+      badgeStyle.push('bg-red-500 border-red-400 ring-red-400 text-red-100');
+      indicatorIcon = <TrashIcon />;
+      break;
  }

  if (inProgress) {
--- a/src/components/Discover/DiscoverMovies/index.tsx
+++ b/src/components/Discover/DiscoverMovies/index.tsx
@@ -85,7 +85,7 @@ const DiscoverMovies = () => {
              id="sortBy"
              name="sortBy"
              className="rounded-r-only"
-              value={preparedFilters.sortBy}
+              value={preparedFilters.sortBy || SortOptions.PopularityDesc}
              onChange={(e) => updateQueryParams('sortBy', e.target.value)}
            >
              <option value={SortOptions.PopularityDesc}>
--- a/src/components/Discover/DiscoverNetwork/index.tsx
+++ b/src/components/Discover/DiscoverNetwork/index.tsx
@@ -1,3 +1,4 @@
+import CachedImage from '@app/components/Common/CachedImage';
 import Header from '@app/components/Common/Header';
 import ListView from '@app/components/Common/ListView';
 import PageTitle from '@app/components/Common/PageTitle';
@@ -7,7 +8,6 @@ import Error from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
 import type { TvNetwork } from '@server/models/common';
 import type { TvResult } from '@server/models/Search';
-import Image from 'next/image';
 import { useRouter } from 'next/router';
 import { useIntl } from 'react-intl';

@@ -49,7 +49,8 @@ const DiscoverTvNetwork = () => {
        <Header>
          {firstResultData?.network.logoPath ? (
            <div className="relative mb-6 flex h-24 justify-center sm:h-32">
-              <Image
+              <CachedImage
+                type="tmdb"
                src={`https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.network.logoPath}`}
                alt={firstResultData.network.name}
                className="object-contain"
--- a/src/components/Discover/DiscoverStudio/index.tsx
+++ b/src/components/Discover/DiscoverStudio/index.tsx
@@ -1,3 +1,4 @@
+import CachedImage from '@app/components/Common/CachedImage';
 import Header from '@app/components/Common/Header';
 import ListView from '@app/components/Common/ListView';
 import PageTitle from '@app/components/Common/PageTitle';
@@ -7,7 +8,6 @@ import Error from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
 import type { ProductionCompany } from '@server/models/common';
 import type { MovieResult } from '@server/models/Search';
-import Image from 'next/image';
 import { useRouter } from 'next/router';
 import { useIntl } from 'react-intl';

@@ -49,7 +49,8 @@ const DiscoverMovieStudio = () => {
        <Header>
          {firstResultData?.studio.logoPath ? (
            <div className="relative mb-6 flex h-24 justify-center sm:h-32">
-              <Image
+              <CachedImage
+                type="tmdb"
                src={`https://image.tmdb.org/t/p/w780_filter(duotone,ffffff,bababa)${firstResultData.studio.logoPath}`}
                alt={firstResultData.studio.name}
                className="object-contain"
--- a/src/components/Discover/DiscoverTv/index.tsx
+++ b/src/components/Discover/DiscoverTv/index.tsx
@@ -83,7 +83,7 @@ const DiscoverTv = () => {
              id="sortBy"
              name="sortBy"
              className="rounded-r-only"
-              value={preparedFilters.sortBy}
+              value={preparedFilters.sortBy || SortOptions.PopularityDesc}
              onChange={(e) => updateQueryParams('sortBy', e.target.value)}
            >
              <option value={SortOptions.PopularityDesc}>
--- a/src/components/Discover/FilterSlideover/index.tsx
+++ b/src/components/Discover/FilterSlideover/index.tsx
@@ -9,6 +9,7 @@ import {
  GenreSelector,
  KeywordSelector,
  StatusSelector,
+  USCertificationSelector,
  WatchProviderSelector,
 } from '@app/components/Selector';
 import useSettings from '@app/hooks/useSettings';
@@ -42,6 +43,7 @@ const messages = defineMessages('components.Discover.FilterSlideover', {
  streamingservices: 'Streaming Services',
  voteCount: 'Number of votes between {minValue} and {maxValue}',
  status: 'Status',
+  certification: 'Content Rating',
 });

 type FilterSlideoverProps = {
@@ -190,6 +192,16 @@ const FilterSlideover = ({
            updateQueryParams('language', value);
          }}
        />
+        <span className="text-lg font-semibold">
+          {intl.formatMessage(messages.certification)}
+        </span>
+        <USCertificationSelector
+          type={type}
+          certification={currentFilters.certification}
+          onChange={(params) => {
+            batchUpdateQueryParams(params);
+          }}
+        />
        <span className="text-lg font-semibold">
          {intl.formatMessage(messages.runtime)}
        </span>
--- a/src/components/Discover/constants.ts
+++ b/src/components/Discover/constants.ts
@@ -109,6 +109,11 @@ export const QueryFilterOptions = z.object({
  watchRegion: z.string().optional(),
  watchProviders: z.string().optional(),
  status: z.string().optional(),
+  certification: z.string().optional(),
+  certificationGte: z.string().optional(),
+  certificationLte: z.string().optional(),
+  certificationCountry: z.string().optional(),
+  certificationMode: z.enum(['exact', 'range']).optional(),
 });

 export type FilterOptions = z.infer<typeof QueryFilterOptions>;
@@ -192,6 +197,30 @@ export const prepareFilterValues = (
    filterValues.watchRegion = values.watchRegion;
  }

+  if (values.certification) {
+    filterValues.certification = values.certification;
+  }
+
+  if (values.certificationGte) {
+    filterValues.certificationGte = values.certificationGte;
+  }
+
+  if (values.certificationLte) {
+    filterValues.certificationLte = values.certificationLte;
+  }
+
+  if (values.certificationCountry) {
+    filterValues.certificationCountry = values.certificationCountry;
+  }
+
+  if (values.certificationMode) {
+    filterValues.certificationMode = values.certificationMode;
+  } else if (values.certification) {
+    filterValues.certificationMode = 'exact';
+  } else if (values.certificationGte || values.certificationLte) {
+    filterValues.certificationMode = 'range';
+  }
+
  return filterValues;
 };

@@ -223,6 +252,20 @@ export const countActiveFilters = (filterValues: FilterOptions): number => {
    delete clonedFilters.watchRegion;
  }

+  if (
+    clonedFilters.certification ||
+    clonedFilters.certificationGte ||
+    clonedFilters.certificationLte ||
+    clonedFilters.certificationCountry
+  ) {
+    totalCount += 1;
+    delete clonedFilters.certification;
+    delete clonedFilters.certificationGte;
+    delete clonedFilters.certificationLte;
+    delete clonedFilters.certificationCountry;
+  }
+
+  delete clonedFilters.certificationMode;
  totalCount += Object.keys(clonedFilters).length;

  return totalCount;
--- a/src/components/IssueDetails/IssueComment/index.tsx
+++ b/src/components/IssueDetails/IssueComment/index.tsx
@@ -2,6 +2,7 @@ import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
 import Modal from '@app/components/Common/Modal';
 import { Permission, useUser } from '@app/hooks/useUser';
+import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { Menu, Transition } from '@headlessui/react';
 import { EllipsisVerticalIcon } from '@heroicons/react/24/solid';
@@ -207,13 +208,13 @@ const IssueComment = ({
                          type="button"
                          onClick={() => setIsEditing(false)}
                        >
-                          Cancel
+                          {intl.formatMessage(globalMessages.cancel)}
                        </Button>
                        <Button
                          buttonType="primary"
                          disabled={!isValid || isSubmitting}
                        >
-                          Save Changes
+                          {intl.formatMessage(globalMessages.save)}
                        </Button>
                      </div>
                    </Form>
@@ -222,7 +223,10 @@ const IssueComment = ({
              </Formik>
            ) : (
              <div className="prose w-full max-w-full">
-                <ReactMarkdown skipHtml allowedElements={['p', 'em', 'strong']}>
+                <ReactMarkdown
+                  skipHtml
+                  allowedElements={['p', 'em', 'strong', 'ul', 'ol', 'li']}
+                >
                  {comment.message}
                </ReactMarkdown>
              </div>
--- a/src/components/ManageSlideOver/index.tsx
+++ b/src/components/ManageSlideOver/index.tsx
@@ -152,6 +152,9 @@ const ManageSlideOver = ({
    if (data.mediaInfo) {
      await axios.post(`/api/v1/media/${data.mediaInfo?.id}/available`, {
        is4k,
+        ...(mediaType === 'tv' && {
+          seasons: data.seasons.filter((season) => season.seasonNumber !== 0),
+        }),
      });
      revalidate();
    }
--- a/src/components/MediaSlider/ShowMoreCard/index.tsx
+++ b/src/components/MediaSlider/ShowMoreCard/index.tsx
@@ -1,7 +1,7 @@
+import CachedImage from '@app/components/Common/CachedImage';
 import TitleCard from '@app/components/TitleCard';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowRightCircleIcon } from '@heroicons/react/24/solid';
-import Image from 'next/image';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useInView } from 'react-intersection-observer';
@@ -60,7 +60,8 @@ const ShowMoreCard = ({ url, posters }: ShowMoreCardProps) => {
            <div className="relative z-10 grid h-full w-full grid-cols-2 items-center justify-center gap-2 opacity-30">
              {posters[0] && (
                <div className="">
-                  <Image
+                  <CachedImage
+                    type="tmdb"
                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[0]}`}
                    alt=""
                    className="rounded-md"
@@ -71,7 +72,8 @@ const ShowMoreCard = ({ url, posters }: ShowMoreCardProps) => {
              )}
              {posters[1] && (
                <div className="">
-                  <Image
+                  <CachedImage
+                    type="tmdb"
                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[1]}`}
                    alt=""
                    className="rounded-md"
@@ -82,7 +84,8 @@ const ShowMoreCard = ({ url, posters }: ShowMoreCardProps) => {
              )}
              {posters[2] && (
                <div className="">
-                  <Image
+                  <CachedImage
+                    type="tmdb"
                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[2]}`}
                    alt=""
                    className="rounded-md"
@@ -93,7 +96,8 @@ const ShowMoreCard = ({ url, posters }: ShowMoreCardProps) => {
              )}
              {posters[3] && (
                <div className="">
-                  <Image
+                  <CachedImage
+                    type="tmdb"
                    src={`https://image.tmdb.org/t/p/w300_and_h450_face${posters[3]}`}
                    alt=""
                    className="rounded-md"
--- a/src/components/MediaSlider/index.tsx
+++ b/src/components/MediaSlider/index.tsx
@@ -74,6 +74,14 @@ const MediaSlider = ({
    );
  }

+  if (settings.currentSettings.hideBlacklisted) {
+    titles = titles.filter(
+      (i) =>
+        (i.mediaType === 'movie' || i.mediaType === 'tv') &&
+        i.mediaInfo?.status !== MediaStatus.BLACKLISTED
+    );
+  }
+
  useEffect(() => {
    if (
      titles.length < 24 &&
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -210,10 +210,16 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
      svg: <PlayIcon />,
    });
  }
-  const trailerUrl = data.relatedVideos
+
+  const trailerVideo = data.relatedVideos
    ?.filter((r) => r.type === 'Trailer')
    .sort((a, b) => a.size - b.size)
-    .pop()?.url;
+    .pop();
+  const trailerUrl =
+    trailerVideo?.site === 'YouTube' &&
+    settings.currentSettings.youtubeUrl != ''
+      ? `${settings.currentSettings.youtubeUrl}${trailerVideo?.key}`
+      : trailerVideo?.url;

  if (trailerUrl) {
    mediaLinks.push({
--- a/src/components/PersonDetails/index.tsx
+++ b/src/components/PersonDetails/index.tsx
@@ -7,6 +7,7 @@ import TitleCard from '@app/components/TitleCard';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
+import { CircleStackIcon } from '@heroicons/react/24/solid';
 import type { PersonCombinedCreditsResponse } from '@server/interfaces/api/personInterfaces';
 import type { PersonDetails as PersonDetailsType } from '@server/models/Person';
 import { groupBy } from 'lodash';
@@ -25,9 +26,12 @@ const messages = defineMessages('components.PersonDetails', {
  ascharacter: 'as {character}',
 });

+type MediaType = 'all' | 'movie' | 'tv';
+
 const PersonDetails = () => {
  const intl = useIntl();
  const router = useRouter();
+  const [currentMediaType, setCurrentMediaType] = useState<string>('all');
  const { data, error } = useSWR<PersonDetailsType>(
    `/api/v1/person/${router.query.personId}`
  );
@@ -39,7 +43,11 @@ const PersonDetails = () => {
    );

  const sortedCast = useMemo(() => {
-    const grouped = groupBy(combinedCredits?.cast ?? [], 'id');
+    const filtered = (combinedCredits?.cast ?? []).filter(
+      (media) =>
+        currentMediaType === 'all' || media.mediaType === currentMediaType
+    );
+    const grouped = groupBy(filtered, 'id');

    const reduced = Object.values(grouped).map((objs) => ({
      ...objs[0],
@@ -54,10 +62,14 @@ const PersonDetails = () => {
      }
      return 1;
    });
-  }, [combinedCredits]);
+  }, [combinedCredits, currentMediaType]);

  const sortedCrew = useMemo(() => {
-    const grouped = groupBy(combinedCredits?.crew ?? [], 'id');
+    const filtered = (combinedCredits?.crew ?? []).filter(
+      (media) =>
+        currentMediaType === 'all' || media.mediaType === currentMediaType
+    );
+    const grouped = groupBy(filtered, 'id');

    const reduced = Object.values(grouped).map((objs) => ({
      ...objs[0],
@@ -72,7 +84,7 @@ const PersonDetails = () => {
      }
      return 1;
    });
-  }, [combinedCredits]);
+  }, [combinedCredits, currentMediaType]);

  if (!data && !error) {
    return <LoadingSpinner />;
@@ -122,6 +134,29 @@ const PersonDetails = () => {

  const isLoading = !combinedCredits && !errorCombinedCredits;

+  const mediaTypePicker = (
+    <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">
+        <CircleStackIcon className="h-6 w-6" />
+      </span>
+      <select
+        id="mediaType"
+        name="mediaType"
+        onChange={(e) => {
+          setCurrentMediaType(e.target.value as MediaType);
+        }}
+        value={currentMediaType}
+        className="rounded-r-only"
+      >
+        <option value="all">{intl.formatMessage(globalMessages.all)}</option>
+        <option value="movie">
+          {intl.formatMessage(globalMessages.movies)}
+        </option>
+        <option value="tv">{intl.formatMessage(globalMessages.tvshows)}</option>
+      </select>
+    </div>
+  );
+
  const cast = (sortedCast ?? []).length > 0 && (
    <>
      <div className="slider-header">
@@ -235,8 +270,13 @@ const PersonDetails = () => {
            />
          </div>
        )}
-        <div className="text-center text-gray-300 lg:text-left">
-          <h1 className="text-3xl text-white lg:text-4xl">{data.name}</h1>
+        <div className="w-full text-center text-gray-300 lg:text-left">
+          <div className="flex w-full items-center justify-center lg:justify-between">
+            <h1 className="text-3xl text-white lg:text-4xl">{data.name}</h1>
+            <div className="hidden flex-shrink-0 lg:block">
+              {mediaTypePicker}
+            </div>
+          </div>
          <div className="mt-1 mb-2 space-y-1 text-xs text-white sm:text-sm lg:text-base">
            <div>{personAttributes.join(' | ')}</div>
            {(data.alsoKnownAs ?? []).length > 0 && (
@@ -274,6 +314,7 @@ const PersonDetails = () => {
          )}
        </div>
      </div>
+      <div className="lg:hidden">{mediaTypePicker}</div>
      {data.knownForDepartment === 'Acting' ? [cast, crew] : [crew, cast]}
      {isLoading && <LoadingSpinner />}
    </>
--- a/src/components/RequestBlock/index.tsx
+++ b/src/components/RequestBlock/index.tsx
@@ -206,6 +206,11 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {
                  {intl.formatMessage(globalMessages.failed)}
                </Badge>
              )}
+              {request.status === MediaRequestStatus.COMPLETED && (
+                <Badge badgeType="success">
+                  {intl.formatMessage(globalMessages.completed)}
+                </Badge>
+              )}
            </div>
          </div>
          <div className="mt-2 flex items-center text-sm leading-5 sm:mt-0">
--- a/src/components/RequestButton/index.tsx
+++ b/src/components/RequestButton/index.tsx
@@ -268,7 +268,9 @@ const RequestButton = ({

  // Standard request button
  if (
-    (!media || media.status === MediaStatus.UNKNOWN) &&
+    (!media ||
+      media.status === MediaStatus.UNKNOWN ||
+      (media.status === MediaStatus.DELETED && !activeRequest)) &&
    hasPermission(
      [
        Permission.REQUEST,
@@ -295,7 +297,6 @@ const RequestButton = ({
      type: 'or',
    }) &&
    media &&
-    media.status !== MediaStatus.AVAILABLE &&
    media.status !== MediaStatus.BLACKLISTED &&
    !isShowComplete
  ) {
@@ -312,7 +313,9 @@ const RequestButton = ({

  // 4K request button
  if (
-    (!media || media.status4k === MediaStatus.UNKNOWN) &&
+    (!media ||
+      media.status4k === MediaStatus.UNKNOWN ||
+      (media.status4k === MediaStatus.DELETED && !active4kRequest)) &&
    hasPermission(
      [
        Permission.REQUEST_4K,
@@ -341,8 +344,7 @@ const RequestButton = ({
      type: 'or',
    }) &&
    media &&
-    media.status4k !== MediaStatus.AVAILABLE &&
-    media.status !== MediaStatus.BLACKLISTED &&
+    media.status4k !== MediaStatus.BLACKLISTED &&
    !is4kShowComplete &&
    settings.currentSettings.series4kEnabled
  ) {
--- a/src/components/RequestCard/index.tsx
+++ b/src/components/RequestCard/index.tsx
@@ -18,7 +18,7 @@ import {
  TrashIcon,
  XMarkIcon,
 } from '@heroicons/react/24/solid';
-import { MediaRequestStatus } from '@server/constants/media';
+import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { MovieDetails } from '@server/models/Movie';
@@ -440,6 +440,15 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
              >
                {intl.formatMessage(globalMessages.failed)}
              </Badge>
+            ) : requestData.status === MediaRequestStatus.PENDING &&
+              requestData.media[requestData.is4k ? 'status4k' : 'status'] ===
+                MediaStatus.DELETED ? (
+              <Badge
+                badgeType="warning"
+                href={`/${requestData.type}/${requestData.media.tmdbId}?manage=1`}
+              >
+                {intl.formatMessage(globalMessages.pending)}
+              </Badge>
            ) : (
              <StatusBadge
                status={
--- a/src/components/RequestList/RequestItem/index.tsx
+++ b/src/components/RequestList/RequestItem/index.tsx
@@ -17,7 +17,7 @@ import {
  TrashIcon,
  XMarkIcon,
 } from '@heroicons/react/24/solid';
-import { MediaRequestStatus } from '@server/constants/media';
+import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { RequestResultsResponse } from '@server/interfaces/api/requestInterfaces';
@@ -509,6 +509,15 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                >
                  {intl.formatMessage(globalMessages.failed)}
                </Badge>
+              ) : requestData.status === MediaRequestStatus.PENDING &&
+                requestData.media[requestData.is4k ? 'status4k' : 'status'] ===
+                  MediaStatus.DELETED ? (
+                <Badge
+                  badgeType="warning"
+                  href={`/${requestData.type}/${requestData.media.tmdbId}?manage=1`}
+                >
+                  {intl.formatMessage(globalMessages.pending)}
+                </Badge>
              ) : (
                <StatusBadge
                  status={
--- a/src/components/RequestList/index.tsx
+++ b/src/components/RequestList/index.tsx
@@ -14,6 +14,7 @@ import {
  Bars3BottomLeftIcon,
  ChevronLeftIcon,
  ChevronRightIcon,
+  CircleStackIcon,
  FunnelIcon,
 } from '@heroicons/react/24/solid';
 import type { RequestResultsResponse } from '@server/interfaces/api/requestInterfaces';
@@ -39,12 +40,16 @@ enum Filter {
  AVAILABLE = 'available',
  UNAVAILABLE = 'unavailable',
  FAILED = 'failed',
+  DELETED = 'deleted',
+  COMPLETED = 'completed',
 }

 type Sort = 'added' | 'modified';

 type SortDirection = 'asc' | 'desc';

+type MediaType = 'all' | 'movie' | 'tv';
+
 const RequestList = () => {
  const router = useRouter();
  const intl = useIntl();
@@ -54,6 +59,7 @@ const RequestList = () => {
  const { user: currentUser } = useUser();
  const [currentFilter, setCurrentFilter] = useState<Filter>(Filter.PENDING);
  const [currentSort, setCurrentSort] = useState<Sort>('added');
+  const [currentMediaType, setCurrentMediaType] = useState<string>('all');
  const [currentSortDirection, setCurrentSortDirection] =
    useState<SortDirection>('desc');
  const [currentPageSize, setCurrentPageSize] = useState<number>(10);
@@ -69,7 +75,7 @@ const RequestList = () => {
  } = useSWR<RequestResultsResponse>(
    `/api/v1/request?take=${currentPageSize}&skip=${
      pageIndex * currentPageSize
-    }&filter=${currentFilter}&sort=${currentSort}&sortDirection=${currentSortDirection}${
+    }&filter=${currentFilter}&mediaType=${currentMediaType}&sort=${currentSort}&sortDirection=${currentSortDirection}${
      router.pathname.startsWith('/profile')
        ? `&requestedBy=${currentUser?.id}`
        : router.query.userId
@@ -105,12 +111,19 @@ const RequestList = () => {
      'rl-filter-settings',
      JSON.stringify({
        currentFilter,
+        currentMediaType,
        currentSort,
        currentSortDirection,
        currentPageSize,
      })
    );
-  }, [currentFilter, currentSort, currentSortDirection, currentPageSize]);
+  }, [
+    currentFilter,
+    currentMediaType,
+    currentSort,
+    currentSortDirection,
+    currentPageSize,
+  ]);

  if (!data && !error) {
    return <LoadingSpinner />;
@@ -150,6 +163,36 @@ const RequestList = () => {
          {intl.formatMessage(messages.requests)}
        </Header>
        <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">
+              <CircleStackIcon className="h-6 w-6" />
+            </span>
+            <select
+              id="mediaType"
+              name="mediaType"
+              onChange={(e) => {
+                setCurrentMediaType(e.target.value as MediaType);
+                router.push({
+                  pathname: router.pathname,
+                  query: router.query.userId
+                    ? { userId: router.query.userId }
+                    : {},
+                });
+              }}
+              value={currentMediaType}
+              className="rounded-r-only"
+            >
+              <option value="all">
+                {intl.formatMessage(globalMessages.all)}
+              </option>
+              <option value="movie">
+                {intl.formatMessage(globalMessages.movies)}
+              </option>
+              <option value="tv">
+                {intl.formatMessage(globalMessages.tvshows)}
+              </option>
+            </select>
+          </div>
          <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" />
@@ -178,6 +221,9 @@ const RequestList = () => {
              <option value="approved">
                {intl.formatMessage(globalMessages.approved)}
              </option>
+              <option value="completed">
+                {intl.formatMessage(globalMessages.completed)}
+              </option>
              <option value="processing">
                {intl.formatMessage(globalMessages.processing)}
              </option>
@@ -190,6 +236,9 @@ const RequestList = () => {
              <option value="unavailable">
                {intl.formatMessage(globalMessages.unavailable)}
              </option>
+              <option value="deleted">
+                {intl.formatMessage(globalMessages.deleted)}
+              </option>
            </select>
          </div>
          <div className="mb-2 flex flex-grow sm:mb-0 lg:flex-grow-0">
@@ -255,11 +304,15 @@ const RequestList = () => {
          <span className="text-2xl text-gray-400">
            {intl.formatMessage(globalMessages.noresults)}
          </span>
-          {currentFilter !== Filter.ALL && (
+          {(currentFilter !== Filter.ALL ||
+            currentMediaType !== Filter.ALL) && (
            <div className="mt-4">
              <Button
                buttonType="primary"
-                onClick={() => setCurrentFilter(Filter.ALL)}
+                onClick={() => {
+                  setCurrentFilter(Filter.ALL);
+                  setCurrentMediaType(Filter.ALL);
+                }}
              >
                {intl.formatMessage(messages.showallrequests)}
              </Button>
--- a/src/components/RequestModal/CollectionRequestModal.tsx
+++ b/src/components/RequestModal/CollectionRequestModal.tsx
@@ -81,7 +81,8 @@ const CollectionRequestModal = ({
            .filter(
              (request) =>
                request.is4k === is4k &&
-                request.status !== MediaRequestStatus.DECLINED
+                request.status !== MediaRequestStatus.DECLINED &&
+                request.status !== MediaRequestStatus.COMPLETED
            )
            .map((part) => part.id),
        ];
@@ -170,7 +171,9 @@ const CollectionRequestModal = ({

    return (part?.mediaInfo?.requests ?? []).find(
      (request) =>
-        request.is4k === is4k && request.status !== MediaRequestStatus.DECLINED
+        request.is4k === is4k &&
+        request.status !== MediaRequestStatus.DECLINED &&
+        request.status !== MediaRequestStatus.COMPLETED
    );
  };

@@ -368,7 +371,9 @@ const CollectionRequestModal = ({
                      const partMedia =
                        part.mediaInfo &&
                        part.mediaInfo[is4k ? 'status4k' : 'status'] !==
-                          MediaStatus.UNKNOWN
+                          MediaStatus.UNKNOWN &&
+                        part.mediaInfo[is4k ? 'status4k' : 'status'] !==
+                          MediaStatus.DELETED
                          ? part.mediaInfo
                          : undefined;

--- a/src/components/RequestModal/SearchByNameModal/index.tsx
+++ b/src/components/RequestModal/SearchByNameModal/index.tsx
@@ -1,9 +1,9 @@
 import Alert from '@app/components/Common/Alert';
+import CachedImage from '@app/components/Common/CachedImage';
 import Modal from '@app/components/Common/Modal';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import type { SonarrSeries } from '@server/api/servarr/sonarr';
-import Image from 'next/image';
 import { useIntl } from 'react-intl';
 import useSWR from 'swr';

@@ -89,7 +89,8 @@ const SearchByNameModal = ({
              } `}
            >
              <div className="relative flex w-24 flex-none items-center space-x-4 self-stretch">
-                <Image
+                <CachedImage
+                  type="tvdb"
                  src={
                    item.remotePoster ??
                    '/images/jellyseerr_poster_not_found.png'
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -120,7 +120,7 @@ const TvRequestModal = ({
          languageProfileId: requestOverrides?.language,
          userId: requestOverrides?.user?.id,
          tags: requestOverrides?.tags,
-          seasons: selectedSeasons,
+          seasons: selectedSeasons.sort((a, b) => a - b),
        });

        if (alsoApproveRequest) {
@@ -202,7 +202,8 @@ const TvRequestModal = ({
        seasons: settings.currentSettings.partialRequestsEnabled
          ? selectedSeasons.sort((a, b) => a - b)
          : getAllSeasons().filter(
-              (season) => !getAllRequestedSeasons().includes(season)
+              (season) =>
+                !getAllRequestedSeasons().includes(season) && season !== 0
            ),
        ...overrideParams,
      });
@@ -249,7 +250,8 @@ const TvRequestModal = ({
      .filter(
        (request) =>
          request.is4k === is4k &&
-          request.status !== MediaRequestStatus.DECLINED
+          request.status !== MediaRequestStatus.DECLINED &&
+          request.status !== MediaRequestStatus.COMPLETED
      )
      .reduce((requestedSeasons, request) => {
        return [
@@ -301,8 +303,10 @@ const TvRequestModal = ({
    }
  };

-  const unrequestedSeasons = getAllSeasons().filter(
-    (season) => !getAllRequestedSeasons().includes(season)
+  const unrequestedSeasons = getAllSeasons().filter((season) =>
+    !settings.currentSettings.partialRequestsEnabled
+      ? !getAllRequestedSeasons().includes(season) && season !== 0
+      : !getAllRequestedSeasons().includes(season)
  );

  const toggleAllSeasons = (): void => {
@@ -314,12 +318,16 @@ const TvRequestModal = ({
      return;
    }

+    const standardUnrequestedSeasons = unrequestedSeasons.filter(
+      (seasonNumber) => seasonNumber !== 0
+    );
+
    if (
      data &&
      selectedSeasons.length >= 0 &&
-      selectedSeasons.length < unrequestedSeasons.length
+      selectedSeasons.length < standardUnrequestedSeasons.length
    ) {
-      setSelectedSeasons(unrequestedSeasons);
+      setSelectedSeasons(standardUnrequestedSeasons);
    } else {
      setSelectedSeasons([]);
    }
@@ -330,9 +338,9 @@ const TvRequestModal = ({
      return false;
    }
    return (
-      selectedSeasons.length ===
+      selectedSeasons.filter((season) => season !== 0).length ===
      getAllSeasons().filter(
-        (season) => !getAllRequestedSeasons().includes(season)
+        (season) => !getAllRequestedSeasons().includes(season) && season !== 0
      ).length
    );
  };
@@ -347,7 +355,8 @@ const TvRequestModal = ({
      (data.mediaInfo.requests || []).filter(
        (request) =>
          request.is4k === is4k &&
-          request.status !== MediaRequestStatus.DECLINED
+          request.status !== MediaRequestStatus.DECLINED &&
+          request.status !== MediaRequestStatus.COMPLETED
      ).length > 0
    ) {
      data.mediaInfo.requests
@@ -355,7 +364,9 @@ const TvRequestModal = ({
        .forEach((request) => {
          if (!seasonRequest) {
            seasonRequest = request.seasons.find(
-              (season) => season.seasonNumber === seasonNumber
+              (season) =>
+                season.seasonNumber === seasonNumber &&
+                season.status !== MediaRequestStatus.COMPLETED
            );
          }
        });
@@ -567,7 +578,11 @@ const TvRequestModal = ({
                      (season) =>
                        (!settings.currentSettings.enableSpecialEpisodes
                          ? season.seasonNumber !== 0
-                          : true) && season.episodeCount !== 0
+                          : true) &&
+                        (!settings.currentSettings.partialRequestsEnabled
+                          ? season.episodeCount !== 0 &&
+                            season.seasonNumber !== 0
+                          : season.episodeCount !== 0)
                    )
                    .map((season) => {
                      const seasonRequest = getSeasonRequest(
@@ -577,7 +592,9 @@ const TvRequestModal = ({
                        (sn) =>
                          sn.seasonNumber === season.seasonNumber &&
                          sn[is4k ? 'status4k' : 'status'] !==
-                            MediaStatus.UNKNOWN
+                            MediaStatus.UNKNOWN &&
+                          sn[is4k ? 'status4k' : 'status'] !==
+                            MediaStatus.DELETED
                      );
                      return (
                        <tr key={`season-${season.id}`}>
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -34,7 +34,7 @@ const Search = () => {
    {
      query: router.query.query,
    },
-    { hideAvailable: false }
+    { hideAvailable: false, hideBlacklisted: false }
  );

  if (error) {
--- a/src/components/Selector/CertificationSelector.tsx
+++ b/src/components/Selector/CertificationSelector.tsx
@@ -0,0 +1,333 @@
+import { SmallLoadingSpinner } from '@app/components/Common/LoadingSpinner';
+import defineMessages from '@app/utils/defineMessages';
+import type { Region } from '@server/lib/settings';
+import React, { useCallback, useEffect, useState } from 'react';
+import { useIntl } from 'react-intl';
+import AsyncSelect from 'react-select/async';
+import useSWR from 'swr';
+
+interface Certification {
+  certification: string;
+  meaning?: string;
+  order?: number;
+}
+
+interface CertificationResponse {
+  certifications: {
+    [country: string]: Certification[];
+  };
+}
+
+interface CertificationOption {
+  value: string;
+  label: string;
+  certification?: string;
+}
+
+interface CertificationSelectorProps {
+  type: string;
+  certificationCountry?: string;
+  certification?: string;
+  certificationGte?: string;
+  certificationLte?: string;
+  onChange: (params: {
+    certificationCountry?: string;
+    certification?: string;
+    certificationGte?: string;
+    certificationLte?: string;
+  }) => void;
+  showRange?: boolean;
+}
+
+const messages = defineMessages('components.Selector.CertificationSelector', {
+  selectCountry: 'Select a country',
+  selectCertification: 'Select a certification',
+  minRating: 'Minimum rating',
+  maxRating: 'Maximum rating',
+  noOptions: 'No options available',
+  starttyping: 'Starting typing to search.',
+  errorLoading: 'Failed to load certifications',
+});
+
+const CertificationSelector: React.FC<CertificationSelectorProps> = ({
+  type,
+  certificationCountry,
+  certification,
+  certificationGte,
+  certificationLte,
+  showRange = false,
+  onChange,
+}) => {
+  const intl = useIntl();
+  const [selectedCountry, setSelectedCountry] =
+    useState<CertificationOption | null>(
+      certificationCountry
+        ? { value: certificationCountry, label: certificationCountry }
+        : null
+    );
+  const [selectedCertification, setSelectedCertification] =
+    useState<CertificationOption | null>(null);
+  const [selectedCertificationGte, setSelectedCertificationGte] =
+    useState<CertificationOption | null>(null);
+  const [selectedCertificationLte, setSelectedCertificationLte] =
+    useState<CertificationOption | null>(null);
+
+  const {
+    data: certificationData,
+    error: certificationError,
+    isLoading: certificationLoading,
+  } = useSWR<CertificationResponse>(`/api/v1/certifications/${type}`);
+
+  const { data: regionsData } = useSWR<Region[]>('/api/v1/regions');
+
+  // Get the country name from its code
+  const getCountryName = useCallback(
+    (countryCode: string): string => {
+      const region = regionsData?.find(
+        (region) => region.iso_3166_1 === countryCode
+      );
+      return region?.name || countryCode;
+    },
+    [regionsData]
+  );
+
+  useEffect(() => {
+    if (certificationCountry && regionsData) {
+      setSelectedCountry({
+        value: certificationCountry,
+        label: getCountryName(certificationCountry),
+      });
+    }
+  }, [certificationCountry, regionsData, getCountryName]);
+
+  useEffect(() => {
+    if (!certificationData || !certificationCountry) return;
+
+    const certifications = (
+      certificationData.certifications[certificationCountry] || []
+    )
+      .sort((a, b) => {
+        if (a.order !== undefined && b.order !== undefined) {
+          return a.order - b.order;
+        }
+        return a.certification.localeCompare(b.certification);
+      })
+      .map((cert) => ({
+        value: cert.certification,
+        label: `${cert.certification}${
+          cert.meaning ? ` - ${cert.meaning}` : ''
+        }`,
+        certification: cert.certification,
+      }));
+
+    if (certification) {
+      setSelectedCertification(
+        certifications.find((c) => c.value === certification) || null
+      );
+    }
+
+    if (certificationGte) {
+      setSelectedCertificationGte(
+        certifications.find((c) => c.value === certificationGte) || null
+      );
+    }
+
+    if (certificationLte) {
+      setSelectedCertificationLte(
+        certifications.find((c) => c.value === certificationLte) || null
+      );
+    }
+  }, [
+    certificationData,
+    certificationCountry,
+    certification,
+    certificationGte,
+    certificationLte,
+  ]);
+
+  if (certificationError) {
+    return (
+      <div className="text-red-500">
+        {intl.formatMessage(messages.errorLoading)}
+      </div>
+    );
+  }
+
+  if (certificationLoading || !certificationData) {
+    return <SmallLoadingSpinner />;
+  }
+
+  const loadCountryOptions = async (inputValue: string) => {
+    if (!certificationData || !regionsData) return [];
+
+    return Object.keys(certificationData.certifications)
+      .filter(
+        (code) =>
+          certificationData.certifications[code] &&
+          certificationData.certifications[code].length > 0 &&
+          (code.toLowerCase().includes(inputValue.toLowerCase()) ||
+            getCountryName(code)
+              .toLowerCase()
+              .includes(inputValue.toLowerCase()))
+      )
+      .sort((a, b) => getCountryName(a).localeCompare(getCountryName(b)))
+      .map((code) => ({
+        value: code,
+        label: getCountryName(code),
+      }));
+  };
+
+  const loadCertificationOptions = async (inputValue: string) => {
+    if (!certificationData || !certificationCountry) return [];
+
+    return (certificationData.certifications[certificationCountry] || [])
+      .sort((a, b) => {
+        if (a.order !== undefined && b.order !== undefined) {
+          return a.order - b.order;
+        }
+        return a.certification.localeCompare(b.certification);
+      })
+      .map((cert) => ({
+        value: cert.certification,
+        label: `${cert.certification}${
+          cert.meaning ? ` - ${cert.meaning}` : ''
+        }`,
+        certification: cert.certification,
+      }))
+      .filter((cert) =>
+        cert.label.toLowerCase().includes(inputValue.toLowerCase())
+      );
+  };
+
+  const handleCountryChange = (option: CertificationOption | null) => {
+    setSelectedCountry(option);
+    setSelectedCertification(null);
+    setSelectedCertificationGte(null);
+    setSelectedCertificationLte(null);
+
+    onChange({
+      certificationCountry: option?.value,
+      certification: undefined,
+      certificationGte: undefined,
+      certificationLte: undefined,
+    });
+  };
+
+  const handleCertificationChange = (option: CertificationOption | null) => {
+    setSelectedCertification(option);
+
+    onChange({
+      certificationCountry,
+      certification: option?.value,
+      certificationGte: undefined,
+      certificationLte: undefined,
+    });
+  };
+
+  const handleMinCertificationChange = (option: CertificationOption | null) => {
+    setSelectedCertificationGte(option);
+
+    onChange({
+      certificationCountry,
+      certification: undefined,
+      certificationGte: option?.value,
+      certificationLte: certificationLte,
+    });
+  };
+
+  const handleMaxCertificationChange = (option: CertificationOption | null) => {
+    setSelectedCertificationLte(option);
+
+    onChange({
+      certificationCountry,
+      certification: undefined,
+      certificationGte: certificationGte,
+      certificationLte: option?.value,
+    });
+  };
+
+  const formatCertificationLabel = (
+    option: CertificationOption,
+    { context }: { context: string }
+  ) => {
+    if (context === 'value') {
+      return option.certification || option.value;
+    }
+    // Show the full label with description in the menu
+    return option.label;
+  };
+
+  return (
+    <div className="space-y-2">
+      <AsyncSelect
+        className="react-select-container"
+        classNamePrefix="react-select"
+        cacheOptions
+        defaultOptions
+        loadOptions={loadCountryOptions}
+        value={selectedCountry}
+        onChange={handleCountryChange}
+        placeholder={intl.formatMessage(messages.selectCountry)}
+        isClearable
+        noOptionsMessage={({ inputValue }) =>
+          inputValue === ''
+            ? intl.formatMessage(messages.starttyping)
+            : intl.formatMessage(messages.noOptions)
+        }
+      />
+
+      {certificationCountry && !showRange && (
+        <AsyncSelect
+          className="react-select-container"
+          classNamePrefix="react-select"
+          cacheOptions
+          defaultOptions
+          loadOptions={loadCertificationOptions}
+          value={selectedCertification}
+          onChange={handleCertificationChange}
+          placeholder={intl.formatMessage(messages.selectCertification)}
+          formatOptionLabel={formatCertificationLabel}
+          isClearable
+          noOptionsMessage={() => intl.formatMessage(messages.noOptions)}
+        />
+      )}
+
+      {certificationCountry && showRange && (
+        <div className="flex space-x-2">
+          <div className="flex-1">
+            <AsyncSelect
+              className="react-select-container"
+              classNamePrefix="react-select"
+              cacheOptions
+              defaultOptions
+              loadOptions={loadCertificationOptions}
+              value={selectedCertificationGte}
+              onChange={handleMinCertificationChange}
+              placeholder={intl.formatMessage(messages.minRating)}
+              formatOptionLabel={formatCertificationLabel}
+              isClearable
+              noOptionsMessage={() => intl.formatMessage(messages.noOptions)}
+            />
+          </div>
+          <div className="flex-1">
+            <AsyncSelect
+              className="react-select-container"
+              classNamePrefix="react-select"
+              cacheOptions
+              defaultOptions
+              loadOptions={loadCertificationOptions}
+              value={selectedCertificationLte}
+              onChange={handleMaxCertificationChange}
+              placeholder={intl.formatMessage(messages.maxRating)}
+              formatOptionLabel={formatCertificationLabel}
+              isClearable
+              noOptionsMessage={() => intl.formatMessage(messages.noOptions)}
+            />
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default CertificationSelector;
--- a/src/components/Selector/USCertificationSelector.tsx
+++ b/src/components/Selector/USCertificationSelector.tsx
@@ -0,0 +1,87 @@
+import React, { useEffect, useState } from 'react';
+
+interface USCertificationSelectorProps {
+  type: string;
+  certification?: string;
+  onChange: (params: {
+    certificationCountry?: string;
+    certification?: string;
+  }) => void;
+}
+
+const US_MOVIE_CERTIFICATIONS = ['NR', 'G', 'PG', 'PG-13', 'R', 'NC-17'];
+const US_TV_CERTIFICATIONS = [
+  'NR',
+  'TV-Y',
+  'TV-Y7',
+  'TV-G',
+  'TV-PG',
+  'TV-14',
+  'TV-MA',
+];
+
+const USCertificationSelector: React.FC<USCertificationSelectorProps> = ({
+  type,
+  certification,
+  onChange,
+}) => {
+  const [selectedRatings, setSelectedRatings] = useState<string[]>(() =>
+    certification ? certification.split('|') : []
+  );
+
+  const certifications =
+    type === 'movie' ? US_MOVIE_CERTIFICATIONS : US_TV_CERTIFICATIONS;
+
+  useEffect(() => {
+    if (certification) {
+      setSelectedRatings(certification.split('|'));
+    } else {
+      setSelectedRatings([]);
+    }
+  }, [certification]);
+
+  const toggleRating = (rating: string) => {
+    setSelectedRatings((prevSelected) => {
+      let newSelected;
+
+      if (prevSelected.includes(rating)) {
+        newSelected = prevSelected.filter((r) => r !== rating);
+      } else {
+        newSelected = [...prevSelected, rating];
+      }
+
+      const newCertification =
+        newSelected.length > 0 ? newSelected.join('|') : undefined;
+
+      onChange({
+        certificationCountry: 'US',
+        certification: newCertification,
+      });
+
+      return newSelected;
+    });
+  };
+
+  return (
+    <div className="mb-4">
+      <div className="flex flex-wrap gap-2">
+        {certifications.map((rating) => (
+          <button
+            key={rating}
+            onClick={() => toggleRating(rating)}
+            className={`rounded-full px-3 py-1 text-sm font-medium transition-colors ${
+              selectedRatings.includes(rating)
+                ? 'bg-indigo-600 text-white hover:bg-indigo-700'
+                : 'bg-gray-200 text-gray-700 hover:bg-gray-300 dark:bg-gray-700 dark:text-gray-200 dark:hover:bg-gray-600'
+            }`}
+            type="button"
+          >
+            {rating}
+          </button>
+        ))}
+      </div>
+    </div>
+  );
+};
+
+export default USCertificationSelector;
--- a/src/components/Selector/index.tsx
+++ b/src/components/Selector/index.tsx
@@ -631,3 +631,5 @@ export const UserSelector = ({
    />
  );
 };
+
+export { default as USCertificationSelector } from './USCertificationSelector';
--- a/src/components/Settings/Notifications/NotificationsGotify/index.tsx
+++ b/src/components/Settings/Notifications/NotificationsGotify/index.tsx
@@ -3,6 +3,7 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner';
 import NotificationTypeSelector from '@app/components/NotificationTypeSelector';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
+import { isValidURL } from '@app/utils/urlValidationHelper';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/solid';
 import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
@@ -51,10 +52,10 @@ const NotificationsGotify = () => {
          .required(intl.formatMessage(messages.validationUrlRequired)),
        otherwise: Yup.string().nullable(),
      })
-      .matches(
-        // eslint-disable-next-line no-useless-escape
-        /^(https?:)?\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i,
-        intl.formatMessage(messages.validationUrlRequired)
+      .test(
+        'valid-url',
+        intl.formatMessage(messages.validationUrlRequired),
+        isValidURL
      )
      .test(
        'no-trailing-slash',
--- a/src/components/Settings/Notifications/NotificationsNtfy/index.tsx
+++ b/src/components/Settings/Notifications/NotificationsNtfy/index.tsx
@@ -0,0 +1,368 @@
+import Button from '@app/components/Common/Button';
+import LoadingSpinner from '@app/components/Common/LoadingSpinner';
+import SensitiveInput from '@app/components/Common/SensitiveInput';
+import NotificationTypeSelector from '@app/components/NotificationTypeSelector';
+import globalMessages from '@app/i18n/globalMessages';
+import defineMessages from '@app/utils/defineMessages';
+import { isValidURL } from '@app/utils/urlValidationHelper';
+import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline';
+import type { NotificationAgentNtfy } from '@server/lib/settings';
+import axios from 'axios';
+import { Field, Form, Formik } from 'formik';
+import { useState } from 'react';
+import { useIntl } from 'react-intl';
+import { useToasts } from 'react-toast-notifications';
+import useSWR from 'swr';
+import * as Yup from 'yup';
+
+const messages = defineMessages(
+  'components.Settings.Notifications.NotificationsNtfy',
+  {
+    agentenabled: 'Enable Agent',
+    url: 'Server root URL',
+    topic: 'Topic',
+    usernamePasswordAuth: 'Username + Password authentication',
+    username: 'Username',
+    password: 'Password',
+    tokenAuth: 'Token authentication',
+    token: 'Token',
+    ntfysettingssaved: 'Ntfy notification settings saved successfully!',
+    ntfysettingsfailed: 'Ntfy notification settings failed to save.',
+    toastNtfyTestSending: 'Sending ntfy test notification…',
+    toastNtfyTestSuccess: 'Ntfy test notification sent!',
+    toastNtfyTestFailed: 'Ntfy test notification failed to send.',
+    validationNtfyUrl: 'You must provide a valid URL',
+    validationNtfyTopic: 'You must provide a topic',
+    validationTypes: 'You must select at least one notification type',
+  }
+);
+
+const NotificationsNtfy = () => {
+  const intl = useIntl();
+  const { addToast, removeToast } = useToasts();
+  const [isTesting, setIsTesting] = useState(false);
+  const {
+    data,
+    error,
+    mutate: revalidate,
+  } = useSWR<NotificationAgentNtfy>('/api/v1/settings/notifications/ntfy');
+
+  const NotificationsNtfySchema = Yup.object().shape({
+    url: Yup.string()
+      .when('enabled', {
+        is: true,
+        then: Yup.string()
+          .nullable()
+          .required(intl.formatMessage(messages.validationNtfyUrl)),
+        otherwise: Yup.string().nullable(),
+      })
+      .test(
+        'valid-url',
+        intl.formatMessage(messages.validationNtfyUrl),
+        isValidURL
+      ),
+    topic: Yup.string()
+      .when('enabled', {
+        is: true,
+        then: Yup.string()
+          .nullable()
+          .required(intl.formatMessage(messages.validationNtfyUrl)),
+        otherwise: Yup.string().nullable(),
+      })
+      .defined(intl.formatMessage(messages.validationNtfyTopic)),
+  });
+
+  if (!data && !error) {
+    return <LoadingSpinner />;
+  }
+
+  return (
+    <Formik
+      initialValues={{
+        enabled: data?.enabled,
+        types: data?.types,
+        url: data?.options.url,
+        topic: data?.options.topic,
+        authMethodUsernamePassword: data?.options.authMethodUsernamePassword,
+        username: data?.options.username,
+        password: data?.options.password,
+        authMethodToken: data?.options.authMethodToken,
+        token: data?.options.token,
+      }}
+      validationSchema={NotificationsNtfySchema}
+      onSubmit={async (values) => {
+        try {
+          await axios.post('/api/v1/settings/notifications/ntfy', {
+            enabled: values.enabled,
+            types: values.types,
+            options: {
+              url: values.url,
+              topic: values.topic,
+              authMethodUsernamePassword: values.authMethodUsernamePassword,
+              username: values.username,
+              password: values.password,
+              authMethodToken: values.authMethodToken,
+              token: values.token,
+            },
+          });
+
+          addToast(intl.formatMessage(messages.ntfysettingssaved), {
+            appearance: 'success',
+            autoDismiss: true,
+          });
+        } catch (e) {
+          addToast(intl.formatMessage(messages.ntfysettingsfailed), {
+            appearance: 'error',
+            autoDismiss: true,
+          });
+        } finally {
+          revalidate();
+        }
+      }}
+    >
+      {({
+        errors,
+        touched,
+        isSubmitting,
+        values,
+        isValid,
+        setFieldValue,
+        setFieldTouched,
+      }) => {
+        const testSettings = async () => {
+          setIsTesting(true);
+          let toastId: string | undefined;
+          try {
+            addToast(
+              intl.formatMessage(messages.toastNtfyTestSending),
+              {
+                autoDismiss: false,
+                appearance: 'info',
+              },
+              (id) => {
+                toastId = id;
+              }
+            );
+            await axios.post('/api/v1/settings/notifications/ntfy/test', {
+              enabled: true,
+              types: values.types,
+              options: {
+                url: values.url,
+                topic: values.topic,
+                authMethodUsernamePassword: values.authMethodUsernamePassword,
+                username: values.username,
+                password: values.password,
+                authMethodToken: values.authMethodToken,
+                token: values.token,
+              },
+            });
+
+            if (toastId) {
+              removeToast(toastId);
+            }
+            addToast(intl.formatMessage(messages.toastNtfyTestSuccess), {
+              autoDismiss: true,
+              appearance: 'success',
+            });
+          } catch (e) {
+            if (toastId) {
+              removeToast(toastId);
+            }
+            addToast(intl.formatMessage(messages.toastNtfyTestFailed), {
+              autoDismiss: true,
+              appearance: 'error',
+            });
+          } finally {
+            setIsTesting(false);
+          }
+        };
+
+        return (
+          <Form className="section">
+            <div className="form-row">
+              <label htmlFor="enabled" className="checkbox-label">
+                {intl.formatMessage(messages.agentenabled)}
+                <span className="label-required">*</span>
+              </label>
+              <div className="form-input-area">
+                <Field type="checkbox" id="enabled" name="enabled" />
+              </div>
+            </div>
+            <div className="form-row">
+              <label htmlFor="url" className="text-label">
+                {intl.formatMessage(messages.url)}
+                <span className="label-required">*</span>
+              </label>
+              <div className="form-input-area">
+                <div className="form-input-field">
+                  <Field id="url" name="url" type="text" inputMode="url" />
+                </div>
+                {errors.url &&
+                  touched.url &&
+                  typeof errors.url === 'string' && (
+                    <div className="error">{errors.url}</div>
+                  )}
+              </div>
+            </div>
+            <div className="form-row">
+              <label htmlFor="topic" className="text-label">
+                {intl.formatMessage(messages.topic)}
+                <span className="label-required">*</span>
+              </label>
+              <div className="form-input-area">
+                <div className="form-input-field">
+                  <Field id="topic" name="topic" type="text" />
+                </div>
+                {errors.topic &&
+                  touched.topic &&
+                  typeof errors.topic === 'string' && (
+                    <div className="error">{errors.topic}</div>
+                  )}
+              </div>
+            </div>
+            <div className="form-row">
+              <label
+                htmlFor="authMethodUsernamePassword"
+                className="checkbox-label"
+              >
+                <span className="mr-2">
+                  {intl.formatMessage(messages.usernamePasswordAuth)}
+                </span>
+              </label>
+              <div className="form-input-area">
+                <Field
+                  type="checkbox"
+                  id="authMethodUsernamePassword"
+                  name="authMethodUsernamePassword"
+                  disabled={values.authMethodToken}
+                  onChange={() => {
+                    setFieldValue(
+                      'authMethodUsernamePassword',
+                      !values.authMethodUsernamePassword
+                    );
+                  }}
+                />
+              </div>
+            </div>
+            {values.authMethodUsernamePassword && (
+              <div className="mr-2 ml-4">
+                <div className="form-row">
+                  <label htmlFor="username" className="text-label">
+                    {intl.formatMessage(messages.username)}
+                  </label>
+                  <div className="form-input-area">
+                    <div className="form-input-field">
+                      <Field id="username" name="username" type="text" />
+                    </div>
+                  </div>
+                </div>
+                <div className="form-row">
+                  <label htmlFor="password" className="text-label">
+                    {intl.formatMessage(messages.password)}
+                  </label>
+                  <div className="form-input-area">
+                    <div className="form-input-field">
+                      <SensitiveInput
+                        as="field"
+                        id="password"
+                        name="password"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </div>
+            )}
+            <div className="form-row">
+              <label htmlFor="authMethodToken" className="checkbox-label">
+                <span className="mr-2">
+                  {intl.formatMessage(messages.tokenAuth)}
+                </span>
+              </label>
+              <div className="form-input-area">
+                <Field
+                  type="checkbox"
+                  id="authMethodToken"
+                  name="authMethodToken"
+                  disabled={values.authMethodUsernamePassword}
+                  onChange={() => {
+                    setFieldValue('authMethodToken', !values.authMethodToken);
+                  }}
+                />
+              </div>
+            </div>
+            {values.authMethodToken && (
+              <div className="form-row mr-2 ml-4">
+                <label htmlFor="token" className="text-label">
+                  {intl.formatMessage(messages.token)}
+                </label>
+                <div className="form-input-area">
+                  <div className="form-input-field">
+                    <SensitiveInput as="field" id="token" name="token" />
+                  </div>
+                </div>
+              </div>
+            )}
+            <NotificationTypeSelector
+              currentTypes={values.enabled ? values.types || 0 : 0}
+              onUpdate={(newTypes) => {
+                setFieldValue('types', newTypes);
+                setFieldTouched('types');
+
+                if (newTypes) {
+                  setFieldValue('enabled', true);
+                }
+              }}
+              error={
+                values.enabled && !values.types && touched.types
+                  ? intl.formatMessage(messages.validationTypes)
+                  : undefined
+              }
+            />
+            <div className="actions">
+              <div className="flex justify-end">
+                <span className="ml-3 inline-flex rounded-md shadow-sm">
+                  <Button
+                    buttonType="warning"
+                    disabled={isSubmitting || !isValid || isTesting}
+                    onClick={(e) => {
+                      e.preventDefault();
+                      testSettings();
+                    }}
+                  >
+                    <BeakerIcon />
+                    <span>
+                      {isTesting
+                        ? intl.formatMessage(globalMessages.testing)
+                        : intl.formatMessage(globalMessages.test)}
+                    </span>
+                  </Button>
+                </span>
+                <span className="ml-3 inline-flex rounded-md shadow-sm">
+                  <Button
+                    buttonType="primary"
+                    type="submit"
+                    disabled={
+                      isSubmitting ||
+                      !isValid ||
+                      isTesting ||
+                      (values.enabled && !values.types)
+                    }
+                  >
+                    <ArrowDownOnSquareIcon />
+                    <span>
+                      {isSubmitting
+                        ? intl.formatMessage(globalMessages.saving)
+                        : intl.formatMessage(globalMessages.save)}
+                    </span>
+                  </Button>
+                </span>
+              </div>
+            </div>
+          </Form>
+        );
+      }}
+    </Formik>
+  );
+};
+
+export default NotificationsNtfy;
--- a/src/components/Settings/Notifications/NotificationsPushover/index.tsx
+++ b/src/components/Settings/Notifications/NotificationsPushover/index.tsx
@@ -100,6 +100,7 @@ const NotificationsPushover = () => {
            options: {
              accessToken: values.accessToken,
              userToken: values.userToken,
+              sound: values.sound,
            },
          });
          addToast(intl.formatMessage(messages.pushoversettingssaved), {
--- a/src/components/Settings/Notifications/NotificationsWebhook/index.tsx
+++ b/src/components/Settings/Notifications/NotificationsWebhook/index.tsx
@@ -3,6 +3,7 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner';
 import NotificationTypeSelector from '@app/components/NotificationTypeSelector';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
+import { isValidURL } from '@app/utils/urlValidationHelper';
 import { ArrowDownOnSquareIcon, BeakerIcon } from '@heroicons/react/24/outline';
 import {
  ArrowPathIcon,
@@ -107,10 +108,10 @@ const NotificationsWebhook = () => {
          .required(intl.formatMessage(messages.validationWebhookUrl)),
        otherwise: Yup.string().nullable(),
      })
-      .matches(
-        // eslint-disable-next-line no-useless-escape
-        /^(https?:)?\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i,
-        intl.formatMessage(messages.validationWebhookUrl)
+      .test(
+        'valid-url',
+        intl.formatMessage(messages.validationWebhookUrl),
+        isValidURL
      ),
    jsonPayload: Yup.string()
      .when('enabled', {
--- a/src/components/Settings/RadarrModal/index.tsx
+++ b/src/components/Settings/RadarrModal/index.tsx
@@ -3,6 +3,7 @@ import SensitiveInput from '@app/components/Common/SensitiveInput';
 import type { RadarrTestResponse } from '@app/components/Settings/SettingsServices';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
+import { isValidURL } from '@app/utils/urlValidationHelper';
 import { Transition } from '@headlessui/react';
 import type { RadarrSettings } from '@server/lib/settings';
 import axios from 'axios';
@@ -117,9 +118,10 @@ const RadarrModal = ({ onClose, radarr, onSave }: RadarrModalProps) => {
      intl.formatMessage(messages.validationMinimumAvailabilityRequired)
    ),
    externalUrl: Yup.string()
-      .matches(
-        /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}(\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))?$/i,
-        intl.formatMessage(messages.validationApplicationUrl)
+      .test(
+        'valid-url',
+        intl.formatMessage(messages.validationApplicationUrl),
+        isValidURL
      )
      .test(
        'no-trailing-slash',
--- a/src/components/Settings/SettingsJellyfin.tsx
+++ b/src/components/Settings/SettingsJellyfin.tsx
@@ -6,6 +6,7 @@ import LibraryItem from '@app/components/Settings/LibraryItem';
 import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
+import { isValidURL } from '@app/utils/urlValidationHelper';
 import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
 import { ApiErrorCode } from '@server/constants/error';
 import { MediaServerType } from '@server/constants/server';
@@ -140,10 +141,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
      ),
    jellyfinExternalUrl: Yup.string()
      .nullable()
-      .matches(
-        /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}(\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))?$/i,
-        intl.formatMessage(messages.validationUrl)
-      )
+      .test('valid-url', intl.formatMessage(messages.validationUrl), isValidURL)
      .test(
        'no-trailing-slash',
        intl.formatMessage(messages.validationUrlTrailingSlash),
@@ -151,10 +149,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
      ),
    jellyfinForgotPasswordUrl: Yup.string()
      .nullable()
-      .matches(
-        /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}(\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))?$/i,
-        intl.formatMessage(messages.validationUrl)
-      )
+      .test('valid-url', intl.formatMessage(messages.validationUrl), isValidURL)
      .test(
        'no-trailing-slash',
        intl.formatMessage(messages.validationUrlTrailingSlash),
--- a/src/components/Settings/SettingsMain/index.tsx
+++ b/src/components/Settings/SettingsMain/index.tsx
@@ -13,6 +13,7 @@ import useLocale from '@app/hooks/useLocale';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
+import { isValidURL } from '@app/utils/urlValidationHelper';
 import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
 import { ArrowPathIcon } from '@heroicons/react/24/solid';
 import type { UserSettingsGeneralResponse } from '@server/interfaces/api/userSettingsInterfaces';
@@ -45,11 +46,16 @@ const messages = defineMessages('components.Settings.SettingsMain', {
    'The "Process Blacklisted Tags" job will blacklist this many pages into each sort. Larger numbers will create a more accurate blacklist, but use more space.',
  streamingRegion: 'Streaming Region',
  streamingRegionTip: 'Show streaming sites by regional availability',
+  hideBlacklisted: 'Hide Blacklisted Items',
+  hideBlacklistedTip:
+    'Hide blacklisted items from discover pages for all users with the "Manage Blacklist" permission',
  toastApiKeySuccess: 'New API key generated successfully!',
  toastApiKeyFailure: 'Something went wrong while generating a new API key.',
  toastSettingsSuccess: 'Settings saved successfully!',
  toastSettingsFailure: 'Something went wrong while saving settings.',
  hideAvailable: 'Hide Available Media',
+  hideAvailableTip:
+    'Hide available media from the discover pages but not search results',
  cacheImages: 'Enable Image Caching',
  cacheImagesTip:
    'Cache externally sourced images (requires a significant amount of disk space)',
@@ -59,6 +65,11 @@ const messages = defineMessages('components.Settings.SettingsMain', {
  partialRequestsEnabled: 'Allow Partial Series Requests',
  enableSpecialEpisodes: 'Allow Special Episodes Requests',
  locale: 'Display Language',
+  youtubeUrl: 'YouTube URL',
+  youtubeUrlTip:
+    'Base URL for YouTube videos if a self-hosted YouTube instance is used.',
+  validationUrl: 'You must provide a valid URL',
+  validationUrlTrailingSlash: 'URL must not end in a trailing slash',
 });

 const SettingsMain = () => {
@@ -80,9 +91,10 @@ const SettingsMain = () => {
      intl.formatMessage(messages.validationApplicationTitle)
    ),
    applicationUrl: Yup.string()
-      .matches(
-        /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}(\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))?$/i,
-        intl.formatMessage(messages.validationApplicationUrl)
+      .test(
+        'valid-url',
+        intl.formatMessage(messages.validationApplicationUrl),
+        isValidURL
      )
      .test(
        'no-trailing-slash',
@@ -100,6 +112,13 @@ const SettingsMain = () => {
        'Number must be less than or equal to 250.',
        (value) => (value ?? 0) <= 250
      ),
+    youtubeUrl: Yup.string()
+      .url(intl.formatMessage(messages.validationUrl))
+      .test(
+        'no-trailing-slash',
+        intl.formatMessage(messages.validationUrlTrailingSlash),
+        (value) => !value || !value.endsWith('/')
+      ),
  });

  const regenerate = async () => {
@@ -145,6 +164,7 @@ const SettingsMain = () => {
            applicationTitle: data?.applicationTitle,
            applicationUrl: data?.applicationUrl,
            hideAvailable: data?.hideAvailable,
+            hideBlacklisted: data?.hideBlacklisted,
            locale: data?.locale ?? 'en',
            discoverRegion: data?.discoverRegion,
            originalLanguage: data?.originalLanguage,
@@ -154,6 +174,7 @@ const SettingsMain = () => {
            partialRequestsEnabled: data?.partialRequestsEnabled,
            enableSpecialEpisodes: data?.enableSpecialEpisodes,
            cacheImages: data?.cacheImages,
+            youtubeUrl: data?.youtubeUrl,
          }}
          enableReinitialize
          validationSchema={MainSettingsSchema}
@@ -163,6 +184,7 @@ const SettingsMain = () => {
                applicationTitle: values.applicationTitle,
                applicationUrl: values.applicationUrl,
                hideAvailable: values.hideAvailable,
+                hideBlacklisted: values.hideBlacklisted,
                locale: values.locale,
                discoverRegion: values.discoverRegion,
                streamingRegion: values.streamingRegion,
@@ -172,6 +194,7 @@ const SettingsMain = () => {
                partialRequestsEnabled: values.partialRequestsEnabled,
                enableSpecialEpisodes: values.enableSpecialEpisodes,
                cacheImages: values.cacheImages,
+                youtubeUrl: values.youtubeUrl,
              });
              mutate('/api/v1/settings/public');
              mutate('/api/v1/status');
@@ -428,6 +451,9 @@ const SettingsMain = () => {
                      {intl.formatMessage(messages.hideAvailable)}
                    </span>
                    <SettingsBadge badgeType="experimental" />
+                    <span className="label-tip">
+                      {intl.formatMessage(messages.hideAvailableTip)}
+                    </span>
                  </label>
                  <div className="form-input-area">
                    <Field
@@ -440,6 +466,29 @@ const SettingsMain = () => {
                    />
                  </div>
                </div>
+                <div className="form-row">
+                  <label htmlFor="hideBlacklisted" className="checkbox-label">
+                    <span className="mr-2">
+                      {intl.formatMessage(messages.hideBlacklisted)}
+                    </span>
+                    <span className="label-tip">
+                      {intl.formatMessage(messages.hideBlacklistedTip)}
+                    </span>
+                  </label>
+                  <div className="form-input-area">
+                    <Field
+                      type="checkbox"
+                      id="hideBlacklisted"
+                      name="hideBlacklisted"
+                      onChange={() => {
+                        setFieldValue(
+                          'hideBlacklisted',
+                          !values.hideBlacklisted
+                        );
+                      }}
+                    />
+                  </div>
+                </div>
                <div className="form-row">
                  <label
                    htmlFor="partialRequestsEnabled"
@@ -486,6 +535,29 @@ const SettingsMain = () => {
                    />
                  </div>
                </div>
+                <div className="form-row">
+                  <label htmlFor="youtubeUrl" className="text-label">
+                    {intl.formatMessage(messages.youtubeUrl)}
+                    <span className="label-tip">
+                      {intl.formatMessage(messages.youtubeUrlTip)}
+                    </span>
+                  </label>
+                  <div className="form-input-area">
+                    <div className="form-input-field">
+                      <Field
+                        id="youtubeUrl"
+                        name="youtubeUrl"
+                        type="text"
+                        inputMode="url"
+                      />
+                    </div>
+                    {errors.youtubeUrl &&
+                      touched.youtubeUrl &&
+                      typeof errors.youtubeUrl === 'string' && (
+                        <div className="error">{errors.youtubeUrl}</div>
+                      )}
+                  </div>
+                </div>
                <div className="actions">
                  <div className="flex justify-end">
                    <span className="ml-3 inline-flex rounded-md shadow-sm">
--- a/src/components/Settings/SettingsNotifications.tsx
+++ b/src/components/Settings/SettingsNotifications.tsx
@@ -1,6 +1,7 @@
 import DiscordLogo from '@app/assets/extlogos/discord.svg';
 import GotifyLogo from '@app/assets/extlogos/gotify.svg';
 import LunaSeaLogo from '@app/assets/extlogos/lunasea.svg';
+import NtfyLogo from '@app/assets/extlogos/ntfy.svg';
 import PushbulletLogo from '@app/assets/extlogos/pushbullet.svg';
 import PushoverLogo from '@app/assets/extlogos/pushover.svg';
 import SlackLogo from '@app/assets/extlogos/slack.svg';
@@ -75,6 +76,17 @@ const SettingsNotifications = ({ children }: SettingsNotificationsProps) => {
      route: '/settings/notifications/gotify',
      regex: /^\/settings\/notifications\/gotify/,
    },
+    {
+      text: 'ntfy.sh',
+      content: (
+        <span className="flex items-center">
+          <NtfyLogo className="mr-2 h-4" />
+          ntfy.sh
+        </span>
+      ),
+      route: '/settings/notifications/ntfy',
+      regex: /^\/settings\/notifications\/ntfy/,
+    },
    {
      text: 'LunaSea',
      content: (
--- a/src/components/Settings/SettingsPlex.tsx
+++ b/src/components/Settings/SettingsPlex.tsx
@@ -8,6 +8,7 @@ import LibraryItem from '@app/components/Settings/LibraryItem';
 import SettingsBadge from '@app/components/Settings/SettingsBadge';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
+import { isValidURL } from '@app/utils/urlValidationHelper';
 import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
 import {
  ArrowPathIcon,
@@ -191,9 +192,10 @@ const SettingsPlex = ({ onComplete }: SettingsPlexProps) => {
        otherwise: Yup.string().nullable(),
      }),
      tautulliExternalUrl: Yup.string()
-        .matches(
-          /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}(\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))?$/i,
-          intl.formatMessage(messages.validationUrl)
+        .test(
+          'valid-url',
+          intl.formatMessage(messages.validationUrl),
+          isValidURL
        )
        .test(
          'no-trailing-slash',
--- a/src/components/Settings/SonarrModal/index.tsx
+++ b/src/components/Settings/SonarrModal/index.tsx
@@ -3,6 +3,7 @@ import SensitiveInput from '@app/components/Common/SensitiveInput';
 import type { SonarrTestResponse } from '@app/components/Settings/SettingsServices';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
+import { isValidURL } from '@app/utils/urlValidationHelper';
 import { Transition } from '@headlessui/react';
 import type { SonarrSettings } from '@server/lib/settings';
 import axios from 'axios';
@@ -126,9 +127,10 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
        )
      : Yup.number(),
    externalUrl: Yup.string()
-      .matches(
-        /^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}(\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]*))?$/i,
-        intl.formatMessage(messages.validationApplicationUrl)
+      .test(
+        'valid-url',
+        intl.formatMessage(messages.validationApplicationUrl),
+        isValidURL
      )
      .test(
        'no-trailing-slash',
--- a/src/components/StatusBadge/index.tsx
+++ b/src/components/StatusBadge/index.tsx
@@ -371,6 +371,17 @@ const StatusBadge = ({
        </Tooltip>
      );

+    case MediaStatus.DELETED:
+      return (
+        <Tooltip content={mediaLinkDescription}>
+          <Badge badgeType="danger">
+            {intl.formatMessage(is4k ? messages.status4k : messages.status, {
+              status: intl.formatMessage(globalMessages.deleted),
+            })}
+          </Badge>
+        </Tooltip>
+      );
+
    default:
      return null;
  }
--- a/src/components/TitleCard/index.tsx
+++ b/src/components/TitleCard/index.tsx
@@ -467,7 +467,9 @@ const TitleCard = ({
                  <div
                    className={`px-2 text-white ${
                      !showRequestButton ||
-                      (currentStatus && currentStatus !== MediaStatus.UNKNOWN)
+                      (currentStatus &&
+                        currentStatus !== MediaStatus.UNKNOWN &&
+                        currentStatus !== MediaStatus.DELETED)
                        ? 'pb-2'
                        : 'pb-11'
                    }`}
@@ -493,7 +495,8 @@ const TitleCard = ({
                        WebkitLineClamp:
                          !showRequestButton ||
                          (currentStatus &&
-                            currentStatus !== MediaStatus.UNKNOWN)
+                            currentStatus !== MediaStatus.UNKNOWN &&
+                            currentStatus !== MediaStatus.DELETED)
                            ? 5
                            : 3,
                        display: '-webkit-box',
@@ -510,7 +513,9 @@ const TitleCard = ({

              <div className="absolute bottom-0 left-0 right-0 flex justify-between px-2 py-2">
                {showRequestButton &&
-                  (!currentStatus || currentStatus === MediaStatus.UNKNOWN) && (
+                  (!currentStatus ||
+                    currentStatus === MediaStatus.UNKNOWN ||
+                    currentStatus === MediaStatus.DELETED) && (
                    <Button
                      buttonType="primary"
                      buttonSize="sm"
--- a/src/components/TvDetails/index.tsx
+++ b/src/components/TvDetails/index.tsx
@@ -208,10 +208,15 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
    });
  }

-  const trailerUrl = data.relatedVideos
+  const trailerVideo = data.relatedVideos
    ?.filter((r) => r.type === 'Trailer')
    .sort((a, b) => a.size - b.size)
-    .pop()?.url;
+    .pop();
+  const trailerUrl =
+    trailerVideo?.site === 'YouTube' &&
+    settings.currentSettings.youtubeUrl != ''
+      ? `${settings.currentSettings.youtubeUrl}${trailerVideo?.key}`
+      : trailerVideo?.url;

  if (trailerUrl) {
    mediaLinks.push({
@@ -276,7 +281,8 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
      .filter(
        (request) =>
          request.is4k === is4k &&
-          request.status !== MediaRequestStatus.DECLINED
+          request.status !== MediaRequestStatus.DECLINED &&
+          request.status !== MediaRequestStatus.COMPLETED
      )
      .reduce((requestedSeasons, request) => {
        return [
@@ -809,18 +815,30 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
                    season.seasonNumber === s.seasonNumber &&
                    s.status4k !== MediaStatus.UNKNOWN
                );
-                const request = (data.mediaInfo?.requests ?? []).find(
-                  (r) =>
-                    !!r.seasons.find(
-                      (s) => s.seasonNumber === season.seasonNumber
-                    ) && !r.is4k
-                );
-                const request4k = (data.mediaInfo?.requests ?? []).find(
-                  (r) =>
-                    !!r.seasons.find(
-                      (s) => s.seasonNumber === season.seasonNumber
-                    ) && r.is4k
-                );
+                const request = (data.mediaInfo?.requests ?? [])
+                  .filter(
+                    (r) =>
+                      !!r.seasons.find(
+                        (s) => s.seasonNumber === season.seasonNumber
+                      ) && !r.is4k
+                  )
+                  .sort(
+                    (a, b) =>
+                      new Date(b.createdAt).getTime() -
+                      new Date(a.createdAt).getTime()
+                  )[0];
+                const request4k = (data.mediaInfo?.requests ?? [])
+                  .filter(
+                    (r) =>
+                      !!r.seasons.find(
+                        (s) => s.seasonNumber === season.seasonNumber
+                      ) && r.is4k
+                  )
+                  .sort(
+                    (a, b) =>
+                      new Date(b.createdAt).getTime() -
+                      new Date(a.createdAt).getTime()
+                  )[0];

                if (season.episodeCount === 0) {
                  return null;
@@ -853,7 +871,9 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
                          </div>
                          {((!mSeason &&
                            request?.status === MediaRequestStatus.APPROVED) ||
-                            mSeason?.status === MediaStatus.PROCESSING) && (
+                            mSeason?.status === MediaStatus.PROCESSING ||
+                            (request?.status === MediaRequestStatus.APPROVED &&
+                              mSeason?.status === MediaStatus.DELETED)) && (
                            <>
                              <div className="hidden md:flex">
                                <Badge badgeType="primary">
@@ -912,10 +932,28 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
                              </div>
                            </>
                          )}
+                          {mSeason?.status === MediaStatus.DELETED &&
+                            request?.status !== MediaRequestStatus.APPROVED && (
+                              <>
+                                <div className="hidden md:flex">
+                                  <Badge badgeType="danger">
+                                    {intl.formatMessage(globalMessages.deleted)}
+                                  </Badge>
+                                </div>
+                                <div className="flex md:hidden">
+                                  <StatusBadgeMini
+                                    status={MediaStatus.DELETED}
+                                  />
+                                </div>
+                              </>
+                            )}
                          {((!mSeason4k &&
                            request4k?.status ===
                              MediaRequestStatus.APPROVED) ||
-                            mSeason4k?.status4k === MediaStatus.PROCESSING) &&
+                            mSeason4k?.status4k === MediaStatus.PROCESSING ||
+                            (request4k?.status ===
+                              MediaRequestStatus.APPROVED &&
+                              mSeason4k?.status4k === MediaStatus.DELETED)) &&
                            show4k && (
                              <>
                                <div className="hidden md:flex">
@@ -998,6 +1036,27 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
                                </div>
                              </>
                            )}
+                          {mSeason4k?.status4k === MediaStatus.DELETED &&
+                            request4k?.status !== MediaRequestStatus.APPROVED &&
+                            show4k && (
+                              <>
+                                <div className="hidden md:flex">
+                                  <Badge badgeType="danger">
+                                    {intl.formatMessage(messages.status4k, {
+                                      status: intl.formatMessage(
+                                        globalMessages.deleted
+                                      ),
+                                    })}
+                                  </Badge>
+                                </div>
+                                <div className="flex md:hidden">
+                                  <StatusBadgeMini
+                                    status={MediaStatus.DELETED}
+                                    is4k={true}
+                                  />
+                                </div>
+                              </>
+                            )}
                          <ChevronDownIcon
                            className={`${
                              open ? 'rotate-180' : ''
--- a/src/components/UserList/index.tsx
+++ b/src/components/UserList/index.tsx
@@ -19,8 +19,11 @@ import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import {
  BarsArrowDownIcon,
+  BarsArrowUpIcon,
+  ChevronDownIcon,
  ChevronLeftIcon,
  ChevronRightIcon,
+  ChevronUpIcon,
  InboxArrowDownIcon,
  PencilIcon,
  UserPlusIcon,
@@ -77,14 +80,27 @@ const messages = defineMessages('components.UserList', {
  autogeneratepasswordTip: 'Email a server-generated password to the user',
  validationUsername: 'You must provide an username',
  validationEmail: 'Email required',
-  sortCreated: 'Join Date',
-  sortDisplayName: 'Display Name',
-  sortRequests: 'Request Count',
+  sortBy: 'Sort by {field}',
+  sortByUser: 'Sort by username',
+  sortByRequests: 'Sort by number of requests',
+  sortByType: 'Sort by account type',
+  sortByRole: 'Sort by user role',
+  sortByJoined: 'Sort by join date',
+  toggleSortDirection: 'Click again to sort {direction}',
+  ascending: 'ascending',
+  descending: 'descending',
  localLoginDisabled:
    'The <strong>Enable Local Sign-In</strong> setting is currently disabled.',
 });

-type Sort = 'created' | 'updated' | 'requests' | 'displayname';
+type Sort =
+  | 'created'
+  | 'updated'
+  | 'requests'
+  | 'displayname'
+  | 'usertype'
+  | 'role';
+type SortDirection = 'asc' | 'desc';

 const UserList = () => {
  const intl = useIntl();
@@ -94,10 +110,12 @@ const UserList = () => {
  const { user: currentUser, hasPermission: currentHasPermission } = useUser();
  const [currentSort, setCurrentSort] = useState<Sort>('displayname');
  const [currentPageSize, setCurrentPageSize] = useState<number>(10);
+  const [localUsers, setLocalUsers] = useState<User[]>([]);

  const page = router.query.page ? Number(router.query.page) : 1;
  const pageIndex = page - 1;
  const updateQueryParams = useUpdateQueryParams({ page: page.toString() });
+  const [sortDirection, setSortDirection] = useState<SortDirection>('desc');

  const {
    data,
@@ -106,9 +124,59 @@ const UserList = () => {
  } = useSWR<UserResultsResponse>(
    `/api/v1/user?take=${currentPageSize}&skip=${
      pageIndex * currentPageSize
-    }&sort=${currentSort}`
+    }&sort=created&sortDirection=desc`
  );

+  const sortUsers = (
+    users: User[],
+    sortKey: Sort,
+    direction: SortDirection
+  ) => {
+    return [...users].sort((a, b) => {
+      let comparison = 0;
+      switch (sortKey) {
+        case 'displayname':
+          comparison = a.displayName.localeCompare(b.displayName);
+          break;
+        case 'requests':
+          comparison = (a.requestCount ?? 0) - (b.requestCount ?? 0);
+          break;
+        case 'usertype':
+          comparison = a.userType - b.userType;
+          break;
+        case 'role':
+          comparison = a.permissions - b.permissions;
+          break;
+        case 'created':
+          comparison =
+            new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
+          break;
+        default:
+          comparison = 0;
+      }
+      return direction === 'asc' ? comparison : -comparison;
+    });
+  };
+
+  useEffect(() => {
+    if (data?.results) {
+      setLocalUsers(sortUsers(data.results, currentSort, sortDirection));
+    }
+  }, [data, currentSort, sortDirection]);
+
+  const handleSortChange = (sortKey: Sort) => {
+    const newSortDirection =
+      currentSort === sortKey
+        ? sortDirection === 'asc'
+          ? 'desc'
+          : 'asc'
+        : 'desc';
+
+    setCurrentSort(sortKey);
+    setSortDirection(newSortDirection);
+    setLocalUsers(sortUsers(localUsers, sortKey, newSortDirection));
+  };
+
  const [isDeleting, setDeleting] = useState(false);
  const [showImportModal, setShowImportModal] = useState(false);
  const [deleteModal, setDeleteModal] = useState<{
@@ -133,6 +201,9 @@ const UserList = () => {

      setCurrentSort(filterSettings.currentSort);
      setCurrentPageSize(filterSettings.currentPageSize);
+      if (filterSettings.sortDirection) {
+        setSortDirection(filterSettings.sortDirection);
+      }
    }
  }, []);

@@ -142,9 +213,74 @@ const UserList = () => {
      JSON.stringify({
        currentSort,
        currentPageSize,
+        sortDirection,
      })
    );
-  }, [currentSort, currentPageSize]);
+  }, [currentSort, currentPageSize, sortDirection]);
+
+  const SortableColumnHeader = ({
+    sortKey,
+    currentSort,
+    sortDirection,
+    onSortChange,
+    children,
+  }: {
+    sortKey: Sort;
+    currentSort: Sort;
+    sortDirection: SortDirection;
+    onSortChange: (sortKey: Sort) => void;
+    children: React.ReactNode;
+  }) => {
+    const intl = useIntl();
+
+    const getTooltip = () => {
+      if (currentSort === sortKey) {
+        return intl.formatMessage(messages.toggleSortDirection, {
+          direction:
+            sortDirection === 'asc'
+              ? intl.formatMessage(messages.descending)
+              : intl.formatMessage(messages.ascending),
+        });
+      }
+
+      switch (sortKey) {
+        case 'displayname':
+          return intl.formatMessage(messages.sortByUser);
+        case 'requests':
+          return intl.formatMessage(messages.sortByRequests);
+        case 'usertype':
+          return intl.formatMessage(messages.sortByType);
+        case 'role':
+          return intl.formatMessage(messages.sortByRole);
+        case 'created':
+          return intl.formatMessage(messages.sortByJoined);
+        default:
+          return intl.formatMessage(messages.sortBy, { field: sortKey });
+      }
+    };
+
+    return (
+      <Table.TH
+        className="cursor-pointer hover:bg-gray-700"
+        onClick={() => onSortChange(sortKey)}
+        data-testid={`column-header-${sortKey}`}
+        title={getTooltip()}
+      >
+        <div className="flex items-center">
+          <span>{children}</span>
+          {currentSort === sortKey && (
+            <span className="ml-1">
+              {sortDirection === 'asc' ? (
+                <ChevronUpIcon className="h-4 w-4" />
+              ) : (
+                <ChevronDownIcon className="h-4 w-4" />
+              )}
+            </span>
+          )}
+        </div>
+      </Table.TH>
+    );
+  };

  const isUserPermsEditable = (userId: number) =>
    userId !== 1 && userId !== currentUser?.id;
@@ -541,28 +677,47 @@ const UserList = () => {
              </span>
            </Button>
          </div>
+
          <div className="mb-2 flex flex-grow lg:mb-0 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">
-              <BarsArrowDownIcon className="h-6 w-6" />
-            </span>
+            <button
+              type="button"
+              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"
+              onClick={() =>
+                setSortDirection(sortDirection === 'asc' ? 'desc' : 'asc')
+              }
+              title={
+                sortDirection === 'asc'
+                  ? intl.formatMessage(messages.descending)
+                  : intl.formatMessage(messages.ascending)
+              }
+            >
+              {sortDirection === 'asc' ? (
+                <BarsArrowUpIcon className="h-6 w-6" />
+              ) : (
+                <BarsArrowDownIcon className="h-6 w-6" />
+              )}
+            </button>
            <select
              id="sort"
              name="sort"
              onChange={(e) => {
                setCurrentSort(e.target.value as Sort);
-                router.push(router.pathname);
              }}
              value={currentSort}
              className="rounded-r-only"
            >
-              <option value="created">
-                {intl.formatMessage(messages.sortCreated)}
+              <option value="displayname">
+                {intl.formatMessage(messages.username)}
              </option>
              <option value="requests">
-                {intl.formatMessage(messages.sortRequests)}
+                {intl.formatMessage(messages.totalrequests)}
              </option>
-              <option value="displayname">
-                {intl.formatMessage(messages.sortDisplayName)}
+              <option value="usertype">
+                {intl.formatMessage(messages.accounttype)}
+              </option>
+              <option value="role">{intl.formatMessage(messages.role)}</option>
+              <option value="created">
+                {intl.formatMessage(messages.created)}
              </option>
            </select>
          </div>
@@ -584,11 +739,46 @@ const UserList = () => {
                />
              )}
            </Table.TH>
-            <Table.TH>{intl.formatMessage(messages.user)}</Table.TH>
-            <Table.TH>{intl.formatMessage(messages.totalrequests)}</Table.TH>
-            <Table.TH>{intl.formatMessage(messages.accounttype)}</Table.TH>
-            <Table.TH>{intl.formatMessage(messages.role)}</Table.TH>
-            <Table.TH>{intl.formatMessage(messages.created)}</Table.TH>
+            <SortableColumnHeader
+              sortKey="displayname"
+              currentSort={currentSort}
+              sortDirection={sortDirection}
+              onSortChange={handleSortChange}
+            >
+              {intl.formatMessage(messages.user)}
+            </SortableColumnHeader>
+            <SortableColumnHeader
+              sortKey="requests"
+              currentSort={currentSort}
+              sortDirection={sortDirection}
+              onSortChange={handleSortChange}
+            >
+              {intl.formatMessage(messages.totalrequests)}
+            </SortableColumnHeader>
+            <SortableColumnHeader
+              sortKey="usertype"
+              currentSort={currentSort}
+              sortDirection={sortDirection}
+              onSortChange={handleSortChange}
+            >
+              {intl.formatMessage(messages.accounttype)}
+            </SortableColumnHeader>
+            <SortableColumnHeader
+              sortKey="role"
+              currentSort={currentSort}
+              sortDirection={sortDirection}
+              onSortChange={handleSortChange}
+            >
+              {intl.formatMessage(messages.role)}
+            </SortableColumnHeader>
+            <SortableColumnHeader
+              sortKey="created"
+              currentSort={currentSort}
+              sortDirection={sortDirection}
+              onSortChange={handleSortChange}
+            >
+              {intl.formatMessage(messages.created)}
+            </SortableColumnHeader>
            <Table.TH className="text-right">
              {(data.results ?? []).length > 1 && (
                <Button
@@ -604,7 +794,7 @@ const UserList = () => {
          </tr>
        </thead>
        <Table.TBody>
-          {data?.results.map((user) => (
+          {localUsers.map((user) => (
            <tr key={`user-list-${user.id}`} data-testid="user-list-row">
              <Table.TD>
                {isUserPermsEditable(user.id) && (
--- a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/DeviceItem.tsx
+++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/DeviceItem.tsx
@@ -33,13 +33,14 @@ const messages = defineMessages(

 const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
  const intl = useIntl();
+  const parsedUserAgent = UAParser(device.userAgent);

  return (
    <div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-4 text-gray-400 shadow-md ring-1 ring-gray-700 xl:h-28 xl:flex-row">
      <div className="relative flex w-full flex-col justify-between overflow-hidden sm:flex-row">
        <div className="relative z-10 flex w-full items-center overflow-hidden pl-4 pr-4 sm:pr-0 xl:w-7/12 2xl:w-2/3">
          <div className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105">
-            {UAParser(device.userAgent).device.type === 'mobile' ? (
+            {parsedUserAgent.device.type === 'mobile' ? (
              <DevicePhoneMobileIcon />
            ) : (
              <ComputerDesktopIcon />
@@ -56,8 +57,8 @@ const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
                : 'N/A'}
            </div>
            <div className="mr-2 min-w-0 truncate text-lg font-bold text-white hover:underline xl:text-xl">
-              {device.userAgent
-                ? UAParser(device.userAgent).device.model
+              {device.userAgent && parsedUserAgent.device.model
+                ? parsedUserAgent.device.model
                : intl.formatMessage(messages.unknown)}
            </div>
          </div>
@@ -68,7 +69,7 @@ const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
              {intl.formatMessage(messages.operatingsystem)}
            </span>
            <span className="flex truncate text-sm text-gray-300">
-              {device.userAgent ? UAParser(device.userAgent).os.name : 'N/A'}
+              {device.userAgent ? parsedUserAgent.os.name : 'N/A'}
            </span>
          </div>
          <div className="card-field">
@@ -76,9 +77,7 @@ const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
              {intl.formatMessage(messages.browser)}
            </span>
            <span className="flex truncate text-sm text-gray-300">
-              {device.userAgent
-                ? UAParser(device.userAgent).browser.name
-                : 'N/A'}
+              {device.userAgent ? parsedUserAgent.browser.name : 'N/A'}
            </span>
          </div>
          <div className="card-field">
@@ -86,16 +85,14 @@ const DeviceItem = ({ disablePushNotifications, device }: DeviceItemProps) => {
              {intl.formatMessage(messages.engine)}
            </span>
            <span className="flex truncate text-sm text-gray-300">
-              {device.userAgent
-                ? UAParser(device.userAgent).engine.name
-                : 'N/A'}
+              {device.userAgent ? parsedUserAgent.engine.name : 'N/A'}
            </span>
          </div>
        </div>
      </div>
      <div className="z-10 mt-4 flex w-full flex-col justify-center space-y-2 pl-4 pr-4 xl:mt-0 xl:w-96 xl:items-end xl:pl-0">
        <ConfirmButton
-          onClick={() => disablePushNotifications(device.p256dh)}
+          onClick={() => disablePushNotifications(device.endpoint)}
          confirmText={intl.formatMessage(globalMessages.areyousure)}
          className="w-full"
        >
--- a/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserNotificationSettings/UserNotificationsWebPush/index.tsx
@@ -113,7 +113,7 @@ const UserWebPushSettings = () => {

  // Unsubscribes from the push manager
  // Deletes/disables corresponding push subscription from database
-  const disablePushNotifications = async (p256dh?: string) => {
+  const disablePushNotifications = async (endpoint?: string) => {
    if ('serviceWorker' in navigator && user?.id) {
      navigator.serviceWorker.getRegistration('/sw.js').then((registration) => {
        registration?.pushManager
@@ -122,17 +122,21 @@ const UserWebPushSettings = () => {
            const parsedSub = JSON.parse(JSON.stringify(subscription));

            await axios.delete(
-              `/api/v1/user/${user?.id}/pushSubscription/${
-                p256dh ? p256dh : parsedSub.keys.p256dh
-              }`
+              `/api/v1/user/${user.id}/pushSubscription/${encodeURIComponent(
+                endpoint ?? parsedSub.endpoint
+              )}`
            );
-            if (subscription && (p256dh === parsedSub.keys.p256dh || !p256dh)) {
+
+            if (
+              subscription &&
+              (endpoint === parsedSub.endpoint || !endpoint)
+            ) {
              subscription.unsubscribe();
              setWebPushEnabled(false);
            }
            addToast(
              intl.formatMessage(
-                p256dh
+                endpoint
                  ? messages.subscriptiondeleted
                  : messages.webpushhasbeendisabled
              ),
@@ -145,7 +149,7 @@ const UserWebPushSettings = () => {
          .catch(function () {
            addToast(
              intl.formatMessage(
-                p256dh
+                endpoint
                  ? messages.subscriptiondeleteerror
                  : messages.disablingwebpusherror
              ),
@@ -176,12 +180,17 @@ const UserWebPushSettings = () => {
                const parsedKey = JSON.parse(JSON.stringify(subscription));
                const currentUserPushSub =
                  await axios.get<UserPushSubscription>(
-                    `/api/v1/user/${user.id}/pushSubscription/${parsedKey.keys.p256dh}`
+                    `/api/v1/user/${
+                      user.id
+                    }/pushSubscription/${encodeURIComponent(
+                      parsedKey.endpoint
+                    )}`
                  );

-                if (currentUserPushSub.data.p256dh !== parsedKey.keys.p256dh) {
+                if (currentUserPushSub.data.endpoint !== parsedKey.endpoint) {
                  return;
                }
+
                setWebPushEnabled(true);
              } else {
                setWebPushEnabled(false);
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50"><g fill="currentColor"><path d="M50.4 46.883c-9.168 0-17.023 7.214-17.023 16.387v.007l.09 71.37-2.303 16.992 31.313-8.319h77.841c9.17 0 17.024-7.224 17.024-16.396V63.27c0-9.17-7.85-16.383-17.016-16.387h-.008zm0 11.566h89.926c3.222.004 5.45 2.347 5.45 4.82v63.655c0 2.475-2.232 4.82-5.457 4.82h-79.54l-15.908 4.807.162-.938-.088-72.343c0-2.476 2.23-4.82 5.455-4.82z" transform="scale(.26458)"/><path d="M88.2 95.309H64.92c-1.601 0-2.91 1.236-2.91 2.746l.022 18.602-.435 2.506 6.231-1.881H88.2c1.6 0 2.91-1.236 2.91-2.747v-16.48c0-1.51-1.31-2.746-2.91-2.746z" transform="translate(-51.147 -81.516)"/><path d="M50.4 46.883c-9.168 0-17.023 7.214-17.023 16.387v.007l.09 71.37-2.303 16.992 31.313-8.319h77.841c9.17 0 17.024-7.224 17.024-16.396V63.27c0-9.17-7.85-16.383-17.016-16.387h-.008zm0 11.566h89.926c3.222.004 5.45 2.347 5.45 4.82v63.655c0 2.475-2.232 4.82-5.457 4.82h-79.54l-15.908 4.807.162-.938-.088-72.343c0-2.476 2.23-4.82 5.455-4.82z" transform="scale(.26458)"/><path d="M62.57 116.77v-1.312l3.28-1.459q.159-.068.306-.102.158-.045.283-.068l.271-.022v-.09q-.136-.012-.271-.046-.125-.023-.283-.057-.147-.045-.306-.113l-3.28-1.459v-1.323l5.068 2.319v1.413z" transform="matrix(1.45366 0 0 1.72815 -75.122 -171.953)"/><path d="M62.309 110.31v1.903l3.437 1.53.022.007-.022.008-3.437 1.53v1.892l.37-.17 5.221-2.39v-1.75zm.525.817 4.541 2.08v1.076l-4.541 2.078v-.732l3.12-1.389.003-.002a1.56 1.56 0 0 1 .258-.086h.006l.008-.002c.094-.027.176-.047.246-.06l.498-.041v-.574l-.24-.02a1.411 1.411 0 0 1-.231-.04l-.008-.001-.008-.002a9.077 9.077 0 0 1-.263-.053 2.781 2.781 0 0 1-.266-.097l-.004-.002-3.119-1.39z" transform="matrix(1.45366 0 0 1.72815 -75.122 -171.953)"/><path d="M69.171 117.754h5.43v1.278h-5.43Z" transform="matrix(1.44935 0 0 1.66414 -74.104 -166.906)"/><path d="M68.908 117.492v1.802h5.955v-1.802zm.526.524h4.904v.754h-4.904z" transform="matrix(1.44935 0 0 1.66414 -74.104 -166.906)"/></g></svg>