chore: merge develop

refactor: use fetch API
Merge branch 'Fallenbagel:develop' into develop
2024-09-18 20:57:05 +02:00 · 2024-09-18 20:52:46 +02:00 · 2024-06-07 09:45:00 +02:00 · 2024-04-18 12:26:11 +02:00 · 2024-02-02 23:12:51 +01:00 · 2024-02-02 23:01:50 +01:00
112 changed files with 554 additions and 2058 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -439,15 +439,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "M0NsTeRRR",
-      "name": "Ludovic Ortega",
-      "avatar_url": "https://avatars.githubusercontent.com/u/37785089?v=4",
-      "profile": "https://github.com/M0NsTeRRR",
-      "contributions": [
-        "security"
-      ]
    }
  ]
 }
--- a/.gitignore
+++ b/.gitignore
@@ -34,7 +34,6 @@ yarn-error.log*
 # database
 config/db/*.sqlite3*
 config/settings.json
-config/settings.old.json

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

 **Jellyseerr** is a free and open source software application for managing requests for your media library.
@@ -146,7 +146,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/XDark187"><img src="https://avatars.githubusercontent.com/u/39034192?v=4?s=100" width="100px;" alt="Baraa"/><br /><sub><b>Baraa</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=XDark187" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/franciscofsales"><img src="https://avatars.githubusercontent.com/u/7977645?v=4?s=100" width="100px;" alt="Francisco Sales"/><br /><sub><b>Francisco Sales</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=franciscofsales" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/myselfolli"><img src="https://avatars.githubusercontent.com/u/37535998?v=4?s=100" width="100px;" alt="Oliver Laing"/><br /><sub><b>Oliver Laing</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=myselfolli" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/M0NsTeRRR"><img src="https://avatars.githubusercontent.com/u/37785089?v=4?s=100" width="100px;" alt="Ludovic Ortega"/><br /><sub><b>Ludovic Ortega</b></sub></a><br /><a href="#security-M0NsTeRRR" title="Security">🛡️</a></td>
    </tr>
  </tbody>
 </table>
--- a/cypress/e2e/indexers/tvdb.cy.ts
+++ b/cypress/e2e/indexers/tvdb.cy.ts
@@ -1,92 +0,0 @@
-describe('TVDB Integration', () => {
-  // Constants for routes and selectors
-  const ROUTES = {
-    home: '/',
-    tvdbSettings: '/settings/tvdb',
-    tomorrowIsOursTvShow: '/tv/72879',
-    monsterTvShow: '/tv/225634',
-  };
-
-  const SELECTORS = {
-    sidebarToggle: '[data-testid=sidebar-toggle]',
-    sidebarSettingsMobile: '[data-testid=sidebar-menu-settings-mobile]',
-    settingsNavDesktop: 'nav[data-testid="settings-nav-desktop"]',
-    tvdbEnable: 'input[data-testid="tvdb-enable"]',
-    tvdbSaveButton: '[data-testid=tvbd-save-button]',
-    heading: '.heading',
-    season1: 'Season 1',
-    season2: 'Season 2',
-  };
-
-  // Reusable commands
-  const toggleTVDBSetting = () => {
-    cy.intercept('/api/v1/settings/tvdb').as('tvdbRequest');
-    cy.get(SELECTORS.tvdbSaveButton).click();
-    return cy.wait('@tvdbRequest');
-  };
-
-  const verifyTVDBResponse = (response, expectedUseValue) => {
-    expect(response.statusCode).to.equal(200);
-    expect(response.body.tvdb).to.equal(expectedUseValue);
-  };
-
-  beforeEach(() => {
-    // Perform login
-    cy.login(Cypress.env('ADMIN_EMAIL'), Cypress.env('ADMIN_PASSWORD'));
-
-    // Navigate to TVDB settings
-    cy.visit(ROUTES.home);
-    cy.get(SELECTORS.sidebarToggle).click();
-    cy.get(SELECTORS.sidebarSettingsMobile).click();
-    cy.get(
-      `${SELECTORS.settingsNavDesktop} a[href="${ROUTES.tvdbSettings}"]`
-    ).click();
-
-    // Verify heading
-    cy.get(SELECTORS.heading).should('contain', 'Tvdb');
-
-    // Configure TVDB settings
-    cy.get(SELECTORS.tvdbEnable).then(($checkbox) => {
-      const isChecked = $checkbox.is(':checked');
-
-      if (!isChecked) {
-        // If disabled, enable TVDB
-        cy.wrap($checkbox).click();
-        toggleTVDBSetting().then(({ response }) => {
-          verifyTVDBResponse(response, true);
-        });
-      } else {
-        // If enabled, disable then re-enable TVDB
-        cy.wrap($checkbox).click();
-        toggleTVDBSetting().then(({ response }) => {
-          verifyTVDBResponse(response, false);
-        });
-
-        cy.wrap($checkbox).click();
-        toggleTVDBSetting().then(({ response }) => {
-          verifyTVDBResponse(response, true);
-        });
-      }
-    });
-  });
-
-  it('should display "Tomorrow is Ours" show information correctly (1 season on TMDB >1 seasons on TVDB)', () => {
-    cy.visit(ROUTES.tomorrowIsOursTvShow);
-    cy.contains(SELECTORS.season2)
-      .should('be.visible')
-      .scrollIntoView()
-      .click();
-  });
-
-  it('Should display "Monster" show information correctly (Not existing on TVDB)', () => {
-    cy.visit(ROUTES.monsterTvShow);
-    cy.intercept('/api/v1/tv/225634/season/1').as('season1');
-    cy.contains(SELECTORS.season1)
-      .should('be.visible')
-      .scrollIntoView()
-      .click();
-    cy.wait('@season1');
-
-    cy.contains('9 - Hang Men').should('be.visible');
-  });
-});
--- a/docs/getting-started/aur.mdx
+++ b/docs/getting-started/aur.mdx
@@ -6,10 +6,6 @@ sidebar_position: 4

 # AUR (Arch User Repository)

-:::note Disclaimer
-This AUR package is not maintained by us but by a third party. Please refer to the maintainer for any issues.
-:::
-
 :::info
 This method is not recommended for most users. It is intended for advanced users who are using Arch Linux or an Arch-based distribution.
 :::
--- a/docs/getting-started/buildfromsource.mdx
+++ b/docs/getting-started/buildfromsource.mdx
@@ -12,12 +12,49 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';

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

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

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

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

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

 Now, Jellyseerr will start when the computer boots up in the background.
--- a/next.config.js
+++ b/next.config.js
@@ -10,7 +10,7 @@ module.exports = {
    remotePatterns: [
      { hostname: 'gravatar.com' },
      { hostname: 'image.tmdb.org' },
-      { hostname: 'artworks.thetvdb.com' },
+      { hostname: '*', protocol: 'https' },
    ],
  },
  webpack(config) {
--- a/overseerr-api.yml
+++ b/overseerr-api.yml
@@ -400,12 +400,6 @@ components:
        serverID:
          type: string
          readOnly: true
-    TvdbSettings:
-      type: object
-      properties:
-        use:
-          type: boolean
-          example: true
    TautulliSettings:
      type: object
      properties:
@@ -1994,9 +1988,6 @@ paths:
                  appDataPath:
                    type: string
                    example: /app/config
-                  appDataPermissions:
-                    type: boolean
-                    example: true
  /settings/main:
    get:
      summary: Get main settings
@@ -2367,60 +2358,6 @@ paths:
                      type: string
                    thumb:
                      type: string
-  /settings/tvdb:
-    get:
-      summary: Get TVDB settings
-      description: Retrieves current TVDB settings.
-      tags:
-        - settings
-      responses:
-        '200':
-          description: OK
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TvdbSettings'
-    put:
-      summary: Update TVDB settings
-      description: Updates TVDB settings with the provided values.
-      tags:
-        - settings
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TvdbSettings'
-      responses:
-        '200':
-          description: 'Values were successfully updated'
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TvdbSettings'
-  /settings/tvdb/test:
-    post:
-      summary: Test TVDB configuration
-      description: Tests if the TVDB configuration is valid. Returns a list of available languages on success.
-      tags:
-        - settings
-      responses:
-        '200':
-          description: Succesfully connected to TVDB
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  languages:
-                    type: array
-                    items:
-                      type: object
-                      properties:
-                        id:
-                          type: number
-                        name:
-                          type: string
  /settings/tautulli:
    get:
      summary: Get Tautulli settings
@@ -2853,15 +2790,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:
@@ -5969,7 +5897,7 @@ paths:
            application/json:
              schema:
                $ref: '#/components/schemas/TvDetails'
-  /tv/{tvId}/season/{seasonNumber}:
+  /tv/{tvId}/season/{seasonId}:
    get:
      summary: Get season details and episode list
      description: Returns season details with a list of episodes in a JSON object.
@@ -5983,11 +5911,11 @@ paths:
            type: number
            example: 76479
        - in: path
-          name: seasonNumber
+          name: seasonId
          required: true
          schema:
            type: number
-            example: 123456
+            example: 1
        - in: query
          name: language
          schema:
--- a/package.json
+++ b/package.json
@@ -62,7 +62,6 @@
    "formik": "^2.4.6",
    "gravatar-url": "3.1.0",
    "lodash": "4.17.21",
-    "mime": "3",
    "next": "^14.2.4",
    "node-cache": "5.1.2",
    "node-gyp": "9.3.1",
@@ -93,8 +92,7 @@
    "sqlite3": "5.1.4",
    "swagger-ui-express": "4.6.2",
    "swr": "2.2.5",
-    "typeorm": "0.3.11",
-    "undici": "^6.20.1",
+    "typeorm": "0.3.12",
    "web-push": "3.5.0",
    "winston": "3.8.2",
    "winston-daily-rotate-file": "4.7.1",
@@ -121,7 +119,6 @@
    "@types/express": "4.17.17",
    "@types/express-session": "1.17.6",
    "@types/lodash": "4.14.191",
-    "@types/mime": "3",
    "@types/node": "20.14.8",
    "@types/node-schedule": "2.1.0",
    "@types/nodemailer": "6.4.7",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -49,7 +49,7 @@ importers:
        version: 2.11.0
      connect-typeorm:
        specifier: 1.1.4
-        version: 1.1.4(typeorm@0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5)))
+        version: 1.1.4(typeorm@0.3.12(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5)))
      cookie-parser:
        specifier: 1.4.6
        version: 1.4.6
@@ -98,9 +98,6 @@ importers:
      lodash:
        specifier: 4.17.21
        version: 4.17.21
-      mime:
-        specifier: '3'
-        version: 3.0.0
      next:
        specifier: ^14.2.4
        version: 14.2.4(@babel/core@7.24.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -192,11 +189,8 @@ importers:
        specifier: 2.2.5
        version: 2.2.5(react@18.3.1)
      typeorm:
-        specifier: 0.3.11
-        version: 0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))
-      undici:
-        specifier: ^6.20.1
-        version: 6.20.1
+        specifier: 0.3.12
+        version: 0.3.12(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))
      web-push:
        specifier: 3.5.0
        version: 3.5.0
@@ -270,9 +264,6 @@ importers:
      '@types/lodash':
        specifier: 4.14.191
        version: 4.14.191
-      '@types/mime':
-        specifier: '3'
-        version: 3.0.4
      '@types/node':
        specifier: 20.14.8
        version: 20.14.8
@@ -2857,9 +2848,6 @@ packages:
  '@types/mime@1.3.5':
    resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}

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

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

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

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

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

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

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

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

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

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

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

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

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

  '@types/mime@1.3.5': {}

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

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

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

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

  date-fns@2.29.3: {}

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

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

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

  mkdirp@1.0.4: {}

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

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

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

  reflect-metadata@0.1.13: {}

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

  typedarray@0.0.6: {}

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

  undici-types@5.26.5: {}

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

  unicode-emoji-utils@1.2.0:
--- a/server/api/externalapi.ts
+++ b/server/api/externalapi.ts
@@ -8,7 +8,7 @@ const DEFAULT_TTL = 300;
 // 10 seconds default rolling buffer (in ms)
 const DEFAULT_ROLLING_BUFFER = 10000;

-export interface ExternalAPIOptions {
+interface ExternalAPIOptions {
  nodeCache?: NodeCache;
  headers?: Record<string, unknown>;
  rateLimit?: RateLimitOptions;
@@ -32,28 +32,13 @@ class ExternalAPI {
      this.fetch = fetch;
    }

-    const url = new URL(baseUrl);
-
+    this.baseUrl = baseUrl;
+    this.params = params;
    this.defaultHeaders = {
      'Content-Type': 'application/json',
      Accept: 'application/json',
-      ...((url.username || url.password) && {
-        Authorization: `Basic ${Buffer.from(
-          `${url.username}:${url.password}`
-        ).toString('base64')}`,
-      }),
      ...options.headers,
    };
-
-    if (url.username || url.password) {
-      url.username = '';
-      url.password = '';
-      baseUrl = url.toString();
-    }
-
-    this.baseUrl = baseUrl;
-    this.params = params;
-
    this.cache = options.nodeCache;
  }

@@ -91,7 +76,7 @@ class ExternalAPI {
    }
    const data = await this.getDataFromResponse(response);

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

@@ -135,7 +120,7 @@ class ExternalAPI {
    }
    const resData = await this.getDataFromResponse(response);

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

@@ -179,7 +164,7 @@ class ExternalAPI {
    }
    const resData = await this.getDataFromResponse(response);

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

--- a/server/api/indexer/index.ts
+++ b/server/api/indexer/index.ts
@@ -1,23 +0,0 @@
-import type {
-  TmdbSeasonWithEpisodes,
-  TmdbTvDetails,
-} from '@server/api/indexer/themoviedb/interfaces';
-
-export interface TvShowIndexer {
-  getTvShow({
-    tvId,
-    language,
-  }: {
-    tvId: number;
-    language?: string;
-  }): Promise<TmdbTvDetails>;
-  getTvSeason({
-    tvId,
-    seasonNumber,
-    language,
-  }: {
-    tvId: number;
-    seasonNumber: number;
-    language?: string;
-  }): Promise<TmdbSeasonWithEpisodes>;
-}
--- a/server/api/indexer/tvdb/index.ts
+++ b/server/api/indexer/tvdb/index.ts
@@ -1,246 +0,0 @@
-import ExternalAPI from '@server/api/externalapi';
-import type { TvShowIndexer } from '@server/api/indexer';
-import TheMovieDb from '@server/api/indexer/themoviedb';
-import type {
-  TmdbSeasonWithEpisodes,
-  TmdbTvDetails,
-} from '@server/api/indexer/themoviedb/interfaces';
-import type {
-  TvdbEpisode,
-  TvdbLoginResponse,
-  TvdbSeason,
-  TvdbTvShowDetail,
-} from '@server/api/indexer/tvdb/interfaces';
-import cacheManager, { type AvailableCacheIds } from '@server/lib/cache';
-import logger from '@server/logger';
-
-interface TvdbConfig {
-  baseUrl: string;
-  maxRequestsPerSecond: number;
-  cachePrefix: AvailableCacheIds;
-}
-
-const DEFAULT_CONFIG: TvdbConfig = {
-  baseUrl: 'https://skyhook.sonarr.tv/v1/tvdb/shows',
-  maxRequestsPerSecond: 50,
-  cachePrefix: 'tvdb' as const,
-};
-
-const enum TvdbIdStatus {
-  INVALID = -1,
-}
-
-type TvdbId = number;
-type ValidTvdbId = Exclude<TvdbId, TvdbIdStatus.INVALID>;
-
-class Tvdb extends ExternalAPI implements TvShowIndexer {
-  private readonly tmdb: TheMovieDb;
-  private static readonly DEFAULT_CACHE_TTL = 43200;
-  private static readonly DEFAULT_LANGUAGE = 'en';
-
-  constructor(config: Partial<TvdbConfig> = {}) {
-    const finalConfig = { ...DEFAULT_CONFIG, ...config };
-
-    super(
-      finalConfig.baseUrl,
-      {},
-      {
-        nodeCache: cacheManager.getCache(finalConfig.cachePrefix).data,
-        rateLimit: {
-          maxRPS: finalConfig.maxRequestsPerSecond,
-          id: finalConfig.cachePrefix,
-        },
-      }
-    );
-    this.tmdb = new TheMovieDb();
-  }
-
-  public async test(): Promise<TvdbLoginResponse> {
-    try {
-      return await this.get<TvdbLoginResponse>('/en/445009', {});
-    } catch (error) {
-      this.handleError('Login failed', error);
-      throw error;
-    }
-  }
-
-  public async getTvShow({
-    tvId,
-    language = Tvdb.DEFAULT_LANGUAGE,
-  }: {
-    tvId: number;
-    language?: string;
-  }): Promise<TmdbTvDetails> {
-    try {
-      const tmdbTvShow = await this.tmdb.getTvShow({ tvId, language });
-      const tvdbId = this.getTvdbIdFromTmdb(tmdbTvShow);
-
-      if (this.isValidTvdbId(tvdbId)) {
-        return await this.enrichTmdbShowWithTvdbData(tmdbTvShow, tvdbId);
-      }
-
-      return tmdbTvShow;
-    } catch (error) {
-      this.handleError('Failed to fetch TV show details', error);
-      throw error;
-    }
-  }
-
-  public async getTvSeason({
-    tvId,
-    seasonNumber,
-    language = Tvdb.DEFAULT_LANGUAGE,
-  }: {
-    tvId: number;
-    seasonNumber: number;
-    language?: string;
-  }): Promise<TmdbSeasonWithEpisodes> {
-    if (seasonNumber === 0) {
-      return this.createEmptySeasonResponse(tvId);
-    }
-
-    try {
-      const tmdbTvShow = await this.tmdb.getTvShow({ tvId, language });
-      const tvdbId = this.getTvdbIdFromTmdb(tmdbTvShow);
-
-      if (!this.isValidTvdbId(tvdbId)) {
-        return await this.tmdb.getTvSeason({ tvId, seasonNumber, language });
-      }
-
-      return await this.getTvdbSeasonData(tvdbId, seasonNumber, tvId);
-    } catch (error) {
-      logger.error(
-        `[TVDB] Failed to fetch TV season details: ${error.message}`
-      );
-      return await this.tmdb.getTvSeason({ tvId, seasonNumber, language });
-    }
-  }
-
-  private async enrichTmdbShowWithTvdbData(
-    tmdbTvShow: TmdbTvDetails,
-    tvdbId: ValidTvdbId
-  ): Promise<TmdbTvDetails> {
-    try {
-      const tvdbData = await this.fetchTvdbShowData(tvdbId);
-      const seasons = this.processSeasons(tvdbData);
-      return { ...tmdbTvShow, seasons };
-    } catch (error) {
-      logger.error(
-        `Failed to enrich TMDB show with TVDB data: ${error.message}`
-      );
-      return tmdbTvShow;
-    }
-  }
-
-  private async fetchTvdbShowData(tvdbId: number): Promise<TvdbTvShowDetail> {
-    return await this.get<TvdbTvShowDetail>(
-      `/en/${tvdbId}`,
-      {},
-      Tvdb.DEFAULT_CACHE_TTL
-    );
-  }
-
-  private processSeasons(tvdbData: TvdbTvShowDetail): any[] {
-    return tvdbData.seasons
-      .filter((season) => season.seasonNumber !== 0)
-      .map((season) => this.createSeasonData(season, tvdbData));
-  }
-
-  private createSeasonData(
-    season: TvdbSeason,
-    tvdbData: TvdbTvShowDetail
-  ): any {
-    if (!season.seasonNumber) return null;
-
-    const episodeCount = tvdbData.episodes.filter(
-      (episode) => episode.seasonNumber === season.seasonNumber
-    ).length;
-
-    return {
-      id: tvdbData.tvdbId,
-      episode_count: episodeCount,
-      name: `${season.seasonNumber}`,
-      overview: '',
-      season_number: season.seasonNumber,
-      poster_path: '',
-      air_date: '',
-      image: '',
-    };
-  }
-
-  private async getTvdbSeasonData(
-    tvdbId: number,
-    seasonNumber: number,
-    tvId: number
-  ): Promise<TmdbSeasonWithEpisodes> {
-    const tvdbSeason = await this.fetchTvdbShowData(tvdbId);
-
-    const episodes = this.processEpisodes(tvdbSeason, seasonNumber, tvId);
-
-    return {
-      episodes,
-      external_ids: { tvdb_id: tvdbSeason.tvdbId },
-      name: '',
-      overview: '',
-      id: tvdbSeason.tvdbId,
-      air_date: tvdbSeason.firstAired,
-      season_number: episodes.length,
-    };
-  }
-
-  private processEpisodes(
-    tvdbSeason: TvdbTvShowDetail,
-    seasonNumber: number,
-    tvId: number
-  ): any[] {
-    return tvdbSeason.episodes
-      .filter((episode) => episode.seasonNumber === seasonNumber)
-      .map((episode, index) => this.createEpisodeData(episode, index, tvId));
-  }
-
-  private createEpisodeData(
-    episode: TvdbEpisode,
-    index: number,
-    tvId: number
-  ): any {
-    return {
-      id: episode.tvdbId,
-      air_date: episode.airDate,
-      episode_number: episode.episodeNumber,
-      name: episode.title || `Episode ${index + 1}`,
-      overview: episode.overview || '',
-      season_number: episode.seasonNumber,
-      production_code: '',
-      show_id: tvId,
-      still_path: episode.image || '',
-      vote_average: 1,
-      vote_count: 1,
-    };
-  }
-
-  private createEmptySeasonResponse(tvId: number): TmdbSeasonWithEpisodes {
-    return {
-      episodes: [],
-      external_ids: { tvdb_id: tvId },
-      name: '',
-      overview: '',
-      id: 0,
-      air_date: '',
-      season_number: 0,
-    };
-  }
-
-  private getTvdbIdFromTmdb(tmdbTvShow: TmdbTvDetails): TvdbId {
-    return tmdbTvShow?.external_ids?.tvdb_id ?? TvdbIdStatus.INVALID;
-  }
-
-  private isValidTvdbId(tvdbId: TvdbId): tvdbId is ValidTvdbId {
-    return tvdbId !== TvdbIdStatus.INVALID;
-  }
-
-  private handleError(context: string, error: Error): void {
-    throw new Error(`[TVDB] ${context}: ${error.message}`);
-  }
-}
-
-export default Tvdb;
--- a/server/api/indexer/tvdb/interfaces.ts
+++ b/server/api/indexer/tvdb/interfaces.ts
@@ -1,80 +0,0 @@
-export interface TvdbBaseResponse<T> {
-  data: T;
-  errors: string;
-}
-
-export interface TvdbLoginResponse extends TvdbBaseResponse<{ token: string }> {
-  data: { token: string };
-}
-
-export interface TvdbTvShowDetail {
-  tvdbId: number;
-  title: string;
-  overview: string;
-  slug: string;
-  originalCountry: string;
-  originalLanguage: string;
-  language: string;
-  firstAired: string;
-  lastAired: string;
-  tvMazeId: number;
-  tmdbId: number;
-  imdbId: string;
-  lastUpdated: string;
-  status: string;
-  runtime: number;
-  timeOfDay: TvdbTimeOfDay;
-  originalNetwork: string;
-  network: string;
-  genres: string[];
-  alternativeTitles: TvdbAlternativeTitle[];
-  actors: TvdbActor[];
-  images: TvdbImage[];
-  seasons: TvdbSeason[];
-  episodes: TvdbEpisode[];
-}
-
-export interface TvdbTimeOfDay {
-  hours: number;
-  minutes: number;
-}
-
-export interface TvdbAlternativeTitle {
-  title: string;
-}
-
-export interface TvdbActor {
-  name: string;
-  character: string;
-  image?: string;
-}
-
-export interface TvdbImage {
-  coverType: string;
-  url: string;
-}
-
-export interface TvdbSeason {
-  seasonNumber: number;
-}
-
-export interface TvdbEpisode {
-  tvdbShowId: number;
-  tvdbId: number;
-  seasonNumber: number;
-  episodeNumber: number;
-  absoluteEpisodeNumber: number;
-  title?: string;
-  airDate: string;
-  airDateUtc: string;
-  runtime?: number;
-  overview?: string;
-  image?: string;
-}
-
-export interface TvdbEpisodeTranslation
-  extends TvdbBaseResponse<TvdbEpisodeTranslation> {
-  name: string;
-  overview: string;
-  language: string;
-}
--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -410,7 +410,7 @@ class JellyfinAPI extends ExternalAPI {
      ).AccessToken;
    } catch (e) {
      logger.error(
-        `Something went wrong while creating an API key from the Jellyfin server: ${e.message}`,
+        `Something went wrong while creating an API key the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );

--- a/server/api/plexapi.ts
+++ b/server/api/plexapi.ts
@@ -180,7 +180,7 @@ class PlexAPI {
      settings.plex.libraries = [];
    }

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

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

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

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

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

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

-  async refreshMonitoredDownloads(): Promise<void> {
-    await this.runCommand('RefreshMonitoredDownloads', {});
-  }
-
  protected async runCommand(
    commandName: string,
    options: Record<string, unknown>
  ): Promise<void> {
    try {
-      await this.post(
-        `/command`,
-        {
-          name: commandName,
-          ...options,
-        },
-        {},
-        0
-      );
+      await this.post(`/command`, {
+        name: commandName,
+        ...options,
+      });
    } catch (e) {
      throw new Error(`[${this.apiName}] Failed to run command: ${e.message}`);
    }
--- a/server/api/indexer/themoviedb/constants.ts
+++ b/server/api/indexer/themoviedb/constants.ts
--- a/server/api/indexer/themoviedb/index.ts
+++ b/server/api/indexer/themoviedb/index.ts
@@ -1,5 +1,4 @@
 import ExternalAPI from '@server/api/externalapi';
-import type { TvShowIndexer } from '@server/api/indexer';
 import cacheManager from '@server/lib/cache';
 import { sortBy } from 'lodash';
 import type {
@@ -99,7 +98,7 @@ interface DiscoverTvOptions {
  withStatus?: string; // Returning Series: 0 Planned: 1 In Production: 2 Ended: 3 Cancelled: 4 Pilot: 5
 }

-class TheMovieDb extends ExternalAPI implements TvShowIndexer {
+class TheMovieDb extends ExternalAPI {
  private region?: string;
  private originalLanguage?: string;
  constructor({
@@ -309,12 +308,6 @@ class TheMovieDb extends ExternalAPI implements TvShowIndexer {
        }
      );

-      data.episodes = data.episodes.map((episode) => {
-        if (episode.still_path) {
-          episode.still_path = `https://image.tmdb.org/t/p/original/${episode.still_path}`;
-        }
-        return episode;
-      });
      return data;
    } catch (e) {
      throw new Error(`[TMDB] Failed to fetch TV show details: ${e.message}`);
--- a/server/api/indexer/themoviedb/interfaces.ts
+++ b/server/api/indexer/themoviedb/interfaces.ts
@@ -220,7 +220,7 @@ export interface TmdbTvEpisodeResult {
  show_id: number;
  still_path: string;
  vote_average: number;
-  vote_count: number;
+  vote_cuont: number;
 }

 export interface TmdbTvSeasonResult {
--- a/server/entity/Media.ts
+++ b/server/entity/Media.ts
@@ -231,7 +231,7 @@ class Media {
        this.mediaUrl = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
      }
      if (this.jellyfinMediaId4k) {
-        this.mediaUrl4k = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId4k}&context=home&serverId=${serverId}`;
+        this.mediaUrl4k = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
      }
    }
  }
--- a/server/entity/MediaRequest.ts
+++ b/server/entity/MediaRequest.ts
@@ -1,5 +1,3 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
-import { ANIME_KEYWORD_ID } from '@server/api/indexer/themoviedb/constants';
 import type { RadarrMovieOptions } from '@server/api/servarr/radarr';
 import RadarrAPI from '@server/api/servarr/radarr';
 import type {
@@ -7,6 +5,8 @@ import type {
  SonarrSeries,
 } from '@server/api/servarr/sonarr';
 import SonarrAPI from '@server/api/servarr/sonarr';
+import TheMovieDb from '@server/api/themoviedb';
+import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
 import {
  MediaRequestStatus,
  MediaStatus,
--- a/server/entity/Watchlist.ts
+++ b/server/entity/Watchlist.ts
@@ -1,4 +1,4 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
+import TheMovieDb from '@server/api/themoviedb';
 import { MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
--- a/server/index.ts
+++ b/server/index.ts
@@ -19,11 +19,8 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import clearCookies from '@server/middleware/clearcookies';
 import routes from '@server/routes';
-import avatarproxy from '@server/routes/avatarproxy';
 import imageproxy from '@server/routes/imageproxy';
-import { appDataPermissions } from '@server/utils/appDataVolume';
 import { getAppVersion } from '@server/utils/appVersion';
-import createCustomProxyAgent from '@server/utils/customProxyAgent';
 import restartFlag from '@server/utils/restartFlag';
 import { getClientIp } from '@supercharge/request-ip';
 import { TypeormStore } from 'connect-typeorm/out';
@@ -53,12 +50,6 @@ const dev = process.env.NODE_ENV !== 'production';
 const app = next({ dev });
 const handle = app.getRequestHandler();

-if (!appDataPermissions()) {
-  logger.error(
-    'Something went wrong while checking config folder! Please ensure the config folder is set up properly.\nhttps://docs.jellyseerr.dev/getting-started'
-  );
-}
-
 app
  .prepare()
  .then(async () => {
@@ -75,11 +66,6 @@ app
    const settings = await getSettings().load();
    restartFlag.initializeSettings(settings.main);

-    // Register HTTP proxy
-    if (settings.main.proxy.enabled) {
-      await createCustomProxyAgent(settings.main.proxy);
-    }
-
    // Migrate library types
    if (
      settings.plex.libraries.length > 1 &&
@@ -188,7 +174,7 @@ app
        },
        store: new TypeormStore({
          cleanupLimit: 2,
-          ttl: 60 * 60 * 24 * 30,
+          ttl: 1000 * 60 * 60 * 24 * 30,
        }).connect(sessionRespository) as Store,
      })
    );
@@ -216,7 +202,6 @@ app

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

    server.get('*', (req, res) => handle(req, res));
    server.use(
--- a/server/interfaces/api/settingsInterfaces.ts
+++ b/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 {
--- a/server/job/schedule.ts
+++ b/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');
    }),
  });

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

 const DEFAULT_TTL = 300;
 const DEFAULT_CHECK_PERIOD = 120;
@@ -69,10 +68,6 @@ class CacheManager {
      stdTtl: 86400 * 7, // 1 week cache
      checkPeriod: 60,
    }),
-    tvdb: new Cache('tvdb', 'The TVDB API', {
-      stdTtl: 21600,
-      checkPeriod: 60 * 30,
-    }),
  };

  public getCache(id: AvailableCacheIds): Cache {
--- a/server/lib/downloadtracker.ts
+++ b/server/lib/downloadtracker.ts
@@ -85,7 +85,6 @@ class DownloadTracker {
          });

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

            this.radarrServers[server.id] = queueItems.map((item) => ({
@@ -163,7 +162,6 @@ class DownloadTracker {
          });

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

            this.sonarrServers[server.id] = queueItems.map((item) => ({
--- a/server/lib/imageproxy.ts
+++ b/server/lib/imageproxy.ts
@@ -3,7 +3,6 @@ import type { RateLimitOptions } from '@server/utils/rateLimit';
 import rateLimit from '@server/utils/rateLimit';
 import { createHash } from 'crypto';
 import { promises } from 'fs';
-import mime from 'mime/lite';
 import path, { join } from 'path';

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  private async writeToCacheDir(
    dir: string,
-    extension: string | null,
+    extension: string,
    maxAge: number,
    expireAt: number,
    buffer: Buffer,
--- a/server/lib/scanners/baseScanner.ts
+++ b/server/lib/scanners/baseScanner.ts
@@ -1,4 +1,4 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
+import TheMovieDb from '@server/api/themoviedb';
 import { MediaStatus, MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
--- a/server/lib/scanners/jellyfin/index.ts
+++ b/server/lib/scanners/jellyfin/index.ts
@@ -1,7 +1,7 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
-import type { TmdbTvDetails } from '@server/api/indexer/themoviedb/interfaces';
 import type { JellyfinLibraryItem } from '@server/api/jellyfin';
 import JellyfinAPI from '@server/api/jellyfin';
+import TheMovieDb from '@server/api/themoviedb';
+import type { TmdbTvDetails } from '@server/api/themoviedb/interfaces';
 import { MediaStatus, MediaType } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import { getRepository } from '@server/datasource';
--- a/server/lib/scanners/plex/index.ts
+++ b/server/lib/scanners/plex/index.ts
@@ -1,7 +1,7 @@
 import animeList from '@server/api/animelist';
-import type { TmdbTvDetails } from '@server/api/indexer/themoviedb/interfaces';
 import type { PlexLibraryItem, PlexMetadata } from '@server/api/plexapi';
 import PlexAPI from '@server/api/plexapi';
+import type { TmdbTvDetails } from '@server/api/themoviedb/interfaces';
 import { getRepository } from '@server/datasource';
 import { User } from '@server/entity/User';
 import cacheManager from '@server/lib/cache';
@@ -129,7 +129,7 @@ class PlexScanner
          });

          settings.plex.libraries = newLibraries;
-          await settings.save();
+          settings.save();
        }
      } else {
        for (const library of this.libraries) {
--- a/server/lib/scanners/sonarr/index.ts
+++ b/server/lib/scanners/sonarr/index.ts
@@ -1,6 +1,6 @@
-import type { TmdbTvDetails } from '@server/api/indexer/themoviedb/interfaces';
 import type { SonarrSeries } from '@server/api/servarr/sonarr';
 import SonarrAPI from '@server/api/servarr/sonarr';
+import type { TmdbTvDetails } from '@server/api/themoviedb/interfaces';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import type {
--- a/server/lib/search.ts
+++ b/server/lib/search.ts
@@ -1,4 +1,4 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
+import TheMovieDb from '@server/api/themoviedb';
 import type {
  TmdbMovieDetails,
  TmdbMovieResult,
@@ -9,7 +9,7 @@ import type {
  TmdbSearchTvResponse,
  TmdbTvDetails,
  TmdbTvResult,
-} from '@server/api/indexer/themoviedb/interfaces';
+} from '@server/api/themoviedb/interfaces';
 import {
  mapMovieDetailsToResult,
  mapPersonDetailsToResult,
--- a/server/lib/settings/index.ts
+++ b/server/lib/settings/index.ts
@@ -1,11 +1,8 @@
-import type { TvShowIndexer } from '@server/api/indexer';
-import TheMovieDb from '@server/api/indexer/themoviedb';
-import Tvdb from '@server/api/indexer/tvdb';
 import { MediaServerType } from '@server/constants/server';
 import { Permission } from '@server/lib/permissions';
 import { runMigrations } from '@server/lib/settings/migrator';
 import { randomUUID } from 'crypto';
-import fs from 'fs/promises';
+import fs from 'fs';
 import { merge } from 'lodash';
 import path from 'path';
 import webpush from 'web-push';
@@ -102,17 +99,6 @@ interface Quota {
  quotaDays?: number;
 }

-export interface ProxySettings {
-  enabled: boolean;
-  hostname: string;
-  port: number;
-  useSsl: boolean;
-  user: string;
-  password: string;
-  bypassFilter: string;
-  bypassLocalAddresses: boolean;
-}
-
 export interface MainSettings {
  apiKey: string;
  applicationTitle: string;
@@ -133,7 +119,6 @@ export interface MainSettings {
  mediaServerType: number;
  partialRequestsEnabled: boolean;
  locale: string;
-  proxy: ProxySettings;
 }

 interface PublicSettings {
@@ -306,7 +291,6 @@ export interface AllSettings {
  public: PublicSettings;
  notifications: NotificationSettings;
  jobs: Record<JobId, JobSettings>;
-  tvdb: boolean;
 }

 const SETTINGS_PATH = process.env.CONFIG_DIRECTORY
@@ -341,16 +325,6 @@ class Settings {
        mediaServerType: MediaServerType.NOT_CONFIGURED,
        partialRequestsEnabled: true,
        locale: 'en',
-        proxy: {
-          enabled: false,
-          hostname: '',
-          port: 8080,
-          useSsl: false,
-          user: '',
-          password: '',
-          bypassFilter: '',
-          bypassLocalAddresses: true,
-        },
      },
      plex: {
        name: '',
@@ -372,7 +346,6 @@ class Settings {
        apiKey: '',
      },
      tautulli: {},
-      tvdb: false,
      radarr: [],
      sonarr: [],
      public: {
@@ -506,6 +479,10 @@ class Settings {
  }

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

@@ -537,14 +514,6 @@ class Settings {
    this.data.tautulli = data;
  }

-  get tvdb(): boolean {
-    return this.data.tvdb;
-  }
-
-  set tvdb(data: boolean) {
-    this.data.tvdb = data;
-  }
-
  get radarr(): RadarrSettings[] {
    return this.data.radarr;
  }
@@ -615,20 +584,29 @@ class Settings {
  }

  get clientId(): string {
+    if (!this.data.clientId) {
+      this.data.clientId = randomUUID();
+      this.save();
+    }
+
    return this.data.clientId;
  }

  get vapidPublic(): string {
+    this.generateVapidKeys();
+
    return this.data.vapidPublic;
  }

  get vapidPrivate(): string {
+    this.generateVapidKeys();
+
    return this.data.vapidPrivate;
  }

-  public async regenerateApiKey(): Promise<MainSettings> {
+  public regenerateApiKey(): MainSettings {
    this.main.apiKey = this.generateApiKey();
-    await this.save();
+    this.save();
    return this.main;
  }

@@ -640,6 +618,15 @@ class Settings {
    }
  }

+  private generateVapidKeys(force = false): void {
+    if (!this.data.vapidPublic || !this.data.vapidPrivate || force) {
+      const vapidKeys = webpush.generateVAPIDKeys();
+      this.data.vapidPrivate = vapidKeys.privateKey;
+      this.data.vapidPublic = vapidKeys.publicKey;
+      this.save();
+    }
+  }
+
  /**
   * Settings Load
   *
@@ -654,51 +641,30 @@ class Settings {
      return this;
    }

-    let data;
-    try {
-      data = await fs.readFile(SETTINGS_PATH, 'utf-8');
-    } catch {
-      await this.save();
+    if (!fs.existsSync(SETTINGS_PATH)) {
+      this.save();
    }
+    const data = fs.readFileSync(SETTINGS_PATH, 'utf-8');

    if (data) {
      const parsedJson = JSON.parse(data);
-      const migratedData = await runMigrations(parsedJson, SETTINGS_PATH);
-      this.data = merge(this.data, migratedData);
-    }
+      this.data = await runMigrations(parsedJson);

-    // generate keys and ids if it's missing
-    let change = false;
-    if (!this.data.main.apiKey) {
-      this.data.main.apiKey = this.generateApiKey();
-      change = true;
-    } else if (process.env.API_KEY) {
-      if (this.main.apiKey != process.env.API_KEY) {
-        this.main.apiKey = process.env.API_KEY;
+      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;
+        }
      }
-    }
-    if (!this.data.clientId) {
-      this.data.clientId = randomUUID();
-      change = true;
-    }
-    if (!this.data.vapidPublic || !this.data.vapidPrivate) {
-      const vapidKeys = webpush.generateVAPIDKeys();
-      this.data.vapidPrivate = vapidKeys.privateKey;
-      this.data.vapidPublic = vapidKeys.publicKey;
-      change = true;
-    }
-    if (change) {
-      await this.save();
-    }

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

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

@@ -712,13 +678,4 @@ export const getSettings = (initialSettings?: AllSettings): Settings => {
  return settings;
 };

-export const getIndexer = (): TvShowIndexer => {
-  const settings = getSettings();
-  if (settings.tvdb) {
-    return new Tvdb();
-  } else {
-    return new TheMovieDb();
-  }
-};
-
 export default Settings;
--- a/server/lib/settings/migrations/0001_migrate_hostname.ts
+++ b/server/lib/settings/migrations/0001_migrate_hostname.ts
@@ -1,14 +1,15 @@
 import type { AllSettings } from '@server/lib/settings';

 const migrateHostname = (settings: any): AllSettings => {
-  if (settings.jellyfin?.hostname) {
-    const { hostname } = settings.jellyfin;
+  const oldJellyfinSettings = settings.jellyfin;
+  if (oldJellyfinSettings && oldJellyfinSettings.hostname) {
+    const { hostname } = oldJellyfinSettings;
    const protocolMatch = hostname.match(/^(https?):\/\//i);
    const useSsl = protocolMatch && protocolMatch[1].toLowerCase() === 'https';
    const remainingUrl = hostname.replace(/^(https?):\/\//i, '');
    const urlMatch = remainingUrl.match(/^([^:]+)(:([0-9]+))?(\/.*)?$/);

-    delete settings.jellyfin.hostname;
+    delete oldJellyfinSettings.hostname;
    if (urlMatch) {
      const [, ip, , port, urlBase] = urlMatch;
      settings.jellyfin = {
@@ -20,7 +21,9 @@ const migrateHostname = (settings: any): AllSettings => {
      };
    }
  }
-
+  if (settings.jellyfin && settings.jellyfin.hostname) {
+    delete settings.jellyfin.hostname;
+  }
  return settings;
 };

--- a/server/lib/settings/migrations/0002_migrate_apitokens.ts
+++ b/server/lib/settings/migrations/0002_migrate_apitokens.ts
@@ -27,14 +27,8 @@ const migrateApiTokens = async (settings: any): Promise<AllSettings> => {
      admin.jellyfinDeviceId
    );
    jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
-    try {
-      const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
-      settings.jellyfin.apiKey = apiKey;
-    } catch {
-      throw new Error(
-        "Failed to create Jellyfin API token from admin account. Please check your network configuration or edit your settings.json by adding an 'apiKey' field inside of the 'jellyfin' section to fix this issue."
-      );
-    }
+    const apiKey = await jellyfinClient.createApiToken('Jellyseerr');
+    settings.jellyfin.apiKey = apiKey;
  }
  return settings;
 };
--- a/server/lib/settings/migrator.ts
+++ b/server/lib/settings/migrator.ts
@@ -1,100 +1,30 @@
 import type { AllSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import fs from 'fs/promises';
+import fs from 'fs';
 import path from 'path';

 const migrationsDir = path.join(__dirname, 'migrations');

 export const runMigrations = async (
-  settings: AllSettings,
-  SETTINGS_PATH: string
+  settings: AllSettings
 ): Promise<AllSettings> => {
+  const migrations = fs
+    .readdirSync(migrationsDir)
+    .filter((file) => file.endsWith('.js') || file.endsWith('.ts'))
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    .map((file) => require(path.join(migrationsDir, file)).default);
+
  let migrated = settings;

  try {
-    // we read old backup and create a backup of currents settings
-    const BACKUP_PATH = SETTINGS_PATH.replace('.json', '.old.json');
-    let oldBackup: string | null = null;
-    try {
-      oldBackup = await fs.readFile(BACKUP_PATH, 'utf-8');
-    } catch {
-      /* empty */
-    }
-    await fs.writeFile(BACKUP_PATH, JSON.stringify(settings, undefined, ' '));
-
-    const migrations = (await fs.readdir(migrationsDir)).filter(
-      (file) => file.endsWith('.js') || file.endsWith('.ts')
-    );
-
-    const settingsBefore = JSON.stringify(migrated);
-
    for (const migration of migrations) {
-      try {
-        logger.debug(`Checking migration '${migration}'...`, {
-          label: 'Settings Migrator',
-        });
-        const { default: migrationFn } = await import(
-          path.join(migrationsDir, migration)
-        );
-        const newSettings = await migrationFn(structuredClone(migrated));
-        if (JSON.stringify(migrated) !== JSON.stringify(newSettings)) {
-          logger.debug(`Migration '${migration}' has been applied.`, {
-            label: 'Settings Migrator',
-          });
-        }
-        migrated = newSettings;
-      } catch (e) {
-        // we stop jellyseerr if the migration failed
-        logger.error(
-          `Error while running migration '${migration}': ${e.message}`,
-          {
-            label: 'Settings Migrator',
-          }
-        );
-        logger.error(
-          'A common cause for this error is a permission issue with your configuration folder, a network issue or a corrupted database.',
-          {
-            label: 'Settings Migrator',
-          }
-        );
-        process.exit();
-      }
-    }
-
-    const settingsAfter = JSON.stringify(migrated);
-
-    if (settingsBefore !== settingsAfter) {
-      // a migration occured
-      // we check that the new config will be saved
-      await fs.writeFile(
-        SETTINGS_PATH,
-        JSON.stringify(migrated, undefined, ' ')
-      );
-      const fileSaved = JSON.parse(await fs.readFile(SETTINGS_PATH, 'utf-8'));
-      if (JSON.stringify(fileSaved) !== settingsAfter) {
-        // something went wrong while saving file
-        throw new Error('Unable to save settings after migration.');
-      }
-    } else if (oldBackup) {
-      // no migration occured
-      // we save the old backup (to avoid settings.json and settings.old.json being the same)
-      await fs.writeFile(BACKUP_PATH, oldBackup.toString());
+      migrated = await migration(migrated);
    }
  } catch (e) {
-    // we stop jellyseerr if the migration failed
    logger.error(
      `Something went wrong while running settings migrations: ${e.message}`,
-      {
-        label: 'Settings Migrator',
-      }
+      { label: 'Settings Migrator' }
    );
-    logger.error(
-      'A common cause for this issue is a permission error of your configuration folder.',
-      {
-        label: 'Settings Migrator',
-      }
-    );
-    process.exit();
  }

  return migrated;
