feat: jellyseerr makeover

2025-12-28 20:49:05 -05:00 · 2024-04-15 23:52:50 +05:00
43 changed files with 820 additions and 2931 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -322,60 +322,6 @@
      "contributions": [
        "doc"
      ]
-    },
-    {
-      "login": "joshuaboniface",
-      "name": "Joshua M. Boniface",
-      "avatar_url": "https://avatars.githubusercontent.com/u/4031396?v=4",
-      "profile": "https://www.boniface.me",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "gauthier-th",
-      "name": "Gauthier",
-      "avatar_url": "https://avatars.githubusercontent.com/u/37781713?v=4",
-      "profile": "https://gauthierth.fr/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Kara-Zor-El",
-      "name": "Kara",
-      "avatar_url": "https://avatars.githubusercontent.com/u/69772087?v=4",
-      "profile": "https://github.com/Kara-Zor-El",
-      "contributions": [
-        "infra"
-      ]
-    },
-    {
-      "login": "JoaquinOlivero",
-      "name": "Joaquin Olivero",
-      "avatar_url": "https://avatars.githubusercontent.com/u/66050823?v=4",
-      "profile": "https://joaquinolivero.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Bretterteig",
-      "name": "Julian Behr",
-      "avatar_url": "https://avatars.githubusercontent.com/u/47298401?v=4",
-      "profile": "https://github.com/Bretterteig",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "ThowZzy",
-      "name": "ThowZzy",
-      "avatar_url": "https://avatars.githubusercontent.com/u/61882536?v=4",
-      "profile": "https://github.com/ThowZzy",
-      "contributions": [
-        "code"
-      ]
    }
  ]
 }
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-buy_me_a_coffee: fallen.bagel
+github: [Fallenbagel]
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
    container: node:18.18-alpine
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Install dependencies
        env:
          HUSKY: 0
@@ -34,18 +34,18 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_TOKEN }}
      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -56,7 +56,7 @@ jobs:
        env:
          OWNER: ${{ github.repository_owner }}
      - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v3
        with:
          context: .
          file: ./Dockerfile
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -24,7 +24,7 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Initialize CodeQL
        uses: github/codeql-action/init@v2
--- a/.github/workflows/conflict_labeler.yml
+++ b/.github/workflows/conflict_labeler.yml
@@ -1,26 +0,0 @@
-name: Merge Conflict Labeler
-
-on:
-  push:
-    branches:
-      - develop
-  pull_request_target:
-    branches:
-      - develop
-    types: [synchronize]
-
-jobs:
-  label:
-    name: Labeling
-    runs-on: ubuntu-latest
-    if: ${{ github.repository == 'Fallenbagel/jellyseerr' }}
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - name: Apply label
-        uses: eps1lon/actions-label-merge-conflict@v3
-        with:
-          dirtyLabel: 'merge conflict'
-          commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -13,9 +13,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Cypress run
-        uses: cypress-io/github-action@v6
+        uses: cypress-io/github-action@v4
        with:
          build: yarn cypress:build
          start: yarn start
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -11,21 +11,21 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Get the version
        id: get_version
        run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_TOKEN }}
      - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v3
        with:
          context: .
          file: ./Dockerfile
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,19 +10,19 @@ jobs:
      HUSKY: 0
    steps:
      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
-          node-version: 18
+          node-version: 16
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_TOKEN }}
@@ -35,60 +35,60 @@ jobs:
          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
        run: npx semantic-release

-  # build-snap:
-  #   name: Build Snap Package (${{ matrix.architecture }})
-  #   needs: semantic-release
-  #   runs-on: ubuntu-22.04
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       architecture:
-  #         - amd64
-  #         - arm64
-  #         - armhf
-  #   steps:
-  #     - name: Checkout Code
-  #       uses: actions/checkout@v4
-  #       with:
-  #         fetch-depth: 0
-  #     - name: Switch to main branch
-  #       run: git checkout main
-  #     - name: Pull latest changes
-  #       run: git pull
-  #     - name: Prepare
-  #       id: prepare
-  #       run: |
-  #         git fetch --prune --tags
-  #         if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
-  #           echo "RELEASE=stable" >> $GITHUB_OUTPUT
-  #         else
-  #           echo "RELEASE=edge" >> $GITHUB_OUTPUT
-  #         fi
-  #     - name: Set Up QEMU
-  #       uses: docker/setup-qemu-action@v3
-  #       with:
-  #         image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
-  #     - name: Build Snap Package
-  #       uses: diddlesnaps/snapcraft-multiarch-action@v1
-  #       id: build
-  #       with:
-  #         architecture: ${{ matrix.architecture }}
-  #     - name: Upload Snap Package
-  #       uses: actions/upload-artifact@v4
-  #       with:
-  #         name: jellyseerr-snap-package-${{ matrix.architecture }}
-  #         path: ${{ steps.build.outputs.snap }}
-  #     - name: Review Snap Package
-  #       uses: diddlesnaps/snapcraft-review-tools-action@v1
-  #       with:
-  #         snap: ${{ steps.build.outputs.snap }}
-  #     - name: Publish Snap Package
-  #       uses: snapcore/action-publish@v1
-  #       env:
-  #         SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
-  #       with:
-  #         snap: ${{ steps.build.outputs.snap }}
-  #         release: ${{ steps.prepare.outputs.RELEASE }}
+  build-snap:
+    name: Build Snap Package (${{ matrix.architecture }})
+    needs: semantic-release
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        architecture:
+          - amd64
+          - arm64
+          - armhf
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Switch to main branch
+        run: git checkout main
+      - name: Pull latest changes
+        run: git pull
+      - name: Prepare
+        id: prepare
+        run: |
+          git fetch --prune --tags
+          if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
+            echo "RELEASE=stable" >> $GITHUB_OUTPUT
+          else
+            echo "RELEASE=edge" >> $GITHUB_OUTPUT
+          fi
+      - name: Set Up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
+      - name: Build Snap Package
+        uses: diddlesnaps/snapcraft-multiarch-action@v1
+        id: build
+        with:
+          architecture: ${{ matrix.architecture }}
+      - name: Upload Snap Package
+        uses: actions/upload-artifact@v2
+        with:
+          name: jellyseerr-snap-package-${{ matrix.architecture }}
+          path: ${{ steps.build.outputs.snap }}
+      - name: Review Snap Package
+        uses: diddlesnaps/snapcraft-review-tools-action@v1
+        with:
+          snap: ${{ steps.build.outputs.snap }}
+      - name: Publish Snap Package
+        uses: snapcore/action-publish@v1
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
+        with:
+          snap: ${{ steps.build.outputs.snap }}
+          release: ${{ steps.prepare.outputs.RELEASE }}

  discord:
    name: Send Discord Notification
--- a/.github/workflows/snap.yaml
+++ b/.github/workflows/snap.yaml
@@ -1,13 +1,9 @@
 name: Publish Snap

-# turn off edge snap builds temporarily and make it manual
-
-# on:
-#  push:
-#    branches:
-#      - develop
-
-on: workflow_dispatch
+on:
+  push:
+    branches:
+      - develop

 jobs:
  jobs:
@@ -16,7 +12,7 @@ jobs:
    if: "!contains(github.event.head_commit.message, '[skip ci]')"
    steps:
      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.12.1
+        uses: styfle/cancel-workflow-action@0.10.0
        with:
          access_token: ${{ secrets.GITHUB_TOKEN }}

@@ -33,7 +29,7 @@ jobs:
          - armhf
    steps:
      - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      - name: Prepare
        id: prepare
        run: |
@@ -44,7 +40,7 @@ jobs:
            echo "RELEASE=edge" >> $GITHUB_OUTPUT
          fi
      - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
      - name: Configure Git
        run: git config --add safe.directory /data/parts/jellyseerr/src
      - name: Build Snap Package
@@ -53,7 +49,7 @@ jobs:
        with:
          architecture: ${{ matrix.architecture }}
      - name: Upload Snap Package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: jellyseerr-snap-package-${{ matrix.architecture }}
          path: ${{ steps.build.outputs.snap }}
--- a/.github/workflows/support.yml
+++ b/.github/workflows/support.yml
@@ -6,9 +6,9 @@ on:

 jobs:
  support:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
-      - uses: dessant/support-requests@v4
+      - uses: dessant/support-requests@v2
        with:
          github-token: ${{ github.token }}
          support-label: 'support'
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 <a href="http://jellyseerr.borgcube.de/engage/jellyseerr/"><img src="http://jellyseerr.borgcube.de/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-40-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-34-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 **Jellyseerr** is a free and open source software application for managing requests for your media library.
@@ -229,14 +229,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://aleksasiriski.dev"><img src="https://avatars.githubusercontent.com/u/31509435?v=4?s=100" width="100px;" alt="Aleksa Siriški"/><br /><sub><b>Aleksa Siriški</b></sub></a><br /><a href="#infra-aleksasiriski" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
      <td align="center" valign="top" width="14.28%"><a href="http://danishhumair.com"><img src="https://avatars.githubusercontent.com/u/121830048?v=4?s=100" width="100px;" alt="Danish Humair"/><br /><sub><b>Danish Humair</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=Danish-H" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://arm0.red"><img src="https://avatars.githubusercontent.com/u/16858514?v=4?s=100" width="100px;" alt="Stephen Harris"/><br /><sub><b>Stephen Harris</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=trackmastersteve" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.boniface.me"><img src="https://avatars.githubusercontent.com/u/4031396?v=4?s=100" width="100px;" alt="Joshua M. Boniface"/><br /><sub><b>Joshua M. Boniface</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=joshuaboniface" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://gauthierth.fr/"><img src="https://avatars.githubusercontent.com/u/37781713?v=4?s=100" width="100px;" alt="Gauthier"/><br /><sub><b>Gauthier</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=gauthier-th" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Kara-Zor-El"><img src="https://avatars.githubusercontent.com/u/69772087?v=4?s=100" width="100px;" alt="Kara"/><br /><sub><b>Kara</b></sub></a><br /><a href="#infra-Kara-Zor-El" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://joaquinolivero.com"><img src="https://avatars.githubusercontent.com/u/66050823?v=4?s=100" width="100px;" alt="Joaquin Olivero"/><br /><sub><b>Joaquin Olivero</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=JoaquinOlivero" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Bretterteig"><img src="https://avatars.githubusercontent.com/u/47298401?v=4?s=100" width="100px;" alt="Julian Behr"/><br /><sub><b>Julian Behr</b></sub></a><br /><a href="#translation-Bretterteig" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ThowZzy"><img src="https://avatars.githubusercontent.com/u/61882536?v=4?s=100" width="100px;" alt="ThowZzy"/><br /><sub><b>ThowZzy</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=ThowZzy" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
--- a/cypress/config/settings.cypress.json
+++ b/cypress/config/settings.cypress.json
@@ -19,7 +19,6 @@
    "region": "",
    "originalLanguage": "",
    "trustProxy": false,
