chore: merge develop

reverts the conditional render toshow the auto-request permission if the mediaServerType was set to
Plex as this should be handled in a different PR and Cypress tests should be modified
accordingly(currently cypress test would fail if this conditional check is there)

.all-contributorsrc

@@ -403,42 +403,6 @@
       "contributions": [
         "doc"
       ]
-    },
-    {
-      "login": "mobihen",
-      "name": "Nir Israel Hen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/35529491?v=4",
-      "profile": "https://mobihen.com",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "XDark187",
-      "name": "Baraa",
-      "avatar_url": "https://avatars.githubusercontent.com/u/39034192?v=4",
-      "profile": "https://github.com/XDark187",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "franciscofsales",
-      "name": "Francisco Sales",
-      "avatar_url": "https://avatars.githubusercontent.com/u/7977645?v=4",
-      "profile": "https://github.com/franciscofsales",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "myselfolli",
-      "name": "Oliver Laing",
-      "avatar_url": "https://avatars.githubusercontent.com/u/37535998?v=4",
-      "profile": "https://github.com/myselfolli",
-      "contributions": [
-        "code"
-      ]
     }
   ]
 }

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # Global code ownership
-*                               @Fallenbagel @gauthier-th
+*                               @Fallenbagel

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,6 +1,6 @@
 name: 🐛 Bug Report
 description: Report a problem
-labels: ['bug', 'awaiting triage']
+labels: ['type:bug', 'awaiting-triage']
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,6 +1,6 @@
 name: ✨ Feature Request
 description: Suggest an idea
-labels: ['enhancement', 'awaiting triage']
+labels: ['type:enhancement', 'awaiting-triage']
 body:
   - type: markdown
     attributes:

README.md

@@ -8,10 +8,10 @@
 <p align="center">
 <a href="https://discord.gg/ckbvBtDJgC"><img src="https://img.shields.io/discord/952656177924300932" alt="Discord"></a>
 <a href="https://hub.docker.com/r/fallenbagel/jellyseerr"><img src="https://img.shields.io/docker/pulls/fallenbagel/jellyseerr" alt="Docker pulls"></a>
-<a href="http://translate.jellyseerr.dev/engage/jellyseerr/"><img src="http://translate.jellyseerr.dev/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
+<a href="http://jellyseerr.borgcube.de/engage/jellyseerr/"><img src="http://jellyseerr.borgcube.de/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-47-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-40-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 **Jellyseerr** is a free and open source software application for managing requests for your media library.
@@ -137,15 +137,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
       <td align="center" valign="top" width="14.28%"><a href="https://joaquinolivero.com"><img src="https://avatars.githubusercontent.com/u/66050823?v=4?s=100" width="100px;" alt="Joaquin Olivero"/><br /><sub><b>Joaquin Olivero</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=JoaquinOlivero" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Bretterteig"><img src="https://avatars.githubusercontent.com/u/47298401?v=4?s=100" width="100px;" alt="Julian Behr"/><br /><sub><b>Julian Behr</b></sub></a><br /><a href="#translation-Bretterteig" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ThowZzy"><img src="https://avatars.githubusercontent.com/u/61882536?v=4?s=100" width="100px;" alt="ThowZzy"/><br /><sub><b>ThowZzy</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=ThowZzy" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://josephrisk.com"><img src="https://avatars.githubusercontent.com/u/18372584?v=4?s=100" width="100px;" alt="Joseph Risk"/><br /><sub><b>Joseph Risk</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=j0srisk" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Loetwiek"><img src="https://avatars.githubusercontent.com/u/79059734?v=4?s=100" width="100px;" alt="Loetwiek"/><br /><sub><b>Loetwiek</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Loetwiek" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuochi"><img src="https://avatars.githubusercontent.com/u/4720478?v=4?s=100" width="100px;" alt="Fuochi"/><br /><sub><b>Fuochi</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Fuochi" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://mobihen.com"><img src="https://avatars.githubusercontent.com/u/35529491?v=4?s=100" width="100px;" alt="Nir Israel Hen"/><br /><sub><b>Nir Israel Hen</b></sub></a><br /><a href="#translation-mobihen" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/XDark187"><img src="https://avatars.githubusercontent.com/u/39034192?v=4?s=100" width="100px;" alt="Baraa"/><br /><sub><b>Baraa</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=XDark187" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/franciscofsales"><img src="https://avatars.githubusercontent.com/u/7977645?v=4?s=100" width="100px;" alt="Francisco Sales"/><br /><sub><b>Francisco Sales</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=franciscofsales" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/myselfolli"><img src="https://avatars.githubusercontent.com/u/37535998?v=4?s=100" width="100px;" alt="Oliver Laing"/><br /><sub><b>Oliver Laing</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=myselfolli" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

cypress/config/settings.cypress.json

@@ -7,7 +7,6 @@
     "applicationTitle": "Overseerr",
     "applicationUrl": "",
     "csrfProtection": false,
-    "cspFrameAncestorDomains": "",
     "cacheImages": false,
     "defaultPermissions": 32,
     "defaultQuotas": {

docs/getting-started/buildfromsource.mdx

@@ -248,7 +248,6 @@ git checkout main
 ```
 3. Install the dependencies:
 ```powershell
-npm install -g win-node-env
 set CYPRESS_INSTALL_BINARY=0 && yarn install --frozen-lockfile --network-timeout 1000000
 ```
 4. Build the project:
@@ -273,7 +272,6 @@ git checkout develop # by default, you are on the develop branch so this step is
 ```
 3. Install the dependencies:
 ```powershell
-npm install -g win-node-env
 set CYPRESS_INSTALL_BINARY=0 && pnpm install --frozen-lockfile
 ```
 4. Build the project:

docs/getting-started/nixpkg.mdx

@@ -22,7 +22,7 @@ export const VersionMismatchWarning = () => {
     <>
       {!isUpToDate ? (
         <Admonition type="warning">
-          The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to <a href="#overriding-the-package-derivation">override the package derivation</a>.
+          The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to <a href="#overriding-the-package">override the package derivation</a>.
         </Admonition>
       ) : (
         <Admonition type="success">
@@ -95,12 +95,12 @@ export const VersionMatch = () => {
       };
 
       offlineCache = pkgs.fetchYarnDeps {
-        sha256 = pkgs.lib.fakeSha256;
+        sha256 = pkgs.lib.fakeSha256; 
       };
-    });
+    }); 
   };
 }`;
-
+ 
   const module = `{ config, pkgs, lib, ... }:
 
 with lib;

docs/using-jellyseerr/settings/general.md

@@ -12,8 +12,6 @@ This is your Jellyseerr API key, which can be used to integrate Jellyseerr with
 
 If you need to generate a new API key for any reason, simply click the button to the right of the text box.
 
-If you want to set the API key, rather than letting it be randomly generated, you can use the API_KEY environment variable. Whatever that variable is set to will be your API key.
-
 ## Application Title
 
 If you aren't a huge fan of the name "Jellyseerr" and would like to display something different to your users, you can customize the application title!

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

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

next.config.js

@@ -6,10 +6,15 @@ module.exports = {
     commitTag: process.env.COMMIT_TAG || 'local',
     forceIpv4First: process.env.FORCE_IPV4_FIRST === 'true' ? 'true' : 'false',
   },
+  publicRuntimeConfig: {
+    // Will be available on both server and client
+    JELLYFIN_TYPE: process.env.JELLYFIN_TYPE,
+  },
   images: {
     remotePatterns: [
       { hostname: 'gravatar.com' },
       { hostname: 'image.tmdb.org' },
+      { hostname: '*', protocol: 'https' },
     ],
   },
   webpack(config) {

overseerr-api.yml

@@ -38,8 +38,6 @@ tags:
     description: Endpoints related to getting service (Radarr/Sonarr) details.
   - name: watchlist
     description: Collection of media to watch later
-  - name: blacklist
-    description: Blacklisted media from discovery page.
 servers:
   - url: '{server}/api/v1'
     variables:
@@ -48,19 +46,6 @@ servers:
 
 components:
   schemas:
-    Blacklist:
-      type: object
-      properties:
-        tmdbId:
-          type: number
-          example: 1
-        title:
-          type: string
-        media:
-          $ref: '#/components/schemas/MediaInfo'
-        userId:
-          type: number
-          example: 1
     Watchlist:
       type: object
       properties:
@@ -168,9 +153,6 @@ components:
         csrfProtection:
           type: boolean
           example: false
-        cspFrameAncestorDomains:
-          type: string
-          example: 'example.com'
         hideAvailable:
           type: boolean
           example: false
@@ -2793,15 +2775,6 @@ paths:
                           imageCount:
                             type: number
                             example: 123
-                      avatar:
-                        type: object
-                        properties:
-                          size:
-                            type: number
-                            example: 123456
-                          imageCount:
-                            type: number
-                            example: 123
                   apiCaches:
                     type: array
                     items:
@@ -4069,94 +4042,6 @@ paths:
                       restricted:
                         type: boolean
                         example: false
-  /blacklist:
-    get:
-      summary: Returns blacklisted items
-      description: Returns list of all blacklisted media
-      tags:
-        - settings
-      parameters:
-        - in: query
-          name: take
-          schema:
-            type: number
-            nullable: true
-            example: 25
-        - in: query
-          name: skip
-          schema:
-            type: number
-            nullable: true
-            example: 0
-        - in: query
-          name: search
-          schema:
-            type: string
-            nullable: true
-            example: dune
-      responses:
-        '200':
-          description: Blacklisted items returned
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  pageInfo:
-                    $ref: '#/components/schemas/PageInfo'
-                  results:
-                    type: array
-                    items:
-                      type: object
-                      properties:
-                        user:
-                          $ref: '#/components/schemas/User'
-                        createdAt:
-                          type: string
-                          example: 2024-04-21T01:55:44.000Z
-                        id:
-                          type: number
-                          example: 1
-                        mediaType:
-                          type: string
-                          example: movie
-                        title:
-                          type: string
-                          example: Dune
-                        tmdbId:
-                          type: number
-                          example: 438631
-    post:
-      summary: Add media to blacklist
-      tags:
-        - blacklist
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Blacklist'
-      responses:
-        '201':
-          description: Item succesfully blacklisted
-        '412':
-          description: Item has already been blacklisted
-  /blacklist/{tmdbId}:
-    delete:
-      summary: Remove media from blacklist
-      tags:
-        - blacklist
-      parameters:
-        - in: path
-          name: tmdbId
-          description: tmdbId ID
-          required: true
-          example: '1'
-          schema:
-            type: string
-      responses:
-        '204':
-          description: Succesfully removed media item
   /watchlist:
     post:
       summary: Add media to watchlist
@@ -4979,11 +4864,6 @@ paths:
           schema:
             type: string
             example: 8|9
-        - in: query
-          name: status
-          schema:
-            type: string
-            example: 3|4
       responses:
         '200':
           description: Results

package.json

@@ -61,9 +61,7 @@
     "express-session": "1.17.3",
     "formik": "^2.4.6",
     "gravatar-url": "3.1.0",
-    "helmet": "^7.1.0",
     "lodash": "4.17.21",
-    "mime": "3",
     "next": "^14.2.4",
     "node-cache": "5.1.2",
     "node-gyp": "9.3.1",
@@ -121,7 +119,6 @@
     "@types/express": "4.17.17",
     "@types/express-session": "1.17.6",
     "@types/lodash": "4.14.191",
-    "@types/mime": "3",
     "@types/node": "20.14.8",
     "@types/node-schedule": "2.1.0",
     "@types/nodemailer": "6.4.7",

pnpm-lock.yaml

@@ -95,15 +95,9 @@ importers:
       gravatar-url:
         specifier: 3.1.0
         version: 3.1.0
-      helmet:
-        specifier: ^7.1.0
-        version: 7.1.0
       lodash:
         specifier: 4.17.21
         version: 4.17.21
-      mime:
-        specifier: '3'
-        version: 3.0.0
       next:
         specifier: ^14.2.4
         version: 14.2.4(@babel/core@7.24.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -270,9 +264,6 @@ importers:
       '@types/lodash':
         specifier: 4.14.191
         version: 4.14.191
-      '@types/mime':
-        specifier: '3'
-        version: 3.0.4
       '@types/node':
         specifier: 20.14.8
         version: 20.14.8
@@ -2857,9 +2848,6 @@ packages:
   '@types/mime@1.3.5':
     resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
 
-  '@types/mime@3.0.4':
-    resolution: {integrity: sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==}
-
   '@types/minimatch@3.0.5':
     resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==}
 
@@ -5295,10 +5283,6 @@ packages:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
 
-  helmet@7.1.0:
-    resolution: {integrity: sha512-g+HZqgfbpXdCkme/Cd/mZkV0aV3BZZZSugecH03kl38m/Kmdx8jKjBikpDj2cr+Iynv4KpYEviojNdTJActJAg==}
-    engines: {node: '>=16.0.0'}
-
   hermes-estree@0.19.1:
     resolution: {integrity: sha512-daLGV3Q2MKk8w4evNMKwS8zBE/rcpA800nu1Q5kM08IKijoSnPe9Uo1iIxzPKRkn95IxxsgBMPeYHt3VG4ej2g==}
 
@@ -10852,7 +10836,7 @@ snapshots:
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.3.8
+      semver: 7.6.2
       tar: 6.2.1
     transitivePeerDependencies:
       - encoding
@@ -10927,13 +10911,13 @@ snapshots:
   '@npmcli/fs@1.1.1':
     dependencies:
       '@gar/promisify': 1.1.3
-      semver: 7.3.8
+      semver: 7.6.2
     optional: true
 
   '@npmcli/fs@2.1.2':
     dependencies:
       '@gar/promisify': 1.1.3
-      semver: 7.3.8
+      semver: 7.6.2
 
   '@npmcli/move-file@1.1.2':
     dependencies:
@@ -12342,7 +12326,7 @@ snapshots:
       read-pkg: 5.2.0
       registry-auth-token: 5.0.2
       semantic-release: 19.0.5(encoding@0.1.13)
-      semver: 7.3.8
+      semver: 7.6.2
       tempy: 1.0.1
 
   '@semantic-release/release-notes-generator@10.0.3(semantic-release@19.0.5(encoding@0.1.13))':
@@ -12686,8 +12670,6 @@ snapshots:
 
   '@types/mime@1.3.5': {}
 
-  '@types/mime@3.0.4': {}
-
   '@types/minimatch@3.0.5': {}
 
   '@types/minimist@1.2.5': {}
@@ -12905,7 +12887,7 @@ snapshots:
       debug: 4.3.5(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.3.8
+      semver: 7.6.2
       tsutils: 3.21.0(typescript@4.9.5)
     optionalDependencies:
       typescript: 4.9.5
@@ -15602,8 +15584,6 @@ snapshots:
 
   he@1.2.0: {}
 
-  helmet@7.1.0: {}
-
   hermes-estree@0.19.1: {}
 
   hermes-estree@0.20.1: {}
@@ -17289,7 +17269,7 @@ snapshots:
       nopt: 5.0.0
       npmlog: 6.0.2
       rimraf: 3.0.2
-      semver: 7.3.8
+      semver: 7.6.2
       tar: 6.2.1
       which: 2.0.2
     transitivePeerDependencies:
@@ -17368,7 +17348,7 @@ snapshots:
     dependencies:
       hosted-git-info: 4.1.0
       is-core-module: 2.14.0
-      semver: 7.3.8
+      semver: 7.6.2
       validate-npm-package-license: 3.0.4
 
   normalize-path@3.0.0: {}

server/api/externalapi.ts

@@ -85,7 +85,7 @@ class ExternalAPI {
 
   protected async post<T>(
     endpoint: string,
-    data?: Record<string, unknown>,
+    data: Record<string, unknown>,
     params?: Record<string, string>,
     ttl?: number,
     config?: RequestInit
@@ -107,7 +107,7 @@ class ExternalAPI {
         ...this.defaultHeaders,
         ...config?.headers,
       },
-      body: data ? JSON.stringify(data) : undefined,
+      body: JSON.stringify(data),
     });
     if (!response.ok) {
       const text = await response.text();
@@ -178,7 +178,6 @@ class ExternalAPI {
   ): Promise<T> {
     const url = this.formatUrl(endpoint, params);
     const response = await this.fetch(url, {
-      method: 'DELETE',
       ...config,
       headers: {
         ...this.defaultHeaders,
@@ -286,12 +285,7 @@ class ExternalAPI {
       ...this.params,
       ...params,
     });
-    return (
-      href +
-      (searchParams.toString().length
-        ? '?' + searchParams.toString()
-        : searchParams.toString())
-    );
+    return `${href}?${searchParams.toString()}`;
   }
 
   private serializeCacheKey(
@@ -319,11 +313,7 @@ class ExternalAPI {
       try {
         return await response.json();
       } catch {
-        try {
-          return await response.blob();
-        } catch {
-          return null;
-        }
+        return await response.blob();
       }
     }
   }

server/api/jellyfin.ts

@@ -93,7 +93,9 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
 }
 
 class JellyfinAPI extends ExternalAPI {
+  private authToken?: string;
   private userId?: string;
+  private jellyfinHost: string;
 
   constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
     let authHeaderVal: string;
@@ -112,6 +114,9 @@ class JellyfinAPI extends ExternalAPI {
         },
       }
     );
+
+    this.jellyfinHost = jellyfinHost;
+    this.authToken = authToken;
   }
 
   public async login(
@@ -400,23 +405,6 @@ class JellyfinAPI extends ExternalAPI {
       throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
     }
   }
-
-  public async createApiToken(appName: string): Promise<string> {
-    try {
-      await this.post(`/Auth/Keys?App=${appName}`);
-      const apiKeys = await this.get<any>(`/Auth/Keys`);
-      return apiKeys.Items.reverse().find(
-        (item: any) => item.AppName === appName
-      ).AccessToken;
-    } catch (e) {
-      logger.error(
-        `Something went wrong while creating an API key the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API' }
-      );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
-    }
-  }
 }
 
 export default JellyfinAPI;

server/api/rating/imdbRadarrProxy.ts

@@ -175,11 +175,7 @@ class IMDBRadarrProxy extends ExternalAPI {
         `/movie/imdb/${IMDBid}`
       );
 
-      if (
-        !data?.length ||
-        data[0].ImdbId !== IMDBid ||
-        !data[0].MovieRatings.Imdb
-      ) {
+      if (!data?.length || data[0].ImdbId !== IMDBid) {
         return null;
       }
 

server/api/servarr/sonarr.ts

@@ -303,10 +303,10 @@ class SonarrAPI extends ServarrBase<{
     });
 
     try {
-      await this.runCommand('MissingEpisodeSearch', { seriesId });
+      await this.runCommand('SeriesSearch', { seriesId });
     } catch (e) {
       logger.error(
-        'Something went wrong while executing Sonarr missing episode search.',
+        'Something went wrong while executing Sonarr series search.',
         {
           label: 'Sonarr API',
           errorMessage: e.message,

server/api/themoviedb/index.ts

@@ -95,7 +95,6 @@ interface DiscoverTvOptions {
   sortBy?: SortOptions;
   watchRegion?: string;
   watchProviders?: string;
-  withStatus?: string; // Returning Series: 0 Planned: 1 In Production: 2 Ended: 3 Cancelled: 4 Pilot: 5
 }
 
 class TheMovieDb extends ExternalAPI {
@@ -524,7 +523,6 @@ class TheMovieDb extends ExternalAPI {
     voteCountLte,
     watchProviders,
     watchRegion,
-    withStatus,
   }: DiscoverTvOptions = {}): Promise<TmdbSearchTvResponse> => {
     try {
       const defaultFutureDate = new Date(
@@ -572,7 +570,6 @@ class TheMovieDb extends ExternalAPI {
         'vote_count.lte': voteCountLte || '',
         with_watch_providers: watchProviders || '',
         watch_region: watchRegion || '',
-        with_status: withStatus || '',
       });
 
       return data;

server/constants/error.ts

@@ -2,7 +2,6 @@ export enum ApiErrorCode {
   InvalidUrl = 'INVALID_URL',
   InvalidCredentials = 'INVALID_CREDENTIALS',
   InvalidAuthToken = 'INVALID_AUTH_TOKEN',
-  InvalidEmail = 'INVALID_EMAIL',
   NotAdmin = 'NOT_ADMIN',
   SyncErrorGroupedFolders = 'SYNC_ERROR_GROUPED_FOLDERS',
   SyncErrorNoLibraries = 'SYNC_ERROR_NO_LIBRARIES',

server/constants/media.ts

@@ -16,5 +16,4 @@ export enum MediaStatus {
   PROCESSING,
   PARTIALLY_AVAILABLE,
   AVAILABLE,
-  BLACKLISTED,
 }

server/entity/Blacklist.ts

@@ -1,95 +0,0 @@
-import { MediaStatus, type MediaType } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
-import Media from '@server/entity/Media';
-import { User } from '@server/entity/User';
-import type { BlacklistItem } from '@server/interfaces/api/blacklistInterfaces';
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  JoinColumn,
-  ManyToOne,
-  OneToOne,
-  PrimaryGeneratedColumn,
-  Unique,
-} from 'typeorm';
-import type { ZodNumber, ZodOptional, ZodString } from 'zod';
-
-@Entity()
-@Unique(['tmdbId'])
-export class Blacklist implements BlacklistItem {
-  @PrimaryGeneratedColumn()
-  public id: number;
-
-  @Column({ type: 'varchar' })
-  public mediaType: MediaType;
-
-  @Column({ nullable: true, type: 'varchar' })
-  title?: string;
-
-  @Column()
-  @Index()
-  public tmdbId: number;
-
-  @ManyToOne(() => User, (user) => user.id, {
-    eager: true,
-  })
-  user: User;
-
-  @OneToOne(() => Media, (media) => media.blacklist, {
-    onDelete: 'CASCADE',
-  })
-  @JoinColumn()
-  public media: Media;
-
-  @CreateDateColumn()
-  public createdAt: Date;
-
-  constructor(init?: Partial<Blacklist>) {
-    Object.assign(this, init);
-  }
-
-  public static async addToBlacklist({
-    blacklistRequest,
-  }: {
-    blacklistRequest: {
-      mediaType: MediaType;
-      title?: ZodOptional<ZodString>['_output'];
-      tmdbId: ZodNumber['_output'];
-    };
-  }): Promise<void> {
-    const blacklist = new this({
-      ...blacklistRequest,
-    });
-
-    const mediaRepository = getRepository(Media);
-    let media = await mediaRepository.findOne({
-      where: {
-        tmdbId: blacklistRequest.tmdbId,
-      },
-    });
-
-    const blacklistRepository = getRepository(this);
-
-    await blacklistRepository.save(blacklist);
-
-    if (!media) {
-      media = new Media({
-        tmdbId: blacklistRequest.tmdbId,
-        status: MediaStatus.BLACKLISTED,
-        status4k: MediaStatus.BLACKLISTED,
-        mediaType: blacklistRequest.mediaType,
-        blacklist: blacklist,
-      });
-
-      await mediaRepository.save(media);
-    } else {
-      media.blacklist = blacklist;
-      media.status = MediaStatus.BLACKLISTED;
-      media.status4k = MediaStatus.BLACKLISTED;
-
-      await mediaRepository.save(media);
-    }
-  }
-}

server/entity/Media.ts

@@ -3,7 +3,6 @@ import SonarrAPI from '@server/api/servarr/sonarr';
 import { MediaStatus, MediaType } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import { getRepository } from '@server/datasource';
-import { Blacklist } from '@server/entity/Blacklist';
 import type { User } from '@server/entity/User';
 import { Watchlist } from '@server/entity/Watchlist';
 import type { DownloadingItem } from '@server/lib/downloadtracker';
@@ -18,7 +17,6 @@ import {
   Entity,
   Index,
   OneToMany,
-  OneToOne,
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm';
@@ -68,7 +66,7 @@ class Media {
 
     try {
       const media = await mediaRepository.findOne({
-        where: { tmdbId: id, mediaType: mediaType },
+        where: { tmdbId: id, mediaType },
         relations: { requests: true, issues: true },
       });
 
@@ -118,11 +116,6 @@ class Media {
   @OneToMany(() => Issue, (issue) => issue.media, { cascade: true })
   public issues: Issue[];
 
-  @OneToOne(() => Blacklist, (blacklist) => blacklist.media, {
-    eager: true,
-  })
-  public blacklist: Blacklist;
-
   @CreateDateColumn()
   public createdAt: Date;
 

server/entity/MediaRequest.ts

@@ -40,7 +40,6 @@ export class RequestPermissionError extends Error {}
 export class QuotaRestrictedError extends Error {}
 export class DuplicateMediaRequestError extends Error {}
 export class NoSeasonsAvailableError extends Error {}
-export class BlacklistedMediaError extends Error {}
 
 type MediaRequestOptions = {
   isAutoRequest?: boolean;
@@ -144,16 +143,6 @@ export class MediaRequest {
         mediaType: requestBody.mediaType,
       });
     } else {
-      if (media.status === MediaStatus.BLACKLISTED) {
-        logger.warn('Request for media blocked due to being blacklisted', {
-          tmdbId: tmdbMedia.id,
-          mediaType: requestBody.mediaType,
-          label: 'Media Request',
-        });
-
-        throw new BlacklistedMediaError('This media is blacklisted.');
-      }
-
       if (media.status === MediaStatus.UNKNOWN && !requestBody.is4k) {
         media.status = MediaStatus.PENDING;
       }

server/index.ts

@@ -19,7 +19,6 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import clearCookies from '@server/middleware/clearcookies';
 import routes from '@server/routes';
-import avatarproxy from '@server/routes/avatarproxy';
 import imageproxy from '@server/routes/imageproxy';
 import { getAppVersion } from '@server/utils/appVersion';
 import restartFlag from '@server/utils/restartFlag';
@@ -32,7 +31,6 @@ import express from 'express';
 import * as OpenApiValidator from 'express-openapi-validator';
 import type { Store } from 'express-session';
 import session from 'express-session';
-import helmet from 'helmet';
 import next from 'next';
 import dns from 'node:dns';
 import net from 'node:net';
@@ -65,7 +63,7 @@ app
     }
 
     // Load Settings
-    const settings = await getSettings().load();
+    const settings = getSettings();
     restartFlag.initializeSettings(settings.main);
 
     // Migrate library types
@@ -160,28 +158,6 @@ app
       });
     }
 
-    // Setup Content-Security-Policy
-    server.use(
-      helmet.contentSecurityPolicy({
-        useDefaults: false,
-        directives: {
-          'default-src': ["'self'", "'unsafe-inline'"],
-          'script-src': [
-            "'self'",
-            "'unsafe-inline'",
-            ...(dev ? ["'unsafe-eval'"] : []),
-          ],
-          'img-src': ["'self'", "'unsafe-inline'", 'data:', 'blob:', '*'],
-          'frame-ancestors': [
-            "'self'",
-            ...(settings.main.cspFrameAncestorDomains
-              ? [settings.main.cspFrameAncestorDomains]
-              : []),
-          ],
-        },
-      })
-    );
-
     // Set up sessions
     const sessionRespository = getRepository(Session);
     server.use(
@@ -193,12 +169,8 @@ app
         cookie: {
           maxAge: 1000 * 60 * 60 * 24 * 30,
           httpOnly: true,
-          sameSite: settings.main.csrfProtection
-            ? 'strict'
-            : settings.main.cspFrameAncestorDomains
-            ? 'none'
-            : 'lax',
-          secure: settings.main.cspFrameAncestorDomains ? true : 'auto',
+          sameSite: settings.main.csrfProtection ? 'strict' : 'lax',
+          secure: 'auto',
         },
         store: new TypeormStore({
           cleanupLimit: 2,
@@ -230,7 +202,6 @@ app
 
     // Do not set cookies so CDNs can cache them
     server.use('/imageproxy', clearCookies, imageproxy);
-    server.use('/avatarproxy', clearCookies, avatarproxy);
 
     server.get('*', (req, res) => handle(req, res));
     server.use(

server/interfaces/api/blacklistInterfaces.ts

@@ -1,14 +0,0 @@
-import type { User } from '@server/entity/User';
-import type { PaginatedResponse } from '@server/interfaces/api/common';
-
-export interface BlacklistItem {
-  tmdbId: number;
-  mediaType: 'movie' | 'tv';
-  title?: string;
-  createdAt?: Date;
-  user: User;
-}
-
-export interface BlacklistResultsResponse extends PaginatedResponse {
-  results: BlacklistItem[];
-}

server/interfaces/api/common.ts

@@ -8,16 +8,3 @@ interface PageInfo {
 export interface PaginatedResponse {
   pageInfo: PageInfo;
 }
-
-/**
- * Get the keys of an object that are not functions
- */
-type NonFunctionPropertyNames<T> = {
-  // eslint-disable-next-line @typescript-eslint/ban-types
-  [K in keyof T]: T[K] extends Function ? never : K;
-}[keyof T];
-
-/**
- * Get the properties of an object that are not functions
- */
-export type NonFunctionProperties<T> = Pick<T, NonFunctionPropertyNames<T>>;

server/interfaces/api/requestInterfaces.ts

@@ -1,9 +1,9 @@
 import type { MediaType } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties, PaginatedResponse } from './common';
+import type { PaginatedResponse } from './common';
 
 export interface RequestResultsResponse extends PaginatedResponse {
-  results: NonFunctionProperties<MediaRequest>[];
+  results: MediaRequest[];
 }
 
 export type MediaRequestBody = {
@@ -14,7 +14,6 @@ export type MediaRequestBody = {
   is4k?: boolean;
   serverId?: number;
   profileId?: number;
-  profileName?: string;
   rootFolder?: string;
   languageProfileId?: number;
   userId?: number;

server/interfaces/api/settingsInterfaces.ts

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

server/job/schedule.ts

@@ -227,9 +227,6 @@ export const startJobs = (): void => {
       });
       // Clean TMDB image cache
       ImageProxy.clearCache('tmdb');
-
-      // Clean users avatar image cache
-      ImageProxy.clearCache('avatar');
     }),
   });
 

server/lib/availabilitySync.ts

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

server/lib/downloadtracker.ts

@@ -20,7 +20,6 @@ export interface DownloadingItem {
   timeLeft: string;
   estimatedCompletionTime: Date;
   title: string;
-  downloadId: string;
   episode?: EpisodeNumberResult;
 }
 
@@ -96,7 +95,6 @@ class DownloadTracker {
               status: item.status,
               timeLeft: item.timeleft,
               title: item.title,
-              downloadId: item.downloadId,
             }));
 
             if (queueItems.length > 0) {
@@ -174,7 +172,6 @@ class DownloadTracker {
               timeLeft: item.timeleft,
               title: item.title,
               episode: item.episode,
-              downloadId: item.downloadId,
             }));
 
             if (queueItems.length > 0) {

server/lib/imageproxy.ts

@@ -3,7 +3,6 @@ import type { RateLimitOptions } from '@server/utils/rateLimit';
 import rateLimit from '@server/utils/rateLimit';
 import { createHash } from 'crypto';
 import { promises } from 'fs';
-import mime from 'mime/lite';
 import path, { join } from 'path';
 
 type ImageResponse = {
@@ -12,7 +11,7 @@ type ImageResponse = {
     curRevalidate: number;
     isStale: boolean;
     etag: string;
-    extension: string | null;
+    extension: string;
     cacheKey: string;
     cacheMiss: boolean;
   };
@@ -28,45 +27,29 @@ class ImageProxy {
     let deletedImages = 0;
     const cacheDirectory = path.join(baseCacheDirectory, key);
 
-    try {
-      const files = await promises.readdir(cacheDirectory);
+    const files = await promises.readdir(cacheDirectory);
 
-      for (const file of files) {
-        const filePath = path.join(cacheDirectory, file);
-        const stat = await promises.lstat(filePath);
+    for (const file of files) {
+      const filePath = path.join(cacheDirectory, file);
+      const stat = await promises.lstat(filePath);
 
-        if (stat.isDirectory()) {
-          const imageFiles = await promises.readdir(filePath);
+      if (stat.isDirectory()) {
+        const imageFiles = await promises.readdir(filePath);
 
-          for (const imageFile of imageFiles) {
-            const [, expireAtSt] = imageFile.split('.');
-            const expireAt = Number(expireAtSt);
-            const now = Date.now();
+        for (const imageFile of imageFiles) {
+          const [, expireAtSt] = imageFile.split('.');
+          const expireAt = Number(expireAtSt);
+          const now = Date.now();
 
-            if (now > expireAt) {
-              await promises.rm(path.join(filePath), {
-                recursive: true,
-              });
-              deletedImages += 1;
-            }
+          if (now > expireAt) {
+            await promises.rm(path.join(filePath, imageFile));
+            deletedImages += 1;
           }
         }
       }
-    } catch (e) {
-      if (e.code === 'ENOENT') {
-        logger.error('Directory not found', {
-          label: 'Image Cache',
-          message: e.message,
-        });
-      } else {
-        logger.error('Failed to read directory', {
-          label: 'Image Cache',
-          message: e.message,
-        });
-      }
     }
 
-    logger.info(`Cleared ${deletedImages} stale image(s) from cache '${key}'`, {
+    logger.info(`Cleared ${deletedImages} stale image(s) from cache`, {
       label: 'Image Cache',
     });
   }
@@ -86,49 +69,33 @@ class ImageProxy {
   }
 
   private static async getDirectorySize(dir: string): Promise<number> {
-    try {
-      const files = await promises.readdir(dir, {
-        withFileTypes: true,
-      });
+    const files = await promises.readdir(dir, {
+      withFileTypes: true,
+    });
 
-      const paths = files.map(async (file) => {
-        const path = join(dir, file.name);
+    const paths = files.map(async (file) => {
+      const path = join(dir, file.name);
 
-        if (file.isDirectory()) return await ImageProxy.getDirectorySize(path);
+      if (file.isDirectory()) return await ImageProxy.getDirectorySize(path);
 
-        if (file.isFile()) {
-          const { size } = await promises.stat(path);
+      if (file.isFile()) {
+        const { size } = await promises.stat(path);
 
-          return size;
-        }
-
-        return 0;
-      });
-
-      return (await Promise.all(paths))
-        .flat(Infinity)
-        .reduce((i, size) => i + size, 0);
-    } catch (e) {
-      if (e.code === 'ENOENT') {
-        return 0;
+        return size;
       }
-    }
 
-    return 0;
+      return 0;
+    });
+
+    return (await Promise.all(paths))
+      .flat(Infinity)
+      .reduce((i, size) => i + size, 0);
   }
 
   private static async getImageCount(dir: string) {
-    try {
-      const files = await promises.readdir(dir);
+    const files = await promises.readdir(dir);
 
-      return files.length;
-    } catch (e) {
-      if (e.code === 'ENOENT') {
-        return 0;
-      }
-    }
-
-    return 0;
+    return files.length;
   }
 
   private fetch: typeof fetch;
@@ -180,27 +147,6 @@ class ImageProxy {
     return imageResponse;
   }
 
-  public async clearCachedImage(path: string) {
-    // find cacheKey
-    const cacheKey = this.getCacheKey(path);
-
-    try {
-      const directory = join(this.getCacheDirectory(), cacheKey);
-      const files = await promises.readdir(directory);
-
-      await promises.rm(directory, { recursive: true });
-
-      logger.info(`Cleared ${files[0]} from cache 'avatar'`, {
-        label: 'Image Cache',
-      });
-    } catch (e) {
-      logger.error('Failed to clear cached image', {
-        label: 'Image Cache',
-        message: e.message,
-      });
-    }
-  }
-
   private async get(cacheKey: string): Promise<ImageResponse | null> {
     try {
       const directory = join(this.getCacheDirectory(), cacheKey);
@@ -241,25 +187,16 @@ class ImageProxy {
       const directory = join(this.getCacheDirectory(), cacheKey);
       const href =
         this.baseUrl +
-        (this.baseUrl.length > 0
-          ? this.baseUrl.endsWith('/')
-            ? ''
-            : '/'
-          : '') +
+        (this.baseUrl.endsWith('/') ? '' : '/') +
         (path.startsWith('/') ? path.slice(1) : path);
       const response = await this.fetch(href);
       const arrayBuffer = await response.arrayBuffer();
       const buffer = Buffer.from(arrayBuffer);
 
-      const extension = mime.getExtension(
-        response.headers.get('content-type') ?? ''
-      );
-
-      let maxAge = Number(
+      const extension = path.split('.').pop() ?? '';
+      const maxAge = Number(
         (response.headers.get('cache-control') ?? '0').split('=')[1]
       );
-
-      if (!maxAge) maxAge = 86400;
       const expireAt = Date.now() + maxAge * 1000;
       const etag = (response.headers.get('etag') ?? '').replace(/"/g, '');
 
@@ -295,7 +232,7 @@ class ImageProxy {
 
   private async writeToCacheDir(
     dir: string,
-    extension: string | null,
+    extension: string,
     maxAge: number,
     expireAt: number,
     buffer: Buffer,

server/lib/permissions.ts

@@ -27,8 +27,6 @@ export enum Permission {
   AUTO_REQUEST_TV = 33554432,
   RECENT_VIEW = 67108864,
   WATCHLIST_VIEW = 134217728,
-  MANAGE_BLACKLIST = 268435456,
-  VIEW_BLACKLIST = 1073741824,
 }
 
 export interface PermissionCheckOptions {

server/lib/scanners/jellyfin/index.ts

@@ -585,7 +585,12 @@ class JellyfinScanner {
       const userRepository = getRepository(User);
       const admin = await userRepository.findOne({
         where: { id: 1 },
-        select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
+        select: [
+          'id',
+          'jellyfinAuthToken',
+          'jellyfinUserId',
+          'jellyfinDeviceId',
+        ],
         order: { id: 'ASC' },
       });
 
@@ -595,7 +600,7 @@ class JellyfinScanner {
 
       this.jfClient = new JellyfinAPI(
         getHostname(),
-        settings.jellyfin.apiKey,
+        admin.jellyfinAuthToken,
         admin.jellyfinDeviceId
       );
 

server/lib/settings/index.ts

@@ -47,7 +47,6 @@ export interface JellyfinSettings {
   jellyfinForgotPasswordUrl?: string;
   libraries: Library[];
   serverId: string;
-  apiKey: string;
 }
 export interface TautulliSettings {
   hostname?: string;
@@ -104,7 +103,6 @@ export interface MainSettings {
   applicationTitle: string;
   applicationUrl: string;
   csrfProtection: boolean;
-  cspFrameAncestorDomains: string;
   cacheImages: boolean;
   defaultPermissions: number;
   defaultQuotas: {
@@ -311,7 +309,6 @@ class Settings {
         applicationTitle: 'Jellyseerr',
         applicationUrl: '',
         csrfProtection: false,
-        cspFrameAncestorDomains: '',
         cacheImages: false,
         defaultPermissions: Permission.REQUEST,
         defaultQuotas: {
@@ -345,7 +342,6 @@ class Settings {
         jellyfinForgotPasswordUrl: '',
         libraries: [],
         serverId: '',
-        apiKey: '',
       },
       tautulli: {},
       radarr: [],
@@ -613,11 +609,7 @@ class Settings {
   }
 
   private generateApiKey(): string {
-    if (process.env.API_KEY) {
-      return process.env.API_KEY;
-    } else {
-      return Buffer.from(`${Date.now()}${randomUUID()}`).toString('base64');
-    }
+    return Buffer.from(`${Date.now()}${randomUUID()}`).toString('base64');
   }
 
   private generateVapidKeys(force = false): void {
@@ -637,7 +629,7 @@ class Settings {
    * @param overrideSettings If passed in, will override all existing settings with these
    * values
    */
-  public async load(overrideSettings?: AllSettings): Promise<Settings> {
+  public load(overrideSettings?: AllSettings): Settings {
     if (overrideSettings) {
       this.data = overrideSettings;
       return this;
@@ -650,16 +642,10 @@ class Settings {
 
     if (data) {
       const parsedJson = JSON.parse(data);
-      this.data = await runMigrations(parsedJson);
+      this.data = runMigrations(parsedJson);
 
       this.data = merge(this.data, parsedJson);
 
-      if (process.env.API_KEY) {
-        if (this.main.apiKey != process.env.API_KEY) {
-          this.main.apiKey = process.env.API_KEY;
-        }
-      }
-
       this.save();
     }
     return this;
@@ -670,6 +656,7 @@ class Settings {
   }
 }
 
+let loaded = false;
 let settings: Settings | undefined;
 
 export const getSettings = (initialSettings?: AllSettings): Settings => {
@@ -677,6 +664,11 @@ export const getSettings = (initialSettings?: AllSettings): Settings => {
     settings = new Settings(initialSettings);
   }
 
+  if (!loaded) {
+    settings.load();
+    loaded = true;
+  }
+
   return settings;
 };
 

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

@@ -3,6 +3,7 @@ import type { AllSettings } from '@server/lib/settings';
 
 const migrateHostname = (settings: any): AllSettings => {
   const oldMediaServerType = settings.main.mediaServerType;
+  console.log('Migrating media server type', oldMediaServerType);
   if (
     oldMediaServerType === MediaServerType.JELLYFIN &&
     process.env.JELLYFIN_TYPE === 'emby'

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

@@ -1,36 +0,0 @@
-import JellyfinAPI from '@server/api/jellyfin';
-import { MediaServerType } from '@server/constants/server';
-import { getRepository } from '@server/datasource';
-import { User } from '@server/entity/User';
-import type { AllSettings } from '@server/lib/settings';
-import { getHostname } from '@server/utils/getHostname';
-
-const migrateApiTokens = async (settings: any): Promise<AllSettings> => {
-  const mediaServerType = settings.main.mediaServerType;
-  if (
-    !settings.jellyfin.apiKey &&
-    (mediaServerType === MediaServerType.JELLYFIN ||
-      mediaServerType === MediaServerType.EMBY)
-  ) {
-    const userRepository = getRepository(User);
-    const admin = await userRepository.findOne({
-      where: { id: 1 },
-      select: ['id', 'jellyfinAuthToken', 'jellyfinUserId', 'jellyfinDeviceId'],
-      order: { id: 'ASC' },
-    });
-    if (!admin) {
-      return settings;
-    }
-    const jellyfinClient = new JellyfinAPI(
-      getHostname(settings.jellyfin),
-      admin.jellyfinAuthToken,
-      admin.jellyfinDeviceId
-    );
-    jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
-    const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
-    settings.jellyfin.apiKey = apiKey;
-  }
-  return settings;
-};
-
-export default migrateApiTokens;

server/lib/settings/migrator.ts

@@ -1,13 +1,10 @@
 import type { AllSettings } from '@server/lib/settings';
-import logger from '@server/logger';
 import fs from 'fs';
 import path from 'path';
 
 const migrationsDir = path.join(__dirname, 'migrations');
 
-export const runMigrations = async (
-  settings: AllSettings
-): Promise<AllSettings> => {
+export const runMigrations = (settings: AllSettings): AllSettings => {
   const migrations = fs
     .readdirSync(migrationsDir)
     .filter((file) => file.endsWith('.js') || file.endsWith('.ts'))
@@ -16,15 +13,8 @@ export const runMigrations = async (
 
   let migrated = settings;
 
-  try {
-    for (const migration of migrations) {
-      migrated = await migration(migrated);
-    }
-  } catch (e) {
-    logger.error(
-      `Something went wrong while running settings migrations: ${e.message}`,
-      { label: 'Settings Migrator' }
-    );
+  for (const migration of migrations) {
+    migrated = migration(migrated);
   }
 
   return migrated;

server/migration/1699901142442-AddBlacklist.ts

@@ -1,20 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class AddBlacklist1699901142442 implements MigrationInterface {
-  name = 'AddBlacklist1699901142442';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `CREATE TABLE "blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')),"userId" integer, "mediaId" integer,CONSTRAINT "UQ_6bbafa28411e6046421991ea21c" UNIQUE ("tmdbId", "userId"))`
-    );
-
-    await queryRunner.query(
-      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`DROP TABLE "blacklist"`);
-    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
-  }
-}

server/models/Movie.ts

@@ -85,7 +85,6 @@ export interface MovieDetails {
   mediaUrl?: string;
   watchProviders?: WatchProviders[];
   keywords: Keyword[];
-  onUserWatchlist?: boolean;
 }
 
 export const mapProductionCompany = (
@@ -102,8 +101,7 @@ export const mapProductionCompany = (
 
 export const mapMovieDetails = (
   movie: TmdbMovieDetails,
-  media?: Media,
-  userWatchlist?: boolean
+  media?: Media
 ): MovieDetails => ({
   id: movie.id,
   adult: movie.adult,
@@ -150,5 +148,4 @@ export const mapMovieDetails = (
     id: keyword.id,
     name: keyword.name,
   })),
-  onUserWatchlist: userWatchlist,
 });

server/models/Tv.ts

@@ -111,7 +111,6 @@ export interface TvDetails {
   keywords: Keyword[];
   mediaInfo?: Media;
   watchProviders?: WatchProviders[];
-  onUserWatchlist?: boolean;
 }
 
 const mapEpisodeResult = (episode: TmdbTvEpisodeResult): Episode => ({
@@ -162,8 +161,7 @@ export const mapNetwork = (network: TmdbNetwork): TvNetwork => ({
 
 export const mapTvDetails = (
   show: TmdbTvDetails,
-  media?: Media,
-  userWatchlist?: boolean
+  media?: Media
 ): TvDetails => ({
   createdBy: show.created_by,
   episodeRunTime: show.episode_run_time,
@@ -225,5 +223,4 @@ export const mapTvDetails = (
   })),
   mediaInfo: media,
   watchProviders: mapWatchProviders(show['watch/providers']?.results ?? {}),
-  onUserWatchlist: userWatchlist,
 });

server/routes/auth.ts

@@ -6,7 +6,6 @@ import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
 import { User } from '@server/entity/User';
 import { startJobs } from '@server/job/schedule';
-import ImageProxy from '@server/lib/imageproxy';
 import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
@@ -343,7 +342,6 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
                 }),
             userType: UserType.EMBY,
           });