--- a/server/models/Collection.ts
+++ b/server/models/Collection.ts
@@ -1,4 +1,4 @@
-import type { TmdbCollection } from '@server/api/indexer/themoviedb/interfaces';
+import type { TmdbCollection } from '@server/api/themoviedb/interfaces';
 import { MediaType } from '@server/constants/media';
 import type Media from '@server/entity/Media';
 import { sortBy } from 'lodash';
--- a/server/models/Movie.ts
+++ b/server/models/Movie.ts
@@ -2,7 +2,7 @@ import type {
  TmdbMovieDetails,
  TmdbMovieReleaseResult,
  TmdbProductionCompany,
-} from '@server/api/indexer/themoviedb/interfaces';
+} from '@server/api/themoviedb/interfaces';
 import type Media from '@server/entity/Media';
 import type {
  Cast,
--- a/server/models/Person.ts
+++ b/server/models/Person.ts
@@ -2,7 +2,7 @@ import type {
  TmdbPersonCreditCast,
  TmdbPersonCreditCrew,
  TmdbPersonDetails,
-} from '@server/api/indexer/themoviedb/interfaces';
+} from '@server/api/themoviedb/interfaces';
 import type Media from '@server/entity/Media';

 export interface PersonDetails {
--- a/server/models/Search.ts
+++ b/server/models/Search.ts
@@ -6,7 +6,7 @@ import type {
  TmdbPersonResult,
  TmdbTvDetails,
  TmdbTvResult,
-} from '@server/api/indexer/themoviedb/interfaces';
+} from '@server/api/themoviedb/interfaces';
 import { MediaType as MainMediaType } from '@server/constants/media';
 import type Media from '@server/entity/Media';