-    "mediaServerType": 1,
    "partialRequestsEnabled": true,
    "locale": "en"
  },
@@ -38,17 +37,6 @@
    ],
    "machineId": "test"
  },
-  "jellyfin": {
-    "name": "",
-    "ip": "",
-    "port": 8096,
-    "useSsl": false,
-    "urlBase": "",
-    "externalHostname": "",
-    "jellyfinForgotPasswordUrl": "",
-    "libraries": [],
-    "serverId": ""
-  },
  "tautulli": {},
  "radarr": [],
  "sonarr": [],
@@ -151,26 +139,11 @@
    "sonarr-scan": {
      "schedule": "0 30 4 * * *"
    },
-    "plex-watchlist-sync": {
-      "schedule": "0 */10 * * * *"
-    },
-    "availability-sync": {
-      "schedule": "0 0 5 * * *"
-    },
    "download-sync": {
      "schedule": "0 * * * * *"
    },
    "download-sync-reset": {
      "schedule": "0 0 1 * * *"
-    },
-    "jellyfin-recently-added-scan": {
-      "schedule": "0 */5 * * * *"
-    },
-    "jellyfin-full-scan": {
-      "schedule": "0 0 3 * * *"
-    },
-    "image-cache-cleanup": {
-      "schedule": "0 0 5 * * *"
    }
  }
 }
--- a/overseerr-api.yml
+++ b/overseerr-api.yml
@@ -2092,13 +2092,6 @@ paths:
            application/json:
              schema:
                type: array
-                items:
-                  type: object
-                  properties:
-                    username:
-                      type: string
-                    userId:
-                      type: integer
  /settings/jellyfin/sync:
    get:
      summary: Get status of full Jellyfin library sync
@@ -3402,12 +3395,6 @@ paths:
        Updates a single slider and return the newly updated slider. Requires the `ADMIN` permission.
      tags:
        - settings
-      parameters:
-        - in: path
-          name: sliderId
-          required: true
-          schema:
-            type: number
      requestBody:
        required: true
        content:
@@ -3737,7 +3724,7 @@ paths:
                  results:
                    type: array
                    items:
-                      $ref: '#/components/schemas/User'
+                    $ref: '#/components/schemas/User'
    post:
      summary: Create new user
      description: |
--- a/package.json
+++ b/package.json
@@ -44,7 +44,6 @@
    "axios-rate-limit": "1.3.0",
    "bcrypt": "5.1.0",
    "bowser": "2.11.0",
-    "cacheable-lookup": "^7.0.0",
    "connect-typeorm": "1.1.4",
    "cookie-parser": "1.4.6",
    "copy-to-clipboard": "3.3.3",
--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -1,19 +1,14 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import ExternalAPI from '@server/api/externalapi';
-import { ApiErrorCode } from '@server/constants/error';
 import availabilitySync from '@server/lib/availabilitySync';
 import logger from '@server/logger';
-import { ApiError } from '@server/types/error';
-import { getAppVersion } from '@server/utils/appVersion';
+import type { AxiosInstance } from 'axios';
+import axios from 'axios';

 export interface JellyfinUserResponse {
  Name: string;
  ServerId: string;
  ServerName: string;
  Id: string;
-  Configuration: {
-    GroupedFolders: string[];
-  };
  Policy: {
    IsAdministrator: boolean;
  };
@@ -29,13 +24,6 @@ export interface JellyfinUserListResponse {
  users: JellyfinUserResponse[];
 }

-interface JellyfinMediaFolder {
-  Name: string;
-  Id: string;
-  Type: string;
-  CollectionType: string;
-}
-
 export interface JellyfinLibrary {
  type: 'show' | 'movie';
  key: string;
@@ -92,90 +80,48 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
  DateCreated?: string;
 }

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

  constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
-    let authHeaderVal: string;
-    if (authToken) {
-      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}", Token="${authToken}"`;
-    } else {
-      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}"`;
-    }
-
-    super(
-      jellyfinHost,
-      {},
-      {
-        headers: {
-          'X-Emby-Authorization': authHeaderVal,
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
-        },
-      }
-    );
-
    this.jellyfinHost = jellyfinHost;
    this.authToken = authToken;