-
           break;
         case MediaServerType.JELLYFIN:
           settings.main.mediaServerType = MediaServerType.JELLYFIN;
@@ -362,20 +360,11 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
                 }),
             userType: UserType.JELLYFIN,
           });
-
           break;
         default:
           throw new Error('select_server_type');
       }
 
-      // Create an API key on Jellyfin from this admin user
-      const jellyfinClient = new JellyfinAPI(
-        hostname,
-        account.AccessToken,
-        deviceId
-      );
-      const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
-
       const serverName = await jellyfinserver.getServerName();
 
       settings.jellyfin.name = serverName;
@@ -384,7 +373,6 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
       settings.jellyfin.port = body.port ?? 8096;
       settings.jellyfin.urlBase = body.urlBase ?? '';
       settings.jellyfin.useSsl = body.useSsl ?? false;
-      settings.jellyfin.apiKey = apiKey;
       settings.save();
       startJobs();
 
@@ -408,26 +396,18 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
           jellyfinUsername: account.User.Name,
         }
       );
+      // Let's check if their authtoken is up to date
+      if (user.jellyfinAuthToken !== account.AccessToken) {
+        user.jellyfinAuthToken = account.AccessToken;
+      }
       // Update the users avatar with their jellyfin profile pic (incase it changed)
       if (account.User.PrimaryImageTag) {
-        const avatar = `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
-        if (avatar !== user.avatar) {
-          const avatarProxy = new ImageProxy('avatar', '');
-          avatarProxy.clearCachedImage(user.avatar);
-        }
-        user.avatar = avatar;
+        user.avatar = `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
       } else {
-        const avatar = gravatarUrl(user.email || account.User.Name, {
+        user.avatar = gravatarUrl(user.email || account.User.Name, {
           default: 'mm',
           size: 200,
         });
-
-        if (avatar !== user.avatar) {
-          const avatarProxy = new ImageProxy('avatar', '');
-          avatarProxy.clearCachedImage(user.avatar);
-        }
-
-        user.avatar = avatar;
       }
       user.jellyfinUsername = account.User.Name;
 
@@ -435,6 +415,12 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
         user.username = '';
       }
 
+      // TODO: If JELLYFIN_TYPE is set to 'emby' then set mediaServerType to EMBY
+      // if (process.env.JELLYFIN_TYPE === 'emby') {
+      //   settings.main.mediaServerType = MediaServerType.EMBY;
+      //   settings.save();
+      // }
+
       await userRepository.save(user);
     } else if (!settings.main.newPlexLogin) {
       logger.warn(
@@ -465,6 +451,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
         jellyfinUsername: account.User.Name,
         jellyfinUserId: account.User.Id,
         jellyfinDeviceId: deviceId,
+        jellyfinAuthToken: account.AccessToken,
         permissions: settings.main.defaultPermissions,
         avatar: account.User.PrimaryImageTag
           ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
@@ -477,7 +464,6 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
             ? UserType.JELLYFIN
             : UserType.EMBY,
       });