--- a/server/models/Tv.ts
+++ b/server/models/Tv.ts
@@ -5,7 +5,7 @@ import type {
  TmdbTvEpisodeResult,
  TmdbTvRatingResult,
  TmdbTvSeasonResult,
-} from '@server/api/indexer/themoviedb/interfaces';
+} from '@server/api/themoviedb/interfaces';
 import type Media from '@server/entity/Media';
 import type {
  Cast,
@@ -124,7 +124,7 @@ const mapEpisodeResult = (episode: TmdbTvEpisodeResult): Episode => ({
  seasonNumber: episode.season_number,
  showId: episode.show_id,
  voteAverage: episode.vote_average,
-  voteCount: episode.vote_count,
+  voteCount: episode.vote_cuont,
  stillPath: episode.still_path,
 });

--- a/server/models/common.ts
+++ b/server/models/common.ts
@@ -7,7 +7,7 @@ import type {
  TmdbVideoResult,
  TmdbWatchProviderDetails,
  TmdbWatchProviders,
-} from '@server/api/indexer/themoviedb/interfaces';
+} from '@server/api/themoviedb/interfaces';
 import type { Video } from '@server/models/Movie';

 export interface ProductionCompany {
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -14,6 +14,7 @@ import { ApiError } from '@server/types/error';
 import { getHostname } from '@server/utils/getHostname';
 import * as EmailValidator from 'email-validator';
 import { Router } from 'express';
+import gravatarUrl from 'gravatar-url';
 import net from 'net';

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

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

      await userRepository.save(user);
@@ -260,6 +261,8 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
            urlBase: body.urlBase,
          });