+
+    let authHeaderVal = '';
+    if (this.authToken) {
+      authHeaderVal = `MediaBrowser Client="Overseerr", Device="Axios", DeviceId="${deviceId}", Version="10.8.0", Token="${authToken}"`;
+    } else {
+      authHeaderVal = `MediaBrowser Client="Overseerr", Device="Axios", DeviceId="${deviceId}", Version="10.8.0"`;
+    }
+
+    this.axios = axios.create({
+      baseURL: this.jellyfinHost,
+      headers: {
+        'X-Emby-Authorization': authHeaderVal,
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+      },
+    });
  }

  public async login(
    Username?: string,
-    Password?: string,
-    ClientIP?: string
+    Password?: string
  ): Promise<JellyfinLoginResponse> {
-    const authenticate = async (useHeaders: boolean) => {
-      const headers =
-        useHeaders && ClientIP ? { 'X-Forwarded-For': ClientIP } : {};
-
-      return this.post<JellyfinLoginResponse>(
+    try {
+      const account = await this.axios.post<JellyfinLoginResponse>(
        '/Users/AuthenticateByName',
        {
-          Username,
+          Username: Username,
          Pw: Password,
-        },
-        { headers }
+        }
      );
-    };
-
-    try {
-      return await authenticate(true);
+      return account.data;
    } catch (e) {
-      logger.debug(`Failed to authenticate with headers: ${e.message}`, {
-        label: 'Jellyfin API',
-        ip: ClientIP,
-      });
-    }
-
-    try {
-      return await authenticate(false);
-    } catch (e) {
-      const status = e.response?.status;
-
-      const networkErrorCodes = new Set([
-        'ECONNREFUSED',
-        'EHOSTUNREACH',
-        'ENOTFOUND',
-        'ETIMEDOUT',
-        'ECONNRESET',
-        'EADDRINUSE',
-        'ENETDOWN',
-        'ENETUNREACH',
-        'EPIPE',
-        'ECONNABORTED',
-        'EPROTO',
-        'EHOSTDOWN',
-        'EAI_AGAIN',
-        'ERR_INVALID_URL',
-      ]);
-
-      if (networkErrorCodes.has(e.code) || status === 404) {
-        throw new ApiError(status, ApiErrorCode.InvalidUrl);
-      }
-
-      throw new ApiError(status, ApiErrorCode.InvalidCredentials);
+      throw new Error('Unauthorized');
    }
  }

@@ -184,106 +130,69 @@ class JellyfinAPI extends ExternalAPI {
    return;
  }

-  public async getSystemInfo(): Promise<any> {
-    try {
-      const systemInfoResponse = await this.get<any>('/System/Info');
-
-      return systemInfoResponse;
-    } catch (e) {
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
-    }
-  }
-
  public async getServerName(): Promise<string> {
    try {
-      const serverResponse = await this.get<JellyfinUserResponse>(
-        '/System/Info/Public'
+      const account = await this.axios.get<JellyfinUserResponse>(
+        "/System/Info/Public'}"
      );
-
-      return serverResponse.ServerName;
+      return account.data.ServerName;
    } catch (e) {
      logger.error(
        `Something went wrong while getting the server name from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.Unknown);
+      throw new Error('girl idk');
    }
  }

  public async getUsers(): Promise<JellyfinUserListResponse> {
    try {
-      const userReponse = await this.get<JellyfinUserResponse[]>(`/Users`);
-
-      return { users: userReponse };
+      const account = await this.axios.get(`/Users`);
+      return { users: account.data };
    } catch (e) {
      logger.error(
        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
    }
  }

  public async getUser(): Promise<JellyfinUserResponse> {
    try {
-      const userReponse = await this.get<JellyfinUserResponse>(
+      const account = await this.axios.get<JellyfinUserResponse>(
        `/Users/${this.userId ?? 'Me'}`
      );
-      return userReponse;
+      return account.data;
    } catch (e) {
      logger.error(
        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
    }
  }

  public async getLibraries(): Promise<JellyfinLibrary[]> {
    try {
-      const mediaFolderResponse = await this.get<any>(`/Library/MediaFolders`);
+      // TODO: Try to fix automatic grouping without fucking up LDAP users
+      // const libraries = await this.axios.get<any>('/Library/VirtualFolders');

-      return this.mapLibraries(mediaFolderResponse.Items);
-    } catch (mediaFoldersResponseError) {
-      // fallback to user views to get libraries
-      // this only and maybe/depending on factors affects LDAP users
-      try {
-        const mediaFolderResponse = await this.get<any>(
-          `/Users/${this.userId ?? 'Me'}/Views`
-        );
+      const account = await this.axios.get<any>(
+        `/Users/${this.userId ?? 'Me'}/Views`
+      );

-        return this.mapLibraries(mediaFolderResponse.Items);
-      } catch (e) {
-        logger.error(
-          `Something went wrong while getting libraries from the Jellyfin server: ${e.message}`,
-          { label: 'Jellyfin API' }
-        );
-
-        return [];
-      }
-    }
-  }
-
-  private mapLibraries(mediaFolders: JellyfinMediaFolder[]): JellyfinLibrary[] {
-    const excludedTypes = [
-      'music',
-      'books',
-      'musicvideos',
-      'homevideos',
-      'boxsets',
-    ];
-
-    return mediaFolders
-      .filter((Item: JellyfinMediaFolder) => {
-        return (
-          Item.Type === 'CollectionFolder' &&
-          !excludedTypes.includes(Item.CollectionType)
-        );
-      })
-      .map((Item: JellyfinMediaFolder) => {
+      const response: JellyfinLibrary[] = account.data.Items.filter(
+        (Item: any) => {
+          return (
+            Item.Type === 'CollectionFolder' &&
+            Item.CollectionType !== 'music' &&
+            Item.CollectionType !== 'books' &&
+            Item.CollectionType !== 'musicvideos' &&
+            Item.CollectionType !== 'homevideos'
+          );
+        }
+      ).map((Item: any) => {
        return <JellyfinLibrary>{
          key: Item.Id,
          title: Item.Name,
@@ -291,15 +200,24 @@ class JellyfinAPI extends ExternalAPI {
          agent: 'jellyfin',
        };
      });
+
+      return response;
+    } catch (e) {
+      logger.error(
+        `Something went wrong while getting libraries from the Jellyfin server: ${e.message}`,
+        { label: 'Jellyfin API' }
+      );
+      return [];
+    }
  }

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

-      return libraryItemsResponse.Items.filter(
+      return contents.data.Items.filter(
        (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
      );
    } catch (e) {
@@ -307,25 +225,23 @@ class JellyfinAPI extends ExternalAPI {
        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
    }
  }

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

-      return itemResponse;
+      return contents.data;
    } catch (e) {
      logger.error(
        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
    }
  }

@@ -333,38 +249,36 @@ class JellyfinAPI extends ExternalAPI {
    id: string
  ): Promise<JellyfinLibraryItemExtended | undefined> {
    try {
-      const itemResponse = await this.get<any>(
+      const contents = await this.axios.get<any>(
        `/Users/${this.userId}/Items/${id}`
      );

-      return itemResponse;
+      return contents.data;
    } catch (e) {
      if (availabilitySync.running) {
        if (e.response && e.response.status === 500) {
          return undefined;
        }
      }
-
      logger.error(
        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
    }
  }

  public async getSeasons(seriesID: string): Promise<JellyfinLibraryItem[]> {
    try {
-      const seasonResponse = await this.get<any>(`/Shows/${seriesID}/Seasons`);
+      const contents = await this.axios.get<any>(`/Shows/${seriesID}/Seasons`);

-      return seasonResponse.Items;
+      return contents.data.Items;
    } catch (e) {
      logger.error(
        `Something went wrong while getting the list of seasons from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
    }
  }

@@ -373,11 +287,11 @@ class JellyfinAPI extends ExternalAPI {
    seasonID: string
  ): Promise<JellyfinLibraryItem[]> {
    try {
-      const episodeResponse = await this.get<any>(
+      const contents = await this.axios.get<any>(
        `/Shows/${seriesID}/Episodes?seasonId=${seasonID}`
      );

-      return episodeResponse.Items.filter(
+      return contents.data.Items.filter(
        (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
      );
    } catch (e) {
@@ -385,8 +299,7 @@ class JellyfinAPI extends ExternalAPI {
        `Something went wrong while getting the list of episodes from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new Error('Invalid auth token');
    }
  }
 }
--- a/server/constants/error.ts
+++ b/server/constants/error.ts
@@ -1,9 +0,0 @@
-export enum ApiErrorCode {
-  InvalidUrl = 'INVALID_URL',
-  InvalidCredentials = 'INVALID_CREDENTIALS',
-  InvalidAuthToken = 'INVALID_AUTH_TOKEN',
-  NotAdmin = 'NOT_ADMIN',
-  SyncErrorGroupedFolders = 'SYNC_ERROR_GROUPED_FOLDERS',
-  SyncErrorNoLibraries = 'SYNC_ERROR_NO_LIBRARIES',
-  Unknown = 'UNKNOWN',
-}
--- a/server/entity/Media.ts
+++ b/server/entity/Media.ts
@@ -9,7 +9,6 @@ import type { DownloadingItem } from '@server/lib/downloadtracker';
 import downloadTracker from '@server/lib/downloadtracker';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import { getHostname } from '@server/utils/getHostname';
 import {
  AfterLoad,
  Column,
@@ -212,12 +211,15 @@ class Media {
    } else {
      const pageName =
        process.env.JELLYFIN_TYPE === 'emby' ? 'item' : 'details';
-      const { serverId, externalHostname } = getSettings().jellyfin;
-
-      const jellyfinHost =
+      const { serverId, hostname, externalHostname } = getSettings().jellyfin;
+      let jellyfinHost =
        externalHostname && externalHostname.length > 0
          ? externalHostname
-          : getHostname();
+          : hostname;
+
+      jellyfinHost = jellyfinHost.endsWith('/')
+        ? jellyfinHost.slice(0, -1)
+        : jellyfinHost;

      if (this.jellyfinMediaId) {
        this.mediaUrl = `${jellyfinHost}/web/index.html#!/${pageName}?id=${this.jellyfinMediaId}&context=home&serverId=${serverId}`;
--- a/server/index.ts
+++ b/server/index.ts
@@ -23,25 +23,19 @@ import imageproxy from '@server/routes/imageproxy';
 import { getAppVersion } from '@server/utils/appVersion';
 import restartFlag from '@server/utils/restartFlag';
 import { getClientIp } from '@supercharge/request-ip';
-import type CacheableLookupType from 'cacheable-lookup';
 import { TypeormStore } from 'connect-typeorm/out';
 import cookieParser from 'cookie-parser';
 import csurf from 'csurf';
-import { lookup } from 'dns';
 import type { NextFunction, Request, Response } from 'express';
 import express from 'express';
 import * as OpenApiValidator from 'express-openapi-validator';
 import type { Store } from 'express-session';
 import session from 'express-session';
 import next from 'next';
-import http from 'node:http';
-import https from 'node:https';
 import path from 'path';
 import swaggerUi from 'swagger-ui-express';
 import YAML from 'yamljs';

-const _importDynamic = new Function('modulePath', 'return import(modulePath)');
-
 const API_SPEC_PATH = path.join(__dirname, '../overseerr-api.yml');

 logger.info(`Starting Overseerr version ${getAppVersion()}`);
@@ -52,25 +46,6 @@ const handle = app.getRequestHandler();
 app
  .prepare()
  .then(async () => {
-    const CacheableLookup = (await _importDynamic('cacheable-lookup'))
-      .default as typeof CacheableLookupType;
-    const cacheable = new CacheableLookup();
-
-    const originalLookup = cacheable.lookup;
-
-    // if hostname is localhost use dns.lookup instead of cacheable-lookup
-    cacheable.lookup = (...args: any) => {
-      const [hostname] = args;
-      if (hostname === 'localhost') {
-        lookup(...(args as Parameters<typeof lookup>));
-      } else {
-        originalLookup(...(args as Parameters<typeof originalLookup>));
-      }
-    };
-
-    cacheable.install(http.globalAgent);
-    cacheable.install(https.globalAgent);
-
    const dbConnection = await dataSource.initialize();

    // Run migrations in production
@@ -84,16 +59,6 @@ app
    const settings = getSettings().load();
    restartFlag.initializeSettings(settings.main);

-    // Overwrite DNS servers
-    if (settings.main.overwriteDnsServers) {
-      cacheable.servers = settings.main.overwriteDnsServers
-        .split(',')
-        .map((server) => server.trim());
-      logger.info('Using custom DNS servers', {
-        label: 'Settings',
-      });
-    }
-
    // Migrate library types
    if (
      settings.plex.libraries.length > 1 &&
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -16,7 +16,6 @@ import { User } from '@server/entity/User';
 import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import { getHostname } from '@server/utils/getHostname';

 class AvailabilitySync {
  public running = false;
@@ -85,7 +84,7 @@ class AvailabilitySync {
      ) {
        if (admin) {
          this.jellyfinClient = new JellyfinAPI(
-            getHostname(),
+            settings.jellyfin.hostname ?? '',
            admin.jellyfinAuthToken,
            admin.jellyfinDeviceId
          );
--- a/server/lib/notifications/agents/webhook.ts
+++ b/server/lib/notifications/agents/webhook.ts
@@ -141,7 +141,7 @@ class WebhookAgent
    const payloadString = Buffer.from(
      this.getSettings().options.jsonPayload,
      'base64'
-    ).toString('utf8');
+    ).toString('ascii');

    const parsedJSON = JSON.parse(JSON.parse(payloadString));

--- a/server/lib/scanners/jellyfin/index.ts
+++ b/server/lib/scanners/jellyfin/index.ts
@@ -12,7 +12,6 @@ import type { Library } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import AsyncLock from '@server/utils/asyncLock';
-import { getHostname } from '@server/utils/getHostname';
 import { randomUUID as uuid } from 'crypto';
 import { uniqWith } from 'lodash';

@@ -84,17 +83,13 @@ class JellyfinScanner {
      }

      const has4k = metadata.MediaSources?.some((MediaSource) => {
-        return MediaSource.MediaStreams.filter(
-          (MediaStream) => MediaStream.Type === 'Video'
-        ).some((MediaStream) => {
+        return MediaSource.MediaStreams.some((MediaStream) => {
          return (MediaStream.Width ?? 0) > 2000;
        });
      });

      const hasOtherResolution = metadata.MediaSources?.some((MediaSource) => {
-        return MediaSource.MediaStreams.filter(
-          (MediaStream) => MediaStream.Type === 'Video'
-        ).some((MediaStream) => {
+        return MediaSource.MediaStreams.some((MediaStream) => {
          return (MediaStream.Width ?? 0) <= 2000;
        });
      });
@@ -595,10 +590,8 @@ class JellyfinScanner {
        return this.log('No admin configured. Jellyfin sync skipped.', 'warn');
      }

-      const hostname = getHostname();
-
      this.jfClient = new JellyfinAPI(
-        hostname,
+        settings.jellyfin.hostname ?? '',
        admin.jellyfinAuthToken,
        admin.jellyfinDeviceId
      );
--- a/server/lib/settings/index.ts
+++ b/server/lib/settings/index.ts
@@ -1,11 +1,10 @@
 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';
 import { merge } from 'lodash';
 import path from 'path';
 import webpush from 'web-push';
+import { Permission } from './permissions';

 export interface Library {
  id: string;
@@ -39,10 +38,7 @@ export interface PlexSettings {

 export interface JellyfinSettings {
  name: string;
-  ip: string;
-  port: number;
-  useSsl?: boolean;
-  urlBase?: string;
+  hostname: string;
  externalHostname?: string;
  jellyfinForgotPasswordUrl?: string;
  libraries: Library[];
@@ -118,7 +114,6 @@ export interface MainSettings {
  mediaServerType: number;
  partialRequestsEnabled: boolean;
  locale: string;
-  overwriteDnsServers?: string;
 }

 interface PublicSettings {
@@ -135,6 +130,7 @@ interface FullPublicSettings extends PublicSettings {
  region: string;
  originalLanguage: string;
  mediaServerType: number;
+  jellyfinHost?: string;
  jellyfinExternalHost?: string;
  jellyfinForgotPasswordUrl?: string;
  jellyfinServerName?: string;
@@ -278,7 +274,7 @@ export type JobId =
  | 'image-cache-cleanup'
  | 'availability-sync';

-export interface AllSettings {
+interface AllSettings {
  clientId: string;
  vapidPublic: string;
  vapidPrivate: string;
@@ -295,7 +291,7 @@ export interface AllSettings {

 const SETTINGS_PATH = process.env.CONFIG_DIRECTORY
  ? `${process.env.CONFIG_DIRECTORY}/settings.json`
-  : path.join(__dirname, '../../../config/settings.json');
+  : path.join(__dirname, '../../config/settings.json');

 class Settings {
  private data: AllSettings;
@@ -335,10 +331,7 @@ class Settings {
      },
      jellyfin: {
        name: '',
-        ip: '',
-        port: 8096,
-        useSsl: false,
-        urlBase: '',
+        hostname: '',
        externalHostname: '',
        jellyfinForgotPasswordUrl: '',
        libraries: [],
@@ -554,6 +547,8 @@ class Settings {
      region: this.data.main.region,
      originalLanguage: this.data.main.originalLanguage,
      mediaServerType: this.main.mediaServerType,
+      jellyfinHost: this.jellyfin.hostname,
+      jellyfinExternalHost: this.jellyfin.externalHostname,
      partialRequestsEnabled: this.data.main.partialRequestsEnabled,
      cacheImages: this.data.main.cacheImages,
      vapidPublic: this.vapidPublic,
@@ -642,11 +637,7 @@ class Settings {
    const data = fs.readFileSync(SETTINGS_PATH, 'utf-8');

    if (data) {
-      const parsedJson = JSON.parse(data);
-      this.data = runMigrations(parsedJson);
-
-      this.data = merge(this.data, parsedJson);
-
+      this.data = merge(this.data, JSON.parse(data));
      this.save();
    }
    return this;
--- a/server/lib/settings/migrations/0001_migrate_hostname.ts
+++ b/server/lib/settings/migrations/0001_migrate_hostname.ts
@@ -1,30 +0,0 @@
-import type { AllSettings } from '@server/lib/settings';
-
-const migrateHostname = (settings: any): AllSettings => {
-  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 oldJellyfinSettings.hostname;
-    if (urlMatch) {
-      const [, ip, , port, urlBase] = urlMatch;
-      settings.jellyfin = {
-        ...settings.jellyfin,
-        ip,
-        port: port || (useSsl ? 443 : 80),
-        useSsl,
-        urlBase: urlBase ? urlBase.replace(/\/$/, '') : '',
-      };
-    }
-  }
-  if (settings.jellyfin && settings.jellyfin.hostname) {
-    delete settings.jellyfin.hostname;
-  }
-  return settings;
-};
-
-export default migrateHostname;
--- a/server/lib/settings/migrator.ts
+++ b/server/lib/settings/migrator.ts
@@ -1,21 +0,0 @@
-import type { AllSettings } from '@server/lib/settings';
-import fs from 'fs';
-import path from 'path';
-
-const migrationsDir = path.join(__dirname, 'migrations');
-
-export const runMigrations = (settings: AllSettings): AllSettings => {
-  const migrations = fs
-    .readdirSync(migrationsDir)
-    .filter((file) => file.endsWith('.js') || file.endsWith('.ts'))
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    .map((file) => require(path.join(migrationsDir, file)).default);
-
-  let migrated = settings;
-
-  for (const migration of migrations) {
-    migrated = migration(migrated);
-  }
-
-  return migrated;
-};
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -1,6 +1,5 @@
 import JellyfinAPI from '@server/api/jellyfin';
 import PlexTvAPI from '@server/api/plextv';
-import { ApiErrorCode } from '@server/constants/error';
 import { MediaServerType } from '@server/constants/server';
 import { UserType } from '@server/constants/user';
 import { getRepository } from '@server/datasource';
@@ -10,12 +9,9 @@ import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
-import { ApiError } from '@server/types/error';
-import { 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();

@@ -223,39 +219,30 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
    username?: string;
    password?: string;
    hostname?: string;
-    port?: number;
-    urlBase?: string;
-    useSsl?: boolean;
    email?: string;
  };

  //Make sure jellyfin login is enabled, but only if jellyfin is not already configured
  if (
    settings.main.mediaServerType !== MediaServerType.JELLYFIN &&
-    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED
+    settings.jellyfin.hostname !== ''
  ) {
    return res.status(500).json({ error: 'Jellyfin login is disabled' });
  } else if (!body.username) {
    return res.status(500).json({ error: 'You must provide an username' });
-  } else if (settings.jellyfin.ip !== '' && body.hostname) {
+  } else if (settings.jellyfin.hostname !== '' && body.hostname) {
    return res
      .status(500)
      .json({ error: 'Jellyfin hostname already configured' });
-  } else if (settings.jellyfin.ip === '' && !body.hostname) {
+  } else if (settings.jellyfin.hostname === '' && !body.hostname) {
    return res.status(500).json({ error: 'No hostname provided.' });
  }

  try {
    const hostname =
-      settings.jellyfin.ip !== ''
-        ? getHostname()
-        : getHostname({
-            useSsl: body.useSsl,
-            ip: body.hostname,
-            port: body.port,
-            urlBase: body.urlBase,
-          });
-
+      settings.jellyfin.hostname !== ''
+        ? settings.jellyfin.hostname
+        : body.hostname ?? '';
    const { externalHostname } = getSettings().jellyfin;

    // Try to find deviceId that corresponds to jellyfin user, else generate a new one
@@ -271,31 +258,18 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        'base64'
      );
    }
-
    // First we need to attempt to log the user in to jellyfin
-    const jellyfinserver = new JellyfinAPI(hostname, undefined, deviceId);
-    const jellyfinHost =
+    const jellyfinserver = new JellyfinAPI(hostname ?? '', undefined, deviceId);
+    let jellyfinHost =
      externalHostname && externalHostname.length > 0
        ? externalHostname
        : hostname;

-    const ip = req.ip;
-    let clientIp;
-
-    if (ip) {
-      if (net.isIPv4(ip)) {
-        clientIp = ip;
-      } else if (net.isIPv6(ip)) {
-        clientIp = ip.startsWith('::ffff:') ? ip.substring(7) : ip;
-      }
-    }
-
-    const account = await jellyfinserver.login(
-      body.username,
-      body.password,
-      clientIp
-    );
+    jellyfinHost = jellyfinHost.endsWith('/')
+      ? jellyfinHost.slice(0, -1)
+      : jellyfinHost;

+    const account = await jellyfinserver.login(body.username, body.password);
    // Next let's see if the user already exists
    user = await userRepository.findOne({
      where: { jellyfinUserId: account.User.Id },
@@ -304,7 +278,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
    if (!user && !(await userRepository.count())) {
      // Check if user is admin on jellyfin
      if (account.User.Policy.IsAdministrator === false) {
-        throw new ApiError(403, ApiErrorCode.NotAdmin);
+        throw new Error('not_admin');
      }

      logger.info(
@@ -332,21 +306,15 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        userType: UserType.JELLYFIN,
      });

-      const serverName = await jellyfinserver.getServerName();
-
-      settings.jellyfin.name = serverName;
+      settings.jellyfin.hostname = body.hostname ?? '';
      settings.jellyfin.serverId = account.User.ServerId;
-      settings.jellyfin.ip = body.hostname ?? '';
-      settings.jellyfin.port = body.port ?? 8096;
-      settings.jellyfin.urlBase = body.urlBase ?? '';
-      settings.jellyfin.useSsl = body.useSsl ?? false;
      settings.save();
      startJobs();

      await userRepository.save(user);
    }
    // User already exists, let's update their information
-    else if (account.User.Id === user?.jellyfinUserId) {
+    else if (body.username === user?.jellyfinUsername) {
      logger.info(
        `Found matching ${
          settings.main.mediaServerType === MediaServerType.JELLYFIN
@@ -444,68 +412,43 @@ authRoutes.post('/jellyfin', async (req, res, next) => {

    return res.status(200).json(user?.filter() ?? {});
  } catch (e) {
-    switch (e.errorCode) {
-      case ApiErrorCode.InvalidUrl:
-        logger.error(
-          `The provided ${
-            process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin'
-          } is invalid or the server is not reachable.`,
-          {
-            label: 'Auth',
-            error: e.errorCode,
-            status: e.statusCode,
-            hostname: getHostname({
-              useSsl: body.useSsl,
-              ip: body.hostname,
-              port: body.port,
-              urlBase: body.urlBase,
-            }),
-          }
-        );
-        return next({
-          status: e.statusCode,
-          message: e.errorCode,
-        });
-
-      case ApiErrorCode.InvalidCredentials:
-        logger.warn(
-          'Failed login attempt from user with incorrect Jellyfin credentials',
-          {
-            label: 'Auth',
-            account: {
-              ip: req.ip,
-              email: body.username,
-              password: '__REDACTED__',
-            },
-          }
-        );
-        return next({
-          status: e.statusCode,
-          message: e.errorCode,
-        });
-
-      case ApiErrorCode.NotAdmin:
-        logger.warn(
-          'Failed login attempt from user without admin permissions',
-          {
-            label: 'Auth',
-            account: {
-              ip: req.ip,
-              email: body.username,
-            },
-          }
-        );
-        return next({
-          status: e.statusCode,
-          message: e.errorCode,
-        });
-
-      default:
-        logger.error(e.message, { label: 'Auth' });
-        return next({
-          status: 500,
-          message: 'Something went wrong.',
-        });
+    if (e.message === 'Unauthorized') {
+      logger.warn(
+        'Failed login attempt from user with incorrect Jellyfin credentials',
+        {
+          label: 'Auth',
+          account: {
+            ip: req.ip,
+            email: body.username,
+            password: '__REDACTED__',
+          },
+        }
+      );
+      return next({
+        status: 401,
+        message: 'Unauthorized',
+      });
+    } else if (e.message === 'not_admin') {
+      return next({
+        status: 403,
+        message: 'CREDENTIAL_ERROR_NOT_ADMIN',
+      });
+    } else if (e.message === 'add_email') {
+      return next({
+        status: 406,
+        message: 'CREDENTIAL_ERROR_ADD_EMAIL',
+      });
+    } else if (e.message === 'select_server_type') {
+      return next({
+        status: 406,
+        message: 'CREDENTIAL_ERROR_NO_SERVER_TYPE',
+      });
+    } else {
+      logger.error(e.message, { label: 'Auth' });
+      return next({
+        status: 500,
+        message: 'Something went wrong.',
+      });
    }
  }
 });
--- a/server/routes/settings/index.ts
+++ b/server/routes/settings/index.ts
@@ -2,7 +2,6 @@ import JellyfinAPI from '@server/api/jellyfin';
 import PlexAPI from '@server/api/plexapi';
 import PlexTvAPI from '@server/api/plextv';
 import TautulliAPI from '@server/api/tautulli';
-import { ApiErrorCode } from '@server/constants/error';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import { MediaRequest } from '@server/entity/MediaRequest';
@@ -25,10 +24,8 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
 import discoverSettingRoutes from '@server/routes/settings/discover';
-import { ApiError } from '@server/types/error';
 import { appDataPath } from '@server/utils/appDataVolume';
 import { getAppVersion } from '@server/utils/appVersion';
-import { getHostname } from '@server/utils/getHostname';
 import { Router } from 'express';
 import rateLimit from 'express-rate-limit';
 import fs from 'fs';
@@ -255,64 +252,16 @@ settingsRoutes.get('/jellyfin', (_req, res) => {
  res.status(200).json(settings.jellyfin);
 });

-settingsRoutes.post('/jellyfin', async (req, res, next) => {
-  const userRepository = getRepository(User);
+settingsRoutes.post('/jellyfin', (req, res) => {
  const settings = getSettings();

-  try {
-    const admin = await userRepository.findOneOrFail({
-      where: { id: 1 },
-      select: ['id', 'jellyfinAuthToken', 'jellyfinUserId', 'jellyfinDeviceId'],
-      order: { id: 'ASC' },
-    });
-
-    const tempJellyfinSettings = { ...settings.jellyfin, ...req.body };
-
-    const jellyfinClient = new JellyfinAPI(
-      getHostname(tempJellyfinSettings),
-      admin.jellyfinAuthToken ?? '',
-      admin.jellyfinDeviceId ?? ''
-    );
-
-    const result = await jellyfinClient.getSystemInfo();
-
-    if (!result?.Id) {
-      throw new ApiError(result?.status, ApiErrorCode.InvalidUrl);
-    }
-
-    Object.assign(settings.jellyfin, req.body);
-    settings.jellyfin.serverId = result.Id;
-    settings.jellyfin.name = result.ServerName;
-    settings.save();
-  } catch (e) {
-    if (e instanceof ApiError) {
-      logger.error('Something went wrong testing Jellyfin connection', {
-        label: 'API',
-        status: e.statusCode,
-        errorMessage: ApiErrorCode.InvalidUrl,
-      });
-
-      return next({
-        status: e.statusCode,
-        message: ApiErrorCode.InvalidUrl,
-      });
-    } else {
-      logger.error('Something went wrong', {
-        label: 'API',
-        errorMessage: e.message,
-      });
-
-      return next({
-        status: e.statusCode ?? 500,
-        message: ApiErrorCode.Unknown,
-      });
-    }
-  }
+  settings.jellyfin = merge(settings.jellyfin, req.body);
+  settings.save();

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

-settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
+settingsRoutes.get('/jellyfin/library', async (req, res) => {
  const settings = getSettings();

  if (req.query.sync) {
@@ -323,7 +272,7 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
      order: { id: 'ASC' },
    });
    const jellyfinClient = new JellyfinAPI(
-      getHostname(),
+      settings.jellyfin.hostname ?? '',
      admin.jellyfinAuthToken ?? '',
      admin.jellyfinDeviceId ?? ''
    );
@@ -332,22 +281,6 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {

    const libraries = await jellyfinClient.getLibraries();

-    if (libraries.length === 0) {
-      // Check if no libraries are found due to the fallback to user views
-      // This only affects LDAP users
-      const account = await jellyfinClient.getUser();
-
-      // Automatic Library grouping is not supported when user views are used to get library
-      if (account.Configuration.GroupedFolders.length > 0) {
-        return next({
-          status: 501,
-          message: ApiErrorCode.SyncErrorGroupedFolders,
-        });
-      }
-
-      return next({ status: 404, message: ApiErrorCode.SyncErrorNoLibraries });
-    }
-
    const newLibraries: Library[] = libraries.map((library) => {
      const existing = settings.jellyfin.libraries.find(
        (l) => l.id === library.key && l.name === library.title
@@ -376,12 +309,16 @@ settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
 });

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

+  jellyfinHost = jellyfinHost.endsWith('/')
+    ? jellyfinHost.slice(0, -1)
+    : jellyfinHost;
  const userRepository = getRepository(User);
  const admin = await userRepository.findOneOrFail({
    select: ['id', 'jellyfinAuthToken', 'jellyfinDeviceId', 'jellyfinUserId'],
@@ -389,6 +326,7 @@ settingsRoutes.get('/jellyfin/users', async (req, res) => {
    order: { id: 'ASC' },
  });
  const jellyfinClient = new JellyfinAPI(
+    settings.jellyfin.hostname ?? '',
    admin.jellyfinAuthToken ?? '',
    admin.jellyfinDeviceId ?? ''
  );
--- a/server/routes/settings/notifications.ts
+++ b/server/routes/settings/notifications.ts
@@ -275,7 +275,7 @@ notificationRoutes.get('/webhook', (_req, res) => {
      ...webhookSettings.options,
      jsonPayload: JSON.parse(
        Buffer.from(webhookSettings.options.jsonPayload, 'base64').toString(
-          'utf8'
+          'ascii'
        )
      ),
    },
--- a/server/routes/user/index.ts
+++ b/server/routes/user/index.ts
@@ -20,7 +20,6 @@ import { hasPermission, Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
-import { getHostname } from '@server/utils/getHostname';
 import { Router } from 'express';
 import gravatarUrl from 'gravatar-url';
 import { findIndex, sortBy } from 'lodash';
@@ -497,6 +496,7 @@ router.post(
        order: { id: 'ASC' },
      });
      const jellyfinClient = new JellyfinAPI(
+        settings.jellyfin.hostname ?? '',
        admin.jellyfinAuthToken ?? '',
        admin.jellyfinDeviceId ?? ''
      );
@@ -504,14 +504,15 @@ router.post(

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

+      jellyfinHost = jellyfinHost.endsWith('/')
+        ? jellyfinHost.slice(0, -1)
+        : jellyfinHost;
      jellyfinClient.setUserId(admin.jellyfinUserId ?? '');
      const jellyfinUsers = await jellyfinClient.getUsers();

--- a/server/routes/user/usersettings.ts
+++ b/server/routes/user/usersettings.ts
@@ -98,7 +98,6 @@ userSettingsRoutes.post<
    }

    user.username = req.body.username;
-    user.email = req.body.email ?? user.email;

    // Update quota values only if the user has the correct permissions
    if (
@@ -128,19 +127,20 @@ userSettingsRoutes.post<
      user.settings.originalLanguage = req.body.originalLanguage;
      user.settings.watchlistSyncMovies = req.body.watchlistSyncMovies;
      user.settings.watchlistSyncTv = req.body.watchlistSyncTv;
+      user.email = req.body.email ?? user.email;
    }

-    const savedUser = await userRepository.save(user);
+    await userRepository.save(user);

    return res.status(200).json({
-      username: savedUser.username,
-      discordId: savedUser.settings?.discordId,
-      locale: savedUser.settings?.locale,
-      region: savedUser.settings?.region,
-      originalLanguage: savedUser.settings?.originalLanguage,
-      watchlistSyncMovies: savedUser.settings?.watchlistSyncMovies,
-      watchlistSyncTv: savedUser.settings?.watchlistSyncTv,
-      email: savedUser.email,
+      username: user.username,
+      discordId: user.settings.discordId,
+      locale: user.settings.locale,
+      region: user.settings.region,
+      originalLanguage: user.settings.originalLanguage,
+      watchlistSyncMovies: user.settings.watchlistSyncMovies,
+      watchlistSyncTv: user.settings.watchlistSyncTv,
+      email: user.email,
    });
  } catch (e) {
    next({ status: 500, message: e.message });
--- a/server/types/error.ts
+++ b/server/types/error.ts
@@ -1,9 +0,0 @@
-import type { ApiErrorCode } from '@server/constants/error';
-
-export class ApiError extends Error {
-  constructor(public statusCode: number, public errorCode: ApiErrorCode) {
-    super();
-
-    this.name = 'apiError';
-  }
-}
--- a/server/utils/getHostname.ts
+++ b/server/utils/getHostname.ts
@@ -1,18 +0,0 @@
-import { getSettings } from '@server/lib/settings';
-
-interface HostnameParams {
-  useSsl?: boolean;
-  ip?: string;
-  port?: number;
-  urlBase?: string;
-}
-
-export const getHostname = (params?: HostnameParams): string => {
-  const settings = params ? params : getSettings().jellyfin;
-
-  const { useSsl, ip, port, urlBase } = settings;
-
-  const hostname = `${useSsl ? 'https' : 'http'}://${ip}:${port}${urlBase}`;
-
-  return hostname;
-};
--- a/src/components/Login/JellyfinLogin.tsx
+++ b/src/components/Login/JellyfinLogin.tsx
@@ -2,7 +2,6 @@ import Button from '@app/components/Common/Button';
 import Tooltip from '@app/components/Common/Tooltip';
 import useSettings from '@app/hooks/useSettings';
 import { InformationCircleIcon } from '@heroicons/react/24/solid';
-import { ApiErrorCode } from '@server/constants/error';
 import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import getConfig from 'next/config';
@@ -14,10 +13,7 @@ import * as Yup from 'yup';
 const messages = defineMessages({
  username: 'Username',
  password: 'Password',
-  hostname: '{mediaServerName} URL',
-  port: 'Port',
-  enablessl: 'Use SSL',
-  urlBase: 'URL Base',
+  host: '{mediaServerName} URL',
  email: 'Email',
  emailtooltip:
    'Address does not need to be associated with your {mediaServerName} instance.',
@@ -27,15 +23,9 @@ const messages = defineMessages({
  validationemailformat: 'Valid email required',
  validationusernamerequired: 'Username required',
  validationpasswordrequired: 'Password required',
-  validationHostnameRequired: 'You must provide a valid hostname or IP address',
-  validationPortRequired: 'You must provide a valid port number',
-  validationUrlTrailingSlash: 'URL must not end in a trailing slash',
-  validationUrlBaseLeadingSlash: 'URL base must have a leading slash',
-  validationUrlBaseTrailingSlash: 'URL base must not end in a trailing slash',
  loginerror: 'Something went wrong while trying to sign in.',
  adminerror: 'You must use an admin account to sign in.',
  credentialerror: 'The username or password is incorrect.',
-  invalidurlerror: 'Unable to connect to {mediaServerName} server.',
  signingin: 'Signing in…',
  signin: 'Sign In',
  initialsigningin: 'Connecting…',
@@ -59,23 +49,16 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({

  if (initial) {
    const LoginSchema = Yup.object().shape({
-      hostname: Yup.string().required(
-        intl.formatMessage(messages.validationhostrequired, {
-          mediaServerName:
-            publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
-        })
-      ),
-      port: Yup.number().required(
-        intl.formatMessage(messages.validationPortRequired)
-      ),
-      urlBase: Yup.string()
+      host: Yup.string()
        .matches(
-          /^(\/[^/].*[^/]$)/,
-          intl.formatMessage(messages.validationUrlBaseLeadingSlash)
+          /^(?:(?:(?:https?):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*\.?)(?::\d{2,5})?(?:[/?#]\S*)?$/,
+          intl.formatMessage(messages.validationhostformat)
        )
-        .matches(
-          /^(.*[^/])$/,
-          intl.formatMessage(messages.validationUrlBaseTrailingSlash)
+        .required(
+          intl.formatMessage(messages.validationhostrequired, {
+            mediaServerName:
+              publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
+          })
        ),
      email: Yup.string()
        .email(intl.formatMessage(messages.validationemailformat))
@@ -90,16 +73,12 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
      mediaServerName:
        publicRuntimeConfig.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin',
    };
-
    return (
      <Formik
        initialValues={{
          username: '',
          password: '',
-          hostname: '',
-          port: 8096,
-          useSsl: false,
-          urlBase: '',
+          host: '',
          email: '',
        }}
        validationSchema={LoginSchema}
@@ -108,31 +87,18 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
            await axios.post('/api/v1/auth/jellyfin', {
              username: values.username,
              password: values.password,
-              hostname: values.hostname,
-              port: values.port,
-              useSsl: values.useSsl,
-              urlBase: values.urlBase,
+              hostname: values.host,
              email: values.email,
            });
          } catch (e) {
-            let errorMessage = null;
-            switch (e.response?.data?.message) {
-              case ApiErrorCode.InvalidUrl:
-                errorMessage = messages.invalidurlerror;
-                break;
-              case ApiErrorCode.InvalidCredentials:
-                errorMessage = messages.credentialerror;
-                break;
-              case ApiErrorCode.NotAdmin:
-                errorMessage = messages.adminerror;
-                break;
-              default:
-                errorMessage = messages.loginerror;
-                break;
-            }
-
            toasts.addToast(
-              intl.formatMessage(errorMessage, mediaServerFormatValues),
+              intl.formatMessage(
+                e.message == 'Request failed with status code 401'
+                  ? messages.credentialerror
+                  : e.message == 'Request failed with status code 403'
+                  ? messages.adminerror
+                  : messages.loginerror
+              ),
              {
                autoDismiss: true,
                appearance: 'error',
@@ -143,100 +109,32 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
          }
        }}
      >
-        {({
-          errors,
-          touched,
-          values,
-          setFieldValue,
-          isSubmitting,
-          isValid,
-        }) => (
+        {({ errors, touched, isSubmitting, isValid }) => (
          <Form>
            <div className="sm:border-t sm:border-gray-800">
-              <div className="flex flex-col sm:flex-row sm:gap-4">
-                <div className="w-full">
-                  <label htmlFor="hostname" className="text-label">
-                    {intl.formatMessage(
-                      messages.hostname,
-                      mediaServerFormatValues
-                    )}
-                  </label>
-                  <div className="mt-1 mb-2 sm:col-span-2 sm:mb-0 sm:mt-0">
-                    <div className="flex rounded-md shadow-sm">
-                      <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-gray-100 sm:text-sm">
-                        {values.useSsl ? 'https://' : 'http://'}
-                      </span>
-                      <Field
-                        id="hostname"
-                        name="hostname"
-                        type="text"
-                        className="rounded-r-only flex-1"
-                        placeholder={intl.formatMessage(
-                          messages.hostname,
-                          mediaServerFormatValues
-                        )}
-                      />
-                    </div>
-                    {errors.hostname && touched.hostname && (
-                      <div className="error">{errors.hostname}</div>
-                    )}
-                  </div>
-                </div>
-                <div className="flex-1">
-                  <label htmlFor="port" className="text-label">
-                    {intl.formatMessage(messages.port)}
-                  </label>
-                  <div className="mt-1 sm:mt-0">
-                    <Field
-                      id="port"
-                      name="port"
-                      inputMode="numeric"
-                      type="text"
-                      className="short flex-1"
-                      placeholder={intl.formatMessage(messages.port)}
-                    />
-                    {errors.port && touched.port && (
-                      <div className="error">{errors.port}</div>
-                    )}
-                  </div>
-                </div>
-              </div>
-              <label htmlFor="useSsl" className="text-label mt-2">
-                {intl.formatMessage(messages.enablessl)}
-              </label>
-              <div className="mt-1 mb-2 sm:col-span-2">
-                <div className="flex rounded-md shadow-sm">
-                  <Field
-                    id="useSsl"
-                    name="useSsl"
-                    type="checkbox"
-                    onChange={() => {
-                      setFieldValue('useSsl', !values.useSsl);
-                      setFieldValue('port', values.useSsl ? 8096 : 443);
-                    }}
-                  />
-                </div>
-              </div>
-              <label htmlFor="urlBase" className="text-label mt-1">
-                {intl.formatMessage(messages.urlBase)}
+              <label htmlFor="host" className="text-label">
+                {intl.formatMessage(messages.host, mediaServerFormatValues)}
              </label>
              <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
                <div className="flex rounded-md shadow-sm">
                  <Field
+                    id="host"
+                    name="host"
                    type="text"
-                    inputMode="url"
-                    id="urlBase"
-                    name="urlBase"
-                    placeholder={intl.formatMessage(messages.urlBase)}
+                    placeholder={intl.formatMessage(
+                      messages.host,
+                      mediaServerFormatValues
+                    )}
                  />
                </div>
-                {errors.urlBase && touched.urlBase && (
-                  <div className="error">{errors.urlBase}</div>
+                {errors.host && touched.host && (
+                  <div className="error">{errors.host}</div>
                )}
              </div>
              <label
                htmlFor="email"
-                className="text-label inline-flex gap-1 align-middle"
+                className="text-label"
+                style={{ display: 'inline-flex' }}
              >
                {intl.formatMessage(messages.email)}
                <span className="label-tip">
@@ -252,7 +150,7 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
                  </Tooltip>
                </span>
              </label>
-              <div className="mt-1 sm:col-span-2 sm:mb-2 sm:mt-0">
+              <div className="mt-1 mb-2 sm:col-span-2 sm:mt-0">
                <div className="flex rounded-md shadow-sm">
                  <Field
                    id="email"
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -434,38 +434,33 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                </Button>
              </Tooltip>
            )}
-          {hasPermission(Permission.MANAGE_REQUESTS) &&
-            data.mediaInfo &&
-            (data.mediaInfo.jellyfinMediaId ||
-              data.mediaInfo.jellyfinMediaId4k ||
-              data.mediaInfo.status !== MediaStatus.UNKNOWN ||
-              data.mediaInfo.status4k !== MediaStatus.UNKNOWN) && (
-              <Tooltip content={intl.formatMessage(messages.managemovie)}>
-                <Button
-                  buttonType="ghost"
-                  onClick={() => setShowManager(true)}
-                  className="relative ml-2 first:ml-0"
-                >
-                  <CogIcon className="!mr-0" />
-                  {hasPermission(
-                    [Permission.MANAGE_ISSUES, Permission.VIEW_ISSUES],
-                    {
-                      type: 'or',
-                    }
-                  ) &&
-                    (
-                      data.mediaInfo?.issues.filter(
-                        (issue) => issue.status === IssueStatus.OPEN
-                      ) ?? []
-                    ).length > 0 && (
-                      <>
-                        <div className="absolute -right-1 -top-1 h-3 w-3 rounded-full bg-red-600" />
-                        <div className="absolute -right-1 -top-1 h-3 w-3 animate-ping rounded-full bg-red-600" />
-                      </>
-                    )}
-                </Button>
-              </Tooltip>
-            )}
+          {hasPermission(Permission.MANAGE_REQUESTS) && data.mediaInfo && (
+            <Tooltip content={intl.formatMessage(messages.managemovie)}>
+              <Button
+                buttonType="ghost"
+                onClick={() => setShowManager(true)}
+                className="relative ml-2 first:ml-0"
+              >
+                <CogIcon className="!mr-0" />
+                {hasPermission(
+                  [Permission.MANAGE_ISSUES, Permission.VIEW_ISSUES],
+                  {
+                    type: 'or',
+                  }
+                ) &&
+                  (
+                    data.mediaInfo?.issues.filter(
+                      (issue) => issue.status === IssueStatus.OPEN
+                    ) ?? []
+                  ).length > 0 && (
+                    <>
+                      <div className="absolute -right-1 -top-1 h-3 w-3 rounded-full bg-red-600" />
+                      <div className="absolute -right-1 -top-1 h-3 w-3 animate-ping rounded-full bg-red-600" />
+                    </>
+                  )}
+              </Button>
+            </Tooltip>
+          )}
        </div>
      </div>
      <div className="media-overview">
--- a/src/components/Settings/SettingsJellyfin.tsx
+++ b/src/components/Settings/SettingsJellyfin.tsx
@@ -4,7 +4,6 @@ import LoadingSpinner from '@app/components/Common/LoadingSpinner';
 import LibraryItem from '@app/components/Settings/LibraryItem';
 import globalMessages from '@app/i18n/globalMessages';
 import { ArrowDownOnSquareIcon } from '@heroicons/react/24/outline';
-import { ApiErrorCode } from '@server/constants/error';
 import type { JellyfinSettings } from '@server/lib/settings';
 import axios from 'axios';
 import { Field, Formik } from 'formik';
@@ -33,17 +32,9 @@ const messages = defineMessages({
  jellyfinSettingsDescription:
    'Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page.',
  externalUrl: 'External URL',
-  hostname: 'Hostname or IP Address',
-  port: 'Port',
-  enablessl: 'Use SSL',
-  urlBase: 'URL Base',
+  internalUrl: 'Internal URL',
  jellyfinForgotPasswordUrl: 'Forgot Password URL',
-  jellyfinSyncFailedNoLibrariesFound: 'No libraries were found',
-  jellyfinSyncFailedAutomaticGroupedFolders:
-    'Custom authentication with Automatic Library Grouping not supported',
-  jellyfinSyncFailedGenericError:
-    'Something went wrong while syncing libraries',
-  invalidurlerror: 'Unable to connect to {mediaServerName} server.',
+  validationUrl: 'You must provide a valid URL',
  syncing: 'Syncing',
  syncJellyfin: 'Sync Libraries',
  manualscanJellyfin: 'Manual Library Scan',
@@ -54,12 +45,6 @@ const messages = defineMessages({
  librariesRemaining: 'Libraries Remaining: {count}',
  startscan: 'Start Scan',
  cancelscan: 'Cancel Scan',
-  validationUrl: 'You must provide a valid URL',
-  validationHostnameRequired: 'You must provide a valid hostname or IP address',
-  validationPortRequired: 'You must provide a valid port number',
-  validationUrlTrailingSlash: 'URL must not end in a trailing slash',
-  validationUrlBaseLeadingSlash: 'URL base must have a leading slash',
-  validationUrlBaseTrailingSlash: 'URL base must not end in a trailing slash',
 });

 interface Library {
@@ -75,7 +60,6 @@ interface SyncStatus {
  currentLibrary?: Library;
  libraries: Library[];
 }
-
 interface SettingsJellyfinProps {
  showAdvancedSettings?: boolean;
  onComplete?: () => void;
@@ -86,7 +70,6 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
  showAdvancedSettings,
 }) => {
  const [isSyncing, setIsSyncing] = useState(false);
-  const toasts = useToasts();

  const {
    data,
@@ -104,50 +87,18 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
  const { publicRuntimeConfig } = getConfig();

  const JellyfinSettingsSchema = Yup.object().shape({
-    hostname: Yup.string()
-      .nullable()
-      .required(intl.formatMessage(messages.validationHostnameRequired))
-      .matches(
-        /^(((([a-z]|\d|_|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])):((([a-z]|\d|_|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))@)?(([a-z]|\d|_|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*)?([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])$/i,
-        intl.formatMessage(messages.validationHostnameRequired)
-      ),
-    port: Yup.number().when(['hostname'], {
-      is: (value: unknown) => !!value,
-      then: Yup.number()
-        .typeError(intl.formatMessage(messages.validationPortRequired))
-        .nullable()
-        .required(intl.formatMessage(messages.validationPortRequired)),
-      otherwise: Yup.number()
-        .typeError(intl.formatMessage(messages.validationPortRequired))
-        .nullable(),
-    }),
-    urlBase: Yup.string()
-      .test(
-        'leading-slash',
-        intl.formatMessage(messages.validationUrlBaseLeadingSlash),
-        (value) => !value || value.startsWith('/')
-      )
-      .test(
-        'trailing-slash',
-        intl.formatMessage(messages.validationUrlBaseTrailingSlash),
-        (value) => !value || !value.endsWith('/')
-      ),
-    jellyfinExternalUrl: Yup.string()
-      .nullable()
-      .url(intl.formatMessage(messages.validationUrl))
-      .test(
-        'no-trailing-slash',
-        intl.formatMessage(messages.validationUrlTrailingSlash),
-        (value) => !value || !value.endsWith('/')
-      ),
-    jellyfinForgotPasswordUrl: Yup.string()
-      .nullable()
-      .url(intl.formatMessage(messages.validationUrl))
-      .test(
-        'no-trailing-slash',
-        intl.formatMessage(messages.validationUrlTrailingSlash),
-        (value) => !value || !value.endsWith('/')
-      ),
+    jellyfinExternalUrl: Yup.string().matches(
+      /^(https?:\/\/)?(?:[\w-]+\.)*[\w-]+(?::\d{2,5})?(?:\/[\w-]+)*(?:\/)?$/gm,
+      intl.formatMessage(messages.validationUrl)
+    ),
+    jellyfinInternalUrl: Yup.string().matches(
+      /^(https?:\/\/)?(?:[\w-]+\.)*[\w-]+(?::\d{2,5})?(?:\/[\w-]+)*(?:\/)?$/gm,
+      intl.formatMessage(messages.validationUrl)
+    ),
+    jellyfinForgotPasswordUrl: Yup.string().matches(
+      /^(https?:\/\/)?(?:[\w-]+\.)*[\w-]+(?::\d{2,5})?(?:\/[\w-]+)*(?:\/)?$/gm,
+      intl.formatMessage(messages.validationUrl)
+    ),
  });

  const activeLibraries =
@@ -166,43 +117,11 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
      params.enable = activeLibraries.join(',');
    }

-    try {
-      await axios.get('/api/v1/settings/jellyfin/library', {
-        params,
-      });
-      setIsSyncing(false);
-      revalidate();
-    } catch (e) {
-      if (e.response.data.message === 'SYNC_ERROR_GROUPED_FOLDERS') {
-        toasts.addToast(
-          intl.formatMessage(
-            messages.jellyfinSyncFailedAutomaticGroupedFolders
-          ),
-          {
-            autoDismiss: true,
-            appearance: 'warning',
-          }
-        );
-      } else if (e.response.data.message === 'SYNC_ERROR_NO_LIBRARIES') {
-        toasts.addToast(
-          intl.formatMessage(messages.jellyfinSyncFailedNoLibrariesFound),
-          {
-            autoDismiss: true,
-            appearance: 'error',
-          }
-        );
-      } else {
-        toasts.addToast(
-          intl.formatMessage(messages.jellyfinSyncFailedGenericError),
-          {
-            autoDismiss: true,
-            appearance: 'error',
-          }
-        );
-      }
-      setIsSyncing(false);
-      revalidate();
-    }
+    await axios.get('/api/v1/settings/jellyfin/library', {
+      params,
+    });
+    setIsSyncing(false);
+    revalidate();
  };

  const startScan = async () => {
@@ -437,10 +356,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
          </div>
          <Formik
            initialValues={{
-              hostname: data?.ip,
-              port: data?.port ?? 8096,
-              useSsl: data?.useSsl,
-              urlBase: data?.urlBase || '',
+              jellyfinInternalUrl: data?.hostname || '',
              jellyfinExternalUrl: data?.externalHostname || '',
              jellyfinForgotPasswordUrl: data?.jellyfinForgotPasswordUrl || '',
            }}
@@ -448,10 +364,7 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
            onSubmit={async (values) => {
              try {
                await axios.post('/api/v1/settings/jellyfin', {
-                  ip: values.hostname,
-                  port: Number(values.port),
-                  useSsl: values.useSsl,
-                  urlBase: values.urlBase,
+                  hostname: values.jellyfinInternalUrl,
                  externalHostname: values.jellyfinExternalUrl,
                  jellyfinForgotPasswordUrl: values.jellyfinForgotPasswordUrl,
                } as JellyfinSettings);
@@ -469,127 +382,44 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
                  }
                );
              } catch (e) {
-                if (e.response?.data?.message === ApiErrorCode.InvalidUrl) {
-                  addToast(
-                    intl.formatMessage(messages.invalidurlerror, {
-                      mediaServerName:
-                        publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
-                          ? 'Emby'
-                          : 'Jellyfin',
-                    }),
-                    {
-                      autoDismiss: true,
-                      appearance: 'error',
-                    }
-                  );
-                } else {
-                  addToast(
-                    intl.formatMessage(messages.jellyfinSettingsFailure, {
-                      mediaServerName:
-                        publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
-                          ? 'Emby'
-                          : 'Jellyfin',
-                    }),
-                    {
-                      autoDismiss: true,
-                      appearance: 'error',
-                    }
-                  );
-                }
+                addToast(
+                  intl.formatMessage(messages.jellyfinSettingsFailure, {
+                    mediaServerName:
+                      publicRuntimeConfig.JELLYFIN_TYPE == 'emby'
+                        ? 'Emby'
+                        : 'Jellyfin',
+                  }),
+                  {
+                    autoDismiss: true,
+                    appearance: 'error',
+                  }
+                );
              } finally {
                revalidate();
              }
            }}
          >
-            {({
-              errors,
-              touched,
-              values,
-              setFieldValue,
-              handleSubmit,
-              isSubmitting,
-              isValid,
-            }) => {
+            {({ errors, touched, handleSubmit, isSubmitting, isValid }) => {
              return (
                <form className="section" onSubmit={handleSubmit}>
                  <div className="form-row">
-                    <label htmlFor="hostname" className="text-label">
-                      {intl.formatMessage(messages.hostname)}
-                      <span className="text-red-500">*</span>
-                    </label>
-                    <div className="form-input-area">
-                      <div className="form-input-field">
-                        <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-gray-100 sm:text-sm">
-                          {values.useSsl ? 'https://' : 'http://'}
-                        </span>
-                        <Field
-                          type="text"
-                          inputMode="url"
-                          id="hostname"
-                          name="hostname"
-                          className="rounded-r-only"
-                        />
-                      </div>
-                      {errors.hostname &&
-                        touched.hostname &&
-                        typeof errors.hostname === 'string' && (
-                          <div className="error">{errors.hostname}</div>
-                        )}
-                    </div>
-                  </div>
-                  <div className="form-row">
-                    <label htmlFor="port" className="text-label">
-                      {intl.formatMessage(messages.port)}
-                      <span className="label-required">*</span>
-                    </label>
-                    <div className="form-input-area">
-                      <Field
-                        type="text"
-                        inputMode="numeric"
-                        id="port"
-                        name="port"
-                        className="short"
-                      />
-                      {errors.port &&
-                        touched.port &&
-                        typeof errors.port === 'string' && (
-                          <div className="error">{errors.port}</div>
-                        )}
-                    </div>
-                  </div>
-                  <div className="form-row">
-                    <label htmlFor="useSsl" className="checkbox-label">
-                      {intl.formatMessage(messages.enablessl)}
-                    </label>
-                    <div className="form-input-area">
-                      <Field
-                        type="checkbox"
-                        id="useSsl"
-                        name="useSsl"
-                        onChange={() => {
-                          setFieldValue('useSsl', !values.useSsl);
-                          setFieldValue('port', values.useSsl ? 8096 : 443);
-                        }}
-                      />
-                    </div>
-                  </div>
-                  <div className="form-row">
-                    <label htmlFor="urlBase" className="text-label">
-                      {intl.formatMessage(messages.urlBase)}
+                    <label htmlFor="jellyfinInternalUrl" className="text-label">
+                      {intl.formatMessage(messages.internalUrl)}
                    </label>
                    <div className="form-input-area">
                      <div className="form-input-field">
                        <Field
                          type="text"
                          inputMode="url"
-                          id="urlBase"
-                          name="urlBase"
+                          id="jellyfinInternalUrl"
+                          name="jellyfinInternalUrl"
                        />
                      </div>
-                      {errors.urlBase &&
-                        touched.urlBase &&
-                        typeof errors.urlBase === 'string' && (
-                          <div className="error">{errors.urlBase}</div>
+                      {errors.jellyfinInternalUrl &&
+                        touched.jellyfinInternalUrl && (
+                          <div className="error">
+                            {errors.jellyfinInternalUrl}
+                          </div>
                        )}
                    </div>
                  </div>
--- a/src/components/Settings/SettingsMain/index.tsx
+++ b/src/components/Settings/SettingsMain/index.tsx
@@ -55,9 +55,6 @@ const messages = defineMessages({
  validationApplicationUrlTrailingSlash: 'URL must not end in a trailing slash',
  partialRequestsEnabled: 'Allow Partial Series Requests',
  locale: 'Display Language',
-  overwriteDnsServers: 'Overwrite Default DNS Servers',
-  overwriteDnsServersTip:
-    'A comma-separated list of DNS server to use instead of the default ones',
 });

 const SettingsMain = () => {
@@ -137,7 +134,6 @@ const SettingsMain = () => {
            partialRequestsEnabled: data?.partialRequestsEnabled,
            trustProxy: data?.trustProxy,
            cacheImages: data?.cacheImages,
-            overwriteDnsServers: data?.overwriteDnsServers,
          }}
          enableReinitialize
          validationSchema={MainSettingsSchema}
@@ -154,7 +150,6 @@ const SettingsMain = () => {
                partialRequestsEnabled: values.partialRequestsEnabled,
                trustProxy: values.trustProxy,
                cacheImages: values.cacheImages,
-                overwriteDnsServers: values.overwriteDnsServers,
              });
              mutate('/api/v1/settings/public');
              mutate('/api/v1/status');
@@ -432,37 +427,6 @@ const SettingsMain = () => {
                    />
                  </div>
                </div>
-                <div className="form-row">
-                  <label
-                    htmlFor="overwriteDnsServers"
-                    className="checkbox-label"
-                  >
-                    <span className="mr-2">
-                      {intl.formatMessage(messages.overwriteDnsServers)}
-                    </span>
-                    <SettingsBadge badgeType="advanced" className="mr-2" />
-                    <SettingsBadge badgeType="restartRequired" />
-                    <span className="label-tip">
-                      {intl.formatMessage(messages.overwriteDnsServersTip)}
-                    </span>
-                  </label>
-                  <div className="form-input-area">
-                    <div className="form-input-field">
-                      <Field
-                        id="overwriteDnsServers"
-                        name="overwriteDnsServers"
-                        type="text"
-                      />
-                    </div>
-                    {errors.overwriteDnsServers &&
-                      touched.overwriteDnsServers &&
-                      typeof errors.overwriteDnsServers === 'string' && (
-                        <div className="error">
-                          {errors.overwriteDnsServers}
-                        </div>
-                      )}
-                  </div>
-                </div>
                <div className="actions">
                  <div className="flex justify-end">
                    <span className="ml-3 inline-flex rounded-md shadow-sm">
--- a/src/components/Settings/SonarrModal/index.tsx
+++ b/src/components/Settings/SonarrModal/index.tsx
@@ -1,8 +1,10 @@
 import Modal from '@app/components/Common/Modal';
 import SensitiveInput from '@app/components/Common/SensitiveInput';
+import useSettings from '@app/hooks/useSettings';
 import globalMessages from '@app/i18n/globalMessages';
 import { Transition } from '@headlessui/react';
-import type { SonarrSettings } from '@server/lib/settings';
+import { MediaServerType } from '@server/constants/server';
+import { type SonarrSettings } from '@server/lib/settings';
 import axios from 'axios';
 import { Field, Formik } from 'formik';
 import { useCallback, useEffect, useRef, useState } from 'react';
@@ -109,6 +111,7 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
  const { addToast } = useToasts();
  const [isValidated, setIsValidated] = useState(sonarr ? true : false);
  const [isTesting, setIsTesting] = useState(false);
+  const settings = useSettings();
  const [testResponse, setTestResponse] = useState<TestResponse>({
    profiles: [],
    rootFolders: [],
@@ -255,7 +258,9 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
          animeTags: sonarr?.animeTags ?? [],
          isDefault: sonarr?.isDefault ?? false,
          is4k: sonarr?.is4k ?? false,
-          enableSeasonFolders: sonarr?.enableSeasonFolders ?? false,
+          enableSeasonFolders:
+            sonarr?.enableSeasonFolders ??
+            settings.currentSettings.mediaServerType !== MediaServerType.PLEX,
          externalUrl: sonarr?.externalUrl,
          syncEnabled: sonarr?.syncEnabled ?? false,
          enableSearch: !sonarr?.preventSearch,
@@ -961,11 +966,24 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                  >
                    {intl.formatMessage(messages.seasonfolders)}
                  </label>
-                  <div className="form-input-area">
+                  <div
+                    className={`form-input-area ${
+                      settings.currentSettings.mediaServerType ===
+                        MediaServerType.JELLYFIN ||
+                      settings.currentSettings.mediaServerType ===
+                        MediaServerType.EMBY
+                        ? 'opacity-50'
+                        : 'opacity-100'
+                    }`}
+                  >
                    <Field
                      type="checkbox"
                      id="enableSeasonFolders"
                      name="enableSeasonFolders"
+                      disabled={
+                        settings.currentSettings.mediaServerType !==
+                        MediaServerType.PLEX
+                      }
                    />
                  </div>
                </div>
--- a/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
+++ b/src/components/UserProfile/UserSettings/UserGeneralSettings/index.tsx
@@ -53,8 +53,6 @@ const messages = defineMessages({
  discordId: 'Discord User ID',
  discordIdTip:
    'The <FindDiscordIdLink>multi-digit ID number</FindDiscordIdLink> associated with your Discord user account',
-  validationemailrequired: 'Email required',
-  validationemailformat: 'Valid email required',
  validationDiscordId: 'You must provide a valid Discord user ID',
  plexwatchlistsyncmovies: 'Auto-Request Movies',
  plexwatchlistsyncmoviestip:
@@ -90,9 +88,6 @@ const UserGeneralSettings = () => {
  );

  const UserGeneralSettingsSchema = Yup.object().shape({
-    email: Yup.string()
-      .email(intl.formatMessage(messages.validationemailformat))
-      .required(intl.formatMessage(messages.validationemailrequired)),
    discordId: Yup.string()
      .nullable()
      .matches(/^\d{17,19}$/, intl.formatMessage(messages.validationDiscordId)),
--- a/src/context/LanguageContext.tsx
+++ b/src/context/LanguageContext.tsx
@@ -9,7 +9,6 @@ export type AvailableLocale =
  | 'en'
  | 'el'
  | 'es'
-  | 'es-MX'
  | 'fr'
  | 'hr'
  | 'hu'
@@ -60,10 +59,6 @@ export const availableLanguages: AvailableLanguageObject = {
    code: 'es',
    display: 'Español',
  },
-  'es-MX': {
-    code: 'es-MX',
-    display: 'Español (Latinoamérica)',
-  },
  fr: {
    code: 'fr',
    display: 'Français',
--- a/src/i18n/locale/de.json
+++ b/src/i18n/locale/de.json
--- a/src/i18n/locale/en.json
+++ b/src/i18n/locale/en.json
@@ -219,20 +219,17 @@
  "components.Layout.VersionStatus.outofdate": "Out of Date",
  "components.Layout.VersionStatus.streamdevelop": "Jellyseerr Develop",
  "components.Layout.VersionStatus.streamstable": "Jellyseerr Stable",
-  "components.Login.adminerror": "You must use an admin account to sign in.",
  "components.Login.credentialerror": "The username or password is incorrect.",
+  "components.Login.adminerror": "You must use an admin account to sign in.",
  "components.Login.description": "Since this is your first time logging into {applicationName}, you are required to add a valid email address.",
  "components.Login.email": "Email Address",
  "components.Login.emailtooltip": "Address does not need to be associated with your {mediaServerName} instance.",
-  "components.Login.enablessl": "Use SSL",
  "components.Login.forgotpassword": "Forgot Password?",
-  "components.Login.hostname": "{mediaServerName} URL",
+  "components.Login.host": "{mediaServerName} URL",
  "components.Login.initialsignin": "Connect",
  "components.Login.initialsigningin": "Connecting…",
-  "components.Login.invalidurlerror": "Unable to connect to {mediaServerName} server.",
  "components.Login.loginerror": "Something went wrong while trying to sign in.",
  "components.Login.password": "Password",
-  "components.Login.port": "Port",
  "components.Login.save": "Add",
  "components.Login.saving": "Adding…",
  "components.Login.signin": "Sign In",
@@ -242,15 +239,9 @@
  "components.Login.signinwithoverseerr": "Use your {applicationTitle} account",
  "components.Login.signinwithplex": "Use your Plex account",
  "components.Login.title": "Add Email",
-  "components.Login.urlBase": "URL Base",
  "components.Login.username": "Username",
  "components.Login.validationEmailFormat": "Invalid email",
  "components.Login.validationEmailRequired": "You must provide an email",
-  "components.Login.validationHostnameRequired": "You must provide a valid hostname or IP address",
-  "components.Login.validationPortRequired": "You must provide a valid port number",
-  "components.Login.validationUrlBaseLeadingSlash": "URL base must have a leading slash",
-  "components.Login.validationUrlBaseTrailingSlash": "URL base must not end in a trailing slash",
-  "components.Login.validationUrlTrailingSlash": "URL must not end in a trailing slash",
  "components.Login.validationemailformat": "Valid email required",
  "components.Login.validationemailrequired": "You must provide a valid email address",
  "components.Login.validationhostformat": "Valid URL required",
@@ -761,8 +752,8 @@
  "components.Settings.SettingsAbout.overseerrinformation": "About Jellyseerr",
  "components.Settings.SettingsAbout.preferredmethod": "Preferred",
  "components.Settings.SettingsAbout.runningDevelop": "You are running the <code>develop</code> branch of Jellyseerr, which is only recommended for those contributing to development or assisting with bleeding-edge testing.",
-  "components.Settings.SettingsAbout.supportjellyseerr": "Support Jellyseerr",
  "components.Settings.SettingsAbout.supportoverseerr": "Support Overseerr",
+  "components.Settings.SettingsAbout.supportjellyseerr": "Support Jellyseerr",
  "components.Settings.SettingsAbout.timezone": "Time Zone",
  "components.Settings.SettingsAbout.totalmedia": "Total Media",
  "components.Settings.SettingsAbout.totalrequests": "Total Requests",
@@ -945,16 +936,12 @@
  "components.Settings.experimentalTooltip": "Enabling this setting may result in unexpected application behavior",
  "components.Settings.externalUrl": "External URL",
  "components.Settings.hostname": "Hostname or IP Address",
-  "components.Settings.invalidurlerror": "Unable to connect to {mediaServerName} server.",
+  "components.Settings.internalUrl": "Internal URL",
  "components.Settings.is4k": "4K",
-  "components.Settings.jellyfinForgotPasswordUrl": "Forgot Password URL",
  "components.Settings.jellyfinSettings": "{mediaServerName} Settings",
  "components.Settings.jellyfinSettingsDescription": "Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page.",
  "components.Settings.jellyfinSettingsFailure": "Something went wrong while saving {mediaServerName} settings.",
  "components.Settings.jellyfinSettingsSuccess": "{mediaServerName} settings saved successfully!",
-  "components.Settings.jellyfinSyncFailedAutomaticGroupedFolders": "Custom authentication with Automatic Library Grouping not supported",
-  "components.Settings.jellyfinSyncFailedGenericError": "Something went wrong while syncing libraries",
-  "components.Settings.jellyfinSyncFailedNoLibrariesFound": "No libraries were found",
  "components.Settings.jellyfinlibraries": "{mediaServerName} Libraries",
  "components.Settings.jellyfinlibrariesDescription": "The libraries {mediaServerName} scans for titles. Click the button below if no libraries are listed.",
  "components.Settings.jellyfinsettings": "{mediaServerName} Settings",
@@ -1185,8 +1172,6 @@
  "components.UserProfile.UserSettings.UserGeneralSettings.toastSettingsSuccess": "Settings saved successfully!",
  "components.UserProfile.UserSettings.UserGeneralSettings.user": "User",
  "components.UserProfile.UserSettings.UserGeneralSettings.validationDiscordId": "You must provide a valid Discord user ID",
-  "components.UserProfile.UserSettings.UserGeneralSettings.validationemailformat": "Valid email required",
-  "components.UserProfile.UserSettings.UserGeneralSettings.validationemailrequired": "Email required",
  "components.UserProfile.UserSettings.UserNotificationSettings.deviceDefault": "Device Default",
  "components.UserProfile.UserSettings.UserNotificationSettings.discordId": "User ID",
  "components.UserProfile.UserSettings.UserNotificationSettings.discordIdTip": "The <FindDiscordIdLink>multi-digit ID number</FindDiscordIdLink> associated with your user account",
--- a/src/i18n/locale/es_MX.json
+++ b/src/i18n/locale/es_MX.json
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -41,8 +41,6 @@ const loadLocaleData = (locale: AvailableLocale): Promise<any> => {
      return import('../i18n/locale/el.json');
    case 'es':
      return import('../i18n/locale/es.json');
-    case 'es-MX':
-      return import('../i18n/locale/es_MX.json');
    case 'fr':
      return import('../i18n/locale/fr.json');
    case 'hr':
--- a/yarn.lock
+++ b/yarn.lock
@@ -5033,11 +5033,6 @@ cacache@^16.0.0, cacache@^16.1.0, cacache@^16.1.3:
    tar "^6.1.11"
    unique-filename "^2.0.0"

-cacheable-lookup@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz#3476a8215d046e5a3202a9209dd13fec1f933a27"
-  integrity sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w==
-
 cachedir@2.3.0, cachedir@^2.3.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"