-
       //initialize Jellyfin/Emby users with local login
       const passedExplicitPassword = body.password && body.password.length > 0;
       if (passedExplicitPassword) {

server/routes/avatarproxy.ts

@@ -1,32 +0,0 @@
-import ImageProxy from '@server/lib/imageproxy';
-import logger from '@server/logger';
-import { Router } from 'express';
-
-const router = Router();
-
-const avatarImageProxy = new ImageProxy('avatar', '');
-// Proxy avatar images
-router.get('/*', async (req, res) => {
-  const imagePath = req.url.startsWith('/') ? req.url.slice(1) : req.url;
-
-  try {
-    const imageData = await avatarImageProxy.getImage(imagePath);
-
-    res.writeHead(200, {
-      'Content-Type': `image/${imageData.meta.extension}`,
-      'Content-Length': imageData.imageBuffer.length,
-      'Cache-Control': `public, max-age=${imageData.meta.curRevalidate}`,
-      'OS-Cache-Key': imageData.meta.cacheKey,
-      'OS-Cache-Status': imageData.meta.cacheMiss ? 'MISS' : 'HIT',
-    });
-
-    res.end(imageData.imageBuffer);
-  } catch (e) {
-    logger.error('Failed to proxy avatar image', {
-      imagePath,
-      errorMessage: e.message,
-    });
-  }
-});
-
-export default router;

server/routes/blacklist.ts

@@ -1,148 +0,0 @@
-import { MediaType } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
-import { Blacklist } from '@server/entity/Blacklist';
-import Media from '@server/entity/Media';
-import { NotFoundError } from '@server/entity/Watchlist';
-import type { BlacklistResultsResponse } from '@server/interfaces/api/blacklistInterfaces';
-import { Permission } from '@server/lib/permissions';
-import logger from '@server/logger';
-import { isAuthenticated } from '@server/middleware/auth';
-import { Router } from 'express';
-import rateLimit from 'express-rate-limit';
-import { QueryFailedError } from 'typeorm';
-import { z } from 'zod';
-
-const blacklistRoutes = Router();
-
-export const blacklistAdd = z.object({
-  tmdbId: z.coerce.number(),
-  mediaType: z.nativeEnum(MediaType),
-  title: z.coerce.string().optional(),
-  user: z.coerce.number(),
-});
-
-blacklistRoutes.get(
-  '/',
-  isAuthenticated([Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST], {
-    type: 'or',
-  }),
-  rateLimit({ windowMs: 60 * 1000, max: 50 }),
-  async (req, res, next) => {
-    const pageSize = req.query.take ? Number(req.query.take) : 25;
-    const skip = req.query.skip ? Number(req.query.skip) : 0;
-    const search = (req.query.search as string) ?? '';
-
-    try {
-      let query = getRepository(Blacklist)
-        .createQueryBuilder('blacklist')
-        .leftJoinAndSelect('blacklist.user', 'user');
-
-      if (search.length > 0) {
-        query = query.where('blacklist.title like :title', {
-          title: `%${search}%`,
-        });
-      }
-
-      const [blacklistedItems, itemsCount] = await query
-        .orderBy('blacklist.createdAt', 'DESC')
-        .take(pageSize)
-        .skip(skip)
-        .getManyAndCount();
-
-      return res.status(200).json({
-        pageInfo: {
-          pages: Math.ceil(itemsCount / pageSize),
-          pageSize,
-          results: itemsCount,
-          page: Math.ceil(skip / pageSize) + 1,
-        },
-        results: blacklistedItems,
-      } as BlacklistResultsResponse);
-    } catch (error) {
-      logger.error('Something went wrong while retrieving blacklisted items', {
-        label: 'Blacklist',
-        errorMessage: error.message,
-      });
-      return next({
-        status: 500,
-        message: 'Unable to retrieve blacklisted items.',
-      });
-    }
-  }
-);
-
-blacklistRoutes.post(
-  '/',
-  isAuthenticated([Permission.MANAGE_BLACKLIST], {
-    type: 'or',
-  }),
-  async (req, res, next) => {
-    try {
-      const values = blacklistAdd.parse(req.body);
-
-      await Blacklist.addToBlacklist({
-        blacklistRequest: values,
-      });
-
-      return res.status(201).send();
-    } catch (error) {
-      if (!(error instanceof Error)) {
-        return;
-      }
-
-      if (error instanceof QueryFailedError) {
-        switch (error.driverError.errno) {
-          case 19:
-            return next({ status: 412, message: 'Item already blacklisted' });
-          default:
-            logger.warn('Something wrong with data blacklist', {
-              tmdbId: req.body.tmdbId,
-              mediaType: req.body.mediaType,
-              label: 'Blacklist',
-            });
-            return next({ status: 409, message: 'Something wrong' });
-        }
-      }
-
-      return next({ status: 500, message: error.message });
-    }
-  }
-);
-
-blacklistRoutes.delete(
-  '/:id',
-  isAuthenticated([Permission.MANAGE_BLACKLIST], {
-    type: 'or',
-  }),
-  async (req, res, next) => {
-    try {
-      const blacklisteRepository = getRepository(Blacklist);
-
-      const blacklistItem = await blacklisteRepository.findOneOrFail({
-        where: { tmdbId: Number(req.params.id) },
-      });
-
-      await blacklisteRepository.remove(blacklistItem);
-
-      const mediaRepository = getRepository(Media);
-
-      const mediaItem = await mediaRepository.findOneOrFail({
-        where: { tmdbId: Number(req.params.id) },
-      });
-
-      await mediaRepository.remove(mediaItem);
-
-      return res.status(204).send();
-    } catch (e) {
-      if (e instanceof NotFoundError) {
-        return next({
-          status: 401,
-          message: e.message,
-        });
-      }
-      return next({ status: 500, message: e.message });
-    }
-  }
-);
-
-export default blacklistRoutes;

server/routes/discover.ts

@@ -71,7 +71,6 @@ const QueryFilterOptions = z.object({
   network: z.coerce.string().optional(),
   watchProviders: z.coerce.string().optional(),
   watchRegion: z.coerce.string().optional(),
-  status: z.coerce.string().optional(),
 });
 
 export type FilterOptions = z.infer<typeof QueryFilterOptions>;
@@ -386,7 +385,6 @@ discoverRoutes.get('/tv', async (req, res, next) => {
       voteCountLte: query.voteCountLte,
       watchProviders: query.watchProviders,
       watchRegion: query.watchRegion,
-      withStatus: query.status,
     });
 
     const media = await Media.getRelatedMedia(

server/routes/index.ts

@@ -23,7 +23,6 @@ import restartFlag from '@server/utils/restartFlag';
 import { isPerson } from '@server/utils/typeHelpers';
 import { Router } from 'express';
 import authRoutes from './auth';
-import blacklistRoutes from './blacklist';
 import collectionRoutes from './collection';
 import discoverRoutes, { createTmdbWithRegionLanguage } from './discover';
 import issueRoutes from './issue';
@@ -145,7 +144,6 @@ router.use('/search', isAuthenticated(), searchRoutes);
 router.use('/discover', isAuthenticated(), discoverRoutes);
 router.use('/request', isAuthenticated(), requestRoutes);
 router.use('/watchlist', isAuthenticated(), watchlistRoutes);
-router.use('/blacklist', isAuthenticated(), blacklistRoutes);
 router.use('/movie', isAuthenticated(), movieRoutes);
 router.use('/tv', isAuthenticated(), tvRoutes);
 router.use('/media', isAuthenticated(), mediaRoutes);

server/routes/movie.ts

@@ -3,9 +3,7 @@ import RottenTomatoes from '@server/api/rating/rottentomatoes';
 import { type RatingResponse } from '@server/api/ratings';
 import TheMovieDb from '@server/api/themoviedb';
 import { MediaType } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
-import { Watchlist } from '@server/entity/Watchlist';
 import logger from '@server/logger';
 import { mapMovieDetails } from '@server/models/Movie';
 import { mapMovieResult } from '@server/models/Search';
@@ -24,24 +22,7 @@ movieRoutes.get('/:id', async (req, res, next) => {
 
     const media = await Media.getMedia(tmdbMovie.id, MediaType.MOVIE);
 
-    const onUserWatchlist = await getRepository(Watchlist).exist({
-      where: {
-        tmdbId: Number(req.params.id),
-        requestedBy: {
-          id: req.user?.id,
-        },
-      },
-    });
-
-    const data = mapMovieDetails(tmdbMovie, media, onUserWatchlist);
-
-    // TMDB issue where it doesnt fallback to English when no overview is available in requested locale.
-    if (!data.overview) {
-      const tvEnglish = await tmdb.getMovie({ movieId: Number(req.params.id) });
-      data.overview = tvEnglish.overview;
-    }
-
-    return res.status(200).json(data);
+    return res.status(200).json(mapMovieDetails(tmdbMovie, media));
   } catch (e) {
     logger.debug('Something went wrong retrieving movie', {
       label: 'API',

server/routes/request.ts

@@ -1,5 +1,3 @@
-import RadarrAPI from '@server/api/servarr/radarr';
-import SonarrAPI from '@server/api/servarr/sonarr';
 import {
   MediaRequestStatus,
   MediaStatus,
@@ -8,7 +6,6 @@ import {
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import {
-  BlacklistedMediaError,
   DuplicateMediaRequestError,
   MediaRequest,
   NoSeasonsAvailableError,
@@ -22,7 +19,6 @@ import type {
   RequestResultsResponse,
 } from '@server/interfaces/api/requestInterfaces';
 import { Permission } from '@server/lib/permissions';
-import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
 import { Router } from 'express';
@@ -147,62 +143,6 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
         .skip(skip)
         .getManyAndCount();
 
-      const settings = getSettings();
-
-      // get all quality profiles for every configured sonarr server
-      const sonarrServers = await Promise.all(
-        settings.sonarr.map(async (sonarrSetting) => {
-          const sonarr = new SonarrAPI({
-            apiKey: sonarrSetting.apiKey,
-            url: SonarrAPI.buildUrl(sonarrSetting, '/api/v3'),
-          });
-
-          return {
-            id: sonarrSetting.id,
-            profiles: await sonarr.getProfiles(),
-          };
-        })
-      );
-
-      // get all quality profiles for every configured radarr server
-      const radarrServers = await Promise.all(
-        settings.radarr.map(async (radarrSetting) => {
-          const radarr = new RadarrAPI({
-            apiKey: radarrSetting.apiKey,
-            url: RadarrAPI.buildUrl(radarrSetting, '/api/v3'),
-          });
-
-          return {
-            id: radarrSetting.id,
-            profiles: await radarr.getProfiles(),
-          };
-        })
-      );
-
-      // add profile names to the media requests, with undefined if not found
-      const requestsWithProfileNames = requests.map((r) => {
-        switch (r.type) {
-          case MediaType.MOVIE: {
-            const profileName = radarrServers
-              .find((serverr) => serverr.id === r.serverId)
-              ?.profiles.find((profile) => profile.id === r.profileId)?.name;
-
-            return {
-              ...r,
-              profileName,
-            };
-          }
-          case MediaType.TV: {
-            return {
-              ...r,
-              profileName: sonarrServers
-                .find((serverr) => serverr.id === r.serverId)
-                ?.profiles.find((profile) => profile.id === r.profileId)?.name,
-            };
-          }
-        }
-      });
-
       return res.status(200).json({
         pageInfo: {
           pages: Math.ceil(requestCount / pageSize),
@@ -210,7 +150,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
           results: requestCount,
           page: Math.ceil(skip / pageSize) + 1,
         },
-        results: requestsWithProfileNames,
+        results: requests,
       });
     } catch (e) {
       next({ status: 500, message: e.message });
@@ -244,8 +184,6 @@ requestRoutes.post<never, MediaRequest, MediaRequestBody>(
           return next({ status: 409, message: error.message });
         case NoSeasonsAvailableError:
           return next({ status: 202, message: error.message });
-        case BlacklistedMediaError:
-          return next({ status: 403, message: error.message });
         default:
           return next({ status: 500, message: error.message });
       }

server/routes/settings/index.ts

@@ -262,7 +262,7 @@ settingsRoutes.post('/jellyfin', async (req, res, next) => {
   try {
     const admin = await userRepository.findOneOrFail({
       where: { id: 1 },
-      select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
+      select: ['id', 'jellyfinAuthToken', 'jellyfinUserId', 'jellyfinDeviceId'],
       order: { id: 'ASC' },
     });
 
@@ -270,7 +270,7 @@ settingsRoutes.post('/jellyfin', async (req, res, next) => {
 
     const jellyfinClient = new JellyfinAPI(
       getHostname(tempJellyfinSettings),
-      tempJellyfinSettings.apiKey,
+      admin.jellyfinAuthToken ?? '',
       admin.jellyfinDeviceId ?? ''
     );
 
@@ -318,13 +318,13 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
   if (req.query.sync) {
     const userRepository = getRepository(User);
     const admin = await userRepository.findOneOrFail({
-      select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
+      select: ['id', 'jellyfinAuthToken', 'jellyfinDeviceId', 'jellyfinUserId'],
       where: { id: 1 },
       order: { id: 'ASC' },
     });
     const jellyfinClient = new JellyfinAPI(
       getHostname(),
-      settings.jellyfin.apiKey,
+      admin.jellyfinAuthToken ?? '',
       admin.jellyfinDeviceId ?? ''
     );
 
@@ -376,8 +376,7 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
 });
 
 settingsRoutes.get('/jellyfin/users', async (req, res) => {
-  const settings = getSettings();
-  const { externalHostname } = settings.jellyfin;
+  const { externalHostname } = getSettings().jellyfin;
   const jellyfinHost =
     externalHostname && externalHostname.length > 0
       ? externalHostname
@@ -385,13 +384,13 @@ settingsRoutes.get('/jellyfin/users', async (req, res) => {
 
   const userRepository = getRepository(User);
   const admin = await userRepository.findOneOrFail({
-    select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
+    select: ['id', 'jellyfinAuthToken', 'jellyfinDeviceId', 'jellyfinUserId'],
     where: { id: 1 },
     order: { id: 'ASC' },
   });
   const jellyfinClient = new JellyfinAPI(
     getHostname(),
-    settings.jellyfin.apiKey,
+    admin.jellyfinAuthToken ?? '',
     admin.jellyfinDeviceId ?? ''
   );
 
@@ -746,13 +745,11 @@ settingsRoutes.get('/cache', async (_req, res) => {
   }));
 
   const tmdbImageCache = await ImageProxy.getImageStats('tmdb');
-  const avatarImageCache = await ImageProxy.getImageStats('avatar');
 
   return res.status(200).json({
     apiCaches,
     imageCache: {
       tmdb: tmdbImageCache,
-      avatar: avatarImageCache,
     },
   });
 });

server/routes/tv.ts

@@ -1,9 +1,7 @@
 import RottenTomatoes from '@server/api/rating/rottentomatoes';
 import TheMovieDb from '@server/api/themoviedb';
 import { MediaType } from '@server/constants/media';
-import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
-import { Watchlist } from '@server/entity/Watchlist';
 import logger from '@server/logger';
 import { mapTvResult } from '@server/models/Search';
 import { mapSeasonWithEpisodes, mapTvDetails } from '@server/models/Tv';
@@ -21,24 +19,7 @@ tvRoutes.get('/:id', async (req, res, next) => {
 
     const media = await Media.getMedia(tv.id, MediaType.TV);
 
-    const onUserWatchlist = await getRepository(Watchlist).exist({
-      where: {
-        tmdbId: Number(req.params.id),
-        requestedBy: {
-          id: req.user?.id,
-        },
-      },
-    });
-
-    const data = mapTvDetails(tv, media, onUserWatchlist);
-
-    // TMDB issue where it doesnt fallback to English when no overview is available in requested locale.
-    if (!data.overview) {
-      const tvEnglish = await tmdb.getTvShow({ tvId: Number(req.params.id) });
-      data.overview = tvEnglish.overview;
-    }
-
-    return res.status(200).json(data);
+    return res.status(200).json(mapTvDetails(tv, media));
   } catch (e) {
     logger.debug('Something went wrong retrieving series', {
       label: 'API',

server/routes/user/index.ts

@@ -2,7 +2,6 @@ import JellyfinAPI from '@server/api/jellyfin';
 import PlexTvAPI from '@server/api/plextv';
 import TautulliAPI from '@server/api/tautulli';
 import { MediaType } from '@server/constants/media';
-import { MediaServerType } from '@server/constants/server';
 import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
@@ -502,14 +501,17 @@ router.post(
       // taken from auth.ts
       const admin = await userRepository.findOneOrFail({
         where: { id: 1 },
-        select: ['id', 'jellyfinDeviceId', 'jellyfinUserId'],
+        select: [
+          'id',
+          'jellyfinAuthToken',
+          'jellyfinDeviceId',
+          'jellyfinUserId',
+        ],
         order: { id: 'ASC' },
       });
-
-      const hostname = getHostname();
       const jellyfinClient = new JellyfinAPI(
-        hostname,
-        settings.jellyfin.apiKey,
+        getHostname(),
+        admin.jellyfinAuthToken ?? '',
         admin.jellyfinDeviceId ?? ''
       );
       jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
@@ -517,6 +519,7 @@ router.post(
       //const jellyfinUsersResponse = await jellyfinClient.getUsers();
       const createdUsers: User[] = [];
       const { externalHostname } = getSettings().jellyfin;
+      const hostname = getHostname();
 
       const jellyfinHost =
         externalHostname && externalHostname.length > 0
@@ -551,10 +554,7 @@ router.post(
                   default: 'mm',
                   size: 200,
                 }),
-            userType:
-              settings.main.mediaServerType === MediaServerType.JELLYFIN
-                ? UserType.JELLYFIN
-                : UserType.EMBY,
+            userType: UserType.JELLYFIN,
           });
 
           await userRepository.save(newUser);

server/routes/user/usersettings.ts

@@ -1,4 +1,3 @@
-import { ApiErrorCode } from '@server/constants/error';
 import { getRepository } from '@server/datasource';
 import { User } from '@server/entity/User';
 import { UserSettings } from '@server/entity/UserSettings';
@@ -10,7 +9,6 @@ import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
-import { ApiError } from '@server/types/error';
 import { Router } from 'express';
 import { canMakePermissionsChange } from '.';
 
@@ -100,18 +98,10 @@ userSettingsRoutes.post<
     }
 
     user.username = req.body.username;
-    const oldEmail = user.email;
     if (user.jellyfinUsername) {
       user.email = req.body.email || user.jellyfinUsername || user.email;
     }
 
-    const existingUser = await userRepository.findOne({
-      where: { email: user.email },
-    });
-    if (oldEmail !== user.email && existingUser) {
-      throw new ApiError(400, ApiErrorCode.InvalidEmail);
-    }
-
     // Update quota values only if the user has the correct permissions
     if (
       !user.hasPermission(Permission.MANAGE_USERS) &&
@@ -155,14 +145,7 @@ userSettingsRoutes.post<
       email: savedUser.email,
     });
   } catch (e) {
-    if (e.errorCode) {
-      return next({
-        status: e.statusCode,
-        message: e.errorCode,
-      });
-    } else {
-      return next({ status: 500, message: e.message });
-    }
+    next({ status: 500, message: e.message });
   }
 });
 

server/utils/restartFlag.ts

@@ -13,8 +13,7 @@ class RestartFlag {
 
     return (
       this.settings.csrfProtection !== settings.csrfProtection ||
-      this.settings.trustProxy !== settings.trustProxy ||
-      this.settings.cspFrameAncestorDomains !== settings.cspFrameAncestorDomains
+      this.settings.trustProxy !== settings.trustProxy
     );
   }
 }

src/components/Blacklist/index.tsx

@@ -1,417 +0,0 @@
-import Badge from '@app/components/Common/Badge';
-import Button from '@app/components/Common/Button';
-import CachedImage from '@app/components/Common/CachedImage';
-import ConfirmButton from '@app/components/Common/ConfirmButton';
-import Header from '@app/components/Common/Header';
-import LoadingSpinner from '@app/components/Common/LoadingSpinner';
-import PageTitle from '@app/components/Common/PageTitle';
-import useDebouncedState from '@app/hooks/useDebouncedState';
-import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams';
-import { Permission, useUser } from '@app/hooks/useUser';
-import globalMessages from '@app/i18n/globalMessages';
-import Error from '@app/pages/_error';
-import defineMessages from '@app/utils/defineMessages';
-import {
-  ChevronLeftIcon,
-  ChevronRightIcon,
-  MagnifyingGlassIcon,
-  TrashIcon,
-} from '@heroicons/react/24/solid';
-import type {
-  BlacklistItem,
-  BlacklistResultsResponse,
-} from '@server/interfaces/api/blacklistInterfaces';
-import type { MovieDetails } from '@server/models/Movie';
-import type { TvDetails } from '@server/models/Tv';
-import Link from 'next/link';
-import { useRouter } from 'next/router';
-import type { ChangeEvent } from 'react';
-import { useState } from 'react';
-import { useInView } from 'react-intersection-observer';
-import { FormattedRelativeTime, useIntl } from 'react-intl';
-import { useToasts } from 'react-toast-notifications';
-import useSWR from 'swr';
-
-const messages = defineMessages('components.Blacklist', {
-  blacklistsettings: 'Blacklist Settings',
-  blacklistSettingsDescription: 'Manage blacklisted media.',
-  mediaName: 'Name',
-  mediaType: 'Type',
-  mediaTmdbId: 'tmdb Id',
-  blacklistdate: 'date',
-  blacklistedby: '{date} by {user}',
-  blacklistNotFoundError: '<strong>{title}</strong> is not blacklisted.',
-});
-
-const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
-  return (movie as MovieDetails).title !== undefined;
-};
-
-const Blacklist = () => {
-  const [currentPageSize, setCurrentPageSize] = useState<number>(10);
-  const [searchFilter, debouncedSearchFilter, setSearchFilter] =
-    useDebouncedState('');
-  const router = useRouter();
-  const intl = useIntl();
-
-  const page = router.query.page ? Number(router.query.page) : 1;
-  const pageIndex = page - 1;
-  const updateQueryParams = useUpdateQueryParams({ page: page.toString() });
-
-  const {
-    data,
-    error,
-    mutate: revalidate,
-  } = useSWR<BlacklistResultsResponse>(
-    `/api/v1/blacklist/?take=${currentPageSize}
-    &skip=${pageIndex * currentPageSize}
-    ${debouncedSearchFilter ? `&search=${debouncedSearchFilter}` : ''}`,
-    {
-      refreshInterval: 0,
-      revalidateOnFocus: false,
-    }
-  );
-
-  // check if there's no data and no errors in the table
-  // so as to show a spinner inside the table and not refresh the whole component
-  if (!data && error) {
-    return <Error statusCode={500} />;
-  }
-
-  const searchItem = (e: ChangeEvent<HTMLInputElement>) => {
-    // Remove the "page" query param from the URL
-    // so that the "skip" query param on line 62 is empty
-    // and the search returns results without skipping items
-    if (router.query.page) router.replace(router.basePath);
-
-    setSearchFilter(e.target.value as string);
-  };
-
-  const hasNextPage = data && data.pageInfo.pages > pageIndex + 1;
-  const hasPrevPage = pageIndex > 0;
-
-  return (
-    <>
-      <PageTitle title={[intl.formatMessage(globalMessages.blacklist)]} />
-      <Header>{intl.formatMessage(globalMessages.blacklist)}</Header>
-
-      <div className="mt-2 flex flex-grow flex-col sm:flex-grow-0 sm:flex-row sm:justify-end">
-        <div className="mb-2 flex flex-grow sm:mb-0 sm:mr-2 md:flex-grow-0">
-          <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-sm text-gray-100">
-            <MagnifyingGlassIcon className="h-6 w-6" />
-          </span>
-          <input
-            type="text"
-            className="rounded-r-only"
-            value={searchFilter}
-            onChange={(e) => searchItem(e)}
-          />
-        </div>
-      </div>
-
-      {!data ? (
-        <LoadingSpinner />
-      ) : data.results.length === 0 ? (
-        <div className="flex w-full flex-col items-center justify-center py-24 text-white">
-          <span className="text-2xl text-gray-400">
-            {intl.formatMessage(globalMessages.noresults)}
-          </span>
-        </div>
-      ) : (
-        data.results.map((item: BlacklistItem) => {
-          return (
-            <div className="py-2" key={`request-list-${item.tmdbId}`}>
-              <BlacklistedItem item={item} revalidateList={revalidate} />
-            </div>
-          );
-        })
-      )}
-
-      <div className="actions">
-        <nav
-          className="mb-3 flex flex-col items-center space-y-3 sm:flex-row sm:space-y-0"
-          aria-label="Pagination"
-        >
-          <div className="hidden lg:flex lg:flex-1">
-            <p className="text-sm">
-              {data &&
-                (data?.results.length ?? 0) > 0 &&
-                intl.formatMessage(globalMessages.showingresults, {
-                  from: pageIndex * currentPageSize + 1,
-                  to:
-                    data.results.length < currentPageSize
-                      ? pageIndex * currentPageSize + data.results.length
-                      : (pageIndex + 1) * currentPageSize,
-                  total: data.pageInfo.results,
-                  strong: (msg: React.ReactNode) => (
-                    <span className="font-medium">{msg}</span>
-                  ),
-                })}
-            </p>
-          </div>
-          <div className="flex justify-center sm:flex-1 sm:justify-start lg:justify-center">
-            <span className="-mt-3 items-center truncate text-sm sm:mt-0">
-              {intl.formatMessage(globalMessages.resultsperpage, {
-                pageSize: (
-                  <select
-                    id="pageSize"
-                    name="pageSize"
-                    onChange={(e) => {
-                      setCurrentPageSize(Number(e.target.value));
-                      router
-                        .push({
-                          pathname: router.pathname,
-                          query: router.query.userId
-                            ? { userId: router.query.userId }
-                            : {},
-                        })
-                        .then(() => window.scrollTo(0, 0));
-                    }}
-                    value={currentPageSize}
-                    className="short inline"
-                  >
-                    <option value="5">5</option>
-                    <option value="10">10</option>
-                    <option value="25">25</option>
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                  </select>
-                ),
-              })}
-            </span>
-          </div>
-          <div className="flex flex-auto justify-center space-x-2 sm:flex-1 sm:justify-end">
-            <Button
-              disabled={!hasPrevPage}
-              onClick={() => updateQueryParams('page', (page - 1).toString())}
-            >
-              <ChevronLeftIcon />
-              <span>{intl.formatMessage(globalMessages.previous)}</span>
-            </Button>
-            <Button
-              disabled={!hasNextPage}
-              onClick={() => updateQueryParams('page', (page + 1).toString())}
-            >
-              <span>{intl.formatMessage(globalMessages.next)}</span>
-              <ChevronRightIcon />
-            </Button>
-          </div>
-        </nav>
-      </div>
-    </>
-  );
-};
-
-export default Blacklist;
-
-interface BlacklistedItemProps {
-  item: BlacklistItem;
-  revalidateList: () => void;
-}
-
-const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
-  const [isUpdating, setIsUpdating] = useState<boolean>(false);
-  const { addToast } = useToasts();
-  const { ref, inView } = useInView({
-    triggerOnce: true,
-  });
-  const intl = useIntl();
-  const { hasPermission } = useUser();
-
-  const url =
-    item.mediaType === 'movie'
-      ? `/api/v1/movie/${item.tmdbId}`
-      : `/api/v1/tv/${item.tmdbId}`;
-  const { data: title, error } = useSWR<MovieDetails | TvDetails>(
-    inView ? url : null
-  );
-
-  if (!title && !error) {
-    return (
-      <div
-        className="h-64 w-full animate-pulse rounded-xl bg-gray-800 xl:h-28"
-        ref={ref}
-      />
-    );
-  }
-
-  const removeFromBlacklist = async (tmdbId: number, title?: string) => {
-    setIsUpdating(true);
-
-    const res = await fetch('/api/v1/blacklist/' + tmdbId, {
-      method: 'DELETE',
-    });
-
-    if (res.status === 204) {
-      addToast(
-        <span>
-          {intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
-            title,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'success', autoDismiss: true }
-      );
-    } else {
-      addToast(intl.formatMessage(globalMessages.blacklistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-    }
-
-    revalidateList();
-    setIsUpdating(false);
-  };
-
-  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">
-      {title && title.backdropPath && (
-        <div className="absolute inset-0 z-0 w-full bg-cover bg-center xl:w-2/3">
-          <CachedImage
-            src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${title.backdropPath}`}
-            alt=""
-            style={{ width: '100%', height: '100%', objectFit: 'cover' }}
-            fill
-          />
-          <div
-            className="absolute inset-0"
-            style={{
-              backgroundImage:
-                'linear-gradient(90deg, rgba(31, 41, 55, 0.47) 0%, rgba(31, 41, 55, 1) 100%)',
-            }}
-          />
-        </div>
-      )}
-      <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">
-          <Link
-            href={
-              item.mediaType === 'movie'
-                ? `/movie/${item.tmdbId}`
-                : `/tv/${item.tmdbId}`
-            }
-            className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105"
-          >
-            <CachedImage
-              src={
-                title?.posterPath
-                  ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
-                  : '/images/overseerr_poster_not_found.png'
-              }
-              alt=""
-              sizes="100vw"
-              style={{ width: '100%', height: 'auto', objectFit: 'cover' }}
-              width={600}
-              height={900}
-            />
-          </Link>
-          <div className="flex flex-col justify-center overflow-hidden pl-2 xl:pl-4">
-            <div className="pt-0.5 text-xs font-medium text-white sm:pt-1">
-              {title &&
-                (isMovie(title)
-                  ? title.releaseDate
-                  : title.firstAirDate
-                )?.slice(0, 4)}
-            </div>
-            <Link
-              href={
-                item.mediaType === 'movie'
-                  ? `/movie/${item.tmdbId}`
-                  : `/tv/${item.tmdbId}`
-              }
-            >
-              <span className="mr-2 min-w-0 truncate text-lg font-bold text-white hover:underline xl:text-xl">
-                {title && (isMovie(title) ? title.title : title.name)}
-              </span>
-            </Link>
-          </div>
-        </div>
-
-        <div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
-          <div className="card-field">
-            <span className="card-field-name">Status</span>
-            <Badge badgeType="danger">
-              {intl.formatMessage(globalMessages.blacklisted)}
-            </Badge>
-          </div>
-
-          {item.createdAt && (
-            <div className="card-field">
-              <span className="card-field-name">
-                {intl.formatMessage(globalMessages.blacklisted)}
-              </span>
-              <span className="flex truncate text-sm text-gray-300">
-                {intl.formatMessage(messages.blacklistedby, {
-                  date: (
-                    <FormattedRelativeTime
-                      value={Math.floor(
-                        (new Date(item.createdAt).getTime() - Date.now()) / 1000
-                      )}
-                      updateIntervalInSeconds={1}
-                      numeric="auto"
-                    />
-                  ),
-                  user: (
-                    <Link href={`/users/${item.user.id}`}>
-                      <span className="group flex items-center truncate">
-                        <CachedImage
-                          src={item.user.avatar}
-                          alt=""
-                          className="avatar-sm ml-1.5"
-                          width={20}
-                          height={20}
-                          style={{ objectFit: 'cover' }}
-                        />
-                        <span className="ml-1 truncate text-sm font-semibold group-hover:text-white group-hover:underline">
-                          {item.user.displayName}
-                        </span>
-                      </span>
-                    </Link>
-                  ),
-                })}
-              </span>
-            </div>
-          )}
-          <div className="card-field">
-            {item.mediaType === 'movie' ? (
-              <div className="pointer-events-none z-40 self-start rounded-full border border-blue-500 bg-blue-600 bg-opacity-80 shadow-md">
-                <div className="flex h-4 items-center px-2 py-2 text-center text-xs font-medium uppercase tracking-wider text-white sm:h-5">
-                  {intl.formatMessage(globalMessages.movie)}
-                </div>
-              </div>
-            ) : (
-              <div className="pointer-events-none z-40 self-start rounded-full border border-purple-600 bg-purple-600 bg-opacity-80 shadow-md">
-                <div className="flex h-4 items-center px-2 py-2 text-center text-xs font-medium uppercase tracking-wider text-white sm:h-5">
-                  {intl.formatMessage(globalMessages.tvshow)}
-                </div>
-              </div>
-            )}
-          </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">
-        {hasPermission(Permission.MANAGE_BLACKLIST) && (
-          <ConfirmButton
-            onClick={() =>
-              removeFromBlacklist(
-                item.tmdbId,
-                title && (isMovie(title) ? title.title : title.name)
-              )
-            }
-            confirmText={intl.formatMessage(
-              isUpdating ? globalMessages.deleting : globalMessages.areyousure
-            )}
-            className={`w-full ${
-              isUpdating ? 'pointer-events-none opacity-50' : ''
-            }`}
-          >
-            <TrashIcon />
-            <span>
-              {intl.formatMessage(globalMessages.removefromBlacklist)}
-            </span>
-          </ConfirmButton>
-        )}
-      </div>
-    </div>
-  );
-};

src/components/BlacklistBlock/index.tsx

@@ -1,129 +0,0 @@
-import Badge from '@app/components/Common/Badge';
-import Button from '@app/components/Common/Button';
-import Tooltip from '@app/components/Common/Tooltip';
-import { useUser } from '@app/hooks/useUser';
-import globalMessages from '@app/i18n/globalMessages';
-import defineMessages from '@app/utils/defineMessages';
-import { CalendarIcon, TrashIcon, UserIcon } from '@heroicons/react/24/solid';
-import type { Blacklist } from '@server/entity/Blacklist';
-import Link from 'next/link';
-import { useState } from 'react';
-import { useIntl } from 'react-intl';
-import { useToasts } from 'react-toast-notifications';
-
-const messages = defineMessages('component.BlacklistBlock', {
-  blacklistedby: 'Blacklisted By',
-  blacklistdate: 'Blacklisted date',
-});
-
-interface BlacklistBlockProps {
-  blacklistItem: Blacklist;
-  onUpdate?: () => void;
-  onDelete?: () => void;
-}
-
-const BlacklistBlock = ({
-  blacklistItem,
-  onUpdate,
-  onDelete,
-}: BlacklistBlockProps) => {
-  const { user } = useUser();
-  const intl = useIntl();
-  const [isUpdating, setIsUpdating] = useState(false);
-  const { addToast } = useToasts();
-
-  const removeFromBlacklist = async (tmdbId: number, title?: string) => {
-    setIsUpdating(true);
-
-    const res = await fetch('/api/v1/blacklist/' + tmdbId, {
-      method: 'DELETE',
-    });
-
-    if (res.status === 204) {
-      addToast(
-        <span>
-          {intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
-            title,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'success', autoDismiss: true }
-      );
-    } else {
-      addToast(intl.formatMessage(globalMessages.blacklistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-    }
-
-    onUpdate && onUpdate();
-    onDelete && onDelete();
-
-    setIsUpdating(false);
-  };
-
-  return (
-    <div className="px-4 py-3 text-gray-300">
-      <div className="flex items-center justify-between">
-        <div className="mr-6 min-w-0 flex-1 flex-col items-center text-sm leading-5">
-          <div className="white mb-1 flex flex-nowrap">
-            <Tooltip content={intl.formatMessage(messages.blacklistedby)}>
-              <UserIcon className="mr-1.5 h-5 w-5 min-w-0 flex-shrink-0" />
-            </Tooltip>
-            <span className="w-40 truncate md:w-auto">
-              <Link
-                href={
-                  blacklistItem.user.id === user?.id
-                    ? '/profile'
-                    : `/users/${blacklistItem.user.id}`
-                }
-              >
-                <span className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline">
-                  {blacklistItem.user.displayName}
-                </span>
-              </Link>
-            </span>
-          </div>
-        </div>
-        <div className="ml-2 flex flex-shrink-0 flex-wrap">
-          <Tooltip
-            content={intl.formatMessage(globalMessages.removefromBlacklist)}
-          >
-            <Button
-              buttonType="danger"
-              onClick={() =>
-                removeFromBlacklist(blacklistItem.tmdbId, blacklistItem.title)
-              }
-              disabled={isUpdating}
-            >
-              <TrashIcon className="icon-sm" />
-            </Button>
-          </Tooltip>
-        </div>
-      </div>
-      <div className="mt-2 sm:flex sm:justify-between">
-        <div className="sm:flex">
-          <div className="mr-6 flex items-center text-sm leading-5">
-            <Badge badgeType="danger">
-              {intl.formatMessage(globalMessages.blacklisted)}
-            </Badge>
-          </div>
-        </div>
-        <div className="mt-2 flex items-center text-sm leading-5 sm:mt-0">
-          <Tooltip content={intl.formatMessage(messages.blacklistdate)}>
-            <CalendarIcon className="mr-1.5 h-5 w-5 flex-shrink-0" />
-          </Tooltip>
-          <span>
-            {intl.formatDate(blacklistItem.createdAt, {
-              year: 'numeric',
-              month: 'long',
-              day: 'numeric',
-            })}
-          </span>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default BlacklistBlock;

src/components/BlacklistModal/index.tsx

@@ -1,79 +0,0 @@
-import Modal from '@app/components/Common/Modal';
-import globalMessages from '@app/i18n/globalMessages';
-import defineMessages from '@app/utils/defineMessages';
-import { Transition } from '@headlessui/react';
-import type { MovieDetails } from '@server/models/Movie';
-import type { TvDetails } from '@server/models/Tv';
-import { useIntl } from 'react-intl';
-import useSWR from 'swr';
-
-interface BlacklistModalProps {
-  tmdbId: number;
-  type: 'movie' | 'tv' | 'collection';
-  show: boolean;
-  onComplete?: () => void;
-  onCancel?: () => void;
-  isUpdating?: boolean;
-}
-
-const messages = defineMessages('component.BlacklistModal', {
-  blacklisting: 'Blacklisting',
-});
-
-const isMovie = (
-  movie: MovieDetails | TvDetails | undefined
-): movie is MovieDetails => {
-  if (!movie) return false;
-  return (movie as MovieDetails).title !== undefined;
-};
-
-const BlacklistModal = ({
-  tmdbId,
-  type,
-  show,
-  onComplete,
-  onCancel,
-  isUpdating,
-}: BlacklistModalProps) => {
-  const intl = useIntl();
-
-  const { data, error } = useSWR<TvDetails | MovieDetails>(
-    `/api/v1/${type}/${tmdbId}`
-  );
-
-  return (
-    <Transition
-      as="div"
-      enter="transition-opacity duration-300"
-      enterFrom="opacity-0"
-      enterTo="opacity-100"
-      leave="transition-opacity duration-300"
-      leaveFrom="opacity-100"
-      leaveTo="opacity-0"
-      show={show}
-    >
-      <Modal
-        loading={!data && !error}
-        backgroundClickable
-        title={`${intl.formatMessage(globalMessages.blacklist)} ${
-          isMovie(data)
-            ? intl.formatMessage(globalMessages.movie)
-            : intl.formatMessage(globalMessages.tvshow)
-        }`}
-        subTitle={`${isMovie(data) ? data.title : data?.name}`}
-        onCancel={onCancel}
-        onOk={onComplete}
-        okText={
-          isUpdating
-            ? intl.formatMessage(messages.blacklisting)
-            : intl.formatMessage(globalMessages.blacklist)
-        }
-        okButtonType="danger"
-        okDisabled={isUpdating}
-        backdrop={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data?.backdropPath}`}
-      />
-    </Transition>
-  );
-};
-
-export default BlacklistModal;

src/components/CollectionDetails/index.tsx

@@ -183,11 +183,6 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
     );
   }
 
-  const blacklistVisibility = hasPermission(
-    [Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST],
-    { type: 'or' }
-  );
-
   return (
     <div
       className="media-page"
@@ -340,26 +335,20 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
         sliderKey="collection-movies"
         isLoading={false}
         isEmpty={data.parts.length === 0}
-        items={data.parts
-          .filter((title) => {
-            if (!blacklistVisibility)
-              return title.mediaInfo?.status !== MediaStatus.BLACKLISTED;
-            return title;
-          })
-          .map((title) => (
-            <TitleCard
-              key={`collection-movie-${title.id}`}
-              id={title.id}
-              isAddedToWatchlist={title.mediaInfo?.watchlists?.length ?? 0}
-              image={title.posterPath}
-              status={title.mediaInfo?.status}
-              summary={title.overview}
-              title={title.title}
-              userScore={title.voteAverage}
-              year={title.releaseDate}
-              mediaType={title.mediaType}
-            />
-          ))}
+        items={data.parts.map((title) => (
+          <TitleCard
+            key={`collection-movie-${title.id}`}
+            id={title.id}
+            isAddedToWatchlist={title.mediaInfo?.watchlists?.length ?? 0}
+            image={title.posterPath}
+            status={title.mediaInfo?.status}
+            summary={title.overview}
+            title={title.title}
+            userScore={title.voteAverage}
+            year={title.releaseDate}
+            mediaType={title.mediaType}
+          />
+        ))}
       />
       <div className="extra-bottom-space relative" />
     </div>

src/components/Common/CachedImage/index.tsx

@@ -16,11 +16,8 @@ const CachedImage = ({ src, ...props }: ImageProps) => {
   if (typeof imageUrl === 'string' && imageUrl.startsWith('http')) {
     const parsedUrl = new URL(imageUrl);
 
-    if (parsedUrl.host === 'image.tmdb.org') {
-      if (currentSettings.cacheImages)
-        imageUrl = imageUrl.replace('https://image.tmdb.org', '/imageproxy');
-    } else if (parsedUrl.host !== 'gravatar.com') {
-      imageUrl = '/avatarproxy/' + imageUrl;
+    if (parsedUrl.host === 'image.tmdb.org' && currentSettings.cacheImages) {
+      imageUrl = imageUrl.replace('https://image.tmdb.org', '/imageproxy');
     }
   }
 

src/components/Common/ListView/index.tsx

@@ -1,10 +1,8 @@
 import PersonCard from '@app/components/PersonCard';
 import TitleCard from '@app/components/TitleCard';
 import TmdbTitleCard from '@app/components/TitleCard/TmdbTitleCard';
-import { Permission, useUser } from '@app/hooks/useUser';
 import useVerticalScroll from '@app/hooks/useVerticalScroll';
 import globalMessages from '@app/i18n/globalMessages';
-import { MediaStatus } from '@server/constants/media';
 import type { WatchlistItem } from '@server/interfaces/api/discoverInterfaces';
 import type {
   CollectionResult,
@@ -34,14 +32,7 @@ const ListView = ({
   mutateParent,
 }: ListViewProps) => {
   const intl = useIntl();
-  const { hasPermission } = useUser();
   useVerticalScroll(onScrollBottom, !isLoading && !isEmpty && !isReachingEnd);
-
-  const blacklistVisibility = hasPermission(
-    [Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST],
-    { type: 'or' }
-  );
-
   return (
     <>
       {isEmpty && (
@@ -64,89 +55,76 @@ const ListView = ({
             </li>
           );
         })}
-        {items
-          ?.filter((title) => {
-            if (!blacklistVisibility)
-              return (
-                (title as TvResult | MovieResult).mediaInfo?.status !==
-                MediaStatus.BLACKLISTED
+        {items?.map((title, index) => {
+          let titleCard: React.ReactNode;
+
+          switch (title.mediaType) {
+            case 'movie':
+              titleCard = (
+                <TitleCard
+                  key={title.id}
+                  id={title.id}
+                  isAddedToWatchlist={title.mediaInfo?.watchlists?.length ?? 0}
+                  image={title.posterPath}
+                  status={title.mediaInfo?.status}
+                  summary={title.overview}
+                  title={title.title}
+                  userScore={title.voteAverage}
+                  year={title.releaseDate}
+                  mediaType={title.mediaType}
+                  inProgress={
+                    (title.mediaInfo?.downloadStatus ?? []).length > 0
+                  }
+                  canExpand
+                />
               );
-            return title;
-          })
-          .map((title, index) => {
-            let titleCard: React.ReactNode;
+              break;
+            case 'tv':
+              titleCard = (
+                <TitleCard
+                  key={title.id}
+                  id={title.id}
+                  isAddedToWatchlist={title.mediaInfo?.watchlists?.length ?? 0}
+                  image={title.posterPath}
+                  status={title.mediaInfo?.status}
+                  summary={title.overview}
+                  title={title.name}
+                  userScore={title.voteAverage}
+                  year={title.firstAirDate}
+                  mediaType={title.mediaType}
+                  inProgress={
+                    (title.mediaInfo?.downloadStatus ?? []).length > 0
+                  }
+                  canExpand
+                />
+              );
+              break;
+            case 'collection':
+              titleCard = (
+                <TitleCard
+                  id={title.id}
+                  image={title.posterPath}
+                  summary={title.overview}
+                  title={title.title}
+                  mediaType={title.mediaType}
+                  canExpand
+                />
+              );
+              break;
+            case 'person':
+              titleCard = (
+                <PersonCard
+                  personId={title.id}
+                  name={title.name}
+                  profilePath={title.profilePath}
+                  canExpand
+                />
+              );
+              break;
+          }
 
-            switch (title.mediaType) {
-              case 'movie':
-                titleCard = (
-                  <TitleCard
-                    key={title.id}
-                    id={title.id}
-                    isAddedToWatchlist={
-                      title.mediaInfo?.watchlists?.length ?? 0
-                    }
-                    image={title.posterPath}
-                    status={title.mediaInfo?.status}
-                    summary={title.overview}
-                    title={title.title}
-                    userScore={title.voteAverage}
-                    year={title.releaseDate}
-                    mediaType={title.mediaType}
-                    inProgress={
-                      (title.mediaInfo?.downloadStatus ?? []).length > 0
-                    }
-                    canExpand
-                  />
-                );
-                break;
-              case 'tv':
-                titleCard = (
-                  <TitleCard
-                    key={title.id}
-                    id={title.id}
-                    isAddedToWatchlist={
-                      title.mediaInfo?.watchlists?.length ?? 0
-                    }
-                    image={title.posterPath}
-                    status={title.mediaInfo?.status}
-                    summary={title.overview}
-                    title={title.name}
-                    userScore={title.voteAverage}
-                    year={title.firstAirDate}
-                    mediaType={title.mediaType}
-                    inProgress={
-                      (title.mediaInfo?.downloadStatus ?? []).length > 0
-                    }
-                    canExpand
-                  />
-                );
-                break;
-              case 'collection':
-                titleCard = (
-                  <TitleCard
-                    id={title.id}
-                    image={title.posterPath}
-                    summary={title.overview}
-                    title={title.title}
-                    mediaType={title.mediaType}
-                    canExpand
-                  />
-                );
-                break;
-              case 'person':
-                titleCard = (
-                  <PersonCard
-                    personId={title.id}
-                    name={title.name}
-                    profilePath={title.profilePath}
-                    canExpand
-                  />
-                );
-                break;
-            }
-
-            return <li key={`${title.id}-${index}`}>{titleCard}</li>;
-          })}
+          return <li key={`${title.id}-${index}`}>{titleCard}</li>;
+        })}
         {isLoading &&
           !isReachingEnd &&
           [...Array(20)].map((_item, i) => (

src/components/Common/StatusBadgeMini/index.tsx

@@ -1,11 +1,6 @@
 import Spinner from '@app/assets/spinner.svg';
 import { CheckCircleIcon } from '@heroicons/react/20/solid';
-import {
-  BellIcon,
-  ClockIcon,
-  EyeSlashIcon,
-  MinusSmallIcon,
-} from '@heroicons/react/24/solid';
+import { BellIcon, ClockIcon, MinusSmallIcon } from '@heroicons/react/24/solid';
 import { MediaStatus } from '@server/constants/media';
 
 interface StatusBadgeMiniProps {
@@ -49,10 +44,6 @@ const StatusBadgeMini = ({
       );
       indicatorIcon = <BellIcon />;
       break;
-    case MediaStatus.BLACKLISTED:
-      badgeStyle.push('bg-red-500 border-white-400 ring-white-400 text-white');
-      indicatorIcon = <EyeSlashIcon />;
-      break;
     case MediaStatus.PARTIALLY_AVAILABLE:
       badgeStyle.push(
         'bg-green-500 border-green-400 ring-green-400 text-green-100'

src/components/Discover/FilterSlideover/index.tsx

@@ -8,7 +8,6 @@ import {
   CompanySelector,
   GenreSelector,
   KeywordSelector,
-  StatusSelector,
   WatchProviderSelector,
 } from '@app/components/Selector';
 import useSettings from '@app/hooks/useSettings';
@@ -41,7 +40,6 @@ const messages = defineMessages('components.Discover.FilterSlideover', {
   runtime: 'Runtime',
   streamingservices: 'Streaming Services',
   voteCount: 'Number of votes between {minValue} and {maxValue}',
-  status: 'Status',
 });
 
 type FilterSlideoverProps = {
@@ -152,23 +150,6 @@ const FilterSlideover = ({
             updateQueryParams('genre', value?.map((v) => v.value).join(','));
           }}
         />
-        {type === 'tv' && (
-          <>
-            <span className="text-lg font-semibold">
-              {intl.formatMessage(messages.status)}
-            </span>
-            <StatusSelector
-              defaultValue={currentFilters.status}
-              isMulti
-              onChange={(value) => {
-                updateQueryParams(
-                  'status',
-                  value?.map((v) => v.value).join('|')
-                );
-              }}
-            />
-          </>
-        )}
         <span className="text-lg font-semibold">
           {intl.formatMessage(messages.keywords)}
         </span>

src/components/Discover/constants.ts

@@ -108,7 +108,6 @@ export const QueryFilterOptions = z.object({
   voteCountGte: z.string().optional(),
   watchRegion: z.string().optional(),
   watchProviders: z.string().optional(),
-  status: z.string().optional(),
 });
 
 export type FilterOptions = z.infer<typeof QueryFilterOptions>;
@@ -148,10 +147,6 @@ export const prepareFilterValues = (
     filterValues.genre = values.genre;
   }
 
-  if (values.status) {
-    filterValues.status = values.status;
-  }
-
   if (values.keywords) {
     filterValues.keywords = values.keywords;
   }

src/components/IssueDetails/IssueComment/index.tsx

@@ -1,5 +1,4 @@
 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 defineMessages from '@app/utils/defineMessages';
@@ -7,6 +6,7 @@ import { Menu, Transition } from '@headlessui/react';
 import { EllipsisVerticalIcon } from '@heroicons/react/24/solid';
 import type { default as IssueCommentType } from '@server/entity/IssueComment';
 import { Field, Form, Formik } from 'formik';
+import Image from 'next/image';
 import Link from 'next/link';
 import { Fragment, useState } from 'react';
 import { FormattedRelativeTime, useIntl } from 'react-intl';
@@ -88,8 +88,8 @@ const IssueComment = ({
         </Modal>
       </Transition>
       <Link href={isActiveUser ? '/profile' : `/users/${comment.user.id}`}>
-        <CachedImage
-          src={`${comment.user.avatar}`}
+        <Image
+          src={comment.user.avatar}
           alt=""
           className="h-10 w-10 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
           width={40}

src/components/IssueDetails/index.tsx

@@ -28,6 +28,7 @@ import type Issue from '@server/entity/Issue';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
 import { Field, Form, Formik } from 'formik';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
@@ -286,10 +287,10 @@ const IssueDetails = () => {
                   }
                   className="group ml-1 inline-flex h-full items-center xl:ml-1.5"
                 >
-                  <CachedImage
-                    src={`${issueData.createdBy.avatar}`}
-                    alt=""
+                  <Image
                     className="mr-0.5 h-5 w-5 scale-100 transform-gpu rounded-full object-cover transition duration-300 group-hover:scale-105 xl:mr-1 xl:h-6 xl:w-6"
+                    src={issueData.createdBy.avatar}
+                    alt=""
                     width={20}
                     height={20}
                   />

src/components/IssueList/IssueItem/index.tsx

@@ -11,6 +11,7 @@ import { MediaType } from '@server/constants/media';
 import type Issue from '@server/entity/Issue';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useInView } from 'react-intersection-observer';
 import { FormattedRelativeTime, useIntl } from 'react-intl';
@@ -225,8 +226,8 @@ const IssueItem = ({ issue }: IssueItemProps) => {
                         href={`/users/${issue.createdBy.id}`}
                         className="group flex items-center truncate"
                       >
-                        <CachedImage
-                          src={'/avatarproxy/' + issue.createdBy.avatar}
+                        <Image
+                          src={issue.createdBy.avatar}
                           alt=""
                           className="avatar-sm ml-1.5 object-cover"
                           width={20}

src/components/Layout/Sidebar/index.tsx

@@ -8,7 +8,6 @@ import {
   ClockIcon,
   CogIcon,
   ExclamationTriangleIcon,
-  EyeSlashIcon,
   FilmIcon,
   SparklesIcon,
   TvIcon,
@@ -26,7 +25,6 @@ export const menuMessages = defineMessages('components.Layout.Sidebar', {
   browsemovies: 'Movies',
   browsetv: 'Series',
   requests: 'Requests',
-  blacklist: 'Blacklist',
   issues: 'Issues',
   users: 'Users',
   settings: 'Settings',
@@ -73,17 +71,6 @@ const SidebarLinks: SidebarLinkProps[] = [
     svgIcon: <ClockIcon className="mr-3 h-6 w-6" />,
     activeRegExp: /^\/requests/,
   },
-  {
-    href: '/blacklist',
-    messagesKey: 'blacklist',
-    svgIcon: <EyeSlashIcon className="mr-3 h-6 w-6" />,
-    activeRegExp: /^\/blacklist/,
-    requiredPermission: [
-      Permission.MANAGE_BLACKLIST,
-      Permission.VIEW_BLACKLIST,
-    ],
-    permissionType: 'or',
-  },
   {
     href: '/issues',
     messagesKey: 'issues',

src/components/Layout/UserDropdown/index.tsx

@@ -1,4 +1,3 @@
-import CachedImage from '@app/components/Common/CachedImage';
 import MiniQuotaDisplay from '@app/components/Layout/UserDropdown/MiniQuotaDisplay';
 import { useUser } from '@app/hooks/useUser';
 import defineMessages from '@app/utils/defineMessages';
@@ -8,6 +7,7 @@ import {
   ClockIcon,
 } from '@heroicons/react/24/outline';
 import { CogIcon, UserIcon } from '@heroicons/react/24/solid';
+import Image from 'next/image';
 import type { LinkProps } from 'next/link';
 import Link from 'next/link';
 import { forwardRef, Fragment } from 'react';
@@ -56,9 +56,9 @@ const UserDropdown = () => {
           className="flex max-w-xs items-center rounded-full text-sm ring-1 ring-gray-700 hover:ring-gray-500 focus:outline-none focus:ring-gray-500"
           data-testid="user-menu"
         >
-          <CachedImage
+          <Image
             className="h-8 w-8 rounded-full object-cover sm:h-10 sm:w-10"
-            src={user ? user.avatar : ''}
+            src={user?.avatar || ''}
             alt=""
             width={40}
             height={40}
@@ -79,9 +79,9 @@ const UserDropdown = () => {
           <div className="divide-y divide-gray-700 rounded-md bg-gray-800 bg-opacity-80 ring-1 ring-gray-700 backdrop-blur">
             <div className="flex flex-col space-y-4 px-4 py-4">
               <div className="flex items-center space-x-2">
-                <CachedImage
+                <Image
                   className="h-8 w-8 rounded-full object-cover sm:h-10 sm:w-10"
-                  src={user ? user.avatar : ''}
+                  src={user?.avatar || ''}
                   alt=""
                   width={40}
                   height={40}

src/components/ManageSlideOver/index.tsx

@@ -1,6 +1,4 @@
-import BlacklistBlock from '@app/components/BlacklistBlock';
 import Button from '@app/components/Common/Button';
-import CachedImage from '@app/components/Common/CachedImage';
 import ConfirmButton from '@app/components/Common/ConfirmButton';
 import SlideOver from '@app/components/Common/SlideOver';
 import Tooltip from '@app/components/Common/Tooltip';
@@ -28,6 +26,7 @@ import type { MediaWatchDataResponse } from '@server/interfaces/api/mediaInterfa
 import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useIntl } from 'react-intl';
 import useSWR from 'swr';
@@ -285,20 +284,6 @@ const ManageSlideOver = ({
             </div>
           </div>
         )}
-        {data.mediaInfo?.status === MediaStatus.BLACKLISTED && (
-          <div>
-            <h3 className="mb-2 text-xl font-bold">
-              {intl.formatMessage(globalMessages.blacklist)}
-            </h3>
-            <div className="overflow-hidden rounded-md border border-gray-700 shadow">
-              <BlacklistBlock
-                blacklistItem={data.mediaInfo.blacklist}
-                onUpdate={() => revalidate()}
-                onDelete={() => onClose()}
-              />
-            </div>
-          </div>
-        )}
         {hasPermission(Permission.ADMIN) &&
           (data.mediaInfo?.serviceUrl ||
             data.mediaInfo?.tautulliUrl ||
@@ -368,7 +353,7 @@ const ManageSlideOver = ({
                                     key={`watch-user-${user.id}`}
                                     content={user.displayName}
                                   >
-                                    <CachedImage
+                                    <Image
                                       src={user.avatar}
                                       alt={user.displayName}
                                       className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
@@ -529,7 +514,7 @@ const ManageSlideOver = ({
                                     key={`watch-user-${user.id}`}
                                     content={user.displayName}
                                   >
-                                    <CachedImage
+                                    <Image
                                       src={user.avatar}
                                       alt={user.displayName}
                                       className="h-8 w-8 scale-100 transform-gpu rounded-full object-cover ring-1 ring-gray-500 transition duration-300 hover:scale-105"
@@ -618,17 +603,32 @@ const ManageSlideOver = ({
               </div>
             </div>
           )}
-        {hasPermission(Permission.ADMIN) &&
-          data?.mediaInfo &&
-          data.mediaInfo.status !== MediaStatus.BLACKLISTED && (
-            <div>
-              <h3 className="mb-2 text-xl font-bold">
-                {intl.formatMessage(messages.manageModalAdvanced)}
-              </h3>
-              <div className="space-y-2">
-                {data?.mediaInfo.status !== MediaStatus.AVAILABLE && (
+        {hasPermission(Permission.ADMIN) && data?.mediaInfo && (
+          <div>
+            <h3 className="mb-2 text-xl font-bold">
+              {intl.formatMessage(messages.manageModalAdvanced)}
+            </h3>
+            <div className="space-y-2">
+              {data?.mediaInfo.status !== MediaStatus.AVAILABLE && (
+                <Button
+                  onClick={() => markAvailable()}
+                  className="w-full"
+                  buttonType="success"
+                >
+                  <CheckCircleIcon />
+                  <span>
+                    {intl.formatMessage(
+                      mediaType === 'movie'
+                        ? messages.markavailable
+                        : messages.markallseasonsavailable
+                    )}
+                  </span>
+                </Button>
+              )}
+              {data?.mediaInfo.status4k !== MediaStatus.AVAILABLE &&
+                settings.currentSettings.series4kEnabled && (
                   <Button
-                    onClick={() => markAvailable()}
+                    onClick={() => markAvailable(true)}
                     className="w-full"
                     buttonType="success"
                   >
@@ -636,59 +636,42 @@ const ManageSlideOver = ({
                     <span>
                       {intl.formatMessage(
                         mediaType === 'movie'
-                          ? messages.markavailable
-                          : messages.markallseasonsavailable
+                          ? messages.mark4kavailable
+                          : messages.markallseasons4kavailable
                       )}
                     </span>
                   </Button>
                 )}
-                {data?.mediaInfo.status4k !== MediaStatus.AVAILABLE &&
-                  settings.currentSettings.series4kEnabled && (
-                    <Button
-                      onClick={() => markAvailable(true)}
-                      className="w-full"
-                      buttonType="success"
-                    >
-                      <CheckCircleIcon />
-                      <span>
-                        {intl.formatMessage(
-                          mediaType === 'movie'
-                            ? messages.mark4kavailable
-                            : messages.markallseasons4kavailable
-                        )}
-                      </span>
-                    </Button>
-                  )}
-                <div>
-                  <ConfirmButton
-                    onClick={() => deleteMedia()}
-                    confirmText={intl.formatMessage(globalMessages.areyousure)}
-                    className="w-full"
-                  >
-                    <DocumentMinusIcon />
-                    <span>
-                      {intl.formatMessage(messages.manageModalClearMedia)}
-                    </span>
-                  </ConfirmButton>
-                  <div className="mt-2 text-xs text-gray-400">
-                    {intl.formatMessage(messages.manageModalClearMediaWarning, {
-                      mediaType: intl.formatMessage(
-                        mediaType === 'movie' ? messages.movie : messages.tvshow
-                      ),
-                      mediaServerName:
-                        settings.currentSettings.mediaServerType ===
-                        MediaServerType.EMBY
-                          ? 'Emby'
-                          : settings.currentSettings.mediaServerType ===
-                            MediaServerType.PLEX
-                          ? 'Plex'
-                          : 'Jellyfin',
-                    })}
-                  </div>
+              <div>
+                <ConfirmButton
+                  onClick={() => deleteMedia()}
+                  confirmText={intl.formatMessage(globalMessages.areyousure)}
+                  className="w-full"
+                >
+                  <DocumentMinusIcon />
+                  <span>
+                    {intl.formatMessage(messages.manageModalClearMedia)}
+                  </span>
+                </ConfirmButton>
+                <div className="mt-2 text-xs text-gray-400">
+                  {intl.formatMessage(messages.manageModalClearMediaWarning, {
+                    mediaType: intl.formatMessage(
+                      mediaType === 'movie' ? messages.movie : messages.tvshow
+                    ),
+                    mediaServerName:
+                      settings.currentSettings.mediaServerType ===
+                      MediaServerType.EMBY
+                        ? 'Emby'
+                        : settings.currentSettings.mediaServerType ===
+                          MediaServerType.PLEX
+                        ? 'Plex'
+                        : 'Jellyfin',
+                  })}
                 </div>
               </div>
             </div>
-          )}
+          </div>
+        )}
       </div>
     </SlideOver>
   );

src/components/MediaSlider/index.tsx

@@ -3,10 +3,8 @@ import PersonCard from '@app/components/PersonCard';
 import Slider from '@app/components/Slider';
 import TitleCard from '@app/components/TitleCard';
 import useSettings from '@app/hooks/useSettings';
-import { useUser } from '@app/hooks/useUser';
 import { ArrowRightCircleIcon } from '@heroicons/react/24/outline';
 import { MediaStatus } from '@server/constants/media';
-import { Permission } from '@server/lib/permissions';
 import type {
   MovieResult,
   PersonResult,
@@ -43,7 +41,6 @@ const MediaSlider = ({
   onNewTitles,
 }: MediaSliderProps) => {
   const settings = useSettings();
-  const { hasPermission } = useUser();
   const { data, error, setSize, size } = useSWRInfinite<MixedResult>(
     (pageIndex: number, previousPageData: MixedResult | null) => {
       if (previousPageData && pageIndex + 1 > previousPageData.totalPages) {
@@ -93,65 +90,50 @@ const MediaSlider = ({
     return null;
   }
 
-  const blacklistVisibility = hasPermission(
-    [Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST],
-    { type: 'or' }
-  );
-
-  const finalTitles = titles
-    .slice(0, 20)
-    .filter((title) => {
-      if (!blacklistVisibility)
+  const finalTitles = titles.slice(0, 20).map((title) => {
+    switch (title.mediaType) {
+      case 'movie':
         return (
-          (title as TvResult | MovieResult).mediaInfo?.status !==
-          MediaStatus.BLACKLISTED
+          <TitleCard
+            key={title.id}
+            id={title.id}
+            isAddedToWatchlist={title.mediaInfo?.watchlists?.length ?? 0}
+            image={title.posterPath}
+            status={title.mediaInfo?.status}
+            summary={title.overview}
+            title={title.title}
+            userScore={title.voteAverage}
+            year={title.releaseDate}
+            mediaType={title.mediaType}
+            inProgress={(title.mediaInfo?.downloadStatus ?? []).length > 0}
+          />
         );
-      return title;
-    })
-    .map((title) => {
-      switch (title.mediaType) {
-        case 'movie':
-          return (
-            <TitleCard
-              key={title.id}
-              id={title.id}
-              isAddedToWatchlist={title.mediaInfo?.watchlists?.length ?? 0}
-              image={title.posterPath}
-              status={title.mediaInfo?.status}
-              summary={title.overview}
-              title={title.title}
-              userScore={title.voteAverage}
-              year={title.releaseDate}
-              mediaType={title.mediaType}
-              inProgress={(title.mediaInfo?.downloadStatus ?? []).length > 0}
-            />
-          );
-        case 'tv':
-          return (
-            <TitleCard
-              key={title.id}
-              id={title.id}
-              isAddedToWatchlist={title.mediaInfo?.watchlists?.length ?? 0}
-              image={title.posterPath}
-              status={title.mediaInfo?.status}
-              summary={title.overview}
-              title={title.name}
-              userScore={title.voteAverage}
-              year={title.firstAirDate}
-              mediaType={title.mediaType}
-              inProgress={(title.mediaInfo?.downloadStatus ?? []).length > 0}
-            />
-          );
-        case 'person':
-          return (
-            <PersonCard
-              personId={title.id}
-              name={title.name}
-              profilePath={title.profilePath}
-            />
-          );
-      }
-    });
+      case 'tv':
+        return (
+          <TitleCard
+            key={title.id}
+            id={title.id}
+            isAddedToWatchlist={title.mediaInfo?.watchlists?.length ?? 0}
+            image={title.posterPath}
+            status={title.mediaInfo?.status}
+            summary={title.overview}
+            title={title.name}
+            userScore={title.voteAverage}
+            year={title.firstAirDate}
+            mediaType={title.mediaType}
+            inProgress={(title.mediaInfo?.downloadStatus ?? []).length > 0}
+          />
+        );
+      case 'person':
+        return (
+          <PersonCard
+            personId={title.id}
+            name={title.name}
+            profilePath={title.profilePath}
+          />
+        );
+    }
+  });
 
   if (linkUrl && titles.length > 20) {
     finalTitles.push(

src/components/MovieDetails/index.tsx

@@ -3,9 +3,7 @@ import RTAudRotten from '@app/assets/rt_aud_rotten.svg';
 import RTFresh from '@app/assets/rt_fresh.svg';
 import RTRotten from '@app/assets/rt_rotten.svg';
 import ImdbLogo from '@app/assets/services/imdb.svg';
-import Spinner from '@app/assets/spinner.svg';
 import TmdbLogo from '@app/assets/tmdb_logo.svg';
-import BlacklistModal from '@app/components/BlacklistModal';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
 import LoadingSpinner from '@app/components/Common/LoadingSpinner';
@@ -27,7 +25,7 @@ import useLocale from '@app/hooks/useLocale';
 import useSettings from '@app/hooks/useSettings';
 import { Permission, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
-import ErrorPage from '@app/pages/_error';
+import Error from '@app/pages/_error';
 import { sortCrewPriority } from '@app/utils/creditHelpers';
 import defineMessages from '@app/utils/defineMessages';
 import { refreshIntervalHelper } from '@app/utils/refreshIntervalHelper';
@@ -36,7 +34,6 @@ import {
   CloudIcon,
   CogIcon,
   ExclamationTriangleIcon,
-  EyeSlashIcon,
   FilmIcon,
   PlayIcon,
   TicketIcon,
@@ -44,12 +41,10 @@ import {
 import {
   ChevronDoubleDownIcon,
   ChevronDoubleUpIcon,
-  MinusCircleIcon,
-  StarIcon,
 } from '@heroicons/react/24/solid';
 import { type RatingResponse } from '@server/api/ratings';
 import { IssueStatus } from '@server/constants/issue';
-import { MediaStatus, MediaType } from '@server/constants/media';
+import { MediaStatus } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import type { MovieDetails as MovieDetailsType } from '@server/models/Movie';
 import { countries } from 'country-flag-icons';
@@ -57,9 +52,8 @@ import 'country-flag-icons/3x2/flags.css';
 import { uniqBy } from 'lodash';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 
 const messages = defineMessages('components.MovieDetails', {
@@ -99,12 +93,6 @@ const messages = defineMessages('components.MovieDetails', {
   rtaudiencescore: 'Rotten Tomatoes Audience Score',
   tmdbuserscore: 'TMDB User Score',
   imdbuserscore: 'IMDB User Score',
-  watchlistSuccess: '<strong>{title}</strong> added to watchlist successfully!',
-  watchlistDeleted:
-    '<strong>{title}</strong> Removed from watchlist successfully!',
-  watchlistError: 'Something went wrong try again.',
-  removefromwatchlist: 'Remove From Watchlist',
-  addtowatchlist: 'Add To Watchlist',
 });
 
 interface MovieDetailsProps {
@@ -123,14 +111,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
   const minStudios = 3;
   const [showMoreStudios, setShowMoreStudios] = useState(false);
   const [showIssueModal, setShowIssueModal] = useState(false);
-  const [isUpdating, setIsUpdating] = useState<boolean>(false);
-  const [toggleWatchlist, setToggleWatchlist] = useState<boolean>(
-    !movie?.onUserWatchlist
-  );
-  const [isBlacklistUpdating, setIsBlacklistUpdating] =
-    useState<boolean>(false);
-  const [showBlacklistModal, setShowBlacklistModal] = useState(false);
-  const { addToast } = useToasts();
 
   const {
     data,
@@ -160,11 +140,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
     setShowManager(router.query.manage == '1' ? true : false);
   }, [router.query.manage]);
 
-  const closeBlacklistModal = useCallback(
-    () => setShowBlacklistModal(false),
-    []
-  );
-
   const { mediaUrl: plexUrl, mediaUrl4k: plexUrl4k } = useDeepLinks({
     mediaUrl: data?.mediaInfo?.mediaUrl,
     mediaUrl4k: data?.mediaInfo?.mediaUrl4k,
@@ -177,7 +152,7 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
   }
 
   if (!data) {
-    return <ErrorPage statusCode={404} />;
+    return <Error statusCode={404} />;
   }
 
   const showAllStudios = data.productionCompanies.length <= minStudios + 1;
@@ -310,134 +285,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
     return intl.formatMessage(messages.play4k, { mediaServerName: 'Jellyfin' });
   }
 
-  const onClickWatchlistBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-
-    const res = await fetch('/api/v1/watchlist', {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        tmdbId: movie?.id,
-        mediaType: MediaType.MOVIE,
-        title: movie?.title,
-      }),
-    });
-
-    if (!res.ok) {
-      addToast(intl.formatMessage(messages.watchlistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-
-      setIsUpdating(false);
-      return;
-    }
-
-    const data = await res.json();
-
-    if (data) {
-      addToast(
-        <span>
-          {intl.formatMessage(messages.watchlistSuccess, {
-            title: movie?.title,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'success', autoDismiss: true }
-      );
-    }
-
-    setIsUpdating(false);
-    setToggleWatchlist((prevState) => !prevState);
-  };
-
-  const onClickDeleteWatchlistBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-    try {
-      const res = await fetch(`/api/v1/watchlist/${movie?.id}`, {
-        method: 'DELETE',
-      });
-      if (!res.ok) throw new Error();
-
-      if (res.status === 204) {
-        addToast(
-          <span>
-            {intl.formatMessage(messages.watchlistDeleted, {
-              title: movie?.title,
-              strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-            })}
-          </span>,
-          { appearance: 'info', autoDismiss: true }
-        );
-      }
-    } catch (e) {
-      addToast(intl.formatMessage(messages.watchlistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-    } finally {
-      setIsUpdating(false);
-      setToggleWatchlist((prevState) => !prevState);
-    }
-  };
-
-  const onClickHideItemBtn = async (): Promise<void> => {
-    setIsBlacklistUpdating(true);
-
-    const res = await fetch('/api/v1/blacklist', {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        tmdbId: movie?.id,
-        mediaType: 'movie',
-        title: movie?.title,
-        user: user?.id,
-      }),
-    });
-
-    if (res.status === 201) {
-      addToast(
-        <span>
-          {intl.formatMessage(globalMessages.blacklistSuccess, {
-            title: movie?.title,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'success', autoDismiss: true }
-      );
-
-      revalidate();
-    } else if (res.status === 412) {
-      addToast(
-        <span>
-          {intl.formatMessage(globalMessages.blacklistDuplicateError, {
-            title: movie?.title,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'info', autoDismiss: true }
-      );
-    } else {
-      addToast(intl.formatMessage(globalMessages.blacklistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-    }
-
-    setIsBlacklistUpdating(false);
-    closeBlacklistModal();
-  };
-
-  const showHideButton = hasPermission([Permission.MANAGE_BLACKLIST], {
-    type: 'or',
-  });
-
   return (
     <div
       className="media-page"
@@ -483,14 +330,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
         revalidate={() => revalidate()}
         show={showManager}
       />
-      <BlacklistModal
-        tmdbId={data.id}
-        type="movie"
-        show={showBlacklistModal}
-        onCancel={closeBlacklistModal}
-        onComplete={onClickHideItemBtn}
-        isUpdating={isBlacklistUpdating}
-      />
       <div className="media-header">
         <div className="media-poster">
           <CachedImage
@@ -567,61 +406,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
           </span>
         </div>
         <div className="media-actions">
-          {showHideButton &&
-            data?.mediaInfo?.status !== MediaStatus.PROCESSING &&
-            data?.mediaInfo?.status !== MediaStatus.AVAILABLE &&
-            data?.mediaInfo?.status !== MediaStatus.PARTIALLY_AVAILABLE &&
-            data?.mediaInfo?.status !== MediaStatus.PENDING &&
-            data?.mediaInfo?.status !== MediaStatus.BLACKLISTED && (
-              <Tooltip
-                content={intl.formatMessage(globalMessages.addToBlacklist)}
-              >
-                <Button
-                  buttonType={'ghost'}
-                  className="z-40 mr-2"
-                  buttonSize={'md'}
-                  onClick={() => setShowBlacklistModal(true)}
-                >
-                  <EyeSlashIcon className={'h-3'} />
-                </Button>
-              </Tooltip>
-            )}
-          {data?.mediaInfo?.status !== MediaStatus.BLACKLISTED && (
-            <>
-              {toggleWatchlist ? (
-                <Tooltip content={intl.formatMessage(messages.addtowatchlist)}>
-                  <Button
-                    buttonType={'ghost'}
-                    className="z-40 mr-2"
-                    buttonSize={'md'}
-                    onClick={onClickWatchlistBtn}
-                  >
-                    {isUpdating ? (
-                      <Spinner className="h-3" />
-                    ) : (
-                      <StarIcon className={'h-3 text-amber-300'} />
-                    )}
-                  </Button>
-                </Tooltip>
-              ) : (
-                <Tooltip
-                  content={intl.formatMessage(messages.removefromwatchlist)}
-                >
-                  <Button
-                    className="z-40 mr-2"
-                    buttonSize={'md'}
-                    onClick={onClickDeleteWatchlistBtn}
-                  >
-                    {isUpdating ? (
-                      <Spinner className="h-3" />
-                    ) : (
-                      <MinusCircleIcon className={'h-3'} />
-                    )}
-                  </Button>
-                </Tooltip>
-              )}
-            </>
-          )}
           <PlayButton links={mediaLinks} />
           <RequestButton
             mediaType="movie"

src/components/PermissionEdit/index.tsx

@@ -78,13 +78,6 @@ export const messages = defineMessages('components.PermissionEdit', {
   viewwatchlists: 'View {mediaServerName} Watchlists',
   viewwatchlistsDescription:
     "Grant permission to view other users' {mediaServerName} Watchlists.",
-  manageblacklist: 'Manage Blacklist',
-  manageblacklistDescription: 'Grant permission to manage blacklisted media.',
-  blacklistedItems: 'Blacklist media.',
-  blacklistedItemsDescription: 'Grant permission to blacklist media.',
-  viewblacklistedItems: 'View blacklisted media.',
-  viewblacklistedItemsDescription:
-    'Grant permission to view blacklisted media.',
 });
 
 interface PermissionEditProps {
@@ -339,22 +332,6 @@ export const PermissionEdit = ({
         },
       ],
     },
-    {
-      id: 'manageblacklist',
-      name: intl.formatMessage(messages.manageblacklist),
-      description: intl.formatMessage(messages.manageblacklistDescription),
-      permission: Permission.MANAGE_BLACKLIST,
-      children: [
-        {
-          id: 'viewblacklisteditems',
-          name: intl.formatMessage(messages.viewblacklistedItems),
-          description: intl.formatMessage(
-            messages.viewblacklistedItemsDescription
-          ),
-          permission: Permission.VIEW_BLACKLIST,
-        },
-      ],
-    },
   ];
 
   return (

src/components/RequestButton/index.tsx

@@ -300,7 +300,6 @@ const RequestButton = ({
     }) &&
     media &&
     media.status !== MediaStatus.AVAILABLE &&
-    media.status !== MediaStatus.BLACKLISTED &&
     !isShowComplete
   ) {
     buttons.push({
@@ -346,7 +345,6 @@ const RequestButton = ({
     }) &&
     media &&
     media.status4k !== MediaStatus.AVAILABLE &&
-    media.status !== MediaStatus.BLACKLISTED &&
     !is4kShowComplete &&
     settings.currentSettings.series4kEnabled
   ) {

src/components/RequestCard/index.tsx

@@ -19,9 +19,9 @@ import {
 } from '@heroicons/react/24/solid';
 import { MediaRequestStatus } 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';
 import type { TvDetails } from '@server/models/Tv';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useEffect, useState } from 'react';
 import { useInView } from 'react-intersection-observer';
@@ -58,7 +58,7 @@ const RequestCardPlaceholder = () => {
 };
 
 interface RequestCardErrorProps {
-  requestData?: NonFunctionProperties<MediaRequest>;
+  requestData?: MediaRequest;
 }
 
 const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
@@ -115,7 +115,7 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
                       className="group flex items-center"
                     >
                       <span className="avatar-sm">
-                        <CachedImage
+                        <Image
                           src={requestData.requestedBy.avatar}
                           alt=""
                           className="avatar-sm object-cover"
@@ -213,7 +213,7 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
 };
 
 interface RequestCardProps {
-  request: NonFunctionProperties<MediaRequest>;
+  request: MediaRequest;
   onTitleData?: (requestId: number, title: MovieDetails | TvDetails) => void;
 }
 
@@ -238,19 +238,16 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
     data: requestData,
     error: requestError,
     mutate: revalidate,
-  } = useSWR<NonFunctionProperties<MediaRequest>>(
-    `/api/v1/request/${request.id}`,
-    {
-      fallbackData: request,
-      refreshInterval: refreshIntervalHelper(
-        {
-          downloadStatus: request.media.downloadStatus,
-          downloadStatus4k: request.media.downloadStatus4k,
-        },
-        15000
-      ),
-    }
-  );
+  } = useSWR<MediaRequest>(`/api/v1/request/${request.id}`, {
+    fallbackData: request,
+    refreshInterval: refreshIntervalHelper(
+      {
+        downloadStatus: request.media.downloadStatus,
+        downloadStatus4k: request.media.downloadStatus4k,
+      },
+      15000
+    ),
+  });
 
   const { mediaUrl: plexUrl, mediaUrl4k: plexUrl4k } = useDeepLinks({
     mediaUrl: requestData?.media?.mediaUrl,
@@ -389,7 +386,7 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
                 className="group flex items-center"
               >
                 <span className="avatar-sm">
-                  <CachedImage
+                  <Image
                     src={requestData.requestedBy.avatar}
                     alt=""
                     className="avatar-sm object-cover"

src/components/RequestList/RequestItem/index.tsx

@@ -18,9 +18,9 @@ import {
 } from '@heroicons/react/24/solid';
 import { MediaRequestStatus } 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';
 import type { TvDetails } from '@server/models/Tv';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useInView } from 'react-intersection-observer';
@@ -42,7 +42,6 @@ const messages = defineMessages('components.RequestList.RequestItem', {
   tmdbid: 'TMDB ID',
   tvdbid: 'TheTVDB ID',
   unknowntitle: 'Unknown Title',
-  profileName: 'Profile',
 });
 
 const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
@@ -50,7 +49,7 @@ const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
 };
 
 interface RequestItemErrorProps {
-  requestData?: NonFunctionProperties<MediaRequest>;
+  requestData?: MediaRequest;
   revalidateList: () => void;
 }
 
@@ -189,7 +188,7 @@ const RequestItemError = ({
                             className="group flex items-center truncate"
                           >
                             <span className="avatar-sm ml-1.5">
-                              <CachedImage
+                              <Image
                                 src={requestData.requestedBy.avatar}
                                 alt=""
                                 className="avatar-sm object-cover"
@@ -248,7 +247,7 @@ const RequestItemError = ({
                           className="group flex items-center truncate"
                         >
                           <span className="avatar-sm ml-1.5">
-                            <CachedImage
+                            <Image
                               src={requestData.modifiedBy.avatar}
                               alt=""
                               className="avatar-sm object-cover"
@@ -286,7 +285,7 @@ const RequestItemError = ({
 };
 
 interface RequestItemProps {
-  request: NonFunctionProperties<MediaRequest> & { profileName?: string };
+  request: MediaRequest;
   revalidateList: () => void;
 }
 
@@ -305,18 +304,19 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
   const { data: title, error } = useSWR<MovieDetails | TvDetails>(
     inView ? url : null
   );
-  const { data: requestData, mutate: revalidate } = useSWR<
-    NonFunctionProperties<MediaRequest>
-  >(`/api/v1/request/${request.id}`, {
-    fallbackData: request,
-    refreshInterval: refreshIntervalHelper(
-      {
-        downloadStatus: request.media.downloadStatus,
-        downloadStatus4k: request.media.downloadStatus4k,
-      },
-      15000
-    ),
-  });
+  const { data: requestData, mutate: revalidate } = useSWR<MediaRequest>(
+    `/api/v1/request/${request.id}`,
+    {
+      fallbackData: request,
+      refreshInterval: refreshIntervalHelper(
+        {
+          downloadStatus: request.media.downloadStatus,
+          downloadStatus4k: request.media.downloadStatus4k,
+        },
+        15000
+      ),
+    }
+  );
 
   const [isRetrying, setRetrying] = useState(false);
 
@@ -401,7 +401,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
           setShowEditModal(false);
         }}
       />
-      <div className="relative flex w-full flex-col justify-between overflow-hidden rounded-xl bg-gray-800 py-2 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 rounded-xl bg-gray-800 py-4 text-gray-400 shadow-md ring-1 ring-gray-700 xl:h-28 xl:flex-row">
         {title.backdropPath && (
           <div className="absolute inset-0 z-0 w-full bg-cover bg-center xl:w-2/3">
             <CachedImage
@@ -482,7 +482,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
               )}
             </div>
           </div>
-          <div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center gap-1 overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
+          <div className="z-10 mt-4 ml-4 flex w-full flex-col justify-center overflow-hidden pr-4 text-sm sm:ml-2 sm:mt-0 xl:flex-1 xl:pr-0">
             <div className="card-field">
               <span className="card-field-name">
                 {intl.formatMessage(globalMessages.status)}
@@ -556,7 +556,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                           className="group flex items-center truncate"
                         >
                           <span className="avatar-sm ml-1.5">
-                            <CachedImage
+                            <Image
                               src={requestData.requestedBy.avatar}
                               alt=""
                               className="avatar-sm object-cover"
@@ -615,7 +615,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                         className="group flex items-center truncate"
                       >
                         <span className="avatar-sm ml-1.5">
-                          <CachedImage
+                          <Image
                             src={requestData.requestedBy.avatar}
                             alt=""
                             className="avatar-sm object-cover"
@@ -632,16 +632,6 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                 </span>
               </div>
             )}
-            {request.profileName && (
-              <div className="card-field">
-                <span className="card-field-name">
-                  {intl.formatMessage(messages.profileName)}
-                </span>
-                <span className="flex truncate text-sm text-gray-300">
-                  {request.profileName}
-                </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">

src/components/RequestModal/AdvancedRequester/index.tsx

@@ -1,5 +1,4 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import CachedImage from '@app/components/Common/CachedImage';
 import { SmallLoadingSpinner } from '@app/components/Common/LoadingSpinner';
 import type { User } from '@app/hooks/useUser';
 import { Permission, useUser } from '@app/hooks/useUser';
@@ -15,6 +14,7 @@ import type {
 import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces';
 import { hasPermission } from '@server/lib/permissions';
 import { isEqual } from 'lodash';
+import Image from 'next/image';
 import { useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
 import Select from 'react-select';
@@ -561,7 +561,7 @@ const AdvancedRequester = ({
                     <span className="inline-block w-full rounded-md shadow-sm">
                       <Listbox.Button className="focus:shadow-outline-blue relative w-full cursor-default rounded-md border border-gray-700 bg-gray-800 py-2 pl-3 pr-10 text-left text-white transition duration-150 ease-in-out focus:border-blue-300 focus:outline-none sm:text-sm sm:leading-5">
                         <span className="flex items-center">
-                          <CachedImage
+                          <Image
                             src={selectedUser.avatar}
                             alt=""
                             className="h-6 w-6 flex-shrink-0 rounded-full object-cover"
@@ -613,7 +613,7 @@ const AdvancedRequester = ({
                                     selected ? 'font-semibold' : 'font-normal'
                                   } flex items-center`}
                                 >
-                                  <CachedImage
+                                  <Image
                                     src={user.avatar}
                                     alt=""
                                     className="h-6 w-6 flex-shrink-0 rounded-full object-cover"

src/components/RequestModal/CollectionRequestModal.tsx

@@ -66,9 +66,7 @@ const CollectionRequestModal = ({
     (quota?.movie.remaining ?? 0) - selectedParts.length;
 
   const getAllParts = (): number[] => {
-    return (data?.parts ?? [])
-      .filter((part) => part.mediaInfo?.status !== MediaStatus.BLACKLISTED)
-      .map((part) => part.id);
+    return (data?.parts ?? []).map((part) => part.id);
   };
 
   const getAllRequestedParts = (): number[] => {
@@ -250,11 +248,6 @@ const CollectionRequestModal = ({
     { type: 'or' }
   );
 
-  const blacklistVisibility = hasPermission(
-    [Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST],
-    { type: 'or' }
-  );
-
   return (
     <Modal
       loading={(!data && !error) || !quota}
@@ -351,156 +344,122 @@ const CollectionRequestModal = ({
                   </tr>
                 </thead>
                 <tbody className="divide-y divide-gray-700">
-                  {data?.parts
-                    .filter((part) => {
-                      if (!blacklistVisibility)
-                        return (
-                          part.mediaInfo?.status !== MediaStatus.BLACKLISTED
-                        );
-                      return part;
-                    })
-                    .map((part) => {
-                      const partRequest = getPartRequest(part.id);
-                      const partMedia =
-                        part.mediaInfo &&
-                        part.mediaInfo[is4k ? 'status4k' : 'status'] !==
-                          MediaStatus.UNKNOWN
-                          ? part.mediaInfo
-                          : undefined;
+                  {data?.parts.map((part) => {
+                    const partRequest = getPartRequest(part.id);
+                    const partMedia =
+                      part.mediaInfo &&
+                      part.mediaInfo[is4k ? 'status4k' : 'status'] !==
+                        MediaStatus.UNKNOWN
+                        ? part.mediaInfo
+                        : undefined;
 
-                      return (
-                        <tr key={`part-${part.id}`}>
-                          <td
-                            className={`whitespace-nowrap px-4 py-4 text-sm font-medium leading-5 text-gray-100 ${
-                              partMedia?.status === MediaStatus.BLACKLISTED &&
-                              'pointer-events-none opacity-50'
+                    return (
+                      <tr key={`part-${part.id}`}>
+                        <td className="whitespace-nowrap px-4 py-4 text-sm font-medium leading-5 text-gray-100">
+                          <span
+                            role="checkbox"
+                            tabIndex={0}
+                            aria-checked={
+                              !!partMedia || isSelectedPart(part.id)
+                            }
+                            onClick={() => togglePart(part.id)}
+                            onKeyDown={(e) => {
+                              if (e.key === 'Enter' || e.key === 'Space') {
+                                togglePart(part.id);
+                              }
+                            }}
+                            className={`relative inline-flex h-5 w-10 flex-shrink-0 cursor-pointer items-center justify-center pt-2 focus:outline-none ${
+                              !!partMedia ||
+                              partRequest ||
+                              (quota?.movie.limit &&
+                                currentlyRemaining <= 0 &&
+                                !isSelectedPart(part.id))
+                                ? 'opacity-50'
+                                : ''
                             }`}
                           >
                             <span
-                              role="checkbox"
-                              tabIndex={0}
-                              aria-checked={
-                                (!!partMedia &&
-                                  partMedia.status !==
-                                    MediaStatus.BLACKLISTED) ||
-                                isSelectedPart(part.id)
-                              }
-                              onClick={() => togglePart(part.id)}
-                              onKeyDown={(e) => {
-                                if (e.key === 'Enter' || e.key === 'Space') {
-                                  togglePart(part.id);
-                                }
-                              }}
-                              className={`relative inline-flex h-5 w-10 flex-shrink-0 cursor-pointer items-center justify-center pt-2 focus:outline-none ${
-                                (!!partMedia &&
-                                  partMedia.status !==
-                                    MediaStatus.BLACKLISTED) ||
+                              aria-hidden="true"
+                              className={`${
+                                !!partMedia ||
                                 partRequest ||
-                                (quota?.movie.limit &&
-                                  currentlyRemaining <= 0 &&
-                                  !isSelectedPart(part.id))
-                                  ? 'opacity-50'
-                                  : ''
-                              }`}
-                            >
-                              <span
-                                aria-hidden="true"
-                                className={`${
-                                  (!!partMedia &&
-                                    partMedia.status !==
-                                      MediaStatus.BLACKLISTED) ||
-                                  partRequest ||
-                                  isSelectedPart(part.id)
-                                    ? 'bg-indigo-500'
-                                    : 'bg-gray-700'
-                                } absolute mx-auto h-4 w-9 rounded-full transition-colors duration-200 ease-in-out`}
-                              ></span>
-                              <span
-                                aria-hidden="true"
-                                className={`${
-                                  (!!partMedia &&
-                                    partMedia.status !==
-                                      MediaStatus.BLACKLISTED) ||
-                                  partRequest ||
-                                  isSelectedPart(part.id)
-                                    ? 'translate-x-5'
-                                    : 'translate-x-0'
-                                } absolute left-0 inline-block h-5 w-5 rounded-full border border-gray-200 bg-white shadow transition-transform duration-200 ease-in-out group-focus:border-blue-300 group-focus:ring`}
-                              ></span>
-                            </span>
-                          </td>
-                          <td
-                            className={`flex items-center px-1 py-4 text-sm font-medium leading-5 text-gray-100 md:px-6 ${
-                              partMedia?.status === MediaStatus.BLACKLISTED &&
-                              'pointer-events-none opacity-50'
-                            }`}
-                          >
-                            <div className="relative h-auto w-10 flex-shrink-0 overflow-hidden rounded-md">
-                              <CachedImage
-                                src={
-                                  part.posterPath
-                                    ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${part.posterPath}`
-                                    : '/images/overseerr_poster_not_found.png'
-                                }
-                                alt=""
-                                sizes="100vw"
-                                style={{
-                                  width: '100%',
-                                  height: 'auto',
-                                  objectFit: 'cover',
-                                }}
-                                width={600}
-                                height={900}
-                              />
+                                isSelectedPart(part.id)
+                                  ? 'bg-indigo-500'
+                                  : 'bg-gray-700'
+                              } absolute mx-auto h-4 w-9 rounded-full transition-colors duration-200 ease-in-out`}
+                            ></span>
+                            <span
+                              aria-hidden="true"
+                              className={`${
+                                !!partMedia ||
+                                partRequest ||
+                                isSelectedPart(part.id)
+                                  ? 'translate-x-5'
+                                  : 'translate-x-0'
+                              } absolute left-0 inline-block h-5 w-5 rounded-full border border-gray-200 bg-white shadow transition-transform duration-200 ease-in-out group-focus:border-blue-300 group-focus:ring`}
+                            ></span>
+                          </span>
+                        </td>
+                        <td className="flex items-center px-1 py-4 text-sm font-medium leading-5 text-gray-100 md:px-6">
+                          <div className="relative h-auto w-10 flex-shrink-0 overflow-hidden rounded-md">
+                            <CachedImage
+                              src={
+                                part.posterPath
+                                  ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${part.posterPath}`
+                                  : '/images/overseerr_poster_not_found.png'
+                              }
+                              alt=""
+                              sizes="100vw"
+                              style={{
+                                width: '100%',
+                                height: 'auto',
+                                objectFit: 'cover',
+                              }}
+                              width={600}
+                              height={900}
+                            />
+                          </div>
+                          <div className="flex flex-col justify-center pl-2">
+                            <div className="text-xs font-medium">
+                              {part.releaseDate?.slice(0, 4)}
                             </div>
-                            <div className="flex flex-col justify-center pl-2">
-                              <div className="text-xs font-medium">
-                                {part.releaseDate?.slice(0, 4)}
-                              </div>
-                              <div className="text-base font-bold">
-                                {part.title}
-                              </div>
+                            <div className="text-base font-bold">
+                              {part.title}
                             </div>
-                          </td>
-                          <td className="whitespace-nowrap py-4 pr-2 text-sm leading-5 text-gray-200 md:px-6">
-                            {!partMedia && !partRequest && (
-                              <Badge>
-                                {intl.formatMessage(
-                                  globalMessages.notrequested
-                                )}
+                          </div>
+                        </td>
+                        <td className="whitespace-nowrap py-4 pr-2 text-sm leading-5 text-gray-200 md:px-6">
+                          {!partMedia && !partRequest && (
+                            <Badge>
+                              {intl.formatMessage(globalMessages.notrequested)}
+                            </Badge>
+                          )}
+                          {!partMedia &&
+                            partRequest?.status ===
+                              MediaRequestStatus.PENDING && (
+                              <Badge badgeType="warning">
+                                {intl.formatMessage(globalMessages.pending)}
                               </Badge>
                             )}
-                            {!partMedia &&
-                              partRequest?.status ===
-                                MediaRequestStatus.PENDING && (
-                                <Badge badgeType="warning">
-                                  {intl.formatMessage(globalMessages.pending)}
-                                </Badge>
-                              )}
-                            {((!partMedia &&
-                              partRequest?.status ===
-                                MediaRequestStatus.APPROVED) ||
-                              partMedia?.[is4k ? 'status4k' : 'status'] ===
-                                MediaStatus.PROCESSING) && (
-                              <Badge badgeType="primary">
-                                {intl.formatMessage(globalMessages.requested)}
-                              </Badge>
-                            )}
-                            {partMedia?.[is4k ? 'status4k' : 'status'] ===
-                              MediaStatus.AVAILABLE && (
-                              <Badge badgeType="success">
-                                {intl.formatMessage(globalMessages.available)}
-                              </Badge>
-                            )}
-                            {partMedia?.status === MediaStatus.BLACKLISTED && (
-                              <Badge badgeType="danger">
-                                {intl.formatMessage(globalMessages.blacklisted)}
-                              </Badge>
-                            )}
-                          </td>
-                        </tr>
-                      );
-                    })}
+                          {((!partMedia &&
+                            partRequest?.status ===
+                              MediaRequestStatus.APPROVED) ||
+                            partMedia?.[is4k ? 'status4k' : 'status'] ===
+                              MediaStatus.PROCESSING) && (
+                            <Badge badgeType="primary">
+                              {intl.formatMessage(globalMessages.requested)}
+                            </Badge>
+                          )}
+                          {partMedia?.[is4k ? 'status4k' : 'status'] ===
+                            MediaStatus.AVAILABLE && (
+                            <Badge badgeType="success">
+                              {intl.formatMessage(globalMessages.available)}
+                            </Badge>
+                          )}
+                        </td>
+                      </tr>
+                    );
+                  })}
                 </tbody>
               </table>
             </div>

src/components/RequestModal/MovieRequestModal.tsx

@@ -8,7 +8,6 @@ import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { MovieDetails } from '@server/models/Movie';
@@ -39,7 +38,7 @@ const messages = defineMessages('components.RequestModal', {
 interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
   tmdbId: number;
   is4k?: boolean;
-  editRequest?: NonFunctionProperties<MediaRequest>;
+  editRequest?: MediaRequest;
   onCancel?: () => void;
   onComplete?: (newStatus: MediaStatus) => void;
   onUpdating?: (isUpdating: boolean) => void;

src/components/RequestModal/TvRequestModal.tsx

@@ -13,7 +13,6 @@ import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
 import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type SeasonRequest from '@server/entity/SeasonRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { TvDetails } from '@server/models/Tv';
@@ -58,7 +57,7 @@ interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
   onComplete?: (newStatus: MediaStatus) => void;
   onUpdating?: (isUpdating: boolean) => void;
   is4k?: boolean;
-  editRequest?: NonFunctionProperties<MediaRequest>;
+  editRequest?: MediaRequest;
 }
 
 const TvRequestModal = ({

src/components/RequestModal/index.tsx

@@ -4,14 +4,13 @@ import TvRequestModal from '@app/components/RequestModal/TvRequestModal';
 import { Transition } from '@headlessui/react';
 import type { MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import type { NonFunctionProperties } from '@server/interfaces/api/common';
 
 interface RequestModalProps {
   show: boolean;
   type: 'movie' | 'tv' | 'collection';
   tmdbId: number;
   is4k?: boolean;
-  editRequest?: NonFunctionProperties<MediaRequest>;
+  editRequest?: MediaRequest;
   onComplete?: (newStatus: MediaStatus) => void;
   onCancel?: () => void;
   onUpdating?: (isUpdating: boolean) => void;

src/components/Selector/index.tsx

@@ -33,13 +33,6 @@ const messages = defineMessages('components.Selector', {
   nooptions: 'No results.',
   showmore: 'Show More',
   showless: 'Show Less',
-  searchStatus: 'Select status...',
-  returningSeries: 'Returning Series',
-  planned: 'Planned',
-  inProduction: 'In Production',
-  ended: 'Ended',
-  canceled: 'Canceled',
-  pilot: 'Pilot',
 });
 
 type SingleVal = {
@@ -211,75 +204,6 @@ export const GenreSelector = ({
   );
 };
 
-export const StatusSelector = ({
-  isMulti,
-  defaultValue,
-  onChange,
-}: BaseSelectorMultiProps | BaseSelectorSingleProps) => {
-  const intl = useIntl();
-  const [defaultDataValue, setDefaultDataValue] = useState<
-    { label: string; value: number }[] | null
-  >(null);
-
-  const options = useMemo(
-    () => [
-      { name: intl.formatMessage(messages.returningSeries), id: 0 },
-      { name: intl.formatMessage(messages.planned), id: 1 },
-      { name: intl.formatMessage(messages.inProduction), id: 2 },
-      { name: intl.formatMessage(messages.ended), id: 3 },
-      { name: intl.formatMessage(messages.canceled), id: 4 },
-      { name: intl.formatMessage(messages.pilot), id: 5 },
-    ],
-    [intl]
-  );
-
-  useEffect(() => {
-    const loadDefaultStatus = async (): Promise<void> => {
-      if (!defaultValue) {
-        return;
-      }
-      const statuses = defaultValue.split('|');
-
-      const statusData = options
-        .filter((opt) => statuses.find((s) => Number(s) === opt.id))
-        .map((o) => ({
-          label: o.name,
-          value: o.id,
-        }));
-
-      setDefaultDataValue(statusData);
-    };
-
-    loadDefaultStatus();
-  }, [defaultValue, options]);
-
-  const loadStatusOptions = async () => {
-    return options
-      .map((result) => ({
-        label: result.name,
-        value: result.id,
-      }))
-      .filter(({ label }) => label.toLowerCase());
-  };
-
-  return (
-    <AsyncSelect
-      key={`status-select-${defaultDataValue}`}
-      className="react-select-container"
-      classNamePrefix="react-select"
-      defaultValue={isMulti ? defaultDataValue : defaultDataValue?.[0]}
-      defaultOptions
-      isMulti={isMulti}
-      loadOptions={loadStatusOptions}
-      placeholder={intl.formatMessage(messages.searchStatus)}
-      onChange={(value) => {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        onChange(value as any);
-      }}
-    />
-  );
-};
-
 export const KeywordSelector = ({
   isMulti,
   defaultValue,

src/components/Settings/SettingsJellyfin.tsx

@@ -1,7 +1,6 @@
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import LoadingSpinner from '@app/components/Common/LoadingSpinner';
-import SensitiveInput from '@app/components/Common/SensitiveInput';
 import LibraryItem from '@app/components/Settings/LibraryItem';
 import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
@@ -32,14 +31,13 @@ const messages = defineMessages('components.Settings', {
   jellyfinSettingsSuccess: '{mediaServerName} settings saved successfully!',
   jellyfinSettings: '{mediaServerName} Settings',
   jellyfinSettingsDescription:
-    'Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page. You can also change the Jellyfin API key, which was automatically generated previously.',
+    'Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page.',
   externalUrl: 'External URL',
   hostname: 'Hostname or IP Address',
   port: 'Port',
   enablessl: 'Use SSL',
   urlBase: 'URL Base',
   jellyfinForgotPasswordUrl: 'Forgot Password URL',
-  apiKey: 'API key',
   jellyfinSyncFailedNoLibrariesFound: 'No libraries were found',
   jellyfinSyncFailedAutomaticGroupedFolders:
     'Custom authentication with Automatic Library Grouping not supported',
@@ -62,9 +60,6 @@ const messages = defineMessages('components.Settings', {
   validationUrlTrailingSlash: 'URL must not end in a trailing slash',
   validationUrlBaseLeadingSlash: 'URL base must have a leading slash',
   validationUrlBaseTrailingSlash: 'URL base must not end in a trailing slash',
-  tip: 'Tip',
-  scanbackground:
-    'Scanning will run in the background. You can continue the setup process in the meantime.',
 });
 
 interface Library {
@@ -82,13 +77,13 @@ interface SyncStatus {
 }
 
 interface SettingsJellyfinProps {
-  isSetupSettings?: boolean;
+  showAdvancedSettings?: boolean;
   onComplete?: () => void;
 }
 
 const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
   onComplete,
-  isSetupSettings,
+  showAdvancedSettings,
 }) => {
   const [isSyncing, setIsSyncing] = useState(false);
   const toasts = useToasts();
@@ -450,117 +445,110 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
           </div>
         </div>
       </div>
-      {isSetupSettings && (
-        <div className="text-sm text-gray-500">
-          <span className="mr-2">
-            <Badge>{intl.formatMessage(messages.tip)}</Badge>
-          </span>
-          {intl.formatMessage(messages.scanbackground)}
-        </div>
-      )}
-      <div className="mt-10 mb-6">
-        <h3 className="heading">
-          {intl.formatMessage(
-            messages.jellyfinSettings,
-            mediaServerFormatValues
-          )}
-        </h3>
-        <p className="description">
-          {intl.formatMessage(
-            messages.jellyfinSettingsDescription,
-            mediaServerFormatValues
-          )}
-        </p>
-      </div>
-      <Formik
-        initialValues={{
-          hostname: data?.ip,
-          port: data?.port ?? 8096,
-          useSsl: data?.useSsl,
-          urlBase: data?.urlBase || '',
-          jellyfinExternalUrl: data?.externalHostname || '',
-          jellyfinForgotPasswordUrl: data?.jellyfinForgotPasswordUrl || '',
-          apiKey: data?.apiKey,
-        }}
-        validationSchema={JellyfinSettingsSchema}
-        onSubmit={async (values) => {
-          try {
-            const res = await fetch('/api/v1/settings/jellyfin', {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
-                ip: values.hostname,
-                port: Number(values.port),
-                useSsl: values.useSsl,
-                urlBase: values.urlBase,
-                externalHostname: values.jellyfinExternalUrl,
-                jellyfinForgotPasswordUrl: values.jellyfinForgotPasswordUrl,
-                apiKey: values.apiKey,
-              } as JellyfinSettings),
-            });
-            if (!res.ok) throw new Error(res.statusText, { cause: res });
-
-            addToast(
-              intl.formatMessage(
-                messages.jellyfinSettingsSuccess,
+      {showAdvancedSettings && (
+        <>
+          <div className="mt-10 mb-6">
+            <h3 className="heading">
+              {intl.formatMessage(
+                messages.jellyfinSettings,
                 mediaServerFormatValues
-              ),
-              {
-                autoDismiss: true,
-                appearance: 'success',
+              )}
+            </h3>
+            <p className="description">
+              {intl.formatMessage(
+                messages.jellyfinSettingsDescription,
+                mediaServerFormatValues
+              )}
+            </p>
+          </div>
+          <Formik
+            initialValues={{
+              hostname: data?.ip,
+              port: data?.port ?? 8096,
+              useSsl: data?.useSsl,
+              urlBase: data?.urlBase || '',
+              jellyfinExternalUrl: data?.externalHostname || '',
+              jellyfinForgotPasswordUrl: data?.jellyfinForgotPasswordUrl || '',
+            }}
+            validationSchema={JellyfinSettingsSchema}
+            onSubmit={async (values) => {
+              try {
+                const res = await fetch('/api/v1/settings/jellyfin', {
+                  method: 'POST',
+                  headers: {
+                    'Content-Type': 'application/json',
+                  },
+                  body: JSON.stringify({
+                    ip: values.hostname,
+                    port: Number(values.port),
+                    useSsl: values.useSsl,
+                    urlBase: values.urlBase,
+                    externalHostname: values.jellyfinExternalUrl,
+                    jellyfinForgotPasswordUrl: values.jellyfinForgotPasswordUrl,
+                  } as JellyfinSettings),
+                });
+                if (!res.ok) throw new Error(res.statusText, { cause: res });
+
+                addToast(
+                  intl.formatMessage(messages.jellyfinSettingsSuccess, {
+                    mediaServerName:
+                      settings.currentSettings.mediaServerType ===
+                      MediaServerType.EMBY
+                        ? 'Emby'
+                        : 'Jellyfin',
+                  }),
+                  {
+                    autoDismiss: true,
+                    appearance: 'success',
+                  }
+                );
+              } catch (e) {
+                let errorData;
+                try {
+                  errorData = await e.cause?.text();
+                  errorData = JSON.parse(errorData);
+                } catch {
+                  /* empty */
+                }
+                if (errorData?.message === ApiErrorCode.InvalidUrl) {
+                  addToast(
+                    intl.formatMessage(
+                      messages.invalidurlerror,
+                      mediaServerFormatValues
+                    ),
+                    {
+                      autoDismiss: true,
+                      appearance: 'error',
+                    }
+                  );
+                } else {
+                  addToast(
+                    intl.formatMessage(
+                      messages.jellyfinSettingsFailure,
+                      mediaServerFormatValues
+                    ),
+                    {
+                      autoDismiss: true,
+                      appearance: 'error',
+                    }
+                  );
+                }
+              } finally {
+                revalidate();
               }
-            );
-          } catch (e) {
-            let errorData;
-            try {
-              errorData = await e.cause?.text();
-              errorData = JSON.parse(errorData);
-            } catch {
-              /* empty */
-            }
-            if (errorData?.message === ApiErrorCode.InvalidUrl) {
-              addToast(
-                intl.formatMessage(
-                  messages.invalidurlerror,
-                  mediaServerFormatValues
-                ),
-                {
-                  autoDismiss: true,
-                  appearance: 'error',
-                }
-              );
-            } else {
-              addToast(
-                intl.formatMessage(
-                  messages.jellyfinSettingsFailure,
-                  mediaServerFormatValues
-                ),
-                {
-                  autoDismiss: true,
-                  appearance: 'error',
-                }
-              );
-            }
-          } finally {
-            revalidate();
-          }
-        }}
-      >
-        {({
-          errors,
-          touched,
-          values,
-          setFieldValue,
-          handleSubmit,
-          isSubmitting,
-          isValid,
-        }) => {
-          return (
-            <form className="section" onSubmit={handleSubmit}>
-              {!isSetupSettings && (
-                <>
+            }}
+          >
+            {({
+              errors,
+              touched,
+              values,
+              setFieldValue,
+              handleSubmit,
+              isSubmitting,
+              isValid,
+            }) => {
+              return (
+                <form className="section" onSubmit={handleSubmit}>
                   <div className="form-row">
                     <label htmlFor="hostname" className="text-label">
                       {intl.formatMessage(messages.hostname)}
@@ -622,29 +610,6 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
                       />
                     </div>
                   </div>
-                </>
-              )}
-              <div className="form-row">
-                <label htmlFor="apiKey" className="text-label">
-                  {intl.formatMessage(messages.apiKey)}
-                </label>
-                <div className="form-input-area">
-                  <div className="form-input-field">
-                    <SensitiveInput
-                      as="field"
-                      type="text"
-                      inputMode="url"
-                      id="apiKey"
-                      name="apiKey"
-                    />
-                  </div>
-                  {errors.apiKey && touched.apiKey && (
-                    <div className="error">{errors.apiKey}</div>
-                  )}
-                </div>
-              </div>
-              {!isSetupSettings && (
-                <>
                   <div className="form-row">
                     <label htmlFor="urlBase" className="text-label">
                       {intl.formatMessage(messages.urlBase)}
@@ -665,75 +630,75 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
                         )}
                     </div>
                   </div>
-                </>
-              )}
-              <div className="form-row">
-                <label htmlFor="jellyfinExternalUrl" className="text-label">
-                  {intl.formatMessage(messages.externalUrl)}
-                </label>
-                <div className="form-input-area">
-                  <div className="form-input-field">
-                    <Field
-                      type="text"
-                      inputMode="url"
-                      id="jellyfinExternalUrl"
-                      name="jellyfinExternalUrl"
-                    />
-                  </div>
-                  {errors.jellyfinExternalUrl &&
-                    touched.jellyfinExternalUrl && (
-                      <div className="error">{errors.jellyfinExternalUrl}</div>
-                    )}
-                </div>
-              </div>
-              <div className="form-row">
-                <label
-                  htmlFor="jellyfinForgotPasswordUrl"
-                  className="text-label"
-                >
-                  {intl.formatMessage(messages.jellyfinForgotPasswordUrl)}
-                </label>
-                <div className="form-input-area">
-                  <div className="form-input-field">
-                    <Field
-                      type="text"
-                      inputMode="url"
-                      id="jellyfinForgotPasswordUrl"
-                      name="jellyfinForgotPasswordUrl"
-                    />
-                  </div>
-                  {errors.jellyfinForgotPasswordUrl &&
-                    touched.jellyfinForgotPasswordUrl && (
-                      <div className="error">
-                        {errors.jellyfinForgotPasswordUrl}
+                  <div className="form-row">
+                    <label htmlFor="jellyfinExternalUrl" className="text-label">
+                      {intl.formatMessage(messages.externalUrl)}
+                    </label>
+                    <div className="form-input-area">
+                      <div className="form-input-field">
+                        <Field
+                          type="text"
+                          inputMode="url"
+                          id="jellyfinExternalUrl"
+                          name="jellyfinExternalUrl"
+                        />
                       </div>
-                    )}
-                </div>
-              </div>
-              <div
-                className={`actions ${isSetupSettings ? 'mt-0 border-0' : ''}`}
-              >
-                <div className="flex justify-end">
-                  <span className="ml-3 inline-flex rounded-md shadow-sm">
-                    <Button
-                      buttonType="primary"
-                      type="submit"
-                      disabled={isSubmitting || !isValid}
+                      {errors.jellyfinExternalUrl &&
+                        touched.jellyfinExternalUrl && (
+                          <div className="error">
+                            {errors.jellyfinExternalUrl}
+                          </div>
+                        )}
+                    </div>
+                  </div>
+                  <div className="form-row">
+                    <label
+                      htmlFor="jellyfinForgotPasswordUrl"
+                      className="text-label"
                     >
-                      <ArrowDownOnSquareIcon />
-                      <span>
-                        {isSubmitting
-                          ? intl.formatMessage(globalMessages.saving)
-                          : intl.formatMessage(globalMessages.save)}
+                      {intl.formatMessage(messages.jellyfinForgotPasswordUrl)}
+                    </label>
+                    <div className="form-input-area">
+                      <div className="form-input-field">
+                        <Field
+                          type="text"
+                          inputMode="url"
+                          id="jellyfinForgotPasswordUrl"
+                          name="jellyfinForgotPasswordUrl"
+                        />
+                      </div>
+                      {errors.jellyfinForgotPasswordUrl &&
+                        touched.jellyfinForgotPasswordUrl && (
+                          <div className="error">
+                            {errors.jellyfinForgotPasswordUrl}
+                          </div>
+                        )}
+                    </div>
+                  </div>
+                  <div className="actions">
+                    <div className="flex justify-end">
+                      <span className="ml-3 inline-flex rounded-md shadow-sm">
+                        <Button
+                          buttonType="primary"
+                          type="submit"
+                          disabled={isSubmitting || !isValid}
+                        >
+                          <ArrowDownOnSquareIcon />
+                          <span>
+                            {isSubmitting
+                              ? intl.formatMessage(globalMessages.saving)
+                              : intl.formatMessage(globalMessages.save)}
+                          </span>
+                        </Button>
                       </span>
-                    </Button>
-                  </span>
-                </div>
-              </div>
-            </form>
-          );
-        }}
-      </Formik>
+                    </div>
+                  </div>
+                </form>
+              );
+            }}
+          </Formik>
+        </>
+      )}
     </>
   );
 };

src/components/Settings/SettingsJobsCache/index.tsx

@@ -82,7 +82,6 @@ const messages: { [messageName: string]: MessageDescriptor } = defineMessages(
       'When enabled in settings, Jellyseerr will proxy and cache images from pre-configured external sources. Cached images are saved into your config folder. You can find the files in <code>{appDataPath}/cache/images</code>.',
     imagecachecount: 'Images Cached',
     imagecachesize: 'Total Cache Size',
-    usersavatars: "Users' Avatars",
   }
 );
 
@@ -574,19 +573,6 @@ const SettingsJobs = () => {
                 {formatBytes(cacheData?.imageCache.tmdb.size ?? 0)}
               </Table.TD>
             </tr>
-            <tr>
-              <Table.TD>
-                {intl.formatMessage(messages.usersavatars)} (avatar)
-              </Table.TD>
-              <Table.TD>
-                {intl.formatNumber(
-                  cacheData?.imageCache.avatar.imageCount ?? 0
-                )}
-              </Table.TD>
-              <Table.TD>
-                {formatBytes(cacheData?.imageCache.avatar.size ?? 0)}
-              </Table.TD>
-            </tr>
           </Table.TBody>
         </Table>
       </div>

src/components/Settings/SettingsMain/index.tsx

@@ -44,9 +44,6 @@ const messages = defineMessages('components.Settings.SettingsMain', {
   csrfProtectionTip: 'Set external API access to read-only (requires HTTPS)',
   csrfProtectionHoverTip:
     'Do NOT enable this setting unless you understand what you are doing!',
-  cspFrameAncestorDomains: 'Frame-Ancestor Domains',
-  cspFrameAncestorDomainsTip:
-    'Domains to allow embedding Jellyseer as iframe, object or embed. Incompatible with CSRF-Protection',
   cacheImages: 'Enable Image Caching',
   cacheImagesTip:
     'Cache externally sourced images (requires a significant amount of disk space)',
@@ -133,7 +130,6 @@ const SettingsMain = () => {
             applicationTitle: data?.applicationTitle,
             applicationUrl: data?.applicationUrl,
             csrfProtection: data?.csrfProtection,
-            cspFrameAncestorDomains: data?.cspFrameAncestorDomains,
             hideAvailable: data?.hideAvailable,
             locale: data?.locale ?? 'en',
             region: data?.region,
@@ -155,7 +151,6 @@ const SettingsMain = () => {
                   applicationTitle: values.applicationTitle,
                   applicationUrl: values.applicationUrl,
                   csrfProtection: values.csrfProtection,
-                  cspFrameAncestorDomains: values.cspFrameAncestorDomains,
                   hideAvailable: values.hideAvailable,
                   locale: values.locale,
                   region: values.region,
@@ -323,31 +318,6 @@ const SettingsMain = () => {
                     </Tooltip>
                   </div>
                 </div>
-                <div className="form-row">
-                  <label
-                    htmlFor="cspFrameAncestorDomains"
-                    className="text-label"
-                  >
-                    <span className="mr-2">
-                      {intl.formatMessage(messages.cspFrameAncestorDomains)}
-                    </span>
-                    <SettingsBadge badgeType="advanced" className="mr-2" />
-                    <SettingsBadge badgeType="restartRequired" />
-                    <span className="label-tip">
-                      {intl.formatMessage(messages.cspFrameAncestorDomainsTip)}
-                    </span>
-                  </label>
-                  <div className="form-input-area">
-                    <div className="form-input-field">
-                      <Field
-                        id="cspFrameAncestorDomains"
-                        name="cspFrameAncestorDomains"
-                        type="text"
-                        disabled={values.csrfProtection}
-                      />
-                    </div>
-                  </div>
-                </div>
                 <div className="form-row">
                   <label htmlFor="cacheImages" className="checkbox-label">
                     <span className="mr-2">

src/components/Setup/index.tsx

@@ -2,6 +2,7 @@ import EmbyLogo from '@app/assets/services/emby.svg';
 import JellyfinLogo from '@app/assets/services/jellyfin.svg';
 import PlexLogo from '@app/assets/services/plex.svg';
 import AppDataWarning from '@app/components/AppDataWarning';
+import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import ImageFader from '@app/components/Common/ImageFader';
 import PageTitle from '@app/components/Common/PageTitle';
@@ -11,12 +12,11 @@ import SettingsPlex from '@app/components/Settings/SettingsPlex';
 import SettingsServices from '@app/components/Settings/SettingsServices';
 import SetupSteps from '@app/components/Setup/SetupSteps';
 import useLocale from '@app/hooks/useLocale';
-import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
 import { MediaServerType } from '@server/constants/server';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useIntl } from 'react-intl';
 import useSWR, { mutate } from 'swr';
 import SetupLogin from './SetupLogin';
@@ -35,6 +35,9 @@ const messages = defineMessages('components.Setup', {
   signin: 'Sign In',
   configuremediaserver: 'Configure Media Server',
   configureservices: 'Configure Services',
+  tip: 'Tip',
+  scanbackground:
+    'Scanning will run in the background. You can continue the setup process in the meantime.',
 });
 
 const Setup = () => {
@@ -48,7 +51,6 @@ const Setup = () => {
   );
   const router = useRouter();
   const { locale } = useLocale();
-  const settings = useSettings();
 
   const finishSetup = async () => {
     setIsUpdating(true);
@@ -83,25 +85,6 @@ const Setup = () => {
     revalidateOnFocus: false,
   });
 
-  useEffect(() => {
-    if (settings.currentSettings.initialized) {
-      router.push('/');
-    }
-    if (
-      settings.currentSettings.mediaServerType !==
-      MediaServerType.NOT_CONFIGURED
-    ) {
-      setCurrentStep(3);
-      setMediaServerType(settings.currentSettings.mediaServerType);
-    }
-  }, [
-    settings.currentSettings.mediaServerType,
-    settings.currentSettings.initialized,
-    router,
-  ]);
-
-  if (settings.currentSettings.initialized) return <></>;
-
   return (
     <div className="relative flex min-h-screen flex-col justify-center bg-gray-900 py-12">
       <PageTitle title={intl.formatMessage(messages.setup)} />
@@ -230,10 +213,16 @@ const Setup = () => {
                 />
               ) : (
                 <SettingsJellyfin
-                  isSetupSettings
+                  showAdvancedSettings={false}
                   onComplete={() => setMediaServerSettingsComplete(true)}
                 />
               )}
+              <div className="mt-4 text-sm text-gray-500">
+                <span className="mr-2">
+                  <Badge>{intl.formatMessage(messages.tip)}</Badge>
+                </span>
+                {intl.formatMessage(messages.scanbackground)}
+              </div>
               <div className="actions">
                 <div className="flex justify-end">
                   <span className="ml-3 inline-flex rounded-md shadow-sm">

src/components/StatusBadge/index.tsx

@@ -17,7 +17,6 @@ const messages = defineMessages('components.StatusBadge', {
   playonplex: 'Play on {mediaServerName}',
   openinarr: 'Open in {arr}',
   managemedia: 'Manage {mediaType}',
-  seasonnumber: 'S{seasonNumber}',
   seasonepisodenumber: 'S{seasonNumber}E{episodeNumber}',
 });
 
@@ -106,34 +105,22 @@ const StatusBadge = ({
     }
   }
 
-  const tooltipContent =
-    mediaType === 'tv' &&
-    downloadItem.length > 1 &&
-    downloadItem.every(
-      (item) =>
-        item.downloadId && item.downloadId === downloadItem[0].downloadId
-    ) ? (
-      <DownloadBlock
-        downloadItem={downloadItem[0]}
-        title={Array.isArray(title) ? title[0] : title}
-        is4k={is4k}
-      />
-    ) : (
-      <ul>
-        {downloadItem.map((status, index) => (
-          <li
-            key={`dl-status-${status.externalId}-${index}`}
-            className="border-b border-gray-700 last:border-b-0"
-          >
-            <DownloadBlock
-              downloadItem={status}
-              title={Array.isArray(title) ? title[index] : title}
-              is4k={is4k}
-            />
-          </li>
-        ))}
-      </ul>
-    );
+  const tooltipContent = (
+    <ul>
+      {downloadItem.map((status, index) => (
+        <li
+          key={`dl-status-${status.externalId}-${index}`}
+          className="border-b border-gray-700 last:border-b-0"
+        >
+          <DownloadBlock
+            downloadItem={status}
+            title={Array.isArray(title) ? title[index] : title}
+            is4k={is4k}
+          />
+        </li>
+      ))}
+    </ul>
+  );
 
   const badgeDownloadProgress = (
     <div
@@ -188,27 +175,14 @@ const StatusBadge = ({
               </span>
               {inProgress && (
                 <>
-                  {mediaType === 'tv' &&
-                    downloadItem[0].episode &&
-                    (downloadItem.length > 1 &&
-                    downloadItem.every(
-                      (item) =>
-                        item.downloadId &&
-                        item.downloadId === downloadItem[0].downloadId
-                    ) ? (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonnumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                        })}
-                      </span>
-                    ) : (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonepisodenumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                          episodeNumber: downloadItem[0].episode.episodeNumber,
-                        })}
-                      </span>
-                    ))}
+                  {mediaType === 'tv' && downloadItem[0].episode && (
+                    <span className="ml-1">
+                      {intl.formatMessage(messages.seasonepisodenumber, {
+                        seasonNumber: downloadItem[0].episode.seasonNumber,
+                        episodeNumber: downloadItem[0].episode.episodeNumber,
+                      })}
+                    </span>
+                  )}
                   <Spinner className="ml-1 h-3 w-3" />
                 </>
               )}
@@ -254,27 +228,14 @@ const StatusBadge = ({
               </span>
               {inProgress && (
                 <>
-                  {mediaType === 'tv' &&
-                    downloadItem[0].episode &&
-                    (downloadItem.length > 1 &&
-                    downloadItem.every(
-                      (item) =>
-                        item.downloadId &&
-                        item.downloadId === downloadItem[0].downloadId
-                    ) ? (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonnumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                        })}
-                      </span>
-                    ) : (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonepisodenumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                          episodeNumber: downloadItem[0].episode.episodeNumber,
-                        })}
-                      </span>
-                    ))}
+                  {mediaType === 'tv' && downloadItem[0].episode && (
+                    <span className="ml-1">
+                      {intl.formatMessage(messages.seasonepisodenumber, {
+                        seasonNumber: downloadItem[0].episode.seasonNumber,
+                        episodeNumber: downloadItem[0].episode.episodeNumber,
+                      })}
+                    </span>
+                  )}
                   <Spinner className="ml-1 h-3 w-3" />
                 </>
               )}
@@ -320,27 +281,14 @@ const StatusBadge = ({
               </span>
               {inProgress && (
                 <>
-                  {mediaType === 'tv' &&
-                    downloadItem[0].episode &&
-                    (downloadItem.length > 1 &&
-                    downloadItem.every(
-                      (item) =>
-                        item.downloadId &&
-                        item.downloadId === downloadItem[0].downloadId
-                    ) ? (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonnumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                        })}
-                      </span>
-                    ) : (
-                      <span className="ml-1">
-                        {intl.formatMessage(messages.seasonepisodenumber, {
-                          seasonNumber: downloadItem[0].episode.seasonNumber,
-                          episodeNumber: downloadItem[0].episode.episodeNumber,
-                        })}
-                      </span>
-                    ))}
+                  {mediaType === 'tv' && downloadItem[0].episode && (
+                    <span className="ml-1">
+                      {intl.formatMessage(messages.seasonepisodenumber, {
+                        seasonNumber: downloadItem[0].episode.seasonNumber,
+                        episodeNumber: downloadItem[0].episode.episodeNumber,
+                      })}
+                    </span>
+                  )}
                   <Spinner className="ml-1 h-3 w-3" />
                 </>
               )}
@@ -360,17 +308,6 @@ const StatusBadge = ({
         </Tooltip>
       );
 
-    case MediaStatus.BLACKLISTED:
-      return (
-        <Tooltip content={mediaLinkDescription}>
-          <Badge badgeType="danger" href={mediaLink}>
-            {intl.formatMessage(is4k ? messages.status4k : messages.status, {
-              status: intl.formatMessage(globalMessages.blacklisted),
-            })}
-          </Badge>
-        </Tooltip>
-      );
-
     default:
       return null;
   }

src/components/TitleCard/index.tsx

@@ -1,9 +1,7 @@
 import Spinner from '@app/assets/spinner.svg';
-import BlacklistModal from '@app/components/BlacklistModal';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
 import StatusBadgeMini from '@app/components/Common/StatusBadgeMini';
-import Tooltip from '@app/components/Common/Tooltip';
 import RequestModal from '@app/components/RequestModal';
 import ErrorCard from '@app/components/TitleCard/ErrorCard';
 import Placeholder from '@app/components/TitleCard/Placeholder';
@@ -15,8 +13,6 @@ import { withProperties } from '@app/utils/typeHelpers';
 import { Transition } from '@headlessui/react';
 import {
   ArrowDownTrayIcon,
-  EyeIcon,
-  EyeSlashIcon,
   MinusCircleIcon,
   StarIcon,
 } from '@heroicons/react/24/outline';
@@ -24,7 +20,7 @@ import { MediaStatus } from '@server/constants/media';
 import type { Watchlist } from '@server/entity/Watchlist';
 import type { MediaType } from '@server/models/Search';
 import Link from 'next/link';
-import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
+import { Fragment, useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import { mutate } from 'swr';
@@ -69,7 +65,7 @@ const TitleCard = ({
 }: TitleCardProps) => {
   const isTouch = useIsTouch();
   const intl = useIntl();
-  const { user, hasPermission } = useUser();
+  const { hasPermission } = useUser();
   const [isUpdating, setIsUpdating] = useState(false);
   const [currentStatus, setCurrentStatus] = useState(status);
   const [showDetail, setShowDetail] = useState(false);
@@ -78,8 +74,6 @@ const TitleCard = ({
   const [toggleWatchlist, setToggleWatchlist] = useState<boolean>(
     !isAddedToWatchlist
   );
-  const [showBlacklistModal, setShowBlacklistModal] = useState(false);
-  const cardRef = useRef<HTMLDivElement>(null);
 
   // Just to get the year from the date
   if (year) {
@@ -100,11 +94,6 @@ const TitleCard = ({
     []
   );
 
-  const closeBlacklistModal = useCallback(
-    () => setShowBlacklistModal(false),
-    []
-  );
-
   const onClickWatchlistBtn = async (): Promise<void> => {
     setIsUpdating(true);
     try {
@@ -177,99 +166,6 @@ const TitleCard = ({
     }
   };
 
-  const onClickHideItemBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-    const topNode = cardRef.current;
-
-    if (topNode) {
-      const res = await fetch('/api/v1/blacklist', {
-        method: 'POST',
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          tmdbId: id,
-          mediaType,
-          title,
-          user: user?.id,
-        }),
-      });
-
-      if (res.status === 201) {
-        addToast(
-          <span>
-            {intl.formatMessage(globalMessages.blacklistSuccess, {
-              title,
-              strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-            })}
-          </span>,
-          { appearance: 'success', autoDismiss: true }
-        );
-        setCurrentStatus(MediaStatus.BLACKLISTED);
-      } else if (res.status === 412) {
-        addToast(
-          <span>
-            {intl.formatMessage(globalMessages.blacklistDuplicateError, {
-              title,
-              strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-            })}
-          </span>,
-          { appearance: 'info', autoDismiss: true }
-        );
-      } else {
-        addToast(intl.formatMessage(globalMessages.blacklistError), {
-          appearance: 'error',
-          autoDismiss: true,
-        });
-      }
-
-      setIsUpdating(false);
-      closeBlacklistModal();
-    } else {
-      addToast(intl.formatMessage(globalMessages.blacklistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-    }
-  };
-
-  const onClickShowBlacklistBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-    const topNode = cardRef.current;
-
-    if (topNode) {
-      const res = await fetch('/api/v1/blacklist/' + id, {
-        method: 'DELETE',
-      });
-
-      if (res.status === 204) {
-        addToast(
-          <span>
-            {intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
-              title,
-              strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-            })}
-          </span>,
-          { appearance: 'success', autoDismiss: true }
-        );
-        setCurrentStatus(MediaStatus.UNKNOWN);
-      } else {
-        addToast(intl.formatMessage(globalMessages.blacklistError), {
-          appearance: 'error',
-          autoDismiss: true,
-        });
-      }
-    } else {
-      addToast(intl.formatMessage(globalMessages.blacklistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-    }
-
-    setIsUpdating(false);
-  };
-
   const closeModal = useCallback(() => setShowRequestModal(false), []);
 
   const showRequestButton = hasPermission(
@@ -282,15 +178,10 @@ const TitleCard = ({
     { type: 'or' }
   );
 
-  const showHideButton = hasPermission([Permission.MANAGE_BLACKLIST], {
-    type: 'or',
-  });
-
   return (
     <div
       className={canExpand ? 'w-full' : 'w-36 sm:w-36 md:w-44'}
       data-testid="title-card"
-      ref={cardRef}
     >
       <RequestModal
         tmdbId={id}
@@ -306,20 +197,6 @@ const TitleCard = ({
         onUpdating={requestUpdating}
         onCancel={closeModal}
       />
-      <BlacklistModal
-        tmdbId={id}
-        type={
-          mediaType === 'movie'
-            ? 'movie'
-            : mediaType === 'collection'
-            ? 'collection'
-            : 'tv'
-        }
-        show={showBlacklistModal}
-        onCancel={closeBlacklistModal}
-        onComplete={onClickHideItemBtn}
-        isUpdating={isUpdating}
-      />
       <div
         className={`relative transform-gpu cursor-default overflow-hidden rounded-xl bg-gray-800 bg-cover outline-none ring-1 transition duration-300 ${
           showDetail
@@ -358,7 +235,7 @@ const TitleCard = ({
           />
           <div className="absolute left-0 right-0 flex items-center justify-between p-2">
             <div
-              className={`pointer-events-none z-40 self-start rounded-full border bg-opacity-80 shadow-md ${
+              className={`pointer-events-none z-40 rounded-full border bg-opacity-80 shadow-md ${
                 mediaType === 'movie' || mediaType === 'collection'
                   ? 'border-blue-500 bg-blue-600'
                   : 'border-purple-600 bg-purple-600'
@@ -372,8 +249,8 @@ const TitleCard = ({
                   : intl.formatMessage(globalMessages.tvshow)}
               </div>
             </div>
-            {showDetail && currentStatus !== MediaStatus.BLACKLISTED && (
-              <div className="flex flex-col gap-1">
+            {showDetail && (
+              <>
                 {toggleWatchlist ? (
                   <Button
                     buttonType={'ghost'}
@@ -392,49 +269,15 @@ const TitleCard = ({
                     <MinusCircleIcon className={'h-3'} />
                   </Button>
                 )}
-                {showHideButton &&
-                  currentStatus !== MediaStatus.PROCESSING &&
-                  currentStatus !== MediaStatus.AVAILABLE &&
-                  currentStatus !== MediaStatus.PARTIALLY_AVAILABLE &&
-                  currentStatus !== MediaStatus.PENDING && (
-                    <Button
-                      buttonType={'ghost'}
-                      className="z-40"
-                      buttonSize={'sm'}
-                      onClick={() => setShowBlacklistModal(true)}
-                    >
-                      <EyeSlashIcon className={'h-3'} />
-                    </Button>
-                  )}
-              </div>
+              </>
             )}
-            {showDetail &&
-              showHideButton &&
-              currentStatus == MediaStatus.BLACKLISTED && (
-                <Tooltip
-                  content={intl.formatMessage(
-                    globalMessages.removefromBlacklist
-                  )}
-                >
-                  <Button
-                    buttonType={'ghost'}
-                    className="z-40"
-                    buttonSize={'sm'}
-                    onClick={() => onClickShowBlacklistBtn()}
-                  >
-                    <EyeIcon className={'h-3'} />
-                  </Button>
-                </Tooltip>
-              )}
             {currentStatus && currentStatus !== MediaStatus.UNKNOWN && (
-              <div className="flex flex-col items-center gap-1">
-                <div className="pointer-events-none z-40 flex">
-                  <StatusBadgeMini
-                    status={currentStatus}
-                    inProgress={inProgress}
-                    shrink
-                  />
-                </div>
+              <div className="pointer-events-none z-40 flex items-center">
+                <StatusBadgeMini
+                  status={currentStatus}
+                  inProgress={inProgress}
+                  shrink
+                />
               </div>
             )}
           </div>

src/components/TvDetails/index.tsx

@@ -2,9 +2,7 @@ import RTAudFresh from '@app/assets/rt_aud_fresh.svg';
 import RTAudRotten from '@app/assets/rt_aud_rotten.svg';
 import RTFresh from '@app/assets/rt_fresh.svg';
 import RTRotten from '@app/assets/rt_rotten.svg';
-import Spinner from '@app/assets/spinner.svg';
 import TmdbLogo from '@app/assets/tmdb_logo.svg';
-import BlacklistModal from '@app/components/BlacklistModal';
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
@@ -39,23 +37,14 @@ import {
   ArrowRightCircleIcon,
   CogIcon,
   ExclamationTriangleIcon,
-  EyeSlashIcon,
   FilmIcon,
   PlayIcon,
 } from '@heroicons/react/24/outline';
-import {
-  ChevronDownIcon,
-  MinusCircleIcon,
-  StarIcon,
-} from '@heroicons/react/24/solid';
+import { ChevronDownIcon } from '@heroicons/react/24/solid';
 import type { RTRating } from '@server/api/rating/rottentomatoes';
 import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
 import { IssueStatus } from '@server/constants/issue';
-import {
-  MediaRequestStatus,
-  MediaStatus,
-  MediaType,
-} from '@server/constants/media';
+import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import type { Crew } from '@server/models/common';
 import type { TvDetails as TvDetailsType } from '@server/models/Tv';
@@ -63,9 +52,8 @@ import { countries } from 'country-flag-icons';
 import 'country-flag-icons/3x2/flags.css';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 
 const messages = defineMessages('components.TvDetails', {
@@ -100,12 +88,6 @@ const messages = defineMessages('components.TvDetails', {
   rtcriticsscore: 'Rotten Tomatoes Tomatometer',
   rtaudiencescore: 'Rotten Tomatoes Audience Score',
   tmdbuserscore: 'TMDB User Score',
-  watchlistSuccess: '<strong>{title}</strong> added to watchlist successfully!',
-  watchlistDeleted:
-    '<strong>{title}</strong> Removed from watchlist successfully!',
-  watchlistError: 'Something went wrong try again.',
-  removefromwatchlist: 'Remove From Watchlist',
-  addtowatchlist: 'Add To Watchlist',
 });
 
 interface TvDetailsProps {
@@ -123,14 +105,6 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
     router.query.manage == '1' ? true : false
   );
   const [showIssueModal, setShowIssueModal] = useState(false);
-  const [isUpdating, setIsUpdating] = useState<boolean>(false);
-  const [toggleWatchlist, setToggleWatchlist] = useState<boolean>(
-    !tv?.onUserWatchlist
-  );
-  const [isBlacklistUpdating, setIsBlacklistUpdating] =
-    useState<boolean>(false);
-  const [showBlacklistModal, setShowBlacklistModal] = useState(false);
-  const { addToast } = useToasts();
 
   const {
     data,
@@ -160,11 +134,6 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
     setShowManager(router.query.manage == '1' ? true : false);
   }, [router.query.manage]);
 
-  const closeBlacklistModal = useCallback(
-    () => setShowBlacklistModal(false),
-    []
-  );
-
   const { mediaUrl: plexUrl, mediaUrl4k: plexUrl4k } = useDeepLinks({
     mediaUrl: data?.mediaInfo?.mediaUrl,
     mediaUrl4k: data?.mediaInfo?.mediaUrl4k,
@@ -331,136 +300,6 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
     return intl.formatMessage(messages.play, { mediaServerName: 'Jellyfin' });
   }
 
-  const onClickWatchlistBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-
-    const res = await fetch('/api/v1/watchlist', {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        tmdbId: tv?.id,
-        mediaType: MediaType.TV,
-        title: tv?.name,
-      }),
-    });
-
-    if (!res.ok) {
-      addToast(intl.formatMessage(messages.watchlistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-
-      setIsUpdating(false);
-      return;
-    }
-
-    const data = await res.json();
-
-    if (data) {
-      addToast(
-        <span>
-          {intl.formatMessage(messages.watchlistSuccess, {
-            title: tv?.name,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'success', autoDismiss: true }
-      );
-    }
-
-    setIsUpdating(false);
-    setToggleWatchlist((prevState) => !prevState);
-  };
-
-  const onClickDeleteWatchlistBtn = async (): Promise<void> => {
-    setIsUpdating(true);
-
-    const res = await fetch('/api/v1/watchlist/' + tv?.id, {
-      method: 'DELETE',
-    });
-
-    if (!res.ok) {
-      addToast(intl.formatMessage(messages.watchlistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-
-      setIsUpdating(false);
-      return;
-    }
-
-    if (res.status === 204) {
-      addToast(
-        <span>
-          {intl.formatMessage(messages.watchlistDeleted, {
-            title: tv?.name,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'info', autoDismiss: true }
-      );
-      setIsUpdating(false);
-      setToggleWatchlist((prevState) => !prevState);
-    }
-  };
-
-  const onClickHideItemBtn = async (): Promise<void> => {
-    setIsBlacklistUpdating(true);
-
-    const res = await fetch('/api/v1/blacklist', {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        tmdbId: tv?.id,
-        mediaType: 'tv',
-        title: tv?.name,
-        user: user?.id,
-      }),
-    });
-
-    if (res.status === 201) {
-      addToast(
-        <span>
-          {intl.formatMessage(globalMessages.blacklistSuccess, {
-            title: tv?.name,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'success', autoDismiss: true }
-      );
-
-      revalidate();
-    } else if (res.status === 412) {
-      addToast(
-        <span>
-          {intl.formatMessage(globalMessages.blacklistDuplicateError, {
-            title: tv?.name,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'info', autoDismiss: true }
-      );
-    } else {
-      addToast(intl.formatMessage(globalMessages.blacklistError), {
-        appearance: 'error',
-        autoDismiss: true,
-      });
-    }
-
-    setIsBlacklistUpdating(false);
-    closeBlacklistModal();
-  };
-
-  const showHideButton = hasPermission([Permission.MANAGE_BLACKLIST], {
-    type: 'or',
-  });
-
   return (
     <div
       className="media-page"
@@ -487,14 +326,6 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
         </div>
       )}
       <PageTitle title={data.name} />
-      <BlacklistModal
-        tmdbId={data.id}
-        type="tv"
-        show={showBlacklistModal}
-        onCancel={closeBlacklistModal}
-        onComplete={onClickHideItemBtn}
-        isUpdating={isBlacklistUpdating}
-      />
       <IssueModal
         onCancel={() => setShowIssueModal(false)}
         show={showIssueModal}
@@ -600,61 +431,6 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
           </span>
         </div>
         <div className="media-actions">
-          {showHideButton &&
-            data?.mediaInfo?.status !== MediaStatus.PROCESSING &&
-            data?.mediaInfo?.status !== MediaStatus.AVAILABLE &&
-            data?.mediaInfo?.status !== MediaStatus.PARTIALLY_AVAILABLE &&
-            data?.mediaInfo?.status !== MediaStatus.PENDING &&
-            data?.mediaInfo?.status !== MediaStatus.BLACKLISTED && (
-              <Tooltip
-                content={intl.formatMessage(globalMessages.addToBlacklist)}
-              >
-                <Button
-                  buttonType={'ghost'}
-                  className="z-40 mr-2"
-                  buttonSize={'md'}
-                  onClick={() => setShowBlacklistModal(true)}
-                >
-                  <EyeSlashIcon className={'h-3'} />
-                </Button>
-              </Tooltip>
-            )}
-          {data?.mediaInfo?.status !== MediaStatus.BLACKLISTED && (
-            <>
-              {toggleWatchlist ? (
-                <Tooltip content={intl.formatMessage(messages.addtowatchlist)}>
-                  <Button
-                    buttonType={'ghost'}
-                    className="z-40 mr-2"
-                    buttonSize={'md'}
-                    onClick={onClickWatchlistBtn}
-                  >
-                    {isUpdating ? (
-                      <Spinner className="h-3" />
-                    ) : (
-                      <StarIcon className={'h-3 text-amber-300'} />
-                    )}
-                  </Button>
-                </Tooltip>
-              ) : (
-                <Tooltip
-                  content={intl.formatMessage(messages.removefromwatchlist)}
-                >
-                  <Button
-                    className="z-40 mr-2"
-                    buttonSize={'md'}
-                    onClick={onClickDeleteWatchlistBtn}
-                  >
-                    {isUpdating ? (
-                      <Spinner className="h-3" />
-                    ) : (
-                      <MinusCircleIcon className={'h-3'} />
-                    )}
-                  </Button>
-                </Tooltip>
-              )}
-            </>
-          )}
           <PlayButton links={mediaLinks} />
           <RequestButton
             mediaType="tv"

src/components/UserList/JellyfinImportModal.tsx

@@ -1,11 +1,11 @@
 import Alert from '@app/components/Common/Alert';
-import CachedImage from '@app/components/Common/CachedImage';
 import Modal from '@app/components/Common/Modal';
 import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { MediaServerType } from '@server/constants/server';
 import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces';
+import Image from 'next/image';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -55,6 +55,14 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
     `/api/v1/user?take=${children}`
   );
 
+  data?.forEach((user, pos) => {
+    if (
+      existingUsers?.results.some((data) => data.jellyfinUserId === user.id)
+    ) {
+      data?.splice(pos, 1);
+    }
+  });
+
   const importUsers = async () => {
     setImporting(true);
 
@@ -207,71 +215,64 @@ const JellyfinImportModal: React.FC<JellyfinImportProps> = ({
                       </tr>
                     </thead>
                     <tbody className="divide-y divide-gray-700 bg-gray-600">
-                      {data
-                        ?.filter(
-                          (user) =>
-                            !existingUsers?.results.some(
-                              (u) => u.jellyfinUserId === user.id
-                            )
-                        )
-                        .map((user) => (
-                          <tr key={`user-${user.id}`}>
-                            <td className="whitespace-nowrap px-4 py-4 text-sm font-medium leading-5 text-gray-100">
+                      {data?.map((user) => (
+                        <tr key={`user-${user.id}`}>
+                          <td className="whitespace-nowrap px-4 py-4 text-sm font-medium leading-5 text-gray-100">
+                            <span
+                              role="checkbox"
+                              tabIndex={0}
+                              aria-checked={isSelectedUser(user.id)}
+                              onClick={() => toggleUser(user.id)}
+                              onKeyDown={(e) => {
+                                if (e.key === 'Enter' || e.key === 'Space') {
+                                  toggleUser(user.id);
+                                }
+                              }}
+                              className="relative inline-flex h-5 w-10 flex-shrink-0 cursor-pointer items-center justify-center pt-2 focus:outline-none"
+                            >
                               <span
-                                role="checkbox"
-                                tabIndex={0}
-                                aria-checked={isSelectedUser(user.id)}
-                                onClick={() => toggleUser(user.id)}
-                                onKeyDown={(e) => {
-                                  if (e.key === 'Enter' || e.key === 'Space') {
-                                    toggleUser(user.id);
-                                  }
-                                }}
-                                className="relative inline-flex h-5 w-10 flex-shrink-0 cursor-pointer items-center justify-center pt-2 focus:outline-none"
-                              >
-                                <span
-                                  aria-hidden="true"
-                                  className={`${
-                                    isSelectedUser(user.id)
-                                      ? 'bg-indigo-500'
-                                      : 'bg-gray-800'
-                                  } absolute mx-auto h-4 w-9 rounded-full transition-colors duration-200 ease-in-out`}
-                                ></span>
-                                <span
-                                  aria-hidden="true"
-                                  className={`${
-                                    isSelectedUser(user.id)
-                                      ? 'translate-x-5'
-                                      : 'translate-x-0'
-                                  } absolute left-0 inline-block h-5 w-5 transform rounded-full border border-gray-200 bg-white shadow transition-transform duration-200 ease-in-out group-focus:border-blue-300 group-focus:ring`}
-                                ></span>
-                              </span>
-                            </td>
-                            <td className="whitespace-nowrap px-1 py-4 text-sm font-medium leading-5 text-gray-100 md:px-6">
-                              <div className="flex items-center">
-                                <CachedImage
-                                  className="h-10 w-10 flex-shrink-0 rounded-full"
-                                  src={user.thumb}
-                                  alt=""
-                                  width={40}
-                                  height={40}
-                                />
-                                <div className="ml-4">
-                                  <div className="text-base font-bold leading-5">
-                                    {user.username}
-                                  </div>
-                                  {/* {user.username &&
+                                aria-hidden="true"
+                                className={`${
+                                  isSelectedUser(user.id)
+                                    ? 'bg-indigo-500'
+                                    : 'bg-gray-800'
+                                } absolute mx-auto h-4 w-9 rounded-full transition-colors duration-200 ease-in-out`}
+                              ></span>
+                              <span
+                                aria-hidden="true"
+                                className={`${
+                                  isSelectedUser(user.id)
+                                    ? 'translate-x-5'
+                                    : 'translate-x-0'
+                                } absolute left-0 inline-block h-5 w-5 transform rounded-full border border-gray-200 bg-white shadow transition-transform duration-200 ease-in-out group-focus:border-blue-300 group-focus:ring`}
+                              ></span>
+                            </span>
+                          </td>
+                          <td className="whitespace-nowrap px-1 py-4 text-sm font-medium leading-5 text-gray-100 md:px-6">
+                            <div className="flex items-center">
+                              <Image
+                                className="h-10 w-10 flex-shrink-0 rounded-full"
+                                src={user.thumb}
+                                alt=""
+                                width={40}
+                                height={40}
+                              />
+                              <div className="ml-4">
+                                <div className="text-base font-bold leading-5">
+                                  {user.username}
+                                </div>
+                                {/* {user.username &&
                                   user.username.toLowerCase() !==
                                   user.email && (
                                     <div className="text-sm leading-5 text-gray-300">
                                       {user.email}
                                     </div>
                                   )} */}
-                                </div>
                               </div>
-                            </td>
-                          </tr>
-                        ))}
+                            </div>
+                          </td>
+                        </tr>
+                      ))}
                     </tbody>
                   </table>
                 </div>

src/components/UserList/index.tsx

@@ -1,7 +1,6 @@
 import Alert from '@app/components/Common/Alert';
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
-import CachedImage from '@app/components/Common/CachedImage';
 import Header from '@app/components/Common/Header';
 import LoadingSpinner from '@app/components/Common/LoadingSpinner';
 import Modal from '@app/components/Common/Modal';
@@ -29,6 +28,7 @@ import { MediaServerType } from '@server/constants/server';
 import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces';
 import { hasPermission } from '@server/lib/permissions';
 import { Field, Form, Formik } from 'formik';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
@@ -633,7 +633,7 @@ const UserList = () => {
                     href={`/users/${user.id}`}
                     className="h-10 w-10 flex-shrink-0"
                   >
-                    <CachedImage
+                    <Image
                       className="h-10 w-10 rounded-full object-cover"
                       src={user.avatar}
                       alt=""

src/components/UserProfile/ProfileHeader/index.tsx

@@ -1,9 +1,9 @@
 import Button from '@app/components/Common/Button';
-import CachedImage from '@app/components/Common/CachedImage';
 import type { User } from '@app/hooks/useUser';
 import { Permission, useUser } from '@app/hooks/useUser';
 import defineMessages from '@app/utils/defineMessages';
 import { CogIcon, UserIcon } from '@heroicons/react/24/solid';
+import Image from 'next/image';
 import Link from 'next/link';
 import { useIntl } from 'react-intl';
 
@@ -42,7 +42,7 @@ const ProfileHeader = ({ user, isSettingsPage }: ProfileHeaderProps) => {
       <div className="flex items-end justify-items-end space-x-5">
         <div className="flex-shrink-0">
           <div className="relative">
-            <CachedImage
+            <Image
               className="h-24 w-24 rounded-full bg-gray-600 object-cover ring-1 ring-gray-700"
               src={user.avatar}
               alt=""

src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx

@@ -14,7 +14,6 @@ import globalMessages from '@app/i18n/globalMessages';
 import ErrorPage from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
-import { ApiErrorCode } from '@server/constants/error';
 import type { UserSettingsGeneralResponse } from '@server/interfaces/api/userSettingsInterfaces';
 import { Field, Form, Formik } from 'formik';
 import { useRouter } from 'next/router';
@@ -43,7 +42,6 @@ const messages = defineMessages(
     user: 'User',
     toastSettingsSuccess: 'Settings saved successfully!',
     toastSettingsFailure: 'Something went wrong while saving settings.',
-    toastSettingsFailureEmail: 'This email is already taken!',
     region: 'Discover Region',
     regionTip: 'Filter content by regional availability',
     originallanguage: 'Discover Language',
@@ -180,7 +178,7 @@ const UserGeneralSettings = () => {
                 watchlistSyncTv: values.watchlistSyncTv,
               }),
             });
-            if (!res.ok) throw new Error(res.statusText, { cause: res });
+            if (!res.ok) throw new Error();
 
             if (currentUser?.id === user?.id && setLocale) {
               setLocale(
@@ -195,24 +193,10 @@ const UserGeneralSettings = () => {
               appearance: 'success',
             });
           } catch (e) {
-            let errorData;
-            try {
-              errorData = await e.cause?.text();
-              errorData = JSON.parse(errorData);
-            } catch {
-              /* empty */
-            }
-            if (errorData?.message === ApiErrorCode.InvalidEmail) {
-              addToast(intl.formatMessage(messages.toastSettingsFailureEmail), {
-                autoDismiss: true,
-                appearance: 'error',
-              });
-            } else {
-              addToast(intl.formatMessage(messages.toastSettingsFailure), {
-                autoDismiss: true,
-                appearance: 'error',
-              });
-            }
+            addToast(intl.formatMessage(messages.toastSettingsFailure), {
+              autoDismiss: true,
+              appearance: 'error',
+            });
           } finally {
             revalidate();
             revalidateUser();

src/i18n/globalMessages.ts

@@ -55,16 +55,6 @@ const globalMessages = defineMessages('i18n', {
   noresults: 'No results.',
   open: 'Open',
   resolved: 'Resolved',
-  blacklist: 'Blacklist',
-  blacklisted: 'Blacklisted',
-  blacklistSuccess: '<strong>{title}</strong> was successfully blacklisted.',
-  blacklistError: 'Something went wrong try again.',
-  blacklistDuplicateError:
-    '<strong>{title}</strong> has already been blacklisted.',
-  removeFromBlacklistSuccess:
-    '<strong>{title}</strong> was successfully removed from the Blacklist.',
-  addToBlacklist: 'Add to Blacklist',
-  removefromBlacklist: 'Remove from Blacklist',
 });
 
 export default globalMessages;

src/i18n/locale/ca.json

@@ -191,7 +191,7 @@
   "components.Discover.TvGenreSlider.tvgenres": "Gèneres de Sèries",
   "components.Discover.TvGenreList.seriesgenres": "Gèneres de Sèries",
   "components.Discover.StudioSlider.studios": "Estudis",
-  "components.Discover.NetworkSlider.networks": "Emissors",
+  "components.Discover.NetworkSlider.networks": "Plataformes",
   "components.Discover.MovieGenreSlider.moviegenres": "Gèneres de Pel·lícules",
   "components.Discover.MovieGenreList.moviegenres": "Gèneres de Pel·lícules",
   "components.Discover.DiscoverTvLanguage.languageSeries": "Sèries en {language}",
@@ -397,7 +397,7 @@
   "components.TvDetails.originaltitle": "Títol original",
   "components.TvDetails.originallanguage": "Idioma original",
   "components.TvDetails.nextAirDate": "Pròxima data d'emissió",
-  "components.TvDetails.network": "{networkCount, plural, one {Emissor} other {Emissors}}",
+  "components.TvDetails.network": "{networkCount, plural, one {Plataforma} other {Plataformes}}",
   "components.TvDetails.firstAirDate": "Primera data d'emissió",
   "components.TvDetails.episodeRuntimeMinutes": "{runtime} minuts",
   "components.TvDetails.episodeRuntime": "Duració de l'episodi",
@@ -494,7 +494,7 @@
   "components.Settings.SonarrModal.validationNameRequired": "Heu de proporcionar un nom de servidor",
   "components.Settings.SonarrModal.validationLanguageProfileRequired": "Heu de seleccionar un perfil d'idioma",
   "components.Settings.SonarrModal.validationHostnameRequired": "Heu de proporcionar un nom d’amfitrió o una adreça IP vàlides",
-  "components.Settings.SonarrModal.validationBaseUrlTrailingSlash": "L'URL base no pot acabar amb una barra inclinada final",
+  "components.Settings.SonarrModal.validationBaseUrlTrailingSlash": "L'URL base no ha d'acabar amb una barra inclinada final",
   "components.Settings.SonarrModal.validationBaseUrlLeadingSlash": "L'URL base ha de tenir una barra inclinada",
   "components.Settings.SonarrModal.validationApplicationUrlTrailingSlash": "L'URL no pot acabar amb una barra inclinada final",
   "components.Settings.SonarrModal.validationApplicationUrl": "Heu de proporcionar un URL vàlid",
@@ -1135,7 +1135,7 @@
   "components.Discover.CreateSlider.needresults": "Cal tenir almenys 1 resultat.",
   "components.Discover.CreateSlider.nooptions": "Sense resultats.",
   "components.Discover.CreateSlider.providetmdbgenreid": "Proporciona un ID de categoria TMDB",
-  "components.Discover.CreateSlider.providetmdbnetwork": "Proporciona l'ID d'emissor TMDB",
+  "components.Discover.CreateSlider.providetmdbnetwork": "Proporciona l'ID de la plataforma TMDB",
   "components.Discover.CreateSlider.providetmdbstudio": "Proporciona l'ID d'estudi TMDB",
   "components.Discover.CreateSlider.searchGenres": "Cercar per gènere…",
   "components.Discover.CreateSlider.searchKeywords": "Cercar per paraules clau…",
@@ -1167,7 +1167,7 @@
   "components.Discover.networks": "Emissors",
   "components.Discover.resetwarning": "Restablir tots els controls lliscants al valor predeterminat. Això també suprimirà els controls lliscants personalitzats!",
   "components.Discover.tmdbmoviekeyword": "Paraula clau de pel·lícula TMDB",
-  "components.Discover.tmdbnetwork": "Emissors TMDB",
+  "components.Discover.tmdbnetwork": "Plataformes TMDB",
   "components.Discover.FilterSlideover.tmdbuserscore": "Puntuació d'usuaris TMDB",
   "components.Discover.tvgenres": "Gèneres de sèries",
   "components.Discover.DiscoverTvKeyword.keywordSeries": "Sèries {keywordTitle}",
@@ -1241,11 +1241,18 @@
   "components.Settings.SettingsJobsCache.availability-sync": "Sincronització de disponibilitat de contingut",
   "components.Discover.tmdbmoviestreamingservices": "Serveis de transmissió de pel·lícules TMDB",
   "components.Discover.tmdbtvstreamingservices": "Serveis de transmissió de TV TMDB",
-  "components.Layout.UserWarnings.emailRequired": "És requereix un n correu electrònic.",
-  "components.Layout.UserWarnings.passwordRequired": "Es requereix una contrasenya.",
-  "components.Login.description": "Com que és la primera vegada que inicieu sessió a {applicationName}, es necessita afegir un correu electrònic vàlid.",
-  "components.Discover.FilterSlideover.tmdbuservotecount": "Recompte de vots d'usuaris de TMDB",
-  "components.Discover.FilterSlideover.voteCount": "Nombre de vots entre {minValue} i {maxValue}",
-  "components.Layout.UserWarnings.emailInvalid": "El correu electrònic no és vàlid.",
-  "components.Login.credentialerror": "El nom d'usuari o la contrasenya són incorrectes."
+  "components.Discover.FilterSlideover.tmdbuservotecount": "Recompte de vots dels usuaris de TMDB",
+  "components.Discover.FilterSlideover.voteCount": "Número de vots entre {minValue} i {maxValue}",
+  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "So per a les notificacions",
+  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Dispositiu per defecte",
+  "components.Settings.Notifications.NotificationsPushover.sound": "So per a les notificacions",
+  "components.Settings.SonarrModal.animeSeriesType": "Tipus d'Anime",
+  "components.Settings.SonarrModal.seriesType": "Tipus de sèrie",
+  "components.Settings.SonarrModal.tagRequests": "Sol·licituds d'etiquetes",
+  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Dispositiu per defecte",
+  "i18n.collection": "Col·lecció",
+  "components.MovieDetails.imdbuserscore": "Puntuació dels usuaris de IMDB",
+  "components.Settings.RadarrModal.tagRequests": "Sol·licituds d'etiqueta",
+  "components.Settings.RadarrModal.tagRequestsInfo": "Automàticament afegeix una etiqueta addicional amb el nom d'usuari i nom complet del sol·licitant",
+  "components.Settings.SonarrModal.tagRequestsInfo": "Automàticament afegeix una etiqueta addicional amb el nom d'usuari i nom complet del sol·licitant"
 }

src/i18n/locale/en.json

@@ -1,18 +1,7 @@
 {
-  "component.BlacklistBlock.blacklistdate": "Blacklisted date",
-  "component.BlacklistBlock.blacklistedby": "Blacklisted By",
-  "component.BlacklistModal.blacklisting": "Blacklisting",
   "components.AirDateBadge.airedrelative": "Aired {relativeTime}",
   "components.AirDateBadge.airsrelative": "Airing {relativeTime}",
   "components.AppDataWarning.dockerVolumeMissingDescription": "The <code>{appDataPath}</code> volume mount was not configured properly. All data will be cleared when the container is stopped or restarted.",
-  "components.Blacklist.blacklistNotFoundError": "<strong>{title}</strong> is not blacklisted.",
-  "components.Blacklist.blacklistSettingsDescription": "Manage blacklisted media.",
-  "components.Blacklist.blacklistdate": "date",
-  "components.Blacklist.blacklistedby": "{date} by {user}",
-  "components.Blacklist.blacklistsettings": "Blacklist Settings",
-  "components.Blacklist.mediaName": "Name",
-  "components.Blacklist.mediaTmdbId": "tmdb Id",
-  "components.Blacklist.mediaType": "Type",
   "components.CollectionDetails.numberofmovies": "{count} Movies",
   "components.CollectionDetails.overview": "Overview",
   "components.CollectionDetails.requestcollection": "Request Collection",
@@ -84,7 +73,6 @@
   "components.Discover.FilterSlideover.releaseDate": "Release Date",
   "components.Discover.FilterSlideover.runtime": "Runtime",
   "components.Discover.FilterSlideover.runtimeText": "{minValue}-{maxValue} minute runtime",
-  "components.Discover.FilterSlideover.status": "Status",
   "components.Discover.FilterSlideover.streamingservices": "Streaming Services",
   "components.Discover.FilterSlideover.studio": "Studio",
   "components.Discover.FilterSlideover.tmdbuserscore": "TMDB User Score",
@@ -211,7 +199,6 @@
   "components.LanguageSelector.originalLanguageDefault": "All Languages",
   "components.Layout.LanguagePicker.displaylanguage": "Display Language",
   "components.Layout.SearchInput.searchPlaceholder": "Search Movies & TV",
-  "components.Layout.Sidebar.blacklist": "Blacklist",
   "components.Layout.Sidebar.browsemovies": "Movies",
   "components.Layout.Sidebar.browsetv": "Series",
   "components.Layout.Sidebar.dashboard": "Discover",
@@ -302,7 +289,6 @@
   "components.MediaSlider.ShowMoreCard.seemore": "See More",
   "components.MovieDetails.MovieCast.fullcast": "Full Cast",
   "components.MovieDetails.MovieCrew.fullcrew": "Full Crew",
-  "components.MovieDetails.addtowatchlist": "Add To Watchlist",
   "components.MovieDetails.budget": "Budget",
   "components.MovieDetails.cast": "Cast",
   "components.MovieDetails.digitalrelease": "Digital Release",
@@ -323,7 +309,6 @@
   "components.MovieDetails.productioncountries": "Production {countryCount, plural, one {Country} other {Countries}}",
   "components.MovieDetails.recommendations": "Recommendations",
   "components.MovieDetails.releasedate": "{releaseCount, plural, one {Release Date} other {Release Dates}}",
-  "components.MovieDetails.removefromwatchlist": "Remove From Watchlist",
   "components.MovieDetails.reportissue": "Report an Issue",
   "components.MovieDetails.revenue": "Revenue",
   "components.MovieDetails.rtaudiencescore": "Rotten Tomatoes Audience Score",
@@ -337,9 +322,6 @@
   "components.MovieDetails.theatricalrelease": "Theatrical Release",
   "components.MovieDetails.tmdbuserscore": "TMDB User Score",
   "components.MovieDetails.viewfullcrew": "View Full Crew",
-  "components.MovieDetails.watchlistDeleted": "<strong>{title}</strong> Removed from watchlist successfully!",
-  "components.MovieDetails.watchlistError": "Something went wrong try again.",
-  "components.MovieDetails.watchlistSuccess": "<strong>{title}</strong> added to watchlist successfully!",
   "components.MovieDetails.watchtrailer": "Watch Trailer",
   "components.NotificationTypeSelector.adminissuecommentDescription": "Get notified when other users comment on issues.",
   "components.NotificationTypeSelector.adminissuereopenedDescription": "Get notified when issues are reopened by other users.",
@@ -399,12 +381,8 @@
   "components.PermissionEdit.autorequestMoviesDescription": "Grant permission to automatically submit requests for non-4K movies via Plex Watchlist.",
   "components.PermissionEdit.autorequestSeries": "Auto-Request Series",
   "components.PermissionEdit.autorequestSeriesDescription": "Grant permission to automatically submit requests for non-4K series via Plex Watchlist.",
-  "components.PermissionEdit.blacklistedItems": "Blacklist media.",
-  "components.PermissionEdit.blacklistedItemsDescription": "Grant permission to blacklist media.",
   "components.PermissionEdit.createissues": "Report Issues",
   "components.PermissionEdit.createissuesDescription": "Grant permission to report media issues.",
-  "components.PermissionEdit.manageblacklist": "Manage Blacklist",
-  "components.PermissionEdit.manageblacklistDescription": "Grant permission to manage blacklisted media.",
   "components.PermissionEdit.manageissues": "Manage Issues",
   "components.PermissionEdit.manageissuesDescription": "Grant permission to manage media issues.",
   "components.PermissionEdit.managerequests": "Manage Requests",
@@ -423,8 +401,6 @@
   "components.PermissionEdit.requestTvDescription": "Grant permission to submit requests for non-4K series.",
   "components.PermissionEdit.users": "Manage Users",
   "components.PermissionEdit.usersDescription": "Grant permission to manage users. Users with this permission cannot modify users with or grant the Admin privilege.",
-  "components.PermissionEdit.viewblacklistedItems": "View blacklisted media.",
-  "components.PermissionEdit.viewblacklistedItemsDescription": "Grant permission to view blacklisted media.",
   "components.PermissionEdit.viewissues": "View Issues",
   "components.PermissionEdit.viewissuesDescription": "Grant permission to view media issues reported by other users.",
   "components.PermissionEdit.viewrecent": "View Recently Added",
@@ -492,7 +468,6 @@
   "components.RequestList.RequestItem.mediaerror": "{mediaType} Not Found",
   "components.RequestList.RequestItem.modified": "Modified",
   "components.RequestList.RequestItem.modifieduserdate": "{date} by {user}",
-  "components.RequestList.RequestItem.profileName": "Profile",
   "components.RequestList.RequestItem.requested": "Requested",
   "components.RequestList.RequestItem.requesteddate": "Requested",
   "components.RequestList.RequestItem.seasons": "{seasonCount, plural, one {Season} other {Seasons}}",
@@ -577,16 +552,9 @@
   "components.ResetPassword.validationpasswordrequired": "You must provide a password",
   "components.Search.search": "Search",
   "components.Search.searchresults": "Search Results",
-  "components.Selector.canceled": "Canceled",
-  "components.Selector.ended": "Ended",
-  "components.Selector.inProduction": "In Production",
   "components.Selector.nooptions": "No results.",
-  "components.Selector.pilot": "Pilot",
-  "components.Selector.planned": "Planned",
-  "components.Selector.returningSeries": "Returning Series",
   "components.Selector.searchGenres": "Select genres…",
   "components.Selector.searchKeywords": "Search keywords…",
-  "components.Selector.searchStatus": "Select status...",
   "components.Selector.searchStudios": "Search studios…",
   "components.Selector.showless": "Show Less",
   "components.Selector.showmore": "Show More",
@@ -849,7 +817,6 @@
   "components.Settings.SettingsJobsCache.runnow": "Run Now",
   "components.Settings.SettingsJobsCache.sonarr-scan": "Sonarr Scan",
   "components.Settings.SettingsJobsCache.unknownJob": "Unknown Job",
-  "components.Settings.SettingsJobsCache.usersavatars": "Users' Avatars",
   "components.Settings.SettingsLogs.copiedLogMessage": "Copied log message to clipboard.",
   "components.Settings.SettingsLogs.copyToClipboard": "Copy to Clipboard",
   "components.Settings.SettingsLogs.extraData": "Additional Data",
@@ -873,8 +840,6 @@
   "components.Settings.SettingsMain.applicationurl": "Application URL",
   "components.Settings.SettingsMain.cacheImages": "Enable Image Caching",
   "components.Settings.SettingsMain.cacheImagesTip": "Cache externally sourced images (requires a significant amount of disk space)",
-  "components.Settings.SettingsMain.cspFrameAncestorDomains": "Frame-Ancestor Domains",
-  "components.Settings.SettingsMain.cspFrameAncestorDomainsTip": "Domains to allow embedding Jellyseer as iframe, object or embed. Incompatible with CSRF-Protection",
   "components.Settings.SettingsMain.csrfProtection": "Enable CSRF Protection",
   "components.Settings.SettingsMain.csrfProtectionHoverTip": "Do NOT enable this setting unless you understand what you are doing!",
   "components.Settings.SettingsMain.csrfProtectionTip": "Set external API access to read-only (requires HTTPS)",
@@ -971,7 +936,6 @@
   "components.Settings.address": "Address",
   "components.Settings.addsonarr": "Add Sonarr Server",
   "components.Settings.advancedTooltip": "Incorrectly configuring this setting may result in broken functionality",
-  "components.Settings.apiKey": "API key",
   "components.Settings.cancelscan": "Cancel Scan",
   "components.Settings.copied": "Copied API key to clipboard.",
   "components.Settings.currentlibrary": "Current Library: {name}",
@@ -988,7 +952,7 @@
   "components.Settings.is4k": "4K",
   "components.Settings.jellyfinForgotPasswordUrl": "Forgot Password URL",
   "components.Settings.jellyfinSettings": "{mediaServerName} Settings",
-  "components.Settings.jellyfinSettingsDescription": "Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page. You can also change the Jellyfin API key, which was automatically generated previously.",
+  "components.Settings.jellyfinSettingsDescription": "Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page.",
   "components.Settings.jellyfinSettingsFailure": "Something went wrong while saving {mediaServerName} settings.",
   "components.Settings.jellyfinSettingsSuccess": "{mediaServerName} settings saved successfully!",
   "components.Settings.jellyfinSyncFailedAutomaticGroupedFolders": "Custom authentication with Automatic Library Grouping not supported",
@@ -1032,7 +996,6 @@
   "components.Settings.save": "Save Changes",
   "components.Settings.saving": "Saving…",
   "components.Settings.scan": "Sync Libraries",
-  "components.Settings.scanbackground": "Scanning will run in the background. You can continue the setup process in the meantime.",
   "components.Settings.scanning": "Syncing…",
   "components.Settings.serverLocal": "local",
   "components.Settings.serverRemote": "remote",
@@ -1053,7 +1016,6 @@
   "components.Settings.tautulliSettings": "Tautulli Settings",
   "components.Settings.tautulliSettingsDescription": "Optionally configure the settings for your Tautulli server. Jellyseerr fetches watch history data for your Plex media from Tautulli.",
   "components.Settings.timeout": "Timeout",
-  "components.Settings.tip": "Tip",
   "components.Settings.toastPlexConnecting": "Attempting to connect to Plex…",
   "components.Settings.toastPlexConnectingFailure": "Failed to connect to Plex.",
   "components.Settings.toastPlexConnectingSuccess": "Plex connection established successfully!",
@@ -1083,6 +1045,7 @@
   "components.Setup.continue": "Continue",
   "components.Setup.finish": "Finish Setup",
   "components.Setup.finishing": "Finishing…",
+  "components.Setup.scanbackground": "Scanning will run in the background. You can continue the setup process in the meantime.",
   "components.Setup.servertype": "Choose Server Type",
   "components.Setup.setup": "Setup",
   "components.Setup.signin": "Sign In",
@@ -1091,12 +1054,12 @@
   "components.Setup.signinWithJellyfin": "Enter your Jellyfin details",
   "components.Setup.signinWithPlex": "Enter your Plex details",
   "components.Setup.subtitle": "Get started by choosing your media server",
+  "components.Setup.tip": "Tip",
   "components.Setup.welcome": "Welcome to Jellyseerr",
   "components.StatusBadge.managemedia": "Manage {mediaType}",
   "components.StatusBadge.openinarr": "Open in {arr}",
   "components.StatusBadge.playonplex": "Play on {mediaServerName}",
   "components.StatusBadge.seasonepisodenumber": "S{seasonNumber}E{episodeNumber}",
-  "components.StatusBadge.seasonnumber": "S{seasonNumber}",
   "components.StatusBadge.status": "{status}",
   "components.StatusBadge.status4k": "4K {status}",
   "components.StatusChecker.appUpdated": "{applicationTitle} Updated",
@@ -1117,7 +1080,6 @@
   "components.TvDetails.Season.somethingwentwrong": "Something went wrong while retrieving season data.",
   "components.TvDetails.TvCast.fullseriescast": "Full Series Cast",
   "components.TvDetails.TvCrew.fullseriescrew": "Full Series Crew",
-  "components.TvDetails.addtowatchlist": "Add To Watchlist",
   "components.TvDetails.anime": "Anime",
   "components.TvDetails.cast": "Cast",
   "components.TvDetails.episodeCount": "{episodeCount, plural, one {# Episode} other {# Episodes}}",
@@ -1135,7 +1097,6 @@
   "components.TvDetails.play4k": "Play 4K on {mediaServerName}",
   "components.TvDetails.productioncountries": "Production {countryCount, plural, one {Country} other {Countries}}",
   "components.TvDetails.recommendations": "Recommendations",
-  "components.TvDetails.removefromwatchlist": "Remove From Watchlist",
   "components.TvDetails.reportissue": "Report an Issue",
   "components.TvDetails.rtaudiencescore": "Rotten Tomatoes Audience Score",
   "components.TvDetails.rtcriticsscore": "Rotten Tomatoes Tomatometer",
@@ -1148,9 +1109,6 @@
   "components.TvDetails.streamingproviders": "Currently Streaming On",
   "components.TvDetails.tmdbuserscore": "TMDB User Score",
   "components.TvDetails.viewfullcrew": "View Full Crew",
-  "components.TvDetails.watchlistDeleted": "<strong>{title}</strong> Removed from watchlist successfully!",
-  "components.TvDetails.watchlistError": "Something went wrong try again.",
-  "components.TvDetails.watchlistSuccess": "<strong>{title}</strong> added to watchlist successfully!",
   "components.TvDetails.watchtrailer": "Watch Trailer",
   "components.UserList.accounttype": "Type",
   "components.UserList.admin": "Admin",
@@ -1235,7 +1193,6 @@
   "components.UserProfile.UserSettings.UserGeneralSettings.saving": "Saving…",
   "components.UserProfile.UserSettings.UserGeneralSettings.seriesrequestlimit": "Series Request Limit",
   "components.UserProfile.UserSettings.UserGeneralSettings.toastSettingsFailure": "Something went wrong while saving settings.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.toastSettingsFailureEmail": "This email is already taken!",
   "components.UserProfile.UserSettings.UserGeneralSettings.toastSettingsSuccess": "Settings saved successfully!",
   "components.UserProfile.UserSettings.UserGeneralSettings.user": "User",
   "components.UserProfile.UserSettings.UserGeneralSettings.validationDiscordId": "You must provide a valid Discord user ID",
@@ -1315,7 +1272,6 @@
   "components.UserProfile.seriesrequest": "Series Requests",
   "components.UserProfile.totalrequests": "Total Requests",
   "components.UserProfile.unlimited": "Unlimited",
-  "i18n.addToBlacklist": "Add to Blacklist",
   "i18n.advanced": "Advanced",
   "i18n.all": "All",
   "i18n.approve": "Approve",
@@ -1323,11 +1279,6 @@
   "i18n.areyousure": "Are you sure?",
   "i18n.available": "Available",
   "i18n.back": "Back",
-  "i18n.blacklist": "Blacklist",
-  "i18n.blacklistDuplicateError": "<strong>{title}</strong> has already been blacklisted.",
-  "i18n.blacklistError": "Something went wrong try again.",
-  "i18n.blacklistSuccess": "<strong>{title}</strong> was successfully blacklisted.",
-  "i18n.blacklisted": "Blacklisted",
   "i18n.cancel": "Cancel",
   "i18n.canceling": "Canceling…",
   "i18n.close": "Close",
@@ -1353,8 +1304,6 @@
   "i18n.pending": "Pending",
   "i18n.previous": "Previous",
   "i18n.processing": "Processing",
-  "i18n.removeFromBlacklistSuccess": "<strong>{title}</strong> was successfully removed from the Blacklist.",
-  "i18n.removefromBlacklist": "Remove from Blacklist",
   "i18n.request": "Request",
   "i18n.request4k": "Request in 4K",
   "i18n.requested": "Requested",

src/i18n/locale/es.json

@@ -201,7 +201,7 @@
   "components.Settings.SonarrModal.animerootfolder": "Carpeta raíz de anime",
   "components.Settings.SonarrModal.animequalityprofile": "Perfil de calidad de anime",
   "components.Settings.SettingsAbout.timezone": "Zona horaria",
-  "components.Settings.SettingsAbout.supportoverseerr": "Apoya a Overseerr",
+  "components.Settings.SettingsAbout.supportoverseerr": "Apoya a Jellyseerr",
   "components.Settings.SettingsAbout.helppaycoffee": "Ayúdame invitándome a un café",
   "components.Settings.SettingsAbout.Releases.viewongithub": "Ver en GitHub",
   "components.Settings.SettingsAbout.Releases.viewchangelog": "Ver registro de cambios",
@@ -299,14 +299,14 @@
   "components.RequestButton.viewrequest": "Ver Solicitud",
   "components.RequestButton.requestmore4k": "Solicitar más en 4K",
   "components.RequestButton.requestmore": "Solicitar más",
-  "components.RequestButton.declinerequests": "Rechazar {requestCount, plural, one {Request} other {{requestCount} Requests}}",
+  "components.RequestButton.declinerequests": "Rechazar {requestCount, plural, one {solicitud} other {{requestCount} solicitudes}}",
   "components.RequestButton.declinerequest4k": "Rechazar Solicitud 4K",
   "components.RequestButton.declinerequest": "Rechazar Solicitud",
-  "components.RequestButton.decline4krequests": "Rechazar {requestCount, plural, one {4K Request} other {{requestCount} 4K Requests}}",
-  "components.RequestButton.approverequests": "Aprobar {requestCount, plural, one {Request} other {{requestCount} Requests}}",
+  "components.RequestButton.decline4krequests": "Rechazar {requestCount, plural, one {solicitud en 4K} other {{requestCount} solicitudes en 4K}}",
+  "components.RequestButton.approverequests": "Aprobar {requestCount, plural, one {solicitud} other {{requestCount} solicitudes}}",
   "components.RequestButton.approverequest4k": "Aprobar Solicitud 4K",
   "components.RequestButton.approverequest": "Aprobar Solicitud",
-  "components.RequestButton.approve4krequests": "Aprobar {requestCount, plural, one {4K Request} other {{requestCount} 4K Requests}}",
+  "components.RequestButton.approve4krequests": "Aprobar {requestCount, plural, one {petición en 4K} other {requestCount} peticiones en 4K}}",
   "components.RequestBlock.server": "Servidor de Destino",
   "components.RequestBlock.rootfolder": "Carpeta Raíz",
   "components.RequestBlock.profilechanged": "Perfil de Calidad",
@@ -656,7 +656,7 @@
   "components.QuotaSelector.unlimited": "Ilimitadas",
   "components.MovieDetails.originaltitle": "Título Original",
   "components.LanguageSelector.originalLanguageDefault": "Todos los Idiomas",
-  "components.LanguageSelector.languageServerDefault": "({language}) por defecto",
+  "components.LanguageSelector.languageServerDefault": "({Language}) por defecto",
   "components.Layout.VersionStatus.commitsbehind": "{commitsBehind} {commitsBehind, plural, one {cambio} other {cambios}} por detrás",
   "components.UserProfile.UserSettings.UserPasswordChange.noPasswordSetOwnAccount": "Tu cuenta no tiene configurada una contraseña actualmente. Configure una contraseña a continuación para habilitar el acceso como \"usuario local\" utilizando tu dirección de email.",
   "components.UserProfile.UserSettings.UserPasswordChange.noPasswordSet": "Esta cuenta de usuario no tiene configurada una contraseña actualmente. Configure una contraseña a continuación para habilitar el acceso como \"usuario local\"",
@@ -784,7 +784,7 @@
   "components.DownloadBlock.estimatedtime": "Estimación de {time}",
   "components.Settings.Notifications.encryptionOpportunisticTls": "Usa siempre STARTTLS",
   "components.TvDetails.streamingproviders": "Emisión Actual en",
-  "components.UserProfile.UserSettings.UserGeneralSettings.languageDefault": "({language}) por defecto",
+  "components.UserProfile.UserSettings.UserGeneralSettings.languageDefault": "{{Language}} por defecto",
   "components.Settings.Notifications.NotificationsWebPush.httpsRequirement": "Para recibir notificaciones web push, Jellyseerr debe servirse mediante HTTPS.",
   "components.Settings.Notifications.NotificationsWebhook.validationTypes": "Debes seleccionar, al menos, un tipo de notificación",
   "components.Settings.Notifications.validationTypes": "Debes seleccionar, al menos, un tipo de notificación",
@@ -816,10 +816,10 @@
   "components.Settings.Notifications.encryptionTip": "Normalmente, TLS Implícito usa el puerto 465 y STARTTLS usa el puerto 587",
   "components.UserList.localLoginDisabled": "El ajuste para <strong>Habilitar el Inicio de Sesión Local</strong> está actualmente deshabilitado.",
   "components.Settings.SettingsUsers.defaultPermissionsTip": "Permisos iniciales asignados a nuevos usuarios",
-  "components.Settings.SettingsAbout.runningDevelop": "Estás utilizando la rama de <code>desarrollo</code> de Jellyseerr, la cual solo se recomienda para aquellos que contribuyen al desarrollo o al soporte de las pruebas de nuevos desarrollos.",
+  "components.Settings.SettingsAbout.runningDevelop": "Estás utilizando la rama de <code>develop</code> de Jellyseerr, la cual solo se recomienda para aquellos que contribuyen al desarrollo o al soporte de las pruebas de nuevos desarrollos.",
   "components.StatusBadge.status": "{status}",
-  "components.Settings.SettingsJobsCache.editJobScheduleSelectorMinutes": "Cada {jobScheduleMinutes, plural, one {minute} other {{jobScheduleMinutes} minutes}}",
-  "components.Settings.SettingsJobsCache.editJobScheduleSelectorHours": "Cada {jobScheduleHours, plural, one {hour} other {{jobScheduleHours} hours}}",
+  "components.Settings.SettingsJobsCache.editJobScheduleSelectorMinutes": "Cada {jobScheduleMinutes, plural, one {minuto} other {{jobScheduleMinutes} minutos}}",
+  "components.Settings.SettingsJobsCache.editJobScheduleSelectorHours": "Cada {jobScheduleHours, plural, one {hora} other {{jobScheduleHours} horas}}",
   "components.Settings.SettingsJobsCache.jobScheduleEditFailed": "Algo fue mal al guardar la tarea programada.",
   "components.Settings.SettingsJobsCache.editJobSchedule": "Modificar tarea programada",
   "components.Settings.SettingsJobsCache.editJobSchedulePrompt": "Nueva frecuencia",
@@ -848,7 +848,7 @@
   "components.IssueDetails.nocomments": "Sin comentarios.",
   "components.IssueDetails.openedby": "#{issueId} abierta {relativeTime} por {username}",
   "components.IssueDetails.openin4karr": "Abrir en {arr} 4K",
-  "components.IssueDetails.openinarr": "Abrir en {arr}",
+  "components.IssueDetails.openinarr": "Abierta en {arr}",
   "components.IssueDetails.play4konplex": "Ver en 4K en {mediaServerName}",
   "components.IssueDetails.playonplex": "Ver en {mediaServerName}",
   "components.IssueDetails.problemepisode": "Episodio Afectado",
@@ -1193,7 +1193,7 @@
   "components.RequestList.RequestItem.tvdbid": "Identificador de TheTVDB",
   "components.Settings.SettingsJobsCache.image-cache-cleanup": "Limpieza de la caché de imágenes",
   "components.Settings.SettingsJobsCache.imagecache": "Caché de imágenes",
-  "components.Settings.SettingsJobsCache.editJobScheduleSelectorSeconds": "Cada {jobScheduleSeconds, plural, one {second} other {{jobScheduleSeconds} seconds}}",
+  "components.Settings.SettingsJobsCache.editJobScheduleSelectorSeconds": "Cada {jobScheduleSeconds, plural, one {segundo} other {{jobScheduleSeconds} segundos}}",
   "components.Settings.SettingsJobsCache.availability-sync": "Sincronización de la disponibilidad de medios",
   "components.Discover.tmdbmoviestreamingservices": "Servicios de streaming de películas TMDB",
   "components.Discover.tmdbtvstreamingservices": "Servicios de TV en streaming TMDB",
@@ -1205,110 +1205,10 @@
   "components.Settings.RadarrModal.tagRequestsInfo": "Añadir automáticamente una etiqueta adicional con el nombre de usuario y el nombre para mostrar del solicitante",
   "components.Settings.SonarrModal.tagRequestsInfo": "Añadir automáticamente una etiqueta adicional con el nombre de usuario y el nombre para mostrar del solicitante",
   "components.MovieDetails.imdbuserscore": "Puntuación de los usuarios de IMDB",
-  "components.Layout.UserWarnings.passwordRequired": "Se requiere una contraseña.",
-  "components.Login.credentialerror": "El usuario o contraseña es incorrecto.",
-  "components.Login.host": "{mediaServerName} URL",
-  "components.Login.initialsignin": "Conectar",
-  "components.Login.initialsigningin": "Conectando…",
-  "components.Login.emailtooltip": "No es necesario asociar la dirección con su instancia de {mediaServerName}.",
-  "components.Login.saving": "Añadiendo…",
-  "components.Login.title": "Añadir Email",
-  "components.Login.username": "Nombre de usuario",
-  "components.Login.validationEmailFormat": "El email es inválido",
-  "components.Login.validationEmailRequired": "Debes proporcional un email",
-  "components.Login.validationemailformat": "Se requiere de un email válido",
-  "components.Login.validationhostformat": "Se requiere de una URL válida",
-  "components.Login.validationusernamerequired": "Se requiere un nombre de usuario",
-  "components.ManageSlideOver.manageModalRemoveMediaWarning": "* Esto eliminará de manera irreversible esta {mediaType} de {arr}, incluyendo todos los archivos.",
-  "i18n.open": "Abierto",
-  "components.MovieDetails.downloadstatus": "Estado de la descarga",
-  "components.MovieDetails.openradarr": "Abrir Película en Radarr",
-  "components.MovieDetails.openradarr4k": "Abrir Película 4K en Radarr",
-  "components.MovieDetails.play": "Reproducir en {mediaServerName}",
-  "components.MovieDetails.play4k": "Reproducir 4K en {mediaServerName}",
-  "components.NotificationTypeSelector.issueresolved": "Incidencia Resuelta",
-  "components.NotificationTypeSelector.userissuecommentDescription": "Notificame cuando haya nuevos comentarios en incidencias que haya abierto.",
-  "components.NotificationTypeSelector.userissuecreatedDescription": "Notificame cuando otros usuarios reporten incidencias.",
-  "components.PermissionEdit.viewissues": "Ver incidencias",
-  "components.PermissionEdit.manageissuesDescription": "Dar permiso para administrar incidencias.",
-  "components.PermissionEdit.viewissuesDescription": "Dar permiso para ver incidencias reportadas por otros usuarios.",
-  "components.Settings.Notifications.NotificationsPushover.sound": "Sonido de Notificacion",
-  "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Escanear Añadidos Recientemente de Jellyfin",
-  "components.Settings.SettingsJobsCache.jellyfin-full-scan": "Escaneo Completo de la libreria de Jellyfin",
-  "components.Settings.jellyfinSettings": "Ajustes de {mediaServerName}",
-  "components.Settings.jellyfinsettings": "Ajustes de {mediaServerName}",
-  "components.Settings.jellyfinSettingsFailure": "Algo salió mal al guardar la configuración de {mediaServerName}.",
-  "components.Settings.jellyfinSettingsSuccess": "¡La configuración de {mediaServerName} se guardó correctamente!",
-  "components.Settings.jellyfinlibraries": "Bibliotecas {mediaServerName}",
-  "components.Settings.jellyfinlibrariesDescription": "La biblioteca {mediaServerName} busca títulos. Haga clic en el botón a continuación si no aparece ninguna biblioteca.",
-  "components.Settings.manualscanDescriptionJellyfin": "Normalmente, esto sólo se ejecutará una vez cada 24 horas. Jellyseerr comprobará de forma más agresiva los añadidos recientemente de su servidor {mediaServerName}. ¡Si es la primera vez que configura Jellyseerr, se recomienda un escaneo manual completo de la biblioteca!",
-  "components.Settings.save": "Guardar Cambios",
-  "components.Settings.saving": "Guardando…",
-  "components.Settings.syncing": "Sincronizando",
-  "components.Settings.timeout": "Tiempo agotado",
-  "components.Setup.signinWithPlex": "Usa tu cuenta de Plex",
-  "components.Setup.configuremediaserver": "Configurar servidor multimedia",
-  "components.TitleCard.addToWatchList": "Añadir a lista de seguimiento",
-  "components.TitleCard.watchlistCancel": "Lista de seguimiento para <strong>{title}</strong> cancelada.",
-  "components.TitleCard.watchlistError": "Algo salió mal, intenta de nuevo.",
-  "components.TitleCard.watchlistSuccess": "<strong>{title}</strong> añadido correctamente a la lista de seguimiento!",
-  "components.TvDetails.play": "Reproducir en {mediaServerName}",
-  "components.UserList.importfromJellyfin": "Importar Usuarios de {mediaServerName}",
-  "components.UserList.mediaServerUser": "Usuario de {mediaServerName}",
-  "components.UserList.importedfromJellyfin": "<strong>{userCount}</strong> {mediaServerName} {userCount, plural, one {user} other {users}} importado correctamente!",
-  "components.UserList.importfromJellyfinerror": "Se produjo un error al importar usuarios de {mediaServerName}.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.save": "Guardar Cambios",
-  "components.UserProfile.UserSettings.UserGeneralSettings.email": "Email",
-  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Dispositivo Predeterminado",
-  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Sonido de Notificacion",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletsettingsfailed": "Fallo al guardar los ajustes de la notificación Pushbullet.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletsettingssaved": "¡Los ajustes de notificación Pushbullet se han guardado con éxito!",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoverApplicationToken": "Token de aplicación API",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoverUserKey": "Clave de usuario o grupo",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoverUserKeyTip": "Tu <UsersGroupsLink>identificador de usuario o grupo</UsersGroupsLink> de 30 caracteres",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoversettingssaved": "¡Se han guardado los ajustes de notificación de Pushover!",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoverApplicationTokenTip": "<ApplicationRegistrationLink>Registrar una aplicación</ApplicationRegistrationLink> para usar con {applicationTitle}",
-  "components.UserProfile.UserSettings.UserNotificationSettings.validationPushoverUserKey": "Debes proporcionar una clave de usuario o grupo válida",
-  "components.Login.validationhostrequired": "{mediaServerName} URL requerida",
-  "i18n.resolved": "Resuelto",
-  "components.UserList.importfrommediaserver": "Importar Usuarios de {mediaServerName}",
-  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Dispositivo Predeterminado",
-  "components.ManageSlideOver.removearr": "Eliminar de {arr}",
-  "components.NotificationTypeSelector.issuereopenedDescription": "Enviar notificación cuando se reabran incidencias.",
-  "components.Layout.UserWarnings.emailRequired": "Se requiere una dirección de email.",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletAccessToken": "Token de Acceso",
-  "components.UserProfile.UserSettings.UserNotificationSettings.validationPushoverApplicationToken": "Debes proporcionar un token de aplicación válido",
-  "components.Settings.syncJellyfin": "Sincronizar Bibliotecas",
-  "components.Layout.UserWarnings.emailInvalid": "La dirección de correo es inválida.",
-  "components.Login.description": "Como es la primera vez que inicias sesión en {applicationName}, es necesario añadir una dirección de email válida.",
-  "components.Login.save": "Añadir",
-  "components.NotificationTypeSelector.issueresolvedDescription": "Enviar notificación cuando se resuelvan incidencias.",
-  "components.PermissionEdit.manageissues": "Administrar incidencias",
-  "components.PermissionEdit.createissues": "Notificar incidencia",
-  "components.Settings.menuJellyfinSettings": "{mediaServerName}",
-  "components.UserProfile.UserSettings.UserGeneralSettings.saving": "Guardando…",
-  "components.UserProfile.UserSettings.UserNotificationSettings.validationPushbulletAccessToken": "Debes indicar un token de acceso",
-  "components.Login.signinwithjellyfin": "Utiliza tu cuenta de {mediaServerName}",
-  "components.ManageSlideOver.removearr4k": "Eliminar de {arr} 4K",
-  "components.Settings.internalUrl": "URL Interna",
-  "components.TvDetails.play4k": "Reproducir 4K en {mediaServerName}",
-  "components.Setup.signin": "Iniciar Sesión",
-  "components.Setup.signinWithJellyfin": "Utiliza tu cuenta de {mediaServerName}",
-  "components.UserList.noJellyfinuserstoimport": "No hay usuarios de {mediaServerName} que importar.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.mediaServerUser": "Usuario de {mediaServerName}",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletAccessTokenTip": "Crea un token desde tu <PushbulletSettingsLink>Opciones de Cuenta</PushbulletSettingsLink>",
-  "components.UserProfile.UserSettings.UserNotificationSettings.pushoversettingsfailed": "No se pudo guardar la configuración de notificaciones de Pushover.",
-  "components.NotificationTypeSelector.userissuereopenedDescription": "Recibir notificaciones cuando se vuelvan a abrir incidencias que haya reportado.",
-  "components.NotificationTypeSelector.userissueresolvedDescription": "Reciba notificaciones cuando se resuelvan las incidencias que haya reportado.",
-  "components.PermissionEdit.createissuesDescription": "Dar permiso para informar incidencias.",
-  "components.Settings.SettingsAbout.supportjellyseerr": "Apoya a Jellyseerr",
-  "components.Settings.Notifications.userEmailRequired": "Requerir email de usuario",
-  "components.Settings.SonarrModal.animeSeriesType": "Tipo de Serie Anime",
-  "components.Settings.SonarrModal.seriesType": "Tipo Serie",
-  "components.Settings.jellyfinSettingsDescription": "Opcionalmente, configure los puntos finales internos y externos para su servidor {mediaServerName}. En la mayoría de los casos, la URL externa es diferente a la URL interna. También se puede configurar una URL de restablecimiento de contraseña personalizada para el inicio de sesión de {mediaServerName}, en caso de que desee redirigir a una página de restablecimiento de contraseña diferente.",
-  "components.Settings.jellyfinsettingsDescription": "Configure los ajustes para su servidor {mediaServerName}. {mediaServerName} escanea sus bibliotecas de {mediaServerName} para ver qué contenido está disponible.",
-  "components.Settings.manualscanJellyfin": "Escanear Libreria Manualmente",
-  "components.TitleCard.watchlistDeleted": "<strong>{title}</strong> Eliminado correctamente de la lista de seguimiento!",
-  "components.UserList.newJellyfinsigninenabled": "La configuración <strong>Habilitar nuevo inicio de sesión de {mediaServerName}</strong> está actualmente habilitada. Los usuarios de {mediaServerName} con acceso a la biblioteca no necesitan ser importados para poder iniciar sesión.",
-  "components.UserProfile.localWatchlist": "Lista de seguimiento de {username}"
+  "components.Settings.SonarrModal.animeSeriesType": "Tipo de anime",
+  "components.Settings.SonarrModal.seriesType": "Tipo de series",
+  "components.Settings.Notifications.NotificationsPushover.sound": "Sonido para las notificaciones",
+  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Dispositivo predeterminado",
+  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Sonido para las notificaciones",
+  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Dispositivo predeterminado"
 }

src/i18n/locale/fr.json

@@ -59,7 +59,7 @@
   "components.Discover.DiscoverTvGenre.genreSeries": "Séries {genre}",
   "components.Discover.DiscoverTvKeyword.keywordSeries": "{keywordTitle} Séries",
   "components.Discover.DiscoverTvLanguage.languageSeries": "Séries en {language}",
-  "components.Discover.DiscoverWatchlist.discoverwatchlist": "Votre watchlist",
+  "components.Discover.DiscoverWatchlist.discoverwatchlist": "Votre watchlist Plex",
   "components.Discover.DiscoverWatchlist.watchlist": "Watchlist Plex",
   "components.Discover.FilterSlideover.activefilters": "{count, plural, one {# Filtre actif} other {# Filtres actifs}}",
   "components.Discover.FilterSlideover.clearfilters": "Effacer les filtres actifs",
@@ -176,7 +176,7 @@
   "components.Settings.RadarrModal.port": "Port",
   "components.Settings.RadarrModal.qualityprofile": "Profil de qualité",
   "components.Settings.RadarrModal.rootfolder": "Dossier racine",
-  "components.Settings.RadarrModal.selectMinimumAvailability": "Sélectionner une disponibilté minimale",
+  "components.Settings.RadarrModal.selectMinimumAvailability": "Sélectionner une disponibilité minimale",
   "components.Settings.RadarrModal.selectQualityProfile": "Sélectionner un profil qualité",
   "components.Settings.RadarrModal.selectRootFolder": "Sélectionner un dossier racine",
   "components.Settings.RadarrModal.server4k": "Serveur 4K",
@@ -277,7 +277,7 @@
   "i18n.tvshows": "Séries",
   "i18n.unavailable": "Indisponible",
   "pages.oops": "Oups",
-  "pages.returnHome": "Retourner à l'acceuil",
+  "pages.returnHome": "Retourner à l'accueil",
   "components.TvDetails.TvCast.fullseriescast": "Casting complet de la série",
   "components.MovieDetails.MovieCast.fullcast": "Casting complet",
   "components.Settings.Notifications.emailsettingssaved": "Paramètres de notification par e-mail enregistrés avec succès !",
@@ -323,7 +323,7 @@
   "components.Settings.SettingsAbout.Releases.viewchangelog": "Voir le journal des modifications",
   "components.Settings.SettingsAbout.Releases.versionChangelog": "Journal des modifications de la version {version}",
   "components.Settings.SettingsAbout.Releases.releases": "Versions",
-  "components.Settings.SettingsAbout.Releases.releasedataMissing": "Les données de version sont actuellement indisponible.",
+  "components.Settings.SettingsAbout.Releases.releasedataMissing": "Les données de version sont actuellement indisponibles.",
   "components.Settings.SettingsAbout.Releases.latestversion": "Dernière version",
   "components.Settings.SettingsAbout.Releases.currentversion": "Actuelle",
   "components.UserList.importfromplexerror": "Une erreur s'est produite durant l'importation des utilisateurs de Plex.",
@@ -1071,7 +1071,7 @@
   "components.ManageSlideOver.manageModalMedia4k": "Média(s) 4K",
   "components.ManageSlideOver.markallseasons4kavailable": "Marquer toutes les saisons comme disponibles en 4K",
   "components.ManageSlideOver.playedby": "Joué par",
-  "components.Settings.validationUrlTrailingSlash": "L'URL ne doit pas ce terminer par un slash",
+  "components.Settings.validationUrlTrailingSlash": "L'URL ne doit pas se terminer par un slash",
   "components.Settings.externalUrl": "URL externe",
   "components.Settings.tautulliApiKey": "Clé API",
   "components.Settings.tautulliSettings": "Paramètres Tautulli",
@@ -1252,70 +1252,10 @@
   "components.Settings.SonarrModal.tagRequestsInfo": "Ajouter automatiquement un tag supplémentaire avec l'ID utilisateur et le nom d'affichage du demandeur",
   "i18n.collection": "Collection",
   "components.Settings.RadarrModal.tagRequestsInfo": "Ajouter automatiquement un tag supplémentaire avec l'ID utilisateur et le nom d'affichage du demandeur",
-  "components.IssueModal.issueVideo": "Vidéo",
-  "components.Settings.Notifications.NotificationsPushover.sound": "Son de notification",
-  "components.Settings.jellyfinSettings": "Paramètres pour {mediaServerName}",
-  "components.Settings.jellyfinSettingsFailure": "Une erreur est survenue lors de l'enregistrement des paramètres pour {mediaServerName}.",
-  "components.Settings.jellyfinSettingsSuccess": "Les paramètres pour {mediaServerName} ont été enregistrés avec succès !",
-  "components.Settings.jellyfinlibraries": "Bibliothèques {mediaServerName}",
-  "components.Settings.jellyfinlibrariesDescription": "Les bibliothèques de {mediaServerName} sont en cours d'analyze. Cliquez sur le bouton ci-dessous si aucune bibliothèque n'est répertoriée.",
-  "components.Settings.jellyfinsettings": "Paramètres pour {mediaServerName}",
-  "components.Settings.manualscanJellyfin": "Analyse manuelle de la bibliothèque",
-  "components.Settings.menuJellyfinSettings": "{mediaServerName}",
-  "components.Settings.save": "Enregistrer les modifications",
-  "components.Settings.saving": "Sauvegarde en cours…",
-  "components.Settings.syncing": "Synchronisation en cours",
-  "components.Setup.signin": "Se connecter",
-  "components.Setup.signinWithPlex": "Utilisez votre compte Plex",
-  "components.StatusBadge.managemedia": "Gérer {mediaType}",
-  "components.StatusBadge.openinarr": "Ouvrir dans {arr}",
-  "components.StatusBadge.playonplex": "Lire sur {mediaServerName}",
-  "components.TitleCard.addToWatchList": "Ajouter à votre watchlist",
-  "components.TitleCard.watchlistCancel": "Watchlist pour <strong>{title}</strong> annulée.",
-  "components.TitleCard.watchlistError": "Une erreur est survenue. Veuillez réessayer.",
-  "components.TitleCard.watchlistSuccess": "<strong>{title}</strong> a été ajouté à votre watchlist avec succès !",
-  "components.TvDetails.Season.somethingwentwrong": "Une erreur est survenue lors de la récupération des données de la saison.",
-  "components.TvDetails.manageseries": "Gérer les séries",
-  "components.TvDetails.play": "Jouer sur {mediaServerName}",
-  "components.TvDetails.play4k": "Jouer en 4K sur {mediaServerName}",
-  "components.TvDetails.rtcriticsscore": "Tomatometer sur Rotten Tomatoes",
-  "components.TvDetails.seasonnumber": "Saison {seasonNumber}",
-  "components.TvDetails.seasonstitle": "Saisons",
-  "components.TvDetails.status4k": "{status} 4K",
-  "components.TvDetails.tmdbuserscore": "Score utilisateur sur TMDB",
-  "components.UserList.importfromJellyfin": "Importer les utilisateurs de {mediaServerName}",
-  "components.UserList.importfromJellyfinerror": "Une erreur est survenue lors de l'importation des utilisateurs de {mediaServerName}.",
-  "components.UserList.importfrommediaserver": "Importer les utilisateurs de {mediaServerName}",
-  "components.UserList.noJellyfinuserstoimport": "Il n'y a aucun utilisateur à importer pour {mediaServerName}.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.saving": "Sauvegarde en cours…",
-  "components.UserProfile.plexwatchlist": "Watchlist Plex",
-  "components.Settings.syncJellyfin": "Synchroniser les bibliothèques",
-  "components.TitleCard.watchlistDeleted": "<strong>{title}</strong> a été retiré de votre watchlist avec succès !",
-  "components.IssueModal.issueSubtitles": "Sous-titre",
-  "components.Login.emailtooltip": "L'adresse ne nécessite pas d'être associée avec votre instance {mediaServerName}.",
-  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Appareil par défaut",
-  "components.Settings.Notifications.userEmailRequired": "E-mail utilisateur requis",
-  "components.Settings.SettingsAbout.supportjellyseerr": "Soutenez Jellyseerr",
-  "components.Settings.SettingsJobsCache.jellyfin-full-scan": "Scan complet des bibliothèques Jellyfin",
-  "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Scan des ajouts récents aux bibliothèques Jellyfin",
-  "components.Settings.SonarrModal.animeSeriesType": "Type de série anime",
   "components.Settings.SonarrModal.seriesType": "Type de série",
-  "components.Settings.internalUrl": "URL interne",
-  "components.Settings.jellyfinsettingsDescription": "Configurez les paramètres de votre serveur {mediaServerName}. {mediaServerName} analyse vos bibliothèques {mediaServerName} pour voir quel contenu est disponible.",
-  "components.Settings.jellyfinSettingsDescription": "Configurez facultativement les URL internes et externes pour votre serveur {mediaServerName}. Dans la plupart des cas, l'URL externe est différente de l'URL interne. Vous pouvez également définir une URL de réinitialisation de mot de passe personnalisée pour la connexion à {mediaServerName}, au cas où vous souhaiteriez rediriger vers une page de réinitialisation de mot de passe différente.",
-  "components.Settings.manualscanDescriptionJellyfin": "Normalement, cette tâche est executée qu'une fois toutes les 24 heures. Jellyseerr vérifiera plus agressivement les éléments récemment ajoutés à votre serveur {mediaServerName}. Si c'est la première fois que vous configurez Jellyseerr, une analyse complète manuelle de la bibliothèque est recommandée !",
-  "components.Settings.timeout": "Temps écoulé",
-  "components.Setup.configuremediaserver": "Configurer le serveur multimédia",
-  "components.TvDetails.rtaudiencescore": "Score de l'audience sur Rotten Tomatoes",
-  "components.UserProfile.UserSettings.UserGeneralSettings.mediaServerUser": "Utilisateur pour {mediaServerName}",
-  "components.Setup.signinWithJellyfin": "Utilisez votre compte {mediaServerName}",
-  "components.UserList.mediaServerUser": "Utilisateur de {mediaServerName}",
-  "components.TvDetails.episodeCount": "{episodeCount, plural, one {# Épisode} other {# Épisodes}}",
-  "components.UserList.newJellyfinsigninenabled": "Le paramètre <strong>Activer la nouvelle connexion à {mediaServerName}</strong> est actuellement activé. Les utilisateurs de {mediaServerName} avec accès à la bibliothèque n'ont pas besoin d'être importés pour se connecter.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.email": "E-mail",
-  "components.UserProfile.UserSettings.UserGeneralSettings.save": "Enregistrer les modifications",
+  "components.Settings.SonarrModal.animeSeriesType": "Types d'anime",
+  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Appareil par défaut",
   "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Appareil par défaut",
-  "components.UserList.importedfromJellyfin": "<strong>{userCount}</strong> {mediaServerName} {userCount, plural, one {user} other {users}} importé(s) avec succès !",
   "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Son de notification",
-  "components.UserProfile.localWatchlist": "Watchlist de {username}"
+  "components.Settings.Notifications.NotificationsPushover.sound": "Son de notification"
 }

src/i18n/locale/nl.json

@@ -3,12 +3,12 @@
   "components.Discover.discovertv": "Populaire series",
   "components.Discover.popularmovies": "Populaire films",
   "components.Discover.populartv": "Populaire series",
-  "components.Discover.recentlyAdded": "Onlangs toegevoegd",
+  "components.Discover.recentlyAdded": "Recent toegevoegd",
   "components.Discover.recentrequests": "Recente verzoeken",
   "components.Discover.trending": "Trending",
   "components.Discover.upcoming": "Verwachte films",
   "components.Discover.upcomingmovies": "Verwachte films",
-  "components.Layout.SearchInput.searchPlaceholder": "Films en series zoeken",
+  "components.Layout.SearchInput.searchPlaceholder": "Zoek films en series",
   "components.Layout.Sidebar.dashboard": "Ontdekken",
   "components.Layout.Sidebar.requests": "Verzoeken",
   "components.Layout.Sidebar.settings": "Instellingen",
@@ -16,7 +16,7 @@
   "components.Layout.UserDropdown.signout": "Uitloggen",
   "components.MovieDetails.budget": "Budget",
   "components.MovieDetails.cast": "Cast",
-  "components.MovieDetails.originallanguage": "Oorspronkelijke taal",
+  "components.MovieDetails.originallanguage": "Originele taal",
   "components.MovieDetails.overview": "Overzicht",
   "components.MovieDetails.overviewunavailable": "Overzicht niet beschikbaar.",
   "components.MovieDetails.recommendations": "Aanbevelingen",
@@ -114,7 +114,7 @@
   "components.Settings.hostname": "Hostnaam of IP-adres",
   "components.Settings.librariesRemaining": "Resterende bibliotheken: {count}",
   "components.Settings.manualscan": "Handmatige bibliotheekscan",
-  "components.Settings.manualscanDescription": "Normaliter wordt dit eenmaal per 24 uur uitgevoerd. Jellyseerr zal de lijst met onlangs toegevoegde media op je Plex-server vaker controleren. Als dit de eerste keer is dat je Jellyseerr instelt, wordt aanbevolen eenmalig een handmatige, volledige bibliotheekscan uit te voeren!",
+  "components.Settings.manualscanDescription": "Normaal wordt dit eens elke 24 uur uitgevoerd. Jellyseerr controleert de recent toegevoegde items van je Plex-server agressiever. Als je Plex voor de eerste keer configureert, is een eenmalige handmatige volledige bibliotheekscan aanbevolen!",
   "components.Settings.menuAbout": "Over",
   "components.Settings.menuGeneralSettings": "Algemeen",
   "components.Settings.menuJobs": "Taken en cache",
@@ -127,7 +127,7 @@
   "components.Settings.plexlibraries": "Plex-bibliotheken",
   "components.Settings.plexlibrariesDescription": "De bibliotheken die Jellyseerr scant voor titels. Stel je Plex-verbinding in en sla ze op. Klik daarna op de onderstaande knop als er geen bibliotheken staan.",
   "components.Settings.plexsettings": "Plex-instellingen",
-  "components.Settings.plexsettingsDescription": "Configureer de instellingen voor je Plex-server. Jellyseerr scant je Plex-bibliotheken om te zien welke inhoud beschikbaar is.",
+  "components.Settings.plexsettingsDescription": "Configureer de instellingen voor je Plex-server. Jellyseerr scant je Plex-bibliotheken om te zien welke content beschikbaar is.",
   "components.Settings.port": "Poort",
   "components.Settings.radarrsettings": "Radarr-instellingen",
   "components.Settings.sonarrsettings": "Sonarr-instellingen",
@@ -137,12 +137,12 @@
   "components.Setup.configureservices": "Diensten configureren",
   "components.Setup.continue": "Doorgaan",
   "components.Setup.finish": "Installatie voltooien",
-  "components.Setup.finishing": "Voltooien…",
+  "components.Setup.finishing": "Bezig met voltooien…",
   "components.Setup.loginwithplex": "Inloggen met Plex",
-  "components.Setup.signinMessage": "Ga aan de slag door je aan te melden",
+  "components.Setup.signinMessage": "Ga aan de slag door in te loggen met je Plex-account",
   "components.Setup.welcome": "Welkom bij Jellyseerr",
   "components.TvDetails.cast": "Cast",
-  "components.TvDetails.originallanguage": "Oorspronkelijke taal",
+  "components.TvDetails.originallanguage": "Originele taal",
   "components.TvDetails.overview": "Overzicht",
   "components.TvDetails.overviewunavailable": "Overzicht niet beschikbaar.",
   "components.TvDetails.recommendations": "Aanbevelingen",
@@ -164,7 +164,7 @@
   "i18n.movies": "Films",
   "i18n.partiallyavailable": "Deels beschikbaar",
   "i18n.pending": "In behandeling",
-  "i18n.processing": "Verwerken",
+  "i18n.processing": "Bezig met verwerken",
   "i18n.tvshows": "Series",
   "i18n.unavailable": "Niet beschikbaar",
   "pages.oops": "Oeps",
@@ -187,14 +187,14 @@
   "components.Setup.tip": "Tip",
   "components.Settings.SonarrModal.testFirstRootFolders": "Test verbinding om hoofdmappen te laden",
   "components.Settings.SonarrModal.testFirstQualityProfiles": "Test verbinding om kwaliteitsprofielen te laden",
-  "components.Settings.SonarrModal.loadingrootfolders": "Hoofdmappen laden…",
-  "components.Settings.SonarrModal.loadingprofiles": "Kwaliteitsprofielen laden…",
+  "components.Settings.SonarrModal.loadingrootfolders": "Bezig met laden van hoofdmappen…",
+  "components.Settings.SonarrModal.loadingprofiles": "Bezig met laden van kwaliteitsprofielen…",
   "components.Settings.SettingsAbout.gettingsupport": "Ondersteuning krijgen",
   "components.Settings.RadarrModal.validationMinimumAvailabilityRequired": "Je moet een minimale beschikbaarheid selecteren",
   "components.Settings.RadarrModal.testFirstRootFolders": "Test verbinding om hoofdmappen te laden",
   "components.Settings.RadarrModal.testFirstQualityProfiles": "Test verbinding om kwaliteitsprofielen te laden",
-  "components.Settings.RadarrModal.loadingrootfolders": "Hoofdmappen laden…",
-  "components.Settings.RadarrModal.loadingprofiles": "Kwaliteitsprofielen laden…",
+  "components.Settings.RadarrModal.loadingrootfolders": "Bezig met laden van hoofdmappen…",
+  "components.Settings.RadarrModal.loadingprofiles": "Bezig met laden van kwaliteitsprofielen…",
   "components.Settings.SettingsAbout.Releases.releasedataMissing": "Versiegegevens zijn momenteel niet beschikbaar.",
   "components.Settings.SettingsAbout.Releases.latestversion": "Nieuwste",
   "components.Settings.SettingsAbout.Releases.currentversion": "Huidig",
@@ -208,7 +208,7 @@
   "i18n.retry": "Opnieuw proberen",
   "i18n.requested": "Aangevraagd",
   "i18n.failed": "Mislukt",
-  "i18n.deleting": "Verwijderen…",
+  "i18n.deleting": "Bezig met verwijderen…",
   "i18n.close": "Sluiten",
   "components.UserList.userdeleteerror": "Er ging iets mis bij het verwijderen van de gebruiker.",
   "components.UserList.userdeleted": "Gebruiker succesvol verwijderd!",
@@ -223,7 +223,7 @@
   "components.TvDetails.network": "{networkCount, plural, one {Netwerk} other {Netwerken}}",
   "components.TvDetails.firstAirDate": "Datum eerste uitzending",
   "components.TvDetails.anime": "Anime",
-  "components.StatusChacker.reloadJellyseerr": "Herladen",
+  "components.StatusChacker.reloadOverseerr": "Herladen",
   "components.StatusChacker.newversionavailable": "Toepassingsupdate",
   "components.StatusChacker.newversionDescription": "Jellyseerr is geüpdatet! Klik op de onderstaande knop om de pagina opnieuw te laden.",
   "components.Settings.toastSettingsSuccess": "Instellingen succesvol opgeslagen!",
@@ -303,10 +303,10 @@
   "components.UserList.create": "Aanmaken",
   "components.UserList.createlocaluser": "Lokale gebruiker aanmaken",
   "components.UserList.usercreatedfailed": "Er ging iets mis bij het aanmaken van de gebruiker.",
-  "components.UserList.creating": "Aanmaken…",
+  "components.UserList.creating": "Bezig met aanmaken…",
   "components.UserList.validationpasswordminchars": "Wachtwoord is te kort; moet minimaal 8 tekens bevatten",
   "components.UserList.usercreatedsuccess": "Gebruiker succesvol aangemaakt!",
-  "components.UserList.passwordinfodescription": "Stel een applicatie-URL in en schakel e-mailmeldingen in om automatische wachtwoordgeneratie mogelijk te maken.",
+  "components.UserList.passwordinfodescription": "Configureer een applicatie-URL en schakel e-mailmeldingen in om automatische wachtwoordgeneratie mogelijk te maken.",
   "components.UserList.password": "Wachtwoord",
   "components.UserList.localuser": "Lokale gebruiker",
   "components.UserList.email": "E-mailadres",
@@ -340,23 +340,23 @@
   "components.RequestModal.SearchByNameModal.notvdbiddescription": "We kunnen deze serie niet automatisch matchen. Selecteer hieronder de juiste match.",
   "components.Login.signinwithplex": "Plex-account gebruiken",
   "components.Login.signinheader": "Log in om verder te gaan",
-  "components.Login.signingin": "Aanmelden…",
+  "components.Login.signingin": "Bezig met inloggen…",
   "components.Login.signin": "Inloggen",
   "components.Settings.notificationAgentSettingsDescription": "Meldingsagenten configureren en inschakelen.",
   "components.PlexLoginButton.signinwithplex": "Inloggen",
-  "components.PlexLoginButton.signingin": "Aanmelden…",
+  "components.PlexLoginButton.signingin": "Bezig met inloggen…",
   "components.PermissionEdit.advancedrequest": "Geavanceerde aanvragen",
   "components.PermissionEdit.admin": "Beheerder",
   "components.UserList.userssaved": "Gebruikersrechten succesvol opgeslagen!",
   "components.Settings.toastPlexRefreshSuccess": "Serverlijst van Plex succesvol opgehaald!",
   "components.Settings.toastPlexRefresh": "Bezig met serverlijst ophalen van Plex…",
-  "components.Settings.toastPlexConnecting": "Verbinden met Plex…",
+  "components.Settings.toastPlexConnecting": "Bezig met verbinden met Plex-server…",
   "components.UserList.bulkedit": "Meerdere bewerken",
   "components.Settings.toastPlexRefreshFailure": "Kan serverlijst van Plex niet ophalen.",
   "components.Settings.toastPlexConnectingSuccess": "Succesvol verbonden met Plex-server!",
   "components.Settings.toastPlexConnectingFailure": "Kan geen verbinding maken met Plex.",
   "components.Settings.settingUpPlexDescription": "Om Plex in te stellen, kan je de gegevens handmatig invoeren of een server selecteren die is opgehaald van <RegisterPlexTVLink>plex.tv</RegisterPlexTVLink>. Druk op de knop rechts van de vervolgkeuzelijst om de lijst van beschikbare servers op te halen.",
-  "components.Settings.serverpresetRefreshing": "Servers ophalen…",
+  "components.Settings.serverpresetRefreshing": "Bezig met servers ophalen…",
   "components.Settings.serverpresetManualMessage": "Handmatige configuratie",
   "components.Settings.serverpresetLoad": "Klik op de knop om de beschikbare servers te laden",
   "components.Settings.serverpreset": "Server",
@@ -431,7 +431,7 @@
   "components.RequestModal.AdvancedRequester.requestas": "Aanvragen als",
   "components.Discover.discover": "Ontdekken",
   "components.Settings.validationApplicationTitle": "Je moet een toepassingstitel opgeven",
-  "components.AppDataWarning.dockerVolumeMissingDescription": "De volumekoppeling <code>{appDataPath}</code> is niet correct geconfigureerd. Alle gegevens zullen worden gewist wanneer de container wordt gestopt of opnieuw wordt gestart.",
+  "components.AppDataWarning.dockerVolumeMissingDescription": "De volumekoppeling <code>{appDataPath}</code> was niet correct geconfigureerd. Alle gegevens zullen worden gewist wanneer de container wordt gestopt of opnieuw wordt gestart.",
   "components.Settings.validationApplicationUrlTrailingSlash": "URL mag niet eindigen op een schuine streep",
   "components.Settings.validationApplicationUrl": "Je moet een geldige URL opgeven",
   "components.Settings.SonarrModal.validationApplicationUrlTrailingSlash": "URL mag niet eindigen op een schuine streep",
@@ -520,7 +520,7 @@
   "components.Layout.UserDropdown.myprofile": "Profiel",
   "components.UserProfile.UserSettings.UserNotificationSettings.validationDiscordId": "Je moet een geldige gebruikers-ID opgeven",
   "components.UserProfile.UserSettings.UserNotificationSettings.discordIdTip": "Het <FindDiscordIdLink>meercijferige ID-nummer</FindDiscordIdLink> van je gebruikersaccount",
-  "components.CollectionDetails.requestcollection4k": "Collectie aanvragen in 4K",
+  "components.CollectionDetails.requestcollection4k": "Collectie in 4K aanvragen",
   "components.UserProfile.UserSettings.UserGeneralSettings.regionTip": "Inhoud filteren op regionale beschikbaarheid",
   "components.UserProfile.UserSettings.UserGeneralSettings.region": "Regio van Ontdekken",
   "components.UserProfile.UserSettings.UserGeneralSettings.originallanguageTip": "Inhoud filteren op oorspronkelijke taal",
@@ -546,7 +546,7 @@
   "components.Settings.SettingsJobsCache.download-sync-reset": "Reset download sync",
   "components.Settings.SettingsJobsCache.download-sync": "Synchronisatie downloads",
   "components.TvDetails.seasons": "{seasonCount, plural, one {# seizoen} other {# seizoenen}}",
-  "i18n.loading": "Laden…",
+  "i18n.loading": "Bezig met laden…",
   "components.UserProfile.UserSettings.UserNotificationSettings.validationTelegramChatId": "Je moet een geldige chat-ID opgeven",
   "components.UserProfile.UserSettings.UserNotificationSettings.telegramChatIdTipLong": "<TelegramBotLink>Een chat starten</TelegramBotLink>, <GetIdBotLink>@get_id_bot</GetIdBotLink> toevoegen en de opdracht <code>/my_id</code> geven",
   "components.UserProfile.UserSettings.UserNotificationSettings.telegramChatId": "Chat-ID",
@@ -558,14 +558,14 @@
   "components.Discover.DiscoverNetwork.networkSeries": "Series van {network}",
   "components.Discover.DiscoverMovieGenre.genreMovies": "{genre} films",
   "components.Setup.scanbackground": "Het scannen wordt op de achtergrond uitgevoerd. Je kunt in de tussentijd doorgaan met het installatieproces.",
-  "components.Settings.scanning": "Synchroniseren…",
+  "components.Settings.scanning": "Bezig met synchroniseren…",
   "components.Settings.scan": "Bibliotheken synchroniseren",
   "components.Settings.SettingsJobsCache.sonarr-scan": "Sonarr-scan",
   "components.Settings.SettingsJobsCache.radarr-scan": "Radarr-scan",
   "components.Settings.SettingsJobsCache.plex-recently-added-scan": "Plex recent toegevoegde scan",
   "components.Settings.SettingsJobsCache.plex-full-scan": "Plex volledige bibliotheekscan",
   "components.Settings.SettingsJobsCache.jellyfin-full-scan": "volledige bibliotheekscan Jellyfin",
-  "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Scan van 'onlangs toegevoegd' in Jellyfin",
+  "components.Settings.SettingsJobsCache.jellyfin-recently-added-scan": "Jellyfin recent toegevoegde scan",
   "components.Settings.Notifications.validationUrl": "Je moet een geldige URL opgeven",
   "components.Settings.Notifications.botAvatarUrl": "URL bot-avatar",
   "components.RequestList.RequestItem.requested": "Aangevraagd",
@@ -670,27 +670,27 @@
   "components.QuotaSelector.unlimited": "Onbeperkt",
   "i18n.view": "Bekijken",
   "i18n.tvshow": "Serie",
-  "i18n.testing": "Testen…",
+  "i18n.testing": "Bezig met testen…",
   "i18n.test": "Test",
   "i18n.status": "Status",
   "i18n.showingresults": "<strong>{from}</strong> tot <strong>{to}</strong> van de <strong>{total}</strong> resultaten worden weergegeven",
-  "i18n.saving": "Opslaan…",
+  "i18n.saving": "Bezig met opslaan…",
   "i18n.save": "Wijzigingen opslaan",
   "i18n.resultsperpage": "{pageSize} resultaten per pagina weergeven",
-  "i18n.requesting": "Aanvragen…",
+  "i18n.requesting": "Bezig met aanvragen…",
   "i18n.request4k": "Aanvragen in 4K",
   "i18n.previous": "Vorige",
   "i18n.notrequested": "Niet aangevraagd",
   "i18n.noresults": "Geen resultaten.",
   "i18n.next": "Volgende",
   "i18n.movie": "Film",
-  "i18n.canceling": "Annuleren…",
+  "i18n.canceling": "Bezig met annuleren…",
   "i18n.back": "Terug",
   "i18n.areyousure": "Weet je het zeker?",
   "i18n.all": "Alle",
   "components.RequestModal.QuotaDisplay.requiredquotaUser": "Deze gebruiker heeft nog minstens <strong>{seasons}</strong> {seasons, plural, one {seizoensverzoek} other {seizoensverzoeken}} nodig om deze serie aan te vragen.",
-  "components.TvDetails.originaltitle": "Oorspronkelijke titel",
-  "components.MovieDetails.originaltitle": "Oorspronkelijke titel",
+  "components.TvDetails.originaltitle": "Originele titel",
+  "components.MovieDetails.originaltitle": "Originele titel",
   "components.LanguageSelector.originalLanguageDefault": "Alle talen",
   "components.LanguageSelector.languageServerDefault": "Standaard ({language})",
   "components.Settings.SonarrModal.testFirstTags": "Test de verbinding om labels te laden",
@@ -733,9 +733,9 @@
   "components.RequestModal.pendingapproval": "Je verzoek is in afwachting van goedkeuring.",
   "components.RequestList.RequestItem.cancelRequest": "Verzoek annuleren",
   "components.NotificationTypeSelector.notificationTypes": "Meldingtypes",
-  "components.UserProfile.UserSettings.UserPasswordChange.noPasswordSetOwnAccount": "Er is voor jouw account momenteel geen wachtwoord ingesteld. Configureer hieronder een wachtwoord om in te kunnen loggen als een \"lokale gebruiker\" met je e-mailadres.",
+  "components.UserProfile.UserSettings.UserPasswordChange.noPasswordSetOwnAccount": "Er is voor jouw account momenteel geen wachtwoord ingesteld. Configureer hieronder een wachtwoord om in te kunnen loggen als een \"lokale gebruiker\" met uw e-mailadres.",
   "components.UserProfile.UserSettings.UserPasswordChange.noPasswordSet": "Deze gebruikersaccount heeft momenteel geen wachtwoord ingesteld. Configureer hieronder een wachtwoord zodat deze account in staat is om zich aan te melden als een \"lokale gebruiker\".",
-  "components.Settings.serviceSettingsDescription": "Stel je {serverType}-server(s) hieronder in. Je kunt meerdere {serverType}-servers verbinden, maar slechts twee ervan kunnen als standaard worden gemarkeerd (één niet-4K en één 4K). Beheerders kunnen vóór goedkeuring de server aanpassen die voor nieuwe aanvragen gebruikt wordt.",
+  "components.Settings.serviceSettingsDescription": "Configureer je {serverType} server(s) hieronder. Je kunt meerdere {serverType} servers verbinden, maar slechts twee ervan kunnen als standaard worden gemarkeerd (één niet-4K en één 4K). Beheerders kunnen vóór de goedkeuring de server die gebruikt wordt om nieuwe aanvragen te verwerken aanpassen.",
   "components.Settings.noDefaultServer": "Ten minste één {serverType} server moet als standaard worden gemarkeerd om {mediaType}verzoeken te kunnen verwerken.",
   "components.Settings.noDefaultNon4kServer": "Als je slechts één enkele {serverType} server hebt voor zowel niet-4K als 4K-inhoud (of als je alleen 4K-inhoud downloadt), dan moet je {serverType} server <strong>NIET</strong> aangeduid worden als een 4K-server.",
   "components.Settings.mediaTypeSeries": "serie",
@@ -747,7 +747,7 @@
   "components.Layout.VersionStatus.outofdate": "Verouderd",
   "components.Layout.VersionStatus.commitsbehind": "{commitsBehind} {commitsBehind, plural, one {commit} other {commits}} achter",
   "components.UserList.autogeneratepasswordTip": "Een door de server gegenereerd wachtwoord naar de gebruiker e-mailen",
-  "i18n.retrying": "Opnieuw proberen…",
+  "i18n.retrying": "Bezig met opnieuw proberen…",
   "components.Settings.serverSecure": "veilig",
   "components.UserList.usercreatedfailedexisting": "Het opgegeven e-mailadres wordt al gebruikt door een andere gebruiker.",
   "components.RequestModal.edit": "Verzoek bewerken",
@@ -847,7 +847,7 @@
   "components.NotificationTypeSelector.usermediadeclinedDescription": "Een melding ontvangen wanneer je mediaverzoeken worden geweigerd.",
   "components.NotificationTypeSelector.usermediaavailableDescription": "Een melding ontvangen wanneer je mediaverzoeken beschikbaar zijn.",
   "components.NotificationTypeSelector.usermediaAutoApprovedDescription": "Een melding ontvangen wanneer andere gebruikers nieuwe mediaverzoeken indienen die automatisch worden goedgekeurd.",
-  "components.Settings.SettingsAbout.betawarning": "Dit is BETA-software. Functies kunnen kapot en/of instabiel zijn. Meld eventuele problemen op GitHub!",
+  "components.Settings.SettingsAbout.betawarning": "Dit is BETA software. Functies kunnen kapot en/of instabiel zijn. Meld eventuele problemen op GitHub!",
   "components.Layout.LanguagePicker.displaylanguage": "Weergavetaal",
   "components.MovieDetails.showmore": "Meer tonen",
   "components.MovieDetails.showless": "Minder tonen",
@@ -971,7 +971,7 @@
   "components.UserProfile.UserSettings.UserNotificationSettings.validationPushoverUserKey": "Je moet een geldige gebruikers- of groepssleutel opgeven",
   "components.UserProfile.UserSettings.UserNotificationSettings.pushbulletsettingssaved": "Instellingen voor Pushbullet-meldingen succesvol opgeslagen!",
   "components.IssueDetails.playonplex": "Afspelen op {mediaServerName}",
-  "components.IssueDetails.play4konplex": "Afspelen op {mediaServerName} in 4K",
+  "components.IssueDetails.play4konplex": "Afspelen in 4K op {mediaServerName}",
   "components.IssueDetails.openin4karr": "Openen in 4K {arr}",
   "components.IssueList.IssueItem.episodes": "{episodeCount, plural, one {aflevering} other {afleveringen}}",
   "components.IssueList.IssueItem.seasons": "{seasonCount, plural, one {seizoen} other {seizoenen}}",
@@ -982,7 +982,7 @@
   "components.NotificationTypeSelector.adminissuereopenedDescription": "Ontvang een melding wanneer problemen door andere gebruikers opnieuw worden ingediend.",
   "components.NotificationTypeSelector.issuereopenedDescription": "Stuur meldingen wanneer problemen opnieuw worden ingediend.",
   "components.NotificationTypeSelector.userissuereopenedDescription": "Ontvang een bericht wanneer problemen die jij hebt gemeld, opnieuw worden ingediend.",
-  "components.RequestModal.requestseasons4k": "{seasonCount} {seasonCount, plural, one {seizoen} other {seizoenen}} aanvragen in 4K",
+  "components.RequestModal.requestseasons4k": "{seasonCount} {seasonCount, plural, one {seizoen} other {seizoenen}} in 4K aanvragen",
   "components.RequestModal.requestmovies": "{count} {count, plural, one {film} other {films}} aanvragen",
   "components.RequestModal.selectmovies": "Film(s) selecteren",
   "components.MovieDetails.productioncountries": "Productie{countryCount, plural, one {land} other {landen}}",
@@ -998,7 +998,7 @@
   "components.Settings.Notifications.NotificationsGotify.agentenabled": "Agent inschakelen",
   "components.Settings.Notifications.NotificationsGotify.gotifysettingssaved": "Instellingen voor meldingen Gotify succesvol opgeslagen!",
   "components.Settings.Notifications.NotificationsGotify.token": "Toepassingstoken",
-  "i18n.importing": "Importeren…",
+  "i18n.importing": "Bezig met importeren…",
   "components.Settings.Notifications.NotificationsGotify.gotifysettingsfailed": "Instellingen voor meldingen Gotify niet opgeslagen.",
   "components.Settings.Notifications.NotificationsGotify.toastGotifyTestFailed": "Testmelding Gotify niet verzonden.",
   "components.Settings.Notifications.NotificationsGotify.toastGotifyTestSuccess": "Testmelding Gotify verzonden!",
@@ -1012,7 +1012,7 @@
   "components.UserList.newplexsigninenabled": "De instelling <strong>Nieuwe Plex-aanmelding inschakelen</strong> is momenteel ingeschakeld. Plex-gebruikers met bibliotheektoegang hoeven niet te worden geïmporteerd om in te loggen.",
   "components.ManageSlideOver.manageModalAdvanced": "Geavanceerd",
   "components.ManageSlideOver.alltime": "Altijd",
-  "components.ManageSlideOver.markallseasons4kavailable": "Alle seizoenen markeren als beschikbaar in 4K",
+  "components.ManageSlideOver.markallseasons4kavailable": "Alle seizoenen als beschikbaar in 4K markeren",
   "components.ManageSlideOver.opentautulli": "In Tautulli openen",
   "components.ManageSlideOver.pastdays": "Afgelopen {days, number} dagen",
   "components.ManageSlideOver.playedby": "Afgespeeld door",
@@ -1046,8 +1046,8 @@
   "components.UserProfile.emptywatchlist": "Media die zijn toegevoegd aan je <PlexWatchlistSupportLink>Plex Kijklijst</PlexWatchlistSupportLink> verschijnen hier.",
   "components.MovieDetails.digitalrelease": "Digitale release",
   "i18n.restartRequired": "Opnieuw opstarten vereist",
-  "components.PermissionEdit.viewrecentDescription": "Toestemming geven om de lijst met onlangs toegevoegde media weer te geven.",
-  "components.PermissionEdit.viewrecent": "Onlangs toegevoegd weergeven",
+  "components.PermissionEdit.viewrecentDescription": "Toestemming geven om de lijst met recent toegevoegde media te bekijken.",
+  "components.PermissionEdit.viewrecent": "Recent toegevoegd bekijken",
   "components.Settings.deleteServer": "{serverType}-server verwijderen",
   "components.StatusChecker.appUpdated": "{applicationTitle} bijgewerkt",
   "components.RequestList.RequestItem.tmdbid": "TMDB ID",
@@ -1072,8 +1072,8 @@
   "components.TvDetails.seasonnumber": "Seizoen {seasonNumber}",
   "components.TvDetails.Season.somethingwentwrong": "Er ging iets mis bij het ophalen van de seizoensgegevens.",
   "components.TvDetails.seasonstitle": "Seizoenen",
-  "components.Discover.DiscoverWatchlist.discoverwatchlist": "Jouw kijklijst",
-  "components.Discover.plexwatchlist": "Jouw kijklijst",
+  "components.Discover.DiscoverWatchlist.discoverwatchlist": "Je Plex-kijklijst",
+  "components.Discover.plexwatchlist": "Je Plex Kijklijst",
   "components.MovieDetails.physicalrelease": "Fysieke release",
   "components.PermissionEdit.autorequest": "Automatisch aanvragen",
   "components.Settings.SettingsJobsCache.plex-watchlist-sync": "Plex Kijklijst synchroniseren",
@@ -1099,7 +1099,7 @@
   "components.TvDetails.manageseries": "Serie beheren",
   "components.MovieDetails.managemovie": "Film beheren",
   "components.MovieDetails.reportissue": "Probleem melden",
-  "components.PermissionEdit.autorequestMoviesDescription": "Toestemming geven om niet-4K films in je Plex-kijklijst automatisch aan te vragen.",
+  "components.PermissionEdit.autorequestMoviesDescription": "Toestemming geven om niet-4K films in je Plex Kijklijst automatisch aan te vragen.",
   "components.PermissionEdit.autorequestSeries": "Series automatisch aanvragen",
   "components.PermissionEdit.autorequestMovies": "Films automatisch aanvragen",
   "components.Settings.experimentalTooltip": "Deze instelling inschakelen, kan leiden tot onverwacht gedrag van de toepassing",
@@ -1152,8 +1152,8 @@
   "components.Discover.DiscoverSliderEdit.remove": "Verwijderen",
   "components.Discover.resetfailed": "Er is iets fout gegaan bij het resetten van de instellingen van Ontdekken.",
   "components.Discover.PlexWatchlistSlider.emptywatchlist": "Media die zijn toegevoegd aan je <PlexWatchlistSupportLink>Plex Kijklijst</PlexWatchlistSupportLink> verschijnen hier.",
-  "components.Discover.PlexWatchlistSlider.plexwatchlist": "Jouw kijklijst",
-  "components.Discover.RecentlyAddedSlider.recentlyAdded": "Onlangs toegevoegd",
+  "components.Discover.PlexWatchlistSlider.plexwatchlist": "Je Plex Kijklijst",
+  "components.Discover.RecentlyAddedSlider.recentlyAdded": "Recent toegevoegd",
   "components.Discover.networks": "Netwerken",
   "components.Discover.CreateSlider.searchStudios": "Studio's zoeken…",
   "components.Discover.CreateSlider.starttyping": "Begin met typen om te zoeken.",
@@ -1184,8 +1184,8 @@
   "components.Discover.DiscoverMovies.sortPopularityAsc": "Populariteit oplopend",
   "components.Discover.DiscoverMovies.sortPopularityDesc": "Populariteit aflopend",
   "components.Discover.DiscoverMovies.sortReleaseDateAsc": "Releasedatum oplopend",
-  "components.Discover.DiscoverMovies.sortTitleAsc": "Titel oplopend (A-Z)",
-  "components.Discover.DiscoverMovies.sortTitleDesc": "Titel aflopend (Z-A)",
+  "components.Discover.DiscoverMovies.sortTitleAsc": "Titel (A-Z) oplopend",
+  "components.Discover.DiscoverMovies.sortTitleDesc": "Titel (Z-A) aflopend",
   "components.Discover.DiscoverMovies.sortTmdbRatingAsc": "TMDB-beoordeling oplopend",
   "components.Discover.DiscoverMovies.sortTmdbRatingDesc": "TMDB-beoordeling aflopend",
   "components.Discover.DiscoverSliderEdit.deletefail": "Slider verwijderen mislukt.",
@@ -1202,7 +1202,7 @@
   "components.Discover.FilterSlideover.from": "Van",
   "components.Discover.FilterSlideover.genres": "Genres",
   "components.Discover.FilterSlideover.keywords": "Trefwoorden",
-  "components.Discover.FilterSlideover.originalLanguage": "Oorspronkelijke taal",
+  "components.Discover.FilterSlideover.originalLanguage": "Originele taal",
   "components.Discover.FilterSlideover.ratingText": "Beoordelingen tussen {minValue} en {maxValue}",
   "components.Discover.FilterSlideover.releaseDate": "Releasedatum",
   "components.Discover.FilterSlideover.runtime": "Duur",
@@ -1262,87 +1262,18 @@
   "components.Settings.SettingsJobsCache.availability-sync": "Synchronisatie van mediabeschikbaarheid",
   "components.Discover.tmdbmoviestreamingservices": "Streamingdiensten voor films TMDB",
   "components.Discover.tmdbtvstreamingservices": "Streamingdiensten voor series TMDB",
-  "components.Login.validationhostrequired": "{mediaServerName}-URL vereist",
-  "components.Layout.UserWarnings.emailInvalid": "E-mailadres is ongeldig.",
-  "components.Login.description": "Aangezien dit de eerste keer is dat je je aanmeldt bij {applicationName}, dien je een geldig e-mailadres op te geven.",
-  "components.Login.saving": "Toevoegen…",
-  "components.ManageSlideOver.removearr": "Verwijderen van {arr}",
-  "components.Settings.RadarrModal.tagRequests": "Aanvragen taggen",
-  "components.MovieDetails.openradarr4k": "Film openen in 4K-Radarr",
-  "components.Settings.RadarrModal.tagRequestsInfo": "Automatisch een extra label toevoegen met de gebruikers-id en weergavenaam van de aanvrager",
-  "components.Settings.SonarrModal.animeSeriesType": "Serietype anime",
-  "components.Settings.SonarrModal.tagRequestsInfo": "Automatisch een extra label toevoegen met de gebruikers-id en weergavenaam van de aanvrager",
-  "components.Settings.internalUrl": "Interne URL",
-  "components.Settings.jellyfinsettings": "{mediaServerName}-instellingen",
-  "components.Settings.jellyfinlibrariesDescription": "De {mediaServerName}-bibliotheken die op titels worden gescand. Klik op onderstaande knop als er geen bibliotheken in de lijst staan.",
-  "components.Settings.manualscanDescriptionJellyfin": "Normaliter wordt dit eenmaal per 24 uur uitgevoerd. Jellyseerr zal de lijst met onlangs toegevoegde media op je {mediaServerName}-server vaker controleren. Als dit de eerste keer is dat je Jellyseerr instelt, wordt aanbevolen eenmalig een handmatige, volledige bibliotheekscan uit te voeren!",
-  "components.Settings.save": "Wijzigingen opslaan",
-  "components.Settings.syncJellyfin": "Bibliotheken synchoniseren",
-  "components.TvDetails.play": "Afspelen op {mediaServerName}",
-  "components.Discover.FilterSlideover.tmdbuservotecount": "Aantal gebruikersstemmen TMDB",
-  "components.Login.save": "Toevoegen",
-  "components.ManageSlideOver.manageModalRemoveMediaWarning": "* Hiermee wordt deze {mediaType} onomkeerbaar verwijderd van {arr}, inclusief alle bestanden.",
-  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Apparaatstandaard",
-  "components.Settings.Notifications.userEmailRequired": "Gebruikerse-mail vereisen",
-  "components.Settings.SettingsAbout.supportjellyseerr": "Jellyseerr ondersteunen",
-  "components.Settings.SonarrModal.seriesType": "Serietype",
-  "components.Settings.jellyfinSettings": "{mediaServerName}-instellingen",
-  "components.Setup.configuremediaserver": "Mediaserver instellen",
-  "components.TvDetails.play4k": "Afspelen op {mediaServerName} in 4K",
-  "components.UserList.mediaServerUser": "{mediaServerName}-gebruiker",
-  "components.UserList.noJellyfinuserstoimport": "Er zijn geen {mediaServerName}-gebruikers om te importeren.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.email": "E-mail",
-  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Apparaatstandaard",
-  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Meldingsgeluid",
-  "components.Login.signinwithjellyfin": "{mediaServerName}-account gebruiken",
+  "components.Discover.FilterSlideover.tmdbuservotecount": "Aantal stemmen TMDB-gebruikers",
   "components.Discover.FilterSlideover.voteCount": "Aantal stemmen tussen {minValue} en {maxValue}",
-  "components.Layout.UserWarnings.emailRequired": "Een e-mailadres is vereist.",
-  "components.Layout.UserWarnings.passwordRequired": "Een wachtwoord is vereist.",
-  "components.Login.credentialerror": "Gebruikersnaam of wachtwoord is onjuist.",
-  "components.Login.emailtooltip": "Het adres hoeft niet gelieerd te zijn aan je {mediaServerName}-instantie.",
-  "components.Login.host": "{mediaServerName}-URL",
-  "components.Login.initialsignin": "Verbinden",
-  "components.Login.initialsigningin": "Verbinden…",
-  "components.Login.title": "E-mail toevoegen",
-  "components.Login.username": "Gebruikersnaam",
-  "components.Login.validationEmailRequired": "Je moet een e-mailadres opgeven",
-  "components.Login.validationEmailFormat": "Ongeldig e-mailadres",
-  "components.Login.validationemailformat": "Geldig e-mailadres vereist",
-  "components.Login.validationhostformat": "Geldige URL vereist",
-  "components.Login.validationusernamerequired": "Gebruikersnaam vereist",
-  "components.ManageSlideOver.removearr4k": "Verwijderen van 4K-{arr}",
-  "components.MovieDetails.downloadstatus": "Downloadstatus",
-  "components.MovieDetails.imdbuserscore": "Gebruikersbeoordeling IMDB",
-  "components.MovieDetails.openradarr": "Film openen in Radarr",
-  "components.MovieDetails.play": "Afspelen op {mediaServerName}",
-  "components.MovieDetails.play4k": "Afspelen op {mediaServerName} in 4K",
-  "components.Settings.Notifications.NotificationsPushover.sound": "Meldingsgeluid",
-  "components.Settings.SonarrModal.tagRequests": "Aanvragen taggen",
-  "components.Settings.jellyfinSettingsFailure": "Er is iets misgegaan bij het opslaan van de {mediaServerName}-instellingen.",
-  "components.Settings.jellyfinSettingsSuccess": "{mediaServerName}-instellingen opgeslagen!",
-  "components.Settings.jellyfinlibraries": "{mediaServerName}-bibliotheken",
-  "components.Settings.manualscanJellyfin": "Handmatige bibliotheekscan",
-  "components.Settings.menuJellyfinSettings": "{mediaServerName}",
-  "components.Settings.saving": "Opslaan…",
-  "components.Settings.syncing": "Synchroniseren",
-  "components.Settings.timeout": "Time-out",
-  "components.Setup.signin": "Aanmelden",
-  "components.Setup.signinWithJellyfin": "{mediaServerName}-account gebruiken",
-  "components.TitleCard.addToWatchList": "Toevoegen aan kijklijst",
-  "components.TitleCard.watchlistError": "Er is iets misgegaan. Probeer het opnieuw.",
-  "components.UserList.importfromJellyfin": "{mediaServerName}-gebruikers importeren",
-  "components.UserList.importfromJellyfinerror": "Er is iets misgegaan bij het importeren van {mediaServerName}-gebruikers.",
-  "components.UserProfile.UserSettings.UserGeneralSettings.mediaServerUser": "{mediaServerName}-gebruiker",
-  "components.UserProfile.UserSettings.UserGeneralSettings.save": "Wijzigingen opslaan",
-  "components.UserProfile.UserSettings.UserGeneralSettings.saving": "Opslaan…",
+  "components.Settings.RadarrModal.tagRequests": "Tagverzoeken",
+  "components.Settings.RadarrModal.tagRequestsInfo": "Voeg automatisch een extra tag toe met de gebruikers-ID en weergavenaam van de aanvrager",
+  "components.MovieDetails.imdbuserscore": "Gebruikersscore IMDB",
+  "components.Settings.SonarrModal.tagRequests": "Tagverzoeken",
+  "components.Settings.SonarrModal.tagRequestsInfo": "Voeg automatisch een extra tag toe met de gebruikers-ID en weergavenaam van de aanvrager",
   "i18n.collection": "Collectie",
-  "components.UserProfile.localWatchlist": "Kijklijst van {username}",
-  "components.Setup.signinWithPlex": "Plex-account gebruiken",
-  "components.Settings.jellyfinSettingsDescription": "Optioneel, configureer de interne en externe eindpunten voor uw {mediaServerName} server. In de meeste gevallen verschilt de externe URL met de interne URL. Een aangepaste wachtwoord reset URL kan ook gebruikt worden voor de {mediaServerName} login, voor het geval dat u doorverwezen wilt worden naar een andere wachtwoord reset pagina.",
-  "components.Settings.jellyfinsettingsDescription": "Configureer de instellingen voor uw {mediaServerName} server. {mediaServerName} scanned uw {mediaServerName} bibliotheken om te zien welke content beschikbaar is.",
-  "components.TitleCard.watchlistDeleted": "<strong>{title}</strong> Is succesvol verwijderd van de kijklijst!",
-  "components.TitleCard.watchlistSuccess": "<strong>{title}</strong> succesvol toegevoegd aan de kijklijst!",
-  "components.TitleCard.watchlistCancel": "kijklijst voor <strong>{title}</strong> is geannuleerd.",
-  "components.UserList.importedfromJellyfin": "<strong>{userCount}</strong> {mediaServerName} {userCount, plural, one {user} other {users}} succesvol geimporteerd!",
-  "components.UserList.newJellyfinsigninenabled": "De <strong>Gebruik Nieuwe {mediaServerName} Login</strong> instelling staat momenteel aan. {mediaServerName} gebruikers met toegang tot de bibliotheek, hoeven niet geïmporteerd te worden om in te kunnen loggen."
+  "components.Settings.Notifications.NotificationsPushover.sound": "Meldingsgeluid",
+  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Apparaatstandaard",
+  "components.Settings.SonarrModal.animeSeriesType": "Serietype anime",
+  "components.Settings.SonarrModal.seriesType": "Serietype",
+  "components.UserProfile.UserSettings.UserNotificationSettings.sound": "Meldingsgeluid",
+  "components.Settings.Notifications.NotificationsPushover.deviceDefault": "Apparaatstandaard"
 }