+    const { externalHostname } = getSettings().jellyfin;
+
    // Try to find deviceId that corresponds to jellyfin user, else generate a new one
    let user = await userRepository.findOne({
      where: { jellyfinUsername: body.username },
@@ -277,6 +280,11 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
    // First we need to attempt to log the user in to jellyfin
    const jellyfinserver = new JellyfinAPI(hostname ?? '', undefined, deviceId);

+    const jellyfinHost =
+      externalHostname && externalHostname.length > 0
+        ? externalHostname
+        : hostname;
+
    const ip = req.ip;
    let clientIp;

@@ -326,10 +334,14 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
            jellyfinDeviceId: deviceId,
            jellyfinAuthToken: account.AccessToken,
            permissions: Permission.ADMIN,
-            avatar: `/avatarproxy/${account.User.Id}`,
+            avatar: account.User.PrimaryImageTag
+              ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
+              : gravatarUrl(body.email || account.User.Name, {
+                  default: 'mm',
+                  size: 200,
+                }),
            userType: UserType.EMBY,
          });
-
          break;
        case MediaServerType.JELLYFIN:
          settings.main.mediaServerType = MediaServerType.JELLYFIN;
@@ -340,10 +352,14 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
            jellyfinDeviceId: deviceId,
            jellyfinAuthToken: account.AccessToken,
            permissions: Permission.ADMIN,
-            avatar: `/avatarproxy/${account.User.Id}`,
+            avatar: account.User.PrimaryImageTag
+              ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
+              : gravatarUrl(body.email || account.User.Name, {
+                  default: 'mm',
+                  size: 200,
+                }),
            userType: UserType.JELLYFIN,
          });
-
          break;
        default:
          throw new Error('select_server_type');
@@ -366,7 +382,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      settings.jellyfin.urlBase = body.urlBase ?? '';
      settings.jellyfin.useSsl = body.useSsl ?? false;
      settings.jellyfin.apiKey = apiKey;
-      await settings.save();
+      settings.save();
      startJobs();

      await userRepository.save(user);
@@ -389,7 +405,15 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
          jellyfinUsername: account.User.Name,
        }
      );
-      user.avatar = `/avatarproxy/${account.User.Id}`;
+      // Update the users avatar with their jellyfin profile pic (incase it changed)
+      if (account.User.PrimaryImageTag) {
+        user.avatar = `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
+      } else {
+        user.avatar = gravatarUrl(user.email || account.User.Name, {
+          default: 'mm',
+          size: 200,
+        });
+      }
      user.jellyfinUsername = account.User.Name;

      if (user.username === account.User.Name) {
@@ -427,13 +451,17 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        jellyfinUserId: account.User.Id,
        jellyfinDeviceId: deviceId,
        permissions: settings.main.defaultPermissions,
-        avatar: `/avatarproxy/${account.User.Id}`,
+        avatar: account.User.PrimaryImageTag
+          ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
+          : gravatarUrl(body.email || account.User.Name, {
+              default: 'mm',
+              size: 200,
+            }),
        userType:
          settings.main.mediaServerType === MediaServerType.JELLYFIN
            ? UserType.JELLYFIN
            : UserType.EMBY,
      });
-
      //initialize Jellyfin/Emby users with local login
      const passedExplicitPassword = body.password && body.password.length > 0;
      if (passedExplicitPassword) {
--- a/server/routes/avatarproxy.ts
+++ b/server/routes/avatarproxy.ts
@@ -1,86 +0,0 @@
-import { MediaServerType } from '@server/constants/server';
-import { getRepository } from '@server/datasource';
-import { User } from '@server/entity/User';
-import ImageProxy from '@server/lib/imageproxy';
-import { getSettings } from '@server/lib/settings';
-import logger from '@server/logger';
-import { getAppVersion } from '@server/utils/appVersion';
-import { getHostname } from '@server/utils/getHostname';
-import { Router } from 'express';
-import gravatarUrl from 'gravatar-url';
-
-const router = Router();
-
-let _avatarImageProxy: ImageProxy | null = null;
-async function initAvatarImageProxy() {
-  if (!_avatarImageProxy) {
-    const userRepository = getRepository(User);
-    const admin = await userRepository.findOne({
-      where: { id: 1 },
-      select: ['id', 'jellyfinUserId', 'jellyfinDeviceId'],
-      order: { id: 'ASC' },
-    });
-    const deviceId = admin?.jellyfinDeviceId;
-    const authToken = getSettings().jellyfin.apiKey;
-    _avatarImageProxy = new ImageProxy('avatar', '', {
-      headers: {
-        'X-Emby-Authorization': `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}", Token="${authToken}"`,
-      },
-    });
-  }
-  return _avatarImageProxy;
-}
-
-router.get('/:jellyfinUserId', async (req, res) => {
-  try {
-    if (!req.params.jellyfinUserId.match(/^[a-f0-9]{32}$/)) {
-      const mediaServerType = getSettings().main.mediaServerType;
-      throw new Error(
-        `Provided URL is not ${
-          mediaServerType === MediaServerType.JELLYFIN
-            ? 'a Jellyfin'
-            : 'an Emby'
-        } avatar.`
-      );
-    }
-
-    const avatarImageCache = await initAvatarImageProxy();
-
-    const user = await getRepository(User).findOne({
-      where: { jellyfinUserId: req.params.jellyfinUserId },
-    });
-
-    const fallbackUrl = gravatarUrl(user?.email || 'none', {
-      default: 'mm',
-      size: 200,
-    });
-    const jellyfinAvatarUrl = `${getHostname()}/UserImage?UserId=${
-      req.params.jellyfinUserId
-    }`;
-    let imageData = await avatarImageCache.getImage(
-      jellyfinAvatarUrl,
-      fallbackUrl
-    );
-
-    if (imageData.meta.extension === 'json') {
-      // this is a 404
-      imageData = await avatarImageCache.getImage(fallbackUrl);
-    }
-
-    res.writeHead(200, {
-      'Content-Type': `image/${imageData.meta.extension}`,
-      'Content-Length': imageData.imageBuffer.length,
-      'Cache-Control': `public, max-age=${imageData.meta.curRevalidate}`,
-      'OS-Cache-Key': imageData.meta.cacheKey,
-      'OS-Cache-Status': imageData.meta.cacheMiss ? 'MISS' : 'HIT',
-    });
-
-    res.end(imageData.imageBuffer);
-  } catch (e) {
-    logger.error('Failed to proxy avatar image', {
-      errorMessage: e.message,
-    });
-  }
-});
-
-export default router;
--- a/server/routes/collection.ts
+++ b/server/routes/collection.ts
@@ -1,4 +1,4 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
+import TheMovieDb from '@server/api/themoviedb';
 import Media from '@server/entity/Media';
 import logger from '@server/logger';
 import { mapCollection } from '@server/models/Collection';
--- a/server/routes/discover.ts
+++ b/server/routes/discover.ts
@@ -1,7 +1,7 @@
-import type { SortOptions } from '@server/api/indexer/themoviedb';
-import TheMovieDb from '@server/api/indexer/themoviedb';
-import type { TmdbKeyword } from '@server/api/indexer/themoviedb/interfaces';
 import PlexTvAPI from '@server/api/plextv';
+import type { SortOptions } from '@server/api/themoviedb';
+import TheMovieDb from '@server/api/themoviedb';
+import type { TmdbKeyword } from '@server/api/themoviedb/interfaces';
 import { MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -1,10 +1,10 @@
 import GithubAPI from '@server/api/github';
-import TheMovieDb from '@server/api/indexer/themoviedb';
+import PushoverAPI from '@server/api/pushover';
+import TheMovieDb from '@server/api/themoviedb';
 import type {
  TmdbMovieResult,
  TmdbTvResult,
-} from '@server/api/indexer/themoviedb/interfaces';
-import PushoverAPI from '@server/api/pushover';
+} from '@server/api/themoviedb/interfaces';
 import { getRepository } from '@server/datasource';
 import DiscoverSlider from '@server/entity/DiscoverSlider';
 import type { StatusResponse } from '@server/interfaces/api/settingsInterfaces';
@@ -17,11 +17,7 @@ import { mapProductionCompany } from '@server/models/Movie';
 import { mapNetwork } from '@server/models/Tv';
 import settingsRoutes from '@server/routes/settings';
 import watchlistRoutes from '@server/routes/watchlist';
-import {
-  appDataPath,
-  appDataPermissions,
-  appDataStatus,
-} from '@server/utils/appDataVolume';
+import { appDataPath, appDataStatus } from '@server/utils/appDataVolume';
 import { getAppVersion, getCommitTag } from '@server/utils/appVersion';
 import restartFlag from '@server/utils/restartFlag';
 import { isPerson } from '@server/utils/typeHelpers';
@@ -97,7 +93,6 @@ router.get('/status/appdata', (_req, res) => {
  return res.status(200).json({
    appData: appDataStatus(),
    appDataPath: appDataPath(),
-    appDataPermissions: appDataPermissions(),
  });
 });

--- a/server/routes/media.ts
+++ b/server/routes/media.ts
@@ -1,7 +1,7 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
 import RadarrAPI from '@server/api/servarr/radarr';
 import SonarrAPI from '@server/api/servarr/sonarr';
 import TautulliAPI from '@server/api/tautulli';
+import TheMovieDb from '@server/api/themoviedb';
 import { MediaStatus, MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
--- a/server/routes/movie.ts
+++ b/server/routes/movie.ts
@@ -1,7 +1,7 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
 import IMDBRadarrProxy from '@server/api/rating/imdbRadarrProxy';
 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';
--- a/server/routes/person.ts
+++ b/server/routes/person.ts
@@ -1,4 +1,4 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
+import TheMovieDb from '@server/api/themoviedb';
 import Media from '@server/entity/Media';
 import logger from '@server/logger';
 import {
--- a/server/routes/search.ts
+++ b/server/routes/search.ts
@@ -1,5 +1,5 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
-import type { TmdbSearchMultiResponse } from '@server/api/indexer/themoviedb/interfaces';
+import TheMovieDb from '@server/api/themoviedb';
+import type { TmdbSearchMultiResponse } from '@server/api/themoviedb/interfaces';
 import Media from '@server/entity/Media';
 import { findSearchProvider } from '@server/lib/search';
 import logger from '@server/logger';
--- a/server/routes/service.ts
+++ b/server/routes/service.ts
@@ -1,6 +1,6 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
 import RadarrAPI from '@server/api/servarr/radarr';
 import SonarrAPI from '@server/api/servarr/sonarr';
+import TheMovieDb from '@server/api/themoviedb';
 import type {
  ServiceCommonServer,
  ServiceCommonServerWithDetails,
@@ -123,13 +123,9 @@ serviceRoutes.get<{ sonarrId: string }>(
    });

    try {
-      const systemStatus = await sonarr.getSystemStatus();
-      const sonarrMajorVersion = Number(systemStatus.version.split('.')[0]);
-
      const profiles = await sonarr.getProfiles();
      const rootFolders = await sonarr.getRootFolders();
-      const languageProfiles =
-        sonarrMajorVersion <= 3 ? await sonarr.getLanguageProfiles() : null;
+      const languageProfiles = await sonarr.getLanguageProfiles();
      const tags = await sonarr.getTags();

      return res.status(200).json({
--- a/server/routes/settings/index.ts
+++ b/server/routes/settings/index.ts
@@ -32,6 +32,7 @@ import { getHostname } from '@server/utils/getHostname';
 import { Router } from 'express';
 import rateLimit from 'express-rate-limit';
 import fs from 'fs';
+import gravatarUrl from 'gravatar-url';
 import { escapeRegExp, merge, omit, set, sortBy } from 'lodash';
 import { rescheduleJob } from 'node-schedule';
 import path from 'path';
@@ -40,7 +41,6 @@ import { URL } from 'url';
 import notificationRoutes from './notifications';
 import radarrRoutes from './radarr';
 import sonarrRoutes from './sonarr';
-import tvdbRoutes from './tvdb';

 const settingsRoutes = Router();

@@ -48,7 +48,6 @@ settingsRoutes.use('/notifications', notificationRoutes);
 settingsRoutes.use('/radarr', radarrRoutes);
 settingsRoutes.use('/sonarr', sonarrRoutes);
 settingsRoutes.use('/discover', discoverSettingRoutes);
-settingsRoutes.use('/tvdb', tvdbRoutes);

 const filteredMainSettings = (
  user: User,
@@ -71,19 +70,19 @@ settingsRoutes.get('/main', (req, res, next) => {
  res.status(200).json(filteredMainSettings(req.user, settings.main));
 });

-settingsRoutes.post('/main', async (req, res) => {
+settingsRoutes.post('/main', (req, res) => {
  const settings = getSettings();

  settings.main = merge(settings.main, req.body);
-  await settings.save();
+  settings.save();

  return res.status(200).json(settings.main);
 });

-settingsRoutes.post('/main/regenerate', async (req, res, next) => {
+settingsRoutes.post('/main/regenerate', (req, res, next) => {
  const settings = getSettings();

-  const main = await settings.regenerateApiKey();
+  const main = settings.regenerateApiKey();

  if (!req.user) {
    return next({ status: 500, message: 'User missing from request.' });
@@ -120,7 +119,7 @@ settingsRoutes.post('/plex', async (req, res, next) => {
    settings.plex.machineId = result.MediaContainer.machineIdentifier;
    settings.plex.name = result.MediaContainer.friendlyName;

-    await settings.save();
+    settings.save();
  } catch (e) {
    logger.error('Something went wrong testing Plex connection', {
      label: 'API',
@@ -233,7 +232,7 @@ settingsRoutes.get('/plex/library', async (req, res) => {
    ...library,
    enabled: enabledLibraries.includes(library.id),
  }));
-  await settings.save();
+  settings.save();
  return res.status(200).json(settings.plex.libraries);
 });

@@ -284,7 +283,7 @@ settingsRoutes.post('/jellyfin', async (req, res, next) => {
    Object.assign(settings.jellyfin, req.body);
    settings.jellyfin.serverId = result.Id;
    settings.jellyfin.name = result.ServerName;
-    await settings.save();
+    settings.save();
  } catch (e) {
    if (e instanceof ApiError) {
      logger.error('Something went wrong testing Jellyfin connection', {
@@ -372,12 +371,17 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
    ...library,
    enabled: enabledLibraries.includes(library.id),
  }));
-  await settings.save();
+  settings.save();
  return res.status(200).json(settings.jellyfin.libraries);
 });

 settingsRoutes.get('/jellyfin/users', async (req, res) => {
  const settings = getSettings();
+  const { externalHostname } = settings.jellyfin;
+  const jellyfinHost =
+    externalHostname && externalHostname.length > 0
+      ? externalHostname
+      : getHostname();

  const userRepository = getRepository(User);
  const admin = await userRepository.findOneOrFail({
@@ -396,7 +400,9 @@ settingsRoutes.get('/jellyfin/users', async (req, res) => {
  const users = resp.users.map((user) => ({
    username: user.Name,
    id: user.Id,
-    thumb: `/avatarproxy/${user.Id}`,
+    thumb: user.PrimaryImageTag
+      ? `${jellyfinHost}/Users/${user.Id}/Images/Primary/?tag=${user.PrimaryImageTag}&quality=90`
+      : gravatarUrl(user.Name, { default: 'mm', size: 200 }),
    email: user.Name,
  }));

@@ -436,7 +442,7 @@ settingsRoutes.post('/tautulli', async (req, res, next) => {
        throw new Error('Tautulli version not supported');
      }

-      await settings.save();
+      settings.save();
    } catch (e) {
      logger.error('Something went wrong testing Tautulli connection', {
        label: 'API',
@@ -697,7 +703,7 @@ settingsRoutes.post<{ jobId: JobId }>(

 settingsRoutes.post<{ jobId: JobId }>(
  '/jobs/:jobId/schedule',
-  async (req, res, next) => {
+  (req, res, next) => {
    const scheduledJob = scheduledJobs.find(
      (job) => job.id === req.params.jobId
    );
@@ -711,7 +717,7 @@ settingsRoutes.post<{ jobId: JobId }>(

    if (result) {
      settings.jobs[scheduledJob.id].schedule = req.body.schedule;
-      await settings.save();
+      settings.save();

      scheduledJob.cronSchedule = req.body.schedule;

@@ -740,13 +746,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,
    },
  });
 });
@@ -768,11 +772,11 @@ settingsRoutes.post<{ cacheId: AvailableCacheIds }>(
 settingsRoutes.post(
  '/initialize',
  isAuthenticated(Permission.ADMIN),
-  async (_req, res) => {
+  (_req, res) => {
    const settings = getSettings();

    settings.public.initialized = true;
-    await settings.save();
+    settings.save();

    return res.status(200).json(settings.public);
  }
--- a/server/routes/settings/notifications.ts
+++ b/server/routes/settings/notifications.ts
@@ -31,11 +31,11 @@ notificationRoutes.get('/discord', (_req, res) => {
  res.status(200).json(settings.notifications.agents.discord);
 });

-notificationRoutes.post('/discord', async (req, res) => {
+notificationRoutes.post('/discord', (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.discord = req.body;
-  await settings.save();
+  settings.save();

  res.status(200).json(settings.notifications.agents.discord);
 });
@@ -65,11 +65,11 @@ notificationRoutes.get('/slack', (_req, res) => {
  res.status(200).json(settings.notifications.agents.slack);
 });

-notificationRoutes.post('/slack', async (req, res) => {
+notificationRoutes.post('/slack', (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.slack = req.body;
-  await settings.save();
+  settings.save();

  res.status(200).json(settings.notifications.agents.slack);
 });
@@ -99,11 +99,11 @@ notificationRoutes.get('/telegram', (_req, res) => {
  res.status(200).json(settings.notifications.agents.telegram);
 });

-notificationRoutes.post('/telegram', async (req, res) => {
+notificationRoutes.post('/telegram', (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.telegram = req.body;
-  await settings.save();
+  settings.save();

  res.status(200).json(settings.notifications.agents.telegram);
 });
@@ -133,11 +133,11 @@ notificationRoutes.get('/pushbullet', (_req, res) => {
  res.status(200).json(settings.notifications.agents.pushbullet);
 });

-notificationRoutes.post('/pushbullet', async (req, res) => {
+notificationRoutes.post('/pushbullet', (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.pushbullet = req.body;
-  await settings.save();
+  settings.save();

  res.status(200).json(settings.notifications.agents.pushbullet);
 });
@@ -167,11 +167,11 @@ notificationRoutes.get('/pushover', (_req, res) => {
  res.status(200).json(settings.notifications.agents.pushover);
 });

-notificationRoutes.post('/pushover', async (req, res) => {
+notificationRoutes.post('/pushover', (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.pushover = req.body;
-  await settings.save();
+  settings.save();

  res.status(200).json(settings.notifications.agents.pushover);
 });
@@ -201,11 +201,11 @@ notificationRoutes.get('/email', (_req, res) => {
  res.status(200).json(settings.notifications.agents.email);
 });

-notificationRoutes.post('/email', async (req, res) => {
+notificationRoutes.post('/email', (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.email = req.body;
-  await settings.save();
+  settings.save();

  res.status(200).json(settings.notifications.agents.email);
 });
@@ -235,11 +235,11 @@ notificationRoutes.get('/webpush', (_req, res) => {
  res.status(200).json(settings.notifications.agents.webpush);
 });

-notificationRoutes.post('/webpush', async (req, res) => {
+notificationRoutes.post('/webpush', (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.webpush = req.body;
-  await settings.save();
+  settings.save();

  res.status(200).json(settings.notifications.agents.webpush);
 });
@@ -284,7 +284,7 @@ notificationRoutes.get('/webhook', (_req, res) => {
  res.status(200).json(response);
 });

-notificationRoutes.post('/webhook', async (req, res, next) => {
+notificationRoutes.post('/webhook', (req, res, next) => {
  const settings = getSettings();
  try {
    JSON.parse(req.body.options.jsonPayload);
@@ -300,7 +300,7 @@ notificationRoutes.post('/webhook', async (req, res, next) => {
        authHeader: req.body.options.authHeader,
      },
    };
-    await settings.save();
+    settings.save();

    res.status(200).json(settings.notifications.agents.webhook);
  } catch (e) {
@@ -351,11 +351,11 @@ notificationRoutes.get('/lunasea', (_req, res) => {
  res.status(200).json(settings.notifications.agents.lunasea);
 });

-notificationRoutes.post('/lunasea', async (req, res) => {
+notificationRoutes.post('/lunasea', (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.lunasea = req.body;
-  await settings.save();
+  settings.save();

  res.status(200).json(settings.notifications.agents.lunasea);
 });
@@ -385,11 +385,11 @@ notificationRoutes.get('/gotify', (_req, res) => {
  res.status(200).json(settings.notifications.agents.gotify);
 });

-notificationRoutes.post('/gotify', async (req, res) => {
+notificationRoutes.post('/gotify', (req, res) => {
  const settings = getSettings();

  settings.notifications.agents.gotify = req.body;
-  await settings.save();
+  settings.save();

  res.status(200).json(settings.notifications.agents.gotify);
 });
--- a/server/routes/settings/radarr.ts
+++ b/server/routes/settings/radarr.ts
@@ -12,7 +12,7 @@ radarrRoutes.get('/', (_req, res) => {
  res.status(200).json(settings.radarr);
 });

-radarrRoutes.post('/', async (req, res) => {
+radarrRoutes.post('/', (req, res) => {
  const settings = getSettings();

  const newRadarr = req.body as RadarrSettings;
@@ -31,7 +31,7 @@ radarrRoutes.post('/', async (req, res) => {
  }

  settings.radarr = [...settings.radarr, newRadarr];
-  await settings.save();
+  settings.save();

  return res.status(201).json(newRadarr);
 });
@@ -76,7 +76,7 @@ radarrRoutes.post<

 radarrRoutes.put<{ id: string }, RadarrSettings, RadarrSettings>(
  '/:id',
-  async (req, res, next) => {
+  (req, res, next) => {
    const settings = getSettings();

    const radarrIndex = settings.radarr.findIndex(
@@ -102,7 +102,7 @@ radarrRoutes.put<{ id: string }, RadarrSettings, RadarrSettings>(
      ...req.body,
      id: Number(req.params.id),
    } as RadarrSettings;
-    await settings.save();
+    settings.save();

    return res.status(200).json(settings.radarr[radarrIndex]);
  }
@@ -134,7 +134,7 @@ radarrRoutes.get<{ id: string }>('/:id/profiles', async (req, res, next) => {
  );
 });

-radarrRoutes.delete<{ id: string }>('/:id', async (req, res, next) => {
+radarrRoutes.delete<{ id: string }>('/:id', (req, res, next) => {
  const settings = getSettings();

  const radarrIndex = settings.radarr.findIndex(
@@ -146,7 +146,7 @@ radarrRoutes.delete<{ id: string }>('/:id', async (req, res, next) => {
  }

  const removed = settings.radarr.splice(radarrIndex, 1);
-  await settings.save();
+  settings.save();

  return res.status(200).json(removed[0]);
 });
--- a/server/routes/settings/sonarr.ts
+++ b/server/routes/settings/sonarr.ts
@@ -12,7 +12,7 @@ sonarrRoutes.get('/', (_req, res) => {
  res.status(200).json(settings.sonarr);
 });

-sonarrRoutes.post('/', async (req, res) => {
+sonarrRoutes.post('/', (req, res) => {
  const settings = getSettings();

  const newSonarr = req.body as SonarrSettings;
@@ -31,7 +31,7 @@ sonarrRoutes.post('/', async (req, res) => {
  }

  settings.sonarr = [...settings.sonarr, newSonarr];
-  await settings.save();
+  settings.save();

  return res.status(201).json(newSonarr);
 });
@@ -43,14 +43,13 @@ sonarrRoutes.post('/test', async (req, res, next) => {
      url: SonarrAPI.buildUrl(req.body, '/api/v3'),
    });

-    const systemStatus = await sonarr.getSystemStatus();
-    const sonarrMajorVersion = Number(systemStatus.version.split('.')[0]);
-
-    const urlBase = systemStatus.urlBase;
+    const urlBase = await sonarr
+      .getSystemStatus()
+      .then((value) => value.urlBase)
+      .catch(() => req.body.baseUrl);
    const profiles = await sonarr.getProfiles();
    const folders = await sonarr.getRootFolders();
-    const languageProfiles =
-      sonarrMajorVersion <= 3 ? await sonarr.getLanguageProfiles() : null;
+    const languageProfiles = await sonarr.getLanguageProfiles();
    const tags = await sonarr.getTags();

    return res.status(200).json({
@@ -73,7 +72,7 @@ sonarrRoutes.post('/test', async (req, res, next) => {
  }
 });

-sonarrRoutes.put<{ id: string }>('/:id', async (req, res) => {
+sonarrRoutes.put<{ id: string }>('/:id', (req, res) => {
  const settings = getSettings();

  const sonarrIndex = settings.sonarr.findIndex(
@@ -101,12 +100,12 @@ sonarrRoutes.put<{ id: string }>('/:id', async (req, res) => {
    ...req.body,
    id: Number(req.params.id),
  } as SonarrSettings;
-  await settings.save();
+  settings.save();

  return res.status(200).json(settings.sonarr[sonarrIndex]);
 });

-sonarrRoutes.delete<{ id: string }>('/:id', async (req, res) => {
+sonarrRoutes.delete<{ id: string }>('/:id', (req, res) => {
  const settings = getSettings();

  const sonarrIndex = settings.sonarr.findIndex(
@@ -120,7 +119,7 @@ sonarrRoutes.delete<{ id: string }>('/:id', async (req, res) => {
  }

  const removed = settings.sonarr.splice(sonarrIndex, 1);
-  await settings.save();
+  settings.save();

  return res.status(200).json(removed[0]);
 });
--- a/server/routes/settings/tvdb.ts
+++ b/server/routes/settings/tvdb.ts
@@ -1,48 +0,0 @@
-import Tvdb from '@server/api/indexer/tvdb';
-import { getSettings } from '@server/lib/settings';
-import logger from '@server/logger';
-import { Router } from 'express';
-
-const tvdbRoutes = Router();
-
-export interface TvdbSettings {
-  tvdb: boolean;
-}
-
-tvdbRoutes.get('/', (_req, res) => {
-  const settings = getSettings();
-
-  res.status(200).json({
-    tvdb: settings.tvdb,
-  });
-});
-
-tvdbRoutes.put('/', (req, res) => {
-  const settings = getSettings();
-
-  const body = req.body as TvdbSettings;
-
-  settings.tvdb = body.tvdb ?? settings.tvdb ?? false;
-  settings.save();
-
-  return res.status(200).json({
-    tvdb: settings.tvdb,
-  });
-});
-
-tvdbRoutes.post('/test', async (req, res, next) => {
-  try {
-    const tvdb = new Tvdb();
-    await tvdb.test();
-    return res.status(200).json({ message: 'Successfully connected to Tvdb' });
-  } catch (e) {
-    logger.error('Failed to test Tvdb', {
-      label: 'Tvdb',
-      message: e.message,
-    });
-
-    return next({ status: 500, message: 'Failed to connect to Tvdb' });
-  }
-});
-
-export default tvdbRoutes;
--- a/server/routes/tv.ts
+++ b/server/routes/tv.ts
@@ -1,10 +1,9 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
 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 { getIndexer } from '@server/lib/settings';
 import logger from '@server/logger';
 import { mapTvResult } from '@server/models/Search';
 import { mapSeasonWithEpisodes, mapTvDetails } from '@server/models/Tv';
@@ -13,10 +12,9 @@ import { Router } from 'express';
 const tvRoutes = Router();

 tvRoutes.get('/:id', async (req, res, next) => {
-  const indexer = getIndexer();
-
+  const tmdb = new TheMovieDb();
  try {
-    const tv = await indexer.getTvShow({
+    const tv = await tmdb.getTvShow({
      tvId: Number(req.params.id),
      language: (req.query.language as string) ?? req.locale,
    });
@@ -36,9 +34,7 @@ tvRoutes.get('/:id', async (req, res, next) => {

    // TMDB issue where it doesnt fallback to English when no overview is available in requested locale.
    if (!data.overview) {
-      const tvEnglish = await indexer.getTvShow({
-        tvId: Number(req.params.id),
-      });
+      const tvEnglish = await tmdb.getTvShow({ tvId: Number(req.params.id) });
      data.overview = tvEnglish.overview;
    }

@@ -57,12 +53,13 @@ tvRoutes.get('/:id', async (req, res, next) => {
 });

 tvRoutes.get('/:id/season/:seasonNumber', async (req, res, next) => {
-  try {
-    const indexer = getIndexer();
+  const tmdb = new TheMovieDb();

-    const season = await indexer.getTvSeason({
+  try {
+    const season = await tmdb.getTvSeason({
      tvId: Number(req.params.id),
      seasonNumber: Number(req.params.seasonNumber),
+      language: (req.query.language as string) ?? req.locale,
    });

    return res.status(200).json(mapSeasonWithEpisodes(season));
--- a/server/routes/user/index.ts
+++ b/server/routes/user/index.ts
@@ -516,6 +516,12 @@ router.post(

      //const jellyfinUsersResponse = await jellyfinClient.getUsers();
      const createdUsers: User[] = [];
+      const { externalHostname } = getSettings().jellyfin;
+
+      const jellyfinHost =
+        externalHostname && externalHostname.length > 0
+          ? externalHostname
+          : hostname;

      jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
      const jellyfinUsers = await jellyfinClient.getUsers();
@@ -539,7 +545,12 @@ router.post(
            ).toString('base64'),
            email: jellyfinUser?.Name,
            permissions: settings.main.defaultPermissions,
-            avatar: `/avatarproxy/${jellyfinUser?.Id}`,
+            avatar: jellyfinUser?.PrimaryImageTag
+              ? `${jellyfinHost}/Users/${jellyfinUser.Id}/Images/Primary/?tag=${jellyfinUser.PrimaryImageTag}&quality=90`
+              : gravatarUrl(jellyfinUser?.Name ?? '', {
+                  default: 'mm',
+                  size: 200,
+                }),
            userType:
              settings.main.mediaServerType === MediaServerType.JELLYFIN
                ? UserType.JELLYFIN
--- a/server/subscriber/IssueCommentSubscriber.ts
+++ b/server/subscriber/IssueCommentSubscriber.ts
@@ -1,4 +1,4 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
+import TheMovieDb from '@server/api/themoviedb';
 import { IssueType, IssueTypeName } from '@server/constants/issue';
 import { MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
--- a/server/subscriber/IssueSubscriber.ts
+++ b/server/subscriber/IssueSubscriber.ts
@@ -1,4 +1,4 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
+import TheMovieDb from '@server/api/themoviedb';
 import { IssueStatus, IssueType, IssueTypeName } from '@server/constants/issue';
 import { MediaType } from '@server/constants/media';
 import Issue from '@server/entity/Issue';
--- a/server/subscriber/MediaSubscriber.ts
+++ b/server/subscriber/MediaSubscriber.ts
@@ -1,4 +1,4 @@
-import TheMovieDb from '@server/api/indexer/themoviedb';
+import TheMovieDb from '@server/api/themoviedb';
 import {
  MediaRequestStatus,
  MediaStatus,
--- a/server/utils/appDataVolume.ts
+++ b/server/utils/appDataVolume.ts
@@ -1,4 +1,4 @@
-import { accessSync, existsSync } from 'fs';
+import { existsSync } from 'fs';
 import path from 'path';

 const CONFIG_PATH = process.env.CONFIG_DIRECTORY
@@ -14,12 +14,3 @@ export const appDataStatus = (): boolean => {
 export const appDataPath = (): string => {
  return CONFIG_PATH;
 };
-
-export const appDataPermissions = (): boolean => {
-  try {
-    accessSync(CONFIG_PATH);
-    return true;
-  } catch (err) {
-    return false;
-  }
-};
--- a/server/utils/customProxyAgent.ts
+++ b/server/utils/customProxyAgent.ts
@@ -1,111 +0,0 @@
-import type { ProxySettings } from '@server/lib/settings';
-import logger from '@server/logger';
-import type { Dispatcher } from 'undici';
-import { Agent, ProxyAgent, setGlobalDispatcher } from 'undici';
-
-export default async function createCustomProxyAgent(
-  proxySettings: ProxySettings
-) {
-  const defaultAgent = new Agent();
-
-  const skipUrl = (url: string) => {
-    const hostname = new URL(url).hostname;
-
-    if (proxySettings.bypassLocalAddresses && isLocalAddress(hostname)) {
-      return true;
-    }
-
-    for (const address of proxySettings.bypassFilter.split(',')) {
-      const trimmedAddress = address.trim();
-      if (!trimmedAddress) {
-        continue;
-      }
-
-      if (trimmedAddress.startsWith('*')) {
-        const domain = trimmedAddress.slice(1);
-        if (hostname.endsWith(domain)) {
-          return true;
-        }
-      } else if (hostname === trimmedAddress) {
-        return true;
-      }
-    }
-
-    return false;
-  };
-
-  const noProxyInterceptor = (
-    dispatch: Dispatcher['dispatch']
-  ): Dispatcher['dispatch'] => {
-    return (opts, handler) => {
-      const url = opts.origin?.toString();
-      return url && skipUrl(url)
-        ? defaultAgent.dispatch(opts, handler)
-        : dispatch(opts, handler);
-    };
-  };
-
-  const token =
-    proxySettings.user && proxySettings.password
-      ? `Basic ${Buffer.from(
-          `${proxySettings.user}:${proxySettings.password}`
-        ).toString('base64')}`
-      : undefined;
-
-  try {
-    const proxyAgent = new ProxyAgent({
-      uri:
-        (proxySettings.useSsl ? 'https://' : 'http://') +
-        proxySettings.hostname +
-        ':' +
-        proxySettings.port,
-      token,
-      interceptors: {
-        Client: [noProxyInterceptor],
-      },
-    });
-
-    setGlobalDispatcher(proxyAgent);
-  } catch (e) {
-    logger.error('Failed to connect to the proxy: ' + e.message, {
-      label: 'Proxy',
-    });
-    setGlobalDispatcher(defaultAgent);
-    return;
-  }
-
-  try {
-    const res = await fetch('https://www.google.com', { method: 'HEAD' });
-    if (res.ok) {
-      logger.debug('HTTP(S) proxy connected successfully', { label: 'Proxy' });
-    } else {
-      logger.error('Proxy responded, but with a non-OK status: ' + res.status, {
-        label: 'Proxy',
-      });
-      setGlobalDispatcher(defaultAgent);
-    }
-  } catch (e) {
-    logger.error(
-      'Failed to connect to the proxy: ' + e.message + ': ' + e.cause,
-      { label: 'Proxy' }
-    );
-    setGlobalDispatcher(defaultAgent);
-  }
-}
-
-function isLocalAddress(hostname: string) {
-  if (hostname === 'localhost' || hostname === '127.0.0.1') {
-    return true;
-  }
-
-  const privateIpRanges = [
-    /^10\./, // 10.x.x.x
-    /^172\.(1[6-9]|2[0-9]|3[0-1])\./, // 172.16.x.x - 172.31.x.x
-    /^192\.168\./, // 192.168.x.x
-  ];
-  if (privateIpRanges.some((regex) => regex.test(hostname))) {
-    return true;
-  }
-
-  return false;
-}
--- a/server/utils/restartFlag.ts
+++ b/server/utils/restartFlag.ts
@@ -13,8 +13,7 @@ class RestartFlag {

    return (
      this.settings.csrfProtection !== settings.csrfProtection ||
-      this.settings.trustProxy !== settings.trustProxy ||
-      this.settings.proxy.enabled !== settings.proxy.enabled
+      this.settings.trustProxy !== settings.trustProxy
    );
  }
 }
--- a/server/utils/typeHelpers.ts
+++ b/server/utils/typeHelpers.ts
@@ -6,7 +6,7 @@ import type {
  TmdbPersonResult,
  TmdbTvDetails,
  TmdbTvResult,
-} from '@server/api/indexer/themoviedb/interfaces';
+} from '@server/api/themoviedb/interfaces';

 export const isMovie = (
  movie:
--- a/src/components/Blacklist/index.tsx
+++ b/src/components/Blacklist/index.tsx
@@ -268,7 +268,6 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
      {title && title.backdropPath && (
        <div className="absolute inset-0 z-0 w-full bg-cover bg-center xl:w-2/3">
          <CachedImage
-            type="tmdb"
            src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${title.backdropPath}`}
            alt=""
            style={{ width: '100%', height: '100%', objectFit: 'cover' }}
@@ -294,7 +293,6 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
            className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105"
          >
            <CachedImage
-              type="tmdb"
              src={
                title?.posterPath
                  ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
@@ -357,7 +355,6 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
                    <Link href={`/users/${item.user.id}`}>
                      <span className="group flex items-center truncate">
                        <CachedImage
-                          type="avatar"
                          src={item.user.avatar}
                          alt=""
                          className="avatar-sm ml-1.5"
--- a/src/components/CollectionDetails/index.tsx
+++ b/src/components/CollectionDetails/index.tsx
@@ -198,7 +198,6 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
      {data.backdropPath && (
        <div className="media-page-bg-image">
          <CachedImage
-            type="tmdb"
            alt=""
            src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath}`}
            style={{ width: '100%', height: '100%', objectFit: 'cover' }}
@@ -229,7 +228,6 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
      <div className="media-header">
        <div className="media-poster">
          <CachedImage
-            type="tmdb"
            src={
              data.posterPath
                ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`
--- a/src/components/Common/CachedImage/index.tsx
+++ b/src/components/Common/CachedImage/index.tsx
@@ -4,31 +4,21 @@ import Image from 'next/image';

 const imageLoader: ImageLoader = ({ src }) => src;

-export type CachedImageProps = ImageProps & {
-  src: string;
-  type: 'tmdb' | 'avatar';
-};
-
 /**
 * The CachedImage component should be used wherever
 * we want to offer the option to locally cache images.
 **/
-const CachedImage = ({ src, type, ...props }: CachedImageProps) => {
+const CachedImage = ({ src, ...props }: ImageProps) => {
  const { currentSettings } = useSettings();

-  let imageUrl: string;
+  let imageUrl = src;

-  if (type === 'tmdb') {
-    // tmdb stuff
-    imageUrl =
-      currentSettings.cacheImages && !src.startsWith('/')
-        ? src.replace(/^https:\/\/image\.tmdb\.org\//, '/imageproxy/')
-        : src;
-  } else if (type === 'avatar') {
-    // jellyfin avatar (if any)
-    imageUrl = src;
-  } else {
-    return null;
+  if (typeof imageUrl === 'string' && imageUrl.startsWith('http')) {
+    const parsedUrl = new URL(imageUrl);
+
+    if (parsedUrl.host === 'image.tmdb.org' && currentSettings.cacheImages) {
+      imageUrl = imageUrl.replace('https://image.tmdb.org', '/imageproxy');
+    }
  }

  return <Image unoptimized loader={imageLoader} src={imageUrl} {...props} />;
--- a/src/components/Common/ImageFader/index.tsx
+++ b/src/components/Common/ImageFader/index.tsx
@@ -61,7 +61,6 @@ const ImageFader: ForwardRefRenderFunction<HTMLDivElement, ImageFaderProps> = (
          {...props}
        >
          <CachedImage
-            type="tmdb"
            className="absolute inset-0 h-full w-full"
            alt=""
            src={imageUrl}
--- a/src/components/Common/Modal/index.tsx
+++ b/src/components/Common/Modal/index.tsx
@@ -123,7 +123,6 @@ const Modal = React.forwardRef<HTMLDivElement, ModalProps>(
          {backdrop && (
            <div className="absolute top-0 left-0 right-0 z-0 h-64 max-h-full w-full">
              <CachedImage
-                type="tmdb"
                alt=""
                src={backdrop}
                style={{ width: '100%', height: '100%', objectFit: 'cover' }}
--- a/src/components/CompanyCard/index.tsx
+++ b/src/components/CompanyCard/index.tsx
@@ -33,7 +33,6 @@ const CompanyCard = ({ image, url, name }: CompanyCardProps) => {
    >
      <div className="relative h-full w-full">
        <CachedImage
-          type="tmdb"
          src={image}
          alt={name}
          className="relative z-40 h-full w-full"
--- a/src/components/Discover/CreateSlider/index.tsx
+++ b/src/components/Discover/CreateSlider/index.tsx
@@ -9,7 +9,7 @@ import type {
  TmdbCompanySearchResponse,
  TmdbGenre,
  TmdbKeywordSearchResponse,
-} from '@server/api/indexer/themoviedb/interfaces';
+} from '@server/api/themoviedb/interfaces';
 import { DiscoverSliderType } from '@server/constants/discover';
 import type DiscoverSlider from '@server/entity/DiscoverSlider';
 import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
--- a/src/components/Discover/DiscoverMovieKeyword/index.tsx
+++ b/src/components/Discover/DiscoverMovieKeyword/index.tsx
@@ -5,7 +5,7 @@ import useDiscover, { encodeURIExtraParams } from '@app/hooks/useDiscover';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
-import type { TmdbKeyword } from '@server/api/indexer/themoviedb/interfaces';
+import type { TmdbKeyword } from '@server/api/themoviedb/interfaces';
 import type { MovieResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
 import { useIntl } from 'react-intl';
--- a/src/components/Discover/DiscoverMovies/index.tsx
+++ b/src/components/Discover/DiscoverMovies/index.tsx
@@ -13,7 +13,7 @@ import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams';
 import Error from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
 import { BarsArrowDownIcon, FunnelIcon } from '@heroicons/react/24/solid';
-import type { SortOptions as TMDBSortOptions } from '@server/api/indexer/themoviedb';
+import type { SortOptions as TMDBSortOptions } from '@server/api/themoviedb';
 import type { MovieResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
--- a/src/components/Discover/DiscoverTv/index.tsx
+++ b/src/components/Discover/DiscoverTv/index.tsx
@@ -13,7 +13,7 @@ import { useUpdateQueryParams } from '@app/hooks/useUpdateQueryParams';
 import Error from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
 import { BarsArrowDownIcon, FunnelIcon } from '@heroicons/react/24/solid';
-import type { SortOptions as TMDBSortOptions } from '@server/api/indexer/themoviedb';
+import type { SortOptions as TMDBSortOptions } from '@server/api/themoviedb';
 import type { TvResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
--- a/src/components/Discover/DiscoverTvKeyword/index.tsx
+++ b/src/components/Discover/DiscoverTvKeyword/index.tsx
@@ -5,7 +5,7 @@ import useDiscover, { encodeURIExtraParams } from '@app/hooks/useDiscover';
 import globalMessages from '@app/i18n/globalMessages';
 import Error from '@app/pages/_error';
 import defineMessages from '@app/utils/defineMessages';
-import type { TmdbKeyword } from '@server/api/indexer/themoviedb/interfaces';
+import type { TmdbKeyword } from '@server/api/themoviedb/interfaces';
 import type { TvResult } from '@server/models/Search';
 import { useRouter } from 'next/router';
 import { useIntl } from 'react-intl';
--- a/src/components/GenreCard/index.tsx
+++ b/src/components/GenreCard/index.tsx
@@ -36,7 +36,6 @@ const GenreCard = ({ image, url, name, canExpand = false }: GenreCardProps) => {
      tabIndex={0}
    >
      <CachedImage
-        type="tmdb"
        src={image}
        alt=""
        style={{ width: '100%', height: '100%', objectFit: 'cover' }}
--- a/src/components/GenreTag/index.tsx
+++ b/src/components/GenreTag/index.tsx
@@ -1,7 +1,7 @@
 import Spinner from '@app/assets/spinner.svg';
 import Tag from '@app/components/Common/Tag';
 import { RectangleStackIcon } from '@heroicons/react/24/outline';
-import type { TmdbGenre } from '@server/api/indexer/themoviedb/interfaces';
+import type { TmdbGenre } from '@server/api/themoviedb/interfaces';
 import useSWR from 'swr';

 type GenreTagProps = {
--- a/src/components/IssueDetails/IssueComment/index.tsx
+++ b/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,7 @@ const IssueComment = ({
        </Modal>
      </Transition>
      <Link href={isActiveUser ? '/profile' : `/users/${comment.user.id}`}>
-        <CachedImage
-          type="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"
--- a/src/components/IssueDetails/index.tsx
+++ b/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';
@@ -217,7 +218,6 @@ const IssueDetails = () => {
      {data.backdropPath && (
        <div className="media-page-bg-image">
          <CachedImage
-            type="tmdb"
            alt=""
            src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath}`}
            style={{ width: '100%', height: '100%', objectFit: 'cover' }}
@@ -236,7 +236,6 @@ const IssueDetails = () => {
      <div className="media-header">
        <div className="media-poster">
          <CachedImage
-            type="tmdb"
            src={
              data.posterPath
                ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`
@@ -288,11 +287,10 @@ const IssueDetails = () => {
                  }
                  className="group ml-1 inline-flex h-full items-center xl:ml-1.5"
                >
-                  <CachedImage
-                    type="avatar"
+                  <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=""
-                    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"
                    width={20}
                    height={20}
                  />
--- a/src/components/IssueList/IssueItem/index.tsx
+++ b/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';
@@ -112,7 +113,6 @@ const IssueItem = ({ issue }: IssueItemProps) => {
      {title.backdropPath && (
        <div className="absolute inset-0 z-0 w-full bg-cover bg-center xl:w-2/3">
          <CachedImage
-            type="tmdb"
            src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${title.backdropPath}`}
            alt=""
            style={{ width: '100%', height: '100%', objectFit: 'cover' }}
@@ -138,7 +138,6 @@ const IssueItem = ({ issue }: IssueItemProps) => {
            className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105"
          >
            <CachedImage
-              type="tmdb"
              src={
                title.posterPath
                  ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
@@ -227,8 +226,7 @@ const IssueItem = ({ issue }: IssueItemProps) => {
                        href={`/users/${issue.createdBy.id}`}
                        className="group flex items-center truncate"
                      >
-                        <CachedImage
-                          type="avatar"
+                        <Image
                          src={issue.createdBy.avatar}
                          alt=""
                          className="avatar-sm ml-1.5 object-cover"
--- a/src/components/Layout/MobileMenu/index.tsx
+++ b/src/components/Layout/MobileMenu/index.tsx
@@ -7,7 +7,6 @@ import {
  CogIcon,
  EllipsisHorizontalIcon,
  ExclamationTriangleIcon,
-  EyeSlashIcon,
  FilmIcon,
  SparklesIcon,
  TvIcon,
@@ -17,7 +16,6 @@ import {
  ClockIcon as FilledClockIcon,
  CogIcon as FilledCogIcon,
  ExclamationTriangleIcon as FilledExclamationTriangleIcon,
-  EyeSlashIcon as FilledEyeSlashIcon,
  FilmIcon as FilledFilmIcon,
  SparklesIcon as FilledSparklesIcon,
  TvIcon as FilledTvIcon,
@@ -86,18 +84,6 @@ const MobileMenu = () => {
      svgIconSelected: <FilledClockIcon className="h-6 w-6" />,
      activeRegExp: /^\/requests/,
    },
-    {
-      href: '/blacklist',
-      content: intl.formatMessage(menuMessages.blacklist),
-      svgIcon: <EyeSlashIcon className="h-6 w-6" />,
-      svgIconSelected: <FilledEyeSlashIcon className="h-6 w-6" />,
-      activeRegExp: /^\/blacklist/,
-      requiredPermission: [
-        Permission.MANAGE_BLACKLIST,
-        Permission.VIEW_BLACKLIST,
-      ],
-      permissionType: 'or',
-    },
    {
      href: '/issues',
      content: intl.formatMessage(menuMessages.issues),
--- a/src/components/Layout/UserDropdown/index.tsx
+++ b/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,10 +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
-            type="avatar"
+          <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}
@@ -80,10 +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
-                  type="avatar"
+                <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}
--- a/src/components/ManageSlideOver/index.tsx
+++ b/src/components/ManageSlideOver/index.tsx
@@ -1,6 +1,5 @@
 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 +27,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';
@@ -368,8 +368,7 @@ const ManageSlideOver = ({
                                    key={`watch-user-${user.id}`}
                                    content={user.displayName}
                                  >
-                                    <CachedImage
-                                      type="avatar"
+                                    <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"
@@ -530,8 +529,7 @@ const ManageSlideOver = ({
                                    key={`watch-user-${user.id}`}
                                    content={user.displayName}
                                  >
-                                    <CachedImage
-                                      type="avatar"
+                                    <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"
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -448,7 +448,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
      {data.backdropPath && (
        <div className="media-page-bg-image">
          <CachedImage
-            type="tmdb"
            alt=""
            src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${data.backdropPath}`}
            style={{ width: '100%', height: '100%', objectFit: 'cover' }}
@@ -495,7 +494,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
      <div className="media-header">
        <div className="media-poster">
          <CachedImage
-            type="tmdb"
            src={
              data.posterPath
                ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.posterPath}`
@@ -743,7 +741,6 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                <div className="group relative z-0 scale-100 transform-gpu cursor-pointer overflow-hidden rounded-lg bg-gray-800 bg-cover bg-center shadow-md ring-1 ring-gray-700 transition duration-300 hover:scale-105 hover:ring-gray-500">
                  <div className="absolute inset-0 z-0">
                    <CachedImage
-                      type="tmdb"
                      src={`https://image.tmdb.org/t/p/w1440_and_h320_multi_faces/${data.collection.backdropPath}`}
                      alt=""
                      style={{
--- a/src/components/PersonCard/index.tsx
+++ b/src/components/PersonCard/index.tsx
@@ -51,7 +51,6 @@ const PersonCard = ({
              {profilePath ? (
                <div className="relative h-full w-3/4 overflow-hidden rounded-full ring-1 ring-gray-700">
                  <CachedImage
-                    type="tmdb"
                    src={`https://image.tmdb.org/t/p/w600_and_h900_bestv2${profilePath}`}
                    alt=""
                    style={{
--- a/src/components/PersonDetails/index.tsx
+++ b/src/components/PersonDetails/index.tsx
@@ -227,7 +227,6 @@ const PersonDetails = () => {
        {data.profilePath && (
          <div className="relative mb-6 mr-0 h-36 w-36 flex-shrink-0 overflow-hidden rounded-full ring-1 ring-gray-700 lg:mb-0 lg:mr-6 lg:h-44 lg:w-44">
            <CachedImage
-              type="tmdb"
              src={`https://image.tmdb.org/t/p/w600_and_h900_bestv2${data.profilePath}`}
              alt=""
              style={{ width: '100%', height: '100%', objectFit: 'cover' }}
--- a/src/components/RequestCard/index.tsx
+++ b/src/components/RequestCard/index.tsx
@@ -22,6 +22,7 @@ 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';
@@ -115,8 +116,7 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
                      className="group flex items-center"
                    >
                      <span className="avatar-sm">
-                        <CachedImage
-                          type="avatar"
+                        <Image
                          src={requestData.requestedBy.avatar}
                          alt=""
                          className="avatar-sm object-cover"
@@ -346,7 +346,6 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
        {title.backdropPath && (
          <div className="absolute inset-0 z-0">
            <CachedImage
-              type="tmdb"
              alt=""
              src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${title.backdropPath}`}
              style={{ width: '100%', height: '100%', objectFit: 'cover' }}
@@ -391,8 +390,7 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
                className="group flex items-center"
              >
                <span className="avatar-sm">
-                  <CachedImage
-                    type="avatar"
+                  <Image
                    src={requestData.requestedBy.avatar}
                    alt=""
                    className="avatar-sm object-cover"
@@ -605,7 +603,6 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
          className="w-20 flex-shrink-0 scale-100 transform-gpu cursor-pointer overflow-hidden rounded-md shadow-sm transition duration-300 hover:scale-105 hover:shadow-md sm:w-28"
        >
          <CachedImage
-            type="tmdb"
            src={
              title.posterPath
                ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
--- a/src/components/RequestList/RequestItem/index.tsx
+++ b/src/components/RequestList/RequestItem/index.tsx
@@ -21,6 +21,7 @@ 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';
@@ -190,8 +191,7 @@ const RequestItemError = ({
                            className="group flex items-center truncate"
                          >
                            <span className="avatar-sm ml-1.5">
-                              <CachedImage
-                                type="avatar"
+                              <Image
                                src={requestData.requestedBy.avatar}
                                alt=""
                                className="avatar-sm object-cover"
@@ -250,8 +250,7 @@ const RequestItemError = ({
                          className="group flex items-center truncate"
                        >
                          <span className="avatar-sm ml-1.5">
-                            <CachedImage
-                              type="avatar"
+                            <Image
                              src={requestData.modifiedBy.avatar}
                              alt=""
                              className="avatar-sm object-cover"
@@ -420,7 +419,6 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
        {title.backdropPath && (
          <div className="absolute inset-0 z-0 w-full bg-cover bg-center xl:w-2/3">
            <CachedImage
-              type="tmdb"
              src={`https://image.tmdb.org/t/p/w1920_and_h800_multi_faces/${title.backdropPath}`}
              alt=""
              style={{ width: '100%', height: '100%', objectFit: 'cover' }}
@@ -446,7 +444,6 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
              className="relative h-auto w-12 flex-shrink-0 scale-100 transform-gpu overflow-hidden rounded-md transition duration-300 hover:scale-105"
            >
              <CachedImage
-                type="tmdb"
                src={
                  title.posterPath
                    ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${title.posterPath}`
@@ -573,8 +570,7 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                          className="group flex items-center truncate"
                        >
                          <span className="avatar-sm ml-1.5">
-                            <CachedImage
-                              type="avatar"
+                            <Image
                              src={requestData.requestedBy.avatar}
                              alt=""
                              className="avatar-sm object-cover"
@@ -633,9 +629,8 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                        className="group flex items-center truncate"
                      >
                        <span className="avatar-sm ml-1.5">
-                          <CachedImage
-                            type="avatar"
-                            src={requestData.modifiedBy.avatar}
+                          <Image
+                            src={requestData.requestedBy.avatar}
                            alt=""
                            className="avatar-sm object-cover"
                            width={20}
--- a/src/components/RequestModal/AdvancedRequester/index.tsx
+++ b/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,8 +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
-                            type="avatar"
+                          <Image
                            src={selectedUser.avatar}
                            alt=""
                            className="h-6 w-6 flex-shrink-0 rounded-full object-cover"
@@ -614,8 +613,7 @@ const AdvancedRequester = ({
                                    selected ? 'font-semibold' : 'font-normal'
                                  } flex items-center`}
                                >
-                                  <CachedImage
-                                    type="avatar"
+                                  <Image
                                    src={user.avatar}
                                    alt=""
                                    className="h-6 w-6 flex-shrink-0 rounded-full object-cover"
--- a/src/components/RequestModal/CollectionRequestModal.tsx
+++ b/src/components/RequestModal/CollectionRequestModal.tsx
@@ -437,7 +437,6 @@ const CollectionRequestModal = ({
                          >
                            <div className="relative h-auto w-10 flex-shrink-0 overflow-hidden rounded-md">
                              <CachedImage
-                                type="tmdb"
                                src={
                                  part.posterPath
                                    ? `https://image.tmdb.org/t/p/w600_and_h900_bestv2${part.posterPath}`
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -9,7 +9,7 @@ import useSettings from '@app/hooks/useSettings';
 import { useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
-import { ANIME_KEYWORD_ID } from '@server/api/indexer/themoviedb/constants';
+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';
--- a/src/components/Selector/index.tsx
+++ b/src/components/Selector/index.tsx
@@ -11,7 +11,7 @@ import type {
  TmdbCompanySearchResponse,
  TmdbGenre,
  TmdbKeywordSearchResponse,
-} from '@server/api/indexer/themoviedb/interfaces';
+} from '@server/api/themoviedb/interfaces';
 import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
 import type {
  Keyword,
@@ -452,7 +452,6 @@ export const WatchProviderSelector = ({
                    tabIndex={0}
                  >
                    <CachedImage
-                      type="tmdb"
                      src={`https://image.tmdb.org/t/p/original${provider.logoPath}`}
                      alt=""
                      style={{
@@ -498,7 +497,6 @@ export const WatchProviderSelector = ({
                      tabIndex={0}
                    >
                      <CachedImage
-                        type="tmdb"
                        src={`https://image.tmdb.org/t/p/original${provider.logoPath}`}
                        alt=""
                        style={{
--- a/src/components/Settings/SettingsJobsCache/index.tsx
+++ b/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>
--- a/src/components/Settings/SettingsLayout.tsx
+++ b/src/components/Settings/SettingsLayout.tsx
@@ -37,11 +37,6 @@ const SettingsLayout = ({ children }: SettingsLayoutProps) => {
      route: '/settings/users',
      regex: /^\/settings\/users/,
    },
-    {
-      text: 'Tvdb',
-      route: '/settings/tvdb',
-      regex: /^\/settings\/tvdb/,
-    },
    settings.currentSettings.mediaServerType === MediaServerType.PLEX
      ? {
          text: intl.formatMessage(messages.menuPlexSettings),
--- a/src/components/Settings/SettingsMain/index.tsx
+++ b/src/components/Settings/SettingsMain/index.tsx
@@ -55,17 +55,6 @@ const messages = defineMessages('components.Settings.SettingsMain', {
  validationApplicationUrlTrailingSlash: 'URL must not end in a trailing slash',
  partialRequestsEnabled: 'Allow Partial Series Requests',
  locale: 'Display Language',
-  proxyEnabled: 'HTTP(S) Proxy',
-  proxyHostname: 'Proxy Hostname',
-  proxyPort: 'Proxy Port',
-  proxySsl: 'Use SSL For Proxy',
-  proxyUser: 'Proxy Username',
-  proxyPassword: 'Proxy Password',
-  proxyBypassFilter: 'Proxy Ignored Addresses',
-  proxyBypassFilterTip:
-    "Use ',' as a separator, and '*.' as a wildcard for subdomains",
-  proxyBypassLocalAddresses: 'Bypass Proxy for Local Addresses',
-  validationProxyPort: 'You must provide a valid port',
 });

 const SettingsMain = () => {
@@ -93,12 +82,6 @@ const SettingsMain = () => {
        intl.formatMessage(messages.validationApplicationUrlTrailingSlash),
        (value) => !value || !value.endsWith('/')
      ),
-    proxyPort: Yup.number().when('proxyEnabled', {
-      is: (proxyEnabled: boolean) => proxyEnabled,
-      then: Yup.number().required(
-        intl.formatMessage(messages.validationProxyPort)
-      ),
-    }),
  });

  const regenerate = async () => {
@@ -154,14 +137,6 @@ const SettingsMain = () => {
            partialRequestsEnabled: data?.partialRequestsEnabled,
            trustProxy: data?.trustProxy,
            cacheImages: data?.cacheImages,
-            proxyEnabled: data?.proxy?.enabled,
-            proxyHostname: data?.proxy?.hostname,
-            proxyPort: data?.proxy?.port,
-            proxySsl: data?.proxy?.useSsl,
-            proxyUser: data?.proxy?.user,
-            proxyPassword: data?.proxy?.password,
-            proxyBypassFilter: data?.proxy?.bypassFilter,
-            proxyBypassLocalAddresses: data?.proxy?.bypassLocalAddresses,
          }}
          enableReinitialize
          validationSchema={MainSettingsSchema}
@@ -183,16 +158,6 @@ const SettingsMain = () => {
                  partialRequestsEnabled: values.partialRequestsEnabled,
                  trustProxy: values.trustProxy,
                  cacheImages: values.cacheImages,
-                  proxy: {
-                    enabled: values.proxyEnabled,
-                    hostname: values.proxyHostname,
-                    port: values.proxyPort,
-                    useSsl: values.proxySsl,
-                    user: values.proxyUser,
-                    password: values.proxyPassword,
-                    bypassFilter: values.proxyBypassFilter,
-                    bypassLocalAddresses: values.proxyBypassLocalAddresses,
-                  },
                }),
              });
              if (!res.ok) throw new Error();
@@ -472,176 +437,6 @@ const SettingsMain = () => {
                    />
                  </div>
                </div>
-                <div className="form-row">
-                  <label htmlFor="proxyEnabled" className="checkbox-label">
-                    <span className="mr-2">
-                      {intl.formatMessage(messages.proxyEnabled)}
-                    </span>
-                    <SettingsBadge badgeType="advanced" className="mr-2" />
-                    <SettingsBadge badgeType="restartRequired" />
-                  </label>
-                  <div className="form-input-area">
-                    <Field
-                      type="checkbox"
-                      id="proxyEnabled"
-                      name="proxyEnabled"
-                      onChange={() => {
-                        setFieldValue('proxyEnabled', !values.proxyEnabled);
-                      }}
-                    />
-                  </div>
-                </div>
-                {values.proxyEnabled && (
-                  <>
-                    <div className="form-row">
-                      <label htmlFor="proxyHostname" className="checkbox-label">
-                        <span className="mr-2 ml-4">
-                          {intl.formatMessage(messages.proxyHostname)}
-                        </span>
-                      </label>
-                      <div className="form-input-area">
-                        <div className="form-input-field">
-                          <Field
-                            id="proxyHostname"
-                            name="proxyHostname"
-                            type="text"
-                          />
-                        </div>
-                        {errors.proxyHostname &&
-                          touched.proxyHostname &&
-                          typeof errors.proxyHostname === 'string' && (
-                            <div className="error">{errors.proxyHostname}</div>
-                          )}
-                      </div>
-                    </div>
-                    <div className="form-row">
-                      <label htmlFor="proxyPort" className="checkbox-label">
-                        <span className="mr-2 ml-4">
-                          {intl.formatMessage(messages.proxyPort)}
-                        </span>
-                      </label>
-                      <div className="form-input-area">
-                        <div className="form-input-field">
-                          <Field id="proxyPort" name="proxyPort" type="text" />
-                        </div>
-                        {errors.proxyPort &&
-                          touched.proxyPort &&
-                          typeof errors.proxyPort === 'string' && (
-                            <div className="error">{errors.proxyPort}</div>
-                          )}
-                      </div>
-                    </div>
-                    <div className="form-row">
-                      <label htmlFor="proxySsl" className="checkbox-label">
-                        <span className="mr-2 ml-4">
-                          {intl.formatMessage(messages.proxySsl)}
-                        </span>
-                      </label>
-                      <div className="form-input-area">
-                        <Field
-                          type="checkbox"
-                          id="proxySsl"
-                          name="proxySsl"
-                          onChange={() => {
-                            setFieldValue('proxySsl', !values.proxySsl);
-                          }}
-                        />
-                      </div>
-                    </div>
-                    <div className="form-row">
-                      <label htmlFor="proxyUser" className="checkbox-label">
-                        <span className="mr-2 ml-4">
-                          {intl.formatMessage(messages.proxyUser)}
-                        </span>
-                      </label>
-                      <div className="form-input-area">
-                        <div className="form-input-field">
-                          <Field id="proxyUser" name="proxyUser" type="text" />
-                        </div>
-                        {errors.proxyUser &&
-                          touched.proxyUser &&
-                          typeof errors.proxyUser === 'string' && (
-                            <div className="error">{errors.proxyUser}</div>
-                          )}
-                      </div>
-                    </div>
-                    <div className="form-row">
-                      <label htmlFor="proxyPassword" className="checkbox-label">
-                        <span className="mr-2 ml-4">
-                          {intl.formatMessage(messages.proxyPassword)}
-                        </span>
-                      </label>
-                      <div className="form-input-area">
-                        <div className="form-input-field">
-                          <Field
-                            id="proxyPassword"
-                            name="proxyPassword"
-                            type="password"
-                          />
-                        </div>
-                        {errors.proxyPassword &&
-                          touched.proxyPassword &&
-                          typeof errors.proxyPassword === 'string' && (
-                            <div className="error">{errors.proxyPassword}</div>
-                          )}
-                      </div>
-                    </div>
-                    <div className="form-row">
-                      <label
-                        htmlFor="proxyBypassFilter"
-                        className="checkbox-label"
-                      >
-                        <span className="mr-2 ml-4">
-                          {intl.formatMessage(messages.proxyBypassFilter)}
-                        </span>
-                        <span className="label-tip ml-4">
-                          {intl.formatMessage(messages.proxyBypassFilterTip)}
-                        </span>
-                      </label>
-                      <div className="form-input-area">
-                        <div className="form-input-field">
-                          <Field
-                            id="proxyBypassFilter"
-                            name="proxyBypassFilter"
-                            type="text"
-                          />
-                        </div>
-                        {errors.proxyBypassFilter &&
-                          touched.proxyBypassFilter &&
-                          typeof errors.proxyBypassFilter === 'string' && (
-                            <div className="error">
-                              {errors.proxyBypassFilter}
-                            </div>
-                          )}
-                      </div>
-                    </div>
-                    <div className="form-row">
-                      <label
-                        htmlFor="proxyBypassLocalAddresses"
-                        className="checkbox-label"
-                      >
-                        <span className="mr-2 ml-4">
-                          {intl.formatMessage(
-                            messages.proxyBypassLocalAddresses
-                          )}
-                        </span>
-                      </label>
-                      <div className="form-input-area">
-                        <Field
-                          type="checkbox"
-                          id="proxyBypassLocalAddresses"
-                          name="proxyBypassLocalAddresses"
-                          onChange={() => {
-                            setFieldValue(
-                              'proxyBypassLocalAddresses',
-                              !values.proxyBypassLocalAddresses
-                            );
-                          }}
-                        />
-                      </div>
-                    </div>
-                  </>
-                )}
                <div className="actions">
                  <div className="flex justify-end">
                    <span className="ml-3 inline-flex rounded-md shadow-sm">
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Loubiou	b02711fd5e	chore: merge develop	2024-09-18 20:57:05 +02:00
Thomas Loubiou	c661f09445	refactor: use fetch API	2024-09-18 20:52:46 +02:00
Thomas Loubiou	12eaf6505a	Merge branch 'Fallenbagel:develop' into develop	2024-06-07 09:45:00 +02:00
Thomas Loubiou	ceb8ce9c33	fix(i18n): remove french translation	2024-04-18 12:26:11 +02:00
Thomas Loubiou	2f7422b312	fix(i18n): add missing translations	2024-02-02 23:12:51 +01:00
Thomas Loubiou	1ff73e3aab	feat: allow requests managers to delete media files	2024-02-02 23:01:50 +01:00