build(dockerfile): ignore scripts to not run husky install when devdependencies are pruned

build(dockerfile): install node-gyp through npm
build(dockerfile): add node-gyp back in
2024-06-24 00:32:49 +05:00 · 2024-06-24 00:14:21 +05:00 · 2024-06-24 00:10:30 +05:00 · 2024-06-24 00:06:52 +05:00 · 2024-06-23 23:50:16 +05:00 · 2024-06-23 23:47:52 +05:00
282 changed files with 34080 additions and 16880 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -322,6 +322,87 @@
      "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"
      ]
    },
    {
      "login": "j0srisk",
      "name": "Joseph Risk",
      "avatar_url": "https://avatars.githubusercontent.com/u/18372584?v=4",
      "profile": "http://josephrisk.com",
      "contributions": [
        "code"
      ]
    },
    {
      "login": "Loetwiek",
      "name": "Loetwiek",
      "avatar_url": "https://avatars.githubusercontent.com/u/79059734?v=4",
      "profile": "https://github.com/Loetwiek",
      "contributions": [
        "code"
      ]
    },
    {
      "login": "Fuochi",
      "name": "Fuochi",
      "avatar_url": "https://avatars.githubusercontent.com/u/4720478?v=4",
      "profile": "https://github.com/Fuochi",
      "contributions": [
        "doc"
      ]
    }
  ]
 }
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -5,9 +5,7 @@ module.exports = {
    'eslint:recommended',
    'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
    'plugin:jsx-a11y/recommended',
-    'plugin:react/recommended',
+    'plugin:@next/next/recommended',
    'plugin:react-hooks/recommended',
    'plugin:react/jsx-runtime',
    'prettier',
  ],
  parserOptions: {
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-github: [Fallenbagel]
+buy_me_a_coffee: fallen.bagel
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,20 +13,35 @@ jobs:
    name: Lint & Test Build
    if: github.event_name == 'pull_request'
    runs-on: ubuntu-22.04
-    container: node:18.18-alpine
+    container: node:20-alpine
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Pnpm Setup
        uses: pnpm/action-setup@v4
        with:
          version: 9
      - name: Get pnpm store directory
        shell: sh
        run: |
          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
      - name: Setup pnpm cache
        uses: actions/cache@v4
        with:
          path: ${{ env.STORE_PATH }}
          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
          restore-keys: |
            ${{ runner.os }}-pnpm-store-
      - name: Install dependencies
        env:
          HUSKY: 0
-        run: yarn
+        run: pnpm install
      - name: Lint
-        run: yarn lint
+        run: pnpm lint
      - name: Formatting
-        run: yarn format:check
+        run: pnpm format:check
      - name: Build
-        run: yarn build
+        run: pnpm build
  build_and_push:
    name: Build & Publish Docker Images
@@ -34,18 +49,18 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_TOKEN }}
      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -56,11 +71,11 @@ jobs:
        env:
          OWNER: ${{ github.repository_owner }}
      - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
        with:
          context: .
          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
          push: true
          build-args: |
            COMMIT_TAG=${{ github.sha }}
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -24,7 +24,7 @@ jobs:
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Initialize CodeQL
        uses: github/codeql-action/init@v2
--- a/.github/workflows/conflict_labeler.yml
+++ b/.github/workflows/conflict_labeler.yml
@@ -0,0 +1,26 @@
 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,12 +13,20 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
-      - name: Cypress run
+      - name: Set up Node.js
-        uses: cypress-io/github-action@v4
+        uses: actions/setup-node@v4
        with:
-          build: yarn cypress:build
+          node-version: 20
-          start: yarn start
+      - name: Pnpm Setup
        uses: pnpm/action-setup@v4
        with:
          version: 9
      - name: Cypress run
        uses: cypress-io/github-action@v6
        with:
          build: pnpm cypress:build
          start: pnpm start
          wait-on: 'http://localhost:5055'
          record: true
        env:
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -11,25 +11,25 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - 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@v2
+        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_TOKEN }}
      - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
        with:
          context: .
          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
          push: true
          build-args: |
            COMMIT_TAG=${{ github.sha }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,24 +10,39 @@ jobs:
      HUSKY: 0
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
-          node-version: 16
+          node-version: 20
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_TOKEN }}
      - name: Pnpm Setup
        uses: pnpm/action-setup@v4
        with:
          version: 9
      - name: Get pnpm store directory
        shell: sh
        run: |
          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
      - name: Setup pnpm cache
        uses: actions/cache@v4
        with:
          path: ${{ env.STORE_PATH }}
          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
          restore-keys: |
            ${{ runner.os }}-pnpm-store-
      - name: Install dependencies
-        run: yarn
+        run: pnpm install
      - name: Release
        env:
          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -35,60 +50,59 @@ jobs:
          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
        run: npx semantic-release
-  build-snap:
+  # build-snap:
-    name: Build Snap Package (${{ matrix.architecture }})
+  #   name: Build Snap Package (${{ matrix.architecture }})
-    needs: semantic-release
+  #   needs: semantic-release
-    runs-on: ubuntu-22.04
+  #   runs-on: ubuntu-22.04
-    strategy:
+  #   strategy:
-      fail-fast: false
+  #     fail-fast: false
-      matrix:
+  #     matrix:
-        architecture:
+  #       architecture:
-          - amd64
+  #         - amd64
-          - arm64
+  #         - arm64
-          - armhf
+  #   steps:
-    steps:
+  #     - name: Checkout Code
-      - name: Checkout Code
+  #       uses: actions/checkout@v4
-        uses: actions/checkout@v3
+  #       with:
-        with:
+  #         fetch-depth: 0
-          fetch-depth: 0
+  #     - name: Switch to main branch
-      - name: Switch to main branch
+  #       run: git checkout main
-        run: git checkout main
+  #     - name: Pull latest changes
-      - name: Pull latest changes
+  #       run: git pull
-        run: git pull
+  #     - name: Prepare
-      - name: Prepare
+  #       id: prepare
-        id: prepare
+  #       run: |
-        run: |
+  #         git fetch --prune --tags
-          git fetch --prune --tags
+  #         if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
-          if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
+  #           echo "RELEASE=stable" >> $GITHUB_OUTPUT
-            echo "RELEASE=stable" >> $GITHUB_OUTPUT
+  #         else
-          else
+  #           echo "RELEASE=edge" >> $GITHUB_OUTPUT
-            echo "RELEASE=edge" >> $GITHUB_OUTPUT
+  #         fi
-          fi
+  #     - name: Set Up QEMU
-      - name: Set Up QEMU
+  #       uses: docker/setup-qemu-action@v3
-        uses: docker/setup-qemu-action@v1
+  #       with:
-        with:
+  #         image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
-          image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde
+  #     - name: Build Snap Package
-      - name: Build Snap Package
+  #       uses: diddlesnaps/snapcraft-multiarch-action@v1
-        uses: diddlesnaps/snapcraft-multiarch-action@v1
+  #       id: build
-        id: build
+  #       with:
-        with:
+  #         architecture: ${{ matrix.architecture }}
-          architecture: ${{ matrix.architecture }}
+  #     - name: Upload Snap Package
-      - name: Upload Snap Package
+  #       uses: actions/upload-artifact@v4
-        uses: actions/upload-artifact@v2
+  #       with:
-        with:
+  #         name: jellyseerr-snap-package-${{ matrix.architecture }}
-          name: jellyseerr-snap-package-${{ matrix.architecture }}
+  #         path: ${{ steps.build.outputs.snap }}
-          path: ${{ steps.build.outputs.snap }}
+  #     - name: Review Snap Package
-      - name: Review Snap Package
+  #       uses: diddlesnaps/snapcraft-review-tools-action@v1
-        uses: diddlesnaps/snapcraft-review-tools-action@v1
+  #       with:
-        with:
+  #         snap: ${{ steps.build.outputs.snap }}
-          snap: ${{ steps.build.outputs.snap }}
+  #     - name: Publish Snap Package
-      - name: Publish Snap Package
+  #       uses: snapcore/action-publish@v1
-        uses: snapcore/action-publish@v1
+  #       env:
-        env:
+  #         SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
+  #       with:
-        with:
+  #         snap: ${{ steps.build.outputs.snap }}
-          snap: ${{ steps.build.outputs.snap }}
+  #         release: ${{ steps.prepare.outputs.RELEASE }}
          release: ${{ steps.prepare.outputs.RELEASE }}
  discord:
    name: Send Discord Notification
--- a/.github/workflows/snap.yaml
+++ b/.github/workflows/snap.yaml
@@ -1,9 +1,13 @@
 name: Publish Snap
-on:
+# turn off edge snap builds temporarily and make it manual
-  push:
+
-    branches:
+# on:
-      - develop
+#  push:
 #    branches:
 #      - develop
 on: workflow_dispatch
 jobs:
  jobs:
@@ -12,7 +16,7 @@ jobs:
    if: "!contains(github.event.head_commit.message, '[skip ci]')"
    steps:
      - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.10.0
+        uses: styfle/cancel-workflow-action@0.12.1
        with:
          access_token: ${{ secrets.GITHUB_TOKEN }}
@@ -26,10 +30,9 @@ jobs:
        architecture:
          - amd64
          - arm64
          - armhf
    steps:
      - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Prepare
        id: prepare
        run: |
@@ -40,7 +43,7 @@ jobs:
            echo "RELEASE=edge" >> $GITHUB_OUTPUT
          fi
      - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
      - name: Configure Git
        run: git config --add safe.directory /data/parts/jellyseerr/src
      - name: Build Snap Package
@@ -49,7 +52,7 @@ jobs:
        with:
          architecture: ${{ matrix.architecture }}
      - name: Upload Snap Package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
        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-20.04
+    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/support-requests@v2
+      - uses: dessant/support-requests@v4
        with:
          github-token: ${{ github.token }}
          support-label: 'support'
--- a/.npmrc
+++ b/.npmrc
@@ -0,0 +1 @@
 engine-strict=true
--- a/18
+++ b/18
@@ -1,4 +1,4 @@
-FROM node:18.18-alpine AS BUILD_IMAGE
+FROM node:20-alpine AS BUILD_IMAGE
 WORKDIR /app
@@ -10,22 +10,24 @@ RUN \
  'linux/arm64' | 'linux/arm/v7') \
  apk update && \
  apk add --no-cache python3 make g++ gcc libc6-compat bash && \
-  yarn global add node-gyp \
+  npm install --global node-gyp \
  ;; \
  esac
-COPY package.json yarn.lock ./
+Run npm install --global pnpm
-RUN CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000
+
 COPY package.json pnpm-lock.yaml ./
 RUN CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile
 COPY . ./
 ARG COMMIT_TAG
 ENV COMMIT_TAG=${COMMIT_TAG}
-RUN yarn build
+RUN pnpm build
 # remove development dependencies
-RUN yarn install --production --ignore-scripts --prefer-offline
+RUN pnpm prune --prod --ignore-scripts
 RUN rm -rf src server .next/cache
@@ -34,7 +36,7 @@ RUN touch config/DOCKER
 RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
-FROM node:18.18-alpine
+FROM node:20-alpine
 # Metadata for Github Package Registry
 LABEL org.opencontainers.image.source="https://github.com/Fallenbagel/jellyseerr"
@@ -47,6 +49,6 @@ RUN apk add --no-cache tzdata tini && rm -rf /tmp/*
 COPY --from=BUILD_IMAGE /app ./
 ENTRYPOINT [ "/sbin/tini", "--" ]
-CMD [ "yarn", "start" ]
+CMD [ "pnpm", "start" ]
 EXPOSE 5055
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -1,4 +1,4 @@
-FROM node:18.18-alpine
+FROM node:20-alpine
 COPY . /app
 WORKDIR /app
--- 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-34-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-40-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 **Jellyseerr** is a free and open source software application for managing requests for your media library.
@@ -53,7 +53,7 @@ https://hub.docker.com/r/fallenbagel/jellyseerr
 Pre-requisites:
- Nodejs [v18](https://nodejs.org/download/release/v18.18.2)
+- Nodejs [v20](https://nodejs.org/en/download)
 - [Yarn](https://classic.yarnpkg.com/lang/en/docs/install)
 - Download/git clone the source code from the github (Either develop branch or main for stable)
@@ -73,7 +73,7 @@ _To set env variables such as `JELLYFIN_TYPE=emby` create a file called `.env` i
 **Pre-requisites:**
- Nodejs [v18](https://nodejs.org/en/download/package-manager)
+- Nodejs [v20](https://nodejs.org/en/download)
 - [Yarn](https://classic.yarnpkg.com/lang/en/docs/install) (on Debian based distros, the package manager provided `yarn` is different and is a package called cmdlet. You can remove that using `apt-remove cmdlet` then install yarn using `npm install -g yarn`)
 - Git
@@ -229,6 +229,14 @@ 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>
@@ -370,6 +378,9 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
    </tr>
    <tr>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RemiRigal"><img src="https://avatars.githubusercontent.com/u/19256051?v=4?s=100" width="100px;" alt="RemiRigal"/><br /><sub><b>RemiRigal</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=RemiRigal" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="http://josephrisk.com"><img src="https://avatars.githubusercontent.com/u/18372584?v=4?s=100" width="100px;" alt="Joseph Risk"/><br /><sub><b>Joseph Risk</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=j0srisk" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Loetwiek"><img src="https://avatars.githubusercontent.com/u/79059734?v=4?s=100" width="100px;" alt="Loetwiek"/><br /><sub><b>Loetwiek</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Loetwiek" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuochi"><img src="https://avatars.githubusercontent.com/u/4720478?v=4?s=100" width="100px;" alt="Fuochi"/><br /><sub><b>Fuochi</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=Fuochi" title="Documentation">📖</a></td>
    </tr>
  </tbody>
 </table>
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,25 +0,0 @@
 module.exports = function (api) {
  api.cache(true);
  return {
    presets: [
      [
        'next/babel',
        {
          'preset-env': {
            useBuiltIns: 'entry',
            corejs: '3',
          },
        },
      ],
    ],
    plugins: [
      [
        'react-intl-auto',
        {
          removePrefix: 'src/',
        },
      ],
    ],
  };
 };
--- a/cypress/config/settings.cypress.json
+++ b/cypress/config/settings.cypress.json
@@ -19,6 +19,7 @@
    "region": "",
    "originalLanguage": "",
    "trustProxy": false,
    "mediaServerType": 1,
    "partialRequestsEnabled": true,
    "locale": "en"
  },
@@ -37,6 +38,17 @@
    ],
    "machineId": "test"
  },
  "jellyfin": {
    "name": "",
    "ip": "",
    "port": 8096,
    "useSsl": false,
    "urlBase": "",
    "externalHostname": "",
    "jellyfinForgotPasswordUrl": "",
    "libraries": [],
    "serverId": ""
  },
  "tautulli": {},
  "radarr": [],
  "sonarr": [],
@@ -139,11 +151,26 @@
    "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/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -2,6 +2,6 @@ import './commands';
 before(() => {
  if (Cypress.env('SEED_DATABASE')) {
-    cy.exec('yarn cypress:prepare');
+    cy.exec('pnpm cypress:prepare');
  }
 });
--- a/next.config.js
+++ b/next.config.js
@@ -10,7 +10,11 @@ module.exports = {
    JELLYFIN_TYPE: process.env.JELLYFIN_TYPE,
  },
  images: {
-    domains: ['image.tmdb.org'],
+    remotePatterns: [
      { hostname: 'gravatar.com' },
      { hostname: 'image.tmdb.org' },
      { hostname: '*', protocol: 'https' },
    ],
  },
  webpack(config) {
    config.module.rules.push({
--- a/overseerr-api.yml
+++ b/overseerr-api.yml
@@ -2092,6 +2092,13 @@ 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
@@ -3395,6 +3402,12 @@ 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:
@@ -3724,7 +3737,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
@@ -3,26 +3,27 @@
  "version": "0.1.0",
  "private": true,
  "scripts": {
    "preinstall": "npx only-allow pnpm",
    "dev": "nodemon -e ts --watch server --watch overseerr-api.yml -e .json,.ts,.yml -x ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/index.ts",
    "build:server": "tsc --project server/tsconfig.json && copyfiles -u 2 server/templates/**/*.{html,pug} dist/templates && tsc-alias -p server/tsconfig.json",
    "build:next": "next build",
-    "build": "yarn build:next && yarn build:server",
+    "build": "pnpm build:next && pnpm build:server",
    "lint": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --cache",
    "lintfix": "eslint \"./server/**/*.{ts,tsx}\" \"./src/**/*.{ts,tsx}\" --fix",
    "start": "NODE_ENV=production node dist/index.js",
-    "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault true \"./src/**/!(*.test).{ts,tsx}\"",
+    "i18n:extract": "ts-node --project server/tsconfig.json src/i18n/extractMessages.ts",
    "migration:generate": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:generate -d server/datasource.ts",
    "migration:create": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:create -d server/datasource.ts",
    "migration:run": "ts-node -r tsconfig-paths/register --project server/tsconfig.json ./node_modules/typeorm/cli.js migration:run -d server/datasource.ts",
    "format": "prettier --loglevel warn --write --cache .",
    "format:check": "prettier --check --cache .",
-    "typecheck": "yarn typecheck:server && yarn typecheck:client",
+    "typecheck": "pnpm typecheck:server && pnpm typecheck:client",
    "typecheck:server": "tsc --project server/tsconfig.json --noEmit",
    "typecheck:client": "tsc --noEmit",
    "prepare": "husky install",
    "cypress:open": "cypress open",
    "cypress:prepare": "ts-node -r tsconfig-paths/register --files --project server/tsconfig.json server/scripts/prepareTestDb.ts",
-    "cypress:build": "yarn build && yarn cypress:prepare"
+    "cypress:build": "pnpm build && pnpm cypress:prepare"
  },
  "repository": {
    "type": "git",
@@ -34,6 +35,7 @@
    "@formatjs/intl-locale": "3.1.1",
    "@formatjs/intl-pluralrules": "5.1.10",
    "@formatjs/intl-utils": "3.8.4",
    "@formatjs/swc-plugin-experimental": "^0.4.0",
    "@headlessui/react": "1.7.12",
    "@heroicons/react": "2.0.16",
    "@supercharge/request-ip": "1.2.0",
@@ -44,6 +46,7 @@
    "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",
@@ -58,11 +61,10 @@
    "express-openapi-validator": "4.13.8",
    "express-rate-limit": "6.7.0",
    "express-session": "1.17.3",
-    "formik": "2.2.9",
+    "formik": "^2.4.6",
    "gravatar-url": "3.1.0",
    "intl": "1.2.5",
    "lodash": "4.17.21",
-    "next": "12.3.4",
+    "next": "^14.2.4",
    "node-cache": "5.1.2",
    "node-gyp": "9.3.1",
    "node-schedule": "2.1.1",
@@ -70,13 +72,13 @@
    "openpgp": "5.7.0",
    "plex-api": "5.3.2",
    "pug": "3.0.2",
-    "react": "18.2.0",
+    "react": "^18.3.1",
    "react-ace": "10.1.0",
    "react-animate-height": "2.1.2",
    "react-aria": "3.23.0",
-    "react-dom": "18.2.0",
+    "react-dom": "^18.3.1",
    "react-intersection-observer": "9.4.3",
-    "react-intl": "6.2.10",
+    "react-intl": "^6.6.8",
    "react-markdown": "8.0.5",
    "react-popper-tooltip": "4.4.2",
    "react-select": "5.7.0",
@@ -88,9 +90,10 @@
    "reflect-metadata": "0.1.13",
    "secure-random-password": "0.2.3",
    "semver": "7.3.8",
    "sharp": "^0.33.4",
    "sqlite3": "5.1.4",
    "swagger-ui-express": "4.6.2",
-    "swr": "2.0.4",
+    "swr": "2.2.5",
    "typeorm": "0.3.12",
    "web-push": "3.5.0",
    "winston": "3.8.2",
@@ -101,7 +104,6 @@
    "zod": "3.20.6"
  },
  "devDependencies": {
    "@babel/cli": "7.21.0",
    "@commitlint/cli": "17.4.4",
    "@commitlint/config-conventional": "17.4.4",
    "@semantic-release/changelog": "6.0.2",
@@ -122,8 +124,8 @@
    "@types/node": "17.0.36",
    "@types/node-schedule": "2.1.0",
    "@types/nodemailer": "6.4.7",
-    "@types/react": "18.0.28",
+    "@types/react": "^18.3.3",
-    "@types/react-dom": "18.0.11",
+    "@types/react-dom": "^18.3.0",
    "@types/react-transition-group": "4.4.5",
    "@types/secure-random-password": "0.2.1",
    "@types/semver": "7.3.13",
@@ -135,15 +137,13 @@
    "@typescript-eslint/eslint-plugin": "5.54.0",
    "@typescript-eslint/parser": "5.54.0",
    "autoprefixer": "10.4.13",
    "babel-plugin-react-intl": "8.2.25",
    "babel-plugin-react-intl-auto": "3.3.0",
    "commitizen": "4.3.0",
    "copyfiles": "2.4.1",
    "cy-mobile-commands": "0.3.0",
    "cypress": "12.7.0",
    "cz-conventional-changelog": "3.3.0",
    "eslint": "8.35.0",
-    "eslint-config-next": "12.3.4",
+    "eslint-config-next": "^14.2.4",
    "eslint-config-prettier": "8.6.0",
    "eslint-plugin-formatjs": "4.9.0",
    "eslint-plugin-jsx-a11y": "6.7.1",
@@ -151,7 +151,6 @@
    "eslint-plugin-prettier": "4.2.1",
    "eslint-plugin-react": "7.32.2",
    "eslint-plugin-react-hooks": "4.6.0",
    "extract-react-intl-messages": "4.1.1",
    "husky": "8.0.3",
    "lint-staged": "13.1.2",
    "nodemon": "2.0.20",
@@ -167,10 +166,12 @@
    "tsconfig-paths": "4.1.2",
    "typescript": "4.9.5"
  },
-  "resolutions": {
+  "engines": {
    "node": "^20.0.0",
    "pnpm": "^9.0.0"
  },
  "overrides": {
    "sqlite3/node-gyp": "8.4.1",
    "@types/react": "18.0.28",
    "@types/react-dom": "18.0.11",
    "@types/express-session": "1.17.6"
  },
  "config": {
@@ -236,8 +237,7 @@
        ],
        "platforms": [
          "linux/amd64",
-          "linux/arm64",
+          "linux/arm64"
          "linux/arm/v7"
        ]
      },
      "@semantic-release/github"
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/public/android-chrome-192x192.png
+++ b/public/android-chrome-192x192.png
--- a/public/android-chrome-192x192_maskable.png
+++ b/public/android-chrome-192x192_maskable.png
--- a/public/android-chrome-512x512.png
+++ b/public/android-chrome-512x512.png
--- a/public/android-chrome-512x512_maskable.png
+++ b/public/android-chrome-512x512_maskable.png
--- a/public/apple-splash-1125-2436.jpg
+++ b/public/apple-splash-1125-2436.jpg
--- a/public/apple-splash-1136-640.jpg
+++ b/public/apple-splash-1136-640.jpg
--- a/public/apple-splash-1170-2532.jpg
+++ b/public/apple-splash-1170-2532.jpg
--- a/public/apple-splash-1179-2556.jpg
+++ b/public/apple-splash-1179-2556.jpg
--- a/public/apple-splash-1242-2208.jpg
+++ b/public/apple-splash-1242-2208.jpg
--- a/public/apple-splash-1242-2688.jpg
+++ b/public/apple-splash-1242-2688.jpg
--- a/public/apple-splash-1284-2778.jpg
+++ b/public/apple-splash-1284-2778.jpg
--- a/public/apple-splash-1290-2796.jpg
+++ b/public/apple-splash-1290-2796.jpg
--- a/public/apple-splash-1334-750.jpg
+++ b/public/apple-splash-1334-750.jpg
--- a/public/apple-splash-1488-2266.jpg
+++ b/public/apple-splash-1488-2266.jpg
--- a/public/apple-splash-1536-2048.jpg
+++ b/public/apple-splash-1536-2048.jpg
--- a/public/apple-splash-1620-2160.jpg
+++ b/public/apple-splash-1620-2160.jpg
--- a/public/apple-splash-1640-2360.jpg
+++ b/public/apple-splash-1640-2360.jpg
--- a/public/apple-splash-1668-2224.jpg
+++ b/public/apple-splash-1668-2224.jpg
--- a/public/apple-splash-1668-2388.jpg
+++ b/public/apple-splash-1668-2388.jpg
--- a/public/apple-splash-1792-828.jpg
+++ b/public/apple-splash-1792-828.jpg
--- a/public/apple-splash-2048-1536.jpg
+++ b/public/apple-splash-2048-1536.jpg
--- a/public/apple-splash-2048-2732.jpg
+++ b/public/apple-splash-2048-2732.jpg
--- a/public/apple-splash-2160-1620.jpg
+++ b/public/apple-splash-2160-1620.jpg
--- a/public/apple-splash-2208-1242.jpg
+++ b/public/apple-splash-2208-1242.jpg
--- a/public/apple-splash-2224-1668.jpg
+++ b/public/apple-splash-2224-1668.jpg
--- a/public/apple-splash-2266-1488.jpg
+++ b/public/apple-splash-2266-1488.jpg
--- a/public/apple-splash-2360-1640.jpg
+++ b/public/apple-splash-2360-1640.jpg
--- a/public/apple-splash-2388-1668.jpg
+++ b/public/apple-splash-2388-1668.jpg
--- a/public/apple-splash-2436-1125.jpg
+++ b/public/apple-splash-2436-1125.jpg
--- a/public/apple-splash-2532-1170.jpg
+++ b/public/apple-splash-2532-1170.jpg
--- a/public/apple-splash-2556-1179.jpg
+++ b/public/apple-splash-2556-1179.jpg
--- a/public/apple-splash-2688-1242.jpg
+++ b/public/apple-splash-2688-1242.jpg
--- a/public/apple-splash-2732-2048.jpg
+++ b/public/apple-splash-2732-2048.jpg
--- a/public/apple-splash-2778-1284.jpg
+++ b/public/apple-splash-2778-1284.jpg
--- a/public/apple-splash-2796-1290.jpg
+++ b/public/apple-splash-2796-1290.jpg
--- a/public/apple-splash-640-1136.jpg
+++ b/public/apple-splash-640-1136.jpg
--- a/public/apple-splash-750-1334.jpg
+++ b/public/apple-splash-750-1334.jpg
--- a/public/apple-splash-828-1792.jpg
+++ b/public/apple-splash-828-1792.jpg
--- a/public/apple-touch-icon.png
+++ b/public/apple-touch-icon.png
--- a/public/badge-128x128.png
+++ b/public/badge-128x128.png
--- a/public/favicon-16x16.png
+++ b/public/favicon-16x16.png
--- a/public/favicon-32x32.png
+++ b/public/favicon-32x32.png
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/images/overseerr_poster_not_found.png
+++ b/public/images/overseerr_poster_not_found.png
--- a/public/images/overseerr_poster_not_found_logo_center.png
+++ b/public/images/overseerr_poster_not_found_logo_center.png
--- a/public/images/overseerr_poster_not_found_logo_top.png
+++ b/public/images/overseerr_poster_not_found_logo_top.png
--- a/public/logo_full.png
+++ b/public/logo_full.png
--- a/public/logo_full.svg
+++ b/public/logo_full.svg
--- a/public/logo_stacked.svg
+++ b/public/logo_stacked.svg
--- a/public/os_icon.svg
+++ b/public/os_icon.svg
--- a/public/os_logo_filled.png
+++ b/public/os_logo_filled.png
--- a/public/os_logo_square.png
+++ b/public/os_logo_square.png
--- a/public/preview.jpg
+++ b/public/preview.jpg
--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -1,14 +1,19 @@
 /* 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 type { AxiosInstance } from 'axios';
+import { ApiError } from '@server/types/error';
-import axios from 'axios';
+import { getAppVersion } from '@server/utils/appVersion';
 export interface JellyfinUserResponse {
  Name: string;
  ServerId: string;
  ServerName: string;
  Id: string;
  Configuration: {
    GroupedFolders: string[];
  };
  Policy: {
    IsAdministrator: boolean;
  };
@@ -24,6 +29,13 @@ export interface JellyfinUserListResponse {
  users: JellyfinUserResponse[];
 }
 interface JellyfinMediaFolder {
  Name: string;
  Id: string;
  Type: string;
  CollectionType: string;
 }
 export interface JellyfinLibrary {
  type: 'show' | 'movie';
  key: string;
@@ -80,48 +92,90 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
  DateCreated?: string;
 }
-class JellyfinAPI {
+class JellyfinAPI extends ExternalAPI {
  private authToken?: string;
  private userId?: string;
  private jellyfinHost: string;
  private axios: AxiosInstance;
  constructor(jellyfinHost: string, authToken?: string, deviceId?: string) {
-    this.jellyfinHost = jellyfinHost;
+    let authHeaderVal: string;
-    this.authToken = authToken;
+    if (authToken) {
-
+      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}", Token="${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"`;
+      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}"`;
    }
-    this.axios = axios.create({
+    super(
-      baseURL: this.jellyfinHost,
+      jellyfinHost,
-      headers: {
+      {},
-        'X-Emby-Authorization': authHeaderVal,
+      {
-        'Content-Type': 'application/json',
+        headers: {
-        Accept: 'application/json',
+          'X-Emby-Authorization': authHeaderVal,
-      },
+          'Content-Type': 'application/json',
-    });
+          Accept: 'application/json',
        },
      }
    );
    this.jellyfinHost = jellyfinHost;
    this.authToken = authToken;
  }
  public async login(
    Username?: string,
-    Password?: string
+    Password?: string,
    ClientIP?: string
  ): Promise<JellyfinLoginResponse> {
-    try {
+    const authenticate = async (useHeaders: boolean) => {
-      const account = await this.axios.post<JellyfinLoginResponse>(
+      const headers =
        useHeaders && ClientIP ? { 'X-Forwarded-For': ClientIP } : {};
      return this.post<JellyfinLoginResponse>(
        '/Users/AuthenticateByName',
        {
-          Username: Username,
+          Username,
          Pw: Password,
-        }
+        },
        { headers }
      );
-      return account.data;
+    };
    try {
      return await authenticate(true);
    } catch (e) {
-      throw new Error('Unauthorized');
+      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);
    }
  }
@@ -130,69 +184,106 @@ class JellyfinAPI {
    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 account = await this.axios.get<JellyfinUserResponse>(
+      const serverResponse = await this.get<JellyfinUserResponse>(
-        "/System/Info/Public'}"
+        '/System/Info/Public'
      );
-      return account.data.ServerName;
+
      return serverResponse.ServerName;
    } catch (e) {
      logger.error(
        `Something went wrong while getting the server name from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-      throw new Error('girl idk');
+
      throw new ApiError(e.response?.status, ApiErrorCode.Unknown);
    }
  }
  public async getUsers(): Promise<JellyfinUserListResponse> {
    try {
-      const account = await this.axios.get(`/Users`);
+      const userReponse = await this.get<JellyfinUserResponse[]>(`/Users`);
-      return { users: account.data };
+
      return { users: userReponse };
    } catch (e) {
      logger.error(
        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-      throw new Error('Invalid auth token');
+
      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }
  public async getUser(): Promise<JellyfinUserResponse> {
    try {
-      const account = await this.axios.get<JellyfinUserResponse>(
+      const userReponse = await this.get<JellyfinUserResponse>(
        `/Users/${this.userId ?? 'Me'}`
      );
-      return account.data;
+      return userReponse;
    } catch (e) {
      logger.error(
        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-      throw new Error('Invalid auth token');
+
      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }
  public async getLibraries(): Promise<JellyfinLibrary[]> {
    try {
-      // TODO: Try to fix automatic grouping without fucking up LDAP users
+      const mediaFolderResponse = await this.get<any>(`/Library/MediaFolders`);
      // const libraries = await this.axios.get<any>('/Library/VirtualFolders');
-      const account = await this.axios.get<any>(
+      return this.mapLibraries(mediaFolderResponse.Items);
-        `/Users/${this.userId ?? 'Me'}/Views`
+    } 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 response: JellyfinLibrary[] = account.data.Items.filter(
+        return this.mapLibraries(mediaFolderResponse.Items);
-        (Item: any) => {
+      } catch (e) {
-          return (
+        logger.error(
-            Item.Type === 'CollectionFolder' &&
+          `Something went wrong while getting libraries from the Jellyfin server: ${e.message}`,
-            Item.CollectionType !== 'music' &&
+          { label: 'Jellyfin API' }
-            Item.CollectionType !== 'books' &&
+        );
-            Item.CollectionType !== 'musicvideos' &&
+
-            Item.CollectionType !== 'homevideos'
+        return [];
-          );
+      }
-        }
+    }
-      ).map((Item: any) => {
+  }
  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) => {
        return <JellyfinLibrary>{
          key: Item.Id,
          title: Item.Name,
@@ -200,24 +291,15 @@ class JellyfinAPI {
          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 contents = await this.axios.get<any>(
+      const libraryItemsResponse = await this.get<any>(
-        `/Users/${this.userId}/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}`
+        `/Users/${this.userId}/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}&collapseBoxSetItems=false`
      );
-      return contents.data.Items.filter(
+      return libraryItemsResponse.Items.filter(
        (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
      );
    } catch (e) {
@@ -225,23 +307,25 @@ class JellyfinAPI {
        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-      throw new Error('Invalid auth token');
+
      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }
  public async getRecentlyAdded(id: string): Promise<JellyfinLibraryItem[]> {
    try {
-      const contents = await this.axios.get<any>(
+      const itemResponse = await this.get<any>(
        `/Users/${this.userId}/Items/Latest?Limit=12&ParentId=${id}`
      );
-      return contents.data;
+      return itemResponse;
    } catch (e) {
      logger.error(
        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-      throw new Error('Invalid auth token');
+
      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }
@@ -249,36 +333,38 @@ class JellyfinAPI {
    id: string
  ): Promise<JellyfinLibraryItemExtended | undefined> {
    try {
-      const contents = await this.axios.get<any>(
+      const itemResponse = await this.get<any>(
        `/Users/${this.userId}/Items/${id}`
      );
-      return contents.data;
+      return itemResponse;
    } 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 Error('Invalid auth token');
+      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }
  public async getSeasons(seriesID: string): Promise<JellyfinLibraryItem[]> {
    try {
-      const contents = await this.axios.get<any>(`/Shows/${seriesID}/Seasons`);
+      const seasonResponse = await this.get<any>(`/Shows/${seriesID}/Seasons`);
-      return contents.data.Items;
+      return seasonResponse.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 Error('Invalid auth token');
+
      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }
@@ -287,11 +373,11 @@ class JellyfinAPI {
    seasonID: string
  ): Promise<JellyfinLibraryItem[]> {
    try {
-      const contents = await this.axios.get<any>(
+      const episodeResponse = await this.get<any>(
        `/Shows/${seriesID}/Episodes?seasonId=${seasonID}`
      );
-      return contents.data.Items.filter(
+      return episodeResponse.Items.filter(
        (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
      );
    } catch (e) {
@@ -299,7 +385,8 @@ class JellyfinAPI {
        `Something went wrong while getting the list of episodes from the Jellyfin server: ${e.message}`,
        { label: 'Jellyfin API' }
      );
-      throw new Error('Invalid auth token');
+
      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
    }
  }
 }
--- a/server/constants/error.ts
+++ b/server/constants/error.ts
@@ -0,0 +1,9 @@
 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,6 +9,7 @@ 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,
@@ -211,15 +212,12 @@ class Media {
    } else {
      const pageName =
        process.env.JELLYFIN_TYPE === 'emby' ? 'item' : 'details';
-      const { serverId, hostname, externalHostname } = getSettings().jellyfin;
+      const { serverId, externalHostname } = getSettings().jellyfin;
-      let jellyfinHost =
+
      const jellyfinHost =
        externalHostname && externalHostname.length > 0
          ? externalHostname
-          : hostname;
+          : getHostname();
      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,19 +23,25 @@ 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()}`);
@@ -46,6 +52,25 @@ 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
@@ -121,7 +146,7 @@ app
      try {
        const descriptor = Object.getOwnPropertyDescriptor(req, 'ip');
        if (descriptor?.writable === true) {
-          req.ip = getClientIp(req) ?? '';
+          (req as any).ip = getClientIp(req) ?? '';
        }
      } catch (e) {
        logger.error('Failed to attach the ip to the request', {
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -16,6 +16,7 @@ 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;
@@ -84,7 +85,7 @@ class AvailabilitySync {
      ) {
        if (admin) {
          this.jellyfinClient = new JellyfinAPI(
-            settings.jellyfin.hostname ?? '',
+            getHostname(),
            admin.jellyfinAuthToken,
            admin.jellyfinDeviceId
          );
--- a/server/lib/notifications/agents/pushover.ts
+++ b/server/lib/notifications/agents/pushover.ts
@@ -14,7 +14,12 @@ import {
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
-interface PushoverPayload {
+interface PushoverImagePayload {
  attachment_base64: string;
  attachment_type: string;
 }
 interface PushoverPayload extends PushoverImagePayload {
  token: string;
  user: string;
  title: string;
@@ -43,10 +48,36 @@ class PushoverAgent
    return true;
  }
-  private getNotificationPayload(
+  private async getImagePayload(
    imageUrl: string
  ): Promise<Partial<PushoverImagePayload>> {
    try {
      const response = await axios.get(imageUrl, {
        responseType: 'arraybuffer',
      });
      const base64 = Buffer.from(response.data, 'binary').toString('base64');
      const contentType = (
        response.headers['Content-Type'] || response.headers['content-type']
      )?.toString();
      return {
        attachment_base64: base64,
        attachment_type: contentType,
      };
    } catch (e) {
      logger.error('Error getting image payload', {
        label: 'Notifications',
        errorMessage: e.message,
        response: e.response?.data,
      });
      return {};
    }
  }
  private async getNotificationPayload(
    type: Notification,
    payload: NotificationPayload
-  ): Partial<PushoverPayload> {
+  ): Promise<Partial<PushoverPayload>> {
    const { applicationUrl, applicationTitle } = getSettings().main;
    const title = payload.event ?? payload.subject;
@@ -122,6 +153,16 @@ class PushoverAgent
      ? `View ${payload.issue ? 'Issue' : 'Media'} in ${applicationTitle}`
      : undefined;
    let attachment_base64;
    let attachment_type;
    if (payload.image) {
      const imagePayload = await this.getImagePayload(payload.image);
      if (imagePayload.attachment_base64 && imagePayload.attachment_type) {
        attachment_base64 = imagePayload.attachment_base64;
        attachment_type = imagePayload.attachment_type;
      }
    }
    return {
      title,
      message,
@@ -129,6 +170,8 @@ class PushoverAgent
      url_title,
      priority,
      html: 1,
      attachment_base64,
      attachment_type,
    };
  }
@@ -138,7 +181,10 @@ class PushoverAgent
  ): Promise<boolean> {
    const settings = this.getSettings();
    const endpoint = 'https://api.pushover.net/1/messages.json';
-    const notificationPayload = this.getNotificationPayload(type, payload);
+    const notificationPayload = await this.getNotificationPayload(
      type,
      payload
    );
    // Send system notification
    if (
--- 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('ascii');
+    ).toString('utf8');
    const parsedJSON = JSON.parse(JSON.parse(payloadString));
--- a/server/lib/scanners/jellyfin/index.ts
+++ b/server/lib/scanners/jellyfin/index.ts
@@ -12,6 +12,7 @@ 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';
@@ -83,13 +84,17 @@ class JellyfinScanner {
      }
      const has4k = metadata.MediaSources?.some((MediaSource) => {
-        return MediaSource.MediaStreams.some((MediaStream) => {
+        return MediaSource.MediaStreams.filter(
          (MediaStream) => MediaStream.Type === 'Video'
        ).some((MediaStream) => {
          return (MediaStream.Width ?? 0) > 2000;
        });
      });
      const hasOtherResolution = metadata.MediaSources?.some((MediaSource) => {
-        return MediaSource.MediaStreams.some((MediaStream) => {
+        return MediaSource.MediaStreams.filter(
          (MediaStream) => MediaStream.Type === 'Video'
        ).some((MediaStream) => {
          return (MediaStream.Width ?? 0) <= 2000;
        });
      });
@@ -590,8 +595,10 @@ class JellyfinScanner {
        return this.log('No admin configured. Jellyfin sync skipped.', 'warn');
      }
      const hostname = getHostname();
      this.jfClient = new JellyfinAPI(
-        settings.jellyfin.hostname ?? '',
+        hostname,
        admin.jellyfinAuthToken,
        admin.jellyfinDeviceId
      );
--- a/server/lib/settings/index.ts
+++ b/server/lib/settings/index.ts
@@ -1,10 +1,11 @@
 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;
@@ -38,7 +39,10 @@ export interface PlexSettings {
 export interface JellyfinSettings {
  name: string;
-  hostname: string;
+  ip: string;
  port: number;
  useSsl?: boolean;
  urlBase?: string;
  externalHostname?: string;
  jellyfinForgotPasswordUrl?: string;
  libraries: Library[];
@@ -130,7 +134,6 @@ interface FullPublicSettings extends PublicSettings {
  region: string;
  originalLanguage: string;
  mediaServerType: number;
  jellyfinHost?: string;
  jellyfinExternalHost?: string;
  jellyfinForgotPasswordUrl?: string;
  jellyfinServerName?: string;
@@ -274,7 +277,7 @@ export type JobId =
  | 'image-cache-cleanup'
  | 'availability-sync';
-interface AllSettings {
+export interface AllSettings {
  clientId: string;
  vapidPublic: string;
  vapidPrivate: string;
@@ -291,7 +294,7 @@ 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;
@@ -331,7 +334,10 @@ class Settings {
      },
      jellyfin: {
        name: '',
-        hostname: '',
+        ip: '',
        port: 8096,
        useSsl: false,
        urlBase: '',
        externalHostname: '',
        jellyfinForgotPasswordUrl: '',
        libraries: [],
@@ -547,8 +553,6 @@ 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,
@@ -637,7 +641,11 @@ class Settings {
    const data = fs.readFileSync(SETTINGS_PATH, 'utf-8');
    if (data) {
-      this.data = merge(this.data, JSON.parse(data));
+      const parsedJson = JSON.parse(data);
      this.data = runMigrations(parsedJson);
      this.data = merge(this.data, parsedJson);
      this.save();
    }
    return this;
--- a/server/lib/settings/migrations/0001_migrate_hostname.ts
+++ b/server/lib/settings/migrations/0001_migrate_hostname.ts
@@ -0,0 +1,30 @@
 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
@@ -0,0 +1,21 @@
 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,5 +1,6 @@
 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';
@@ -9,9 +10,12 @@ 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();
@@ -219,30 +223,39 @@ 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.jellyfin.hostname !== ''
+    settings.main.mediaServerType != MediaServerType.NOT_CONFIGURED
  ) {
    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.hostname !== '' && body.hostname) {
+  } else if (settings.jellyfin.ip !== '' && body.hostname) {
    return res
      .status(500)
      .json({ error: 'Jellyfin hostname already configured' });
-  } else if (settings.jellyfin.hostname === '' && !body.hostname) {
+  } else if (settings.jellyfin.ip === '' && !body.hostname) {
    return res.status(500).json({ error: 'No hostname provided.' });
  }
  try {
    const hostname =
-      settings.jellyfin.hostname !== ''
+      settings.jellyfin.ip !== ''
-        ? settings.jellyfin.hostname
+        ? getHostname()
-        : body.hostname ?? '';
+        : getHostname({
            useSsl: body.useSsl,
            ip: body.hostname,
            port: body.port,
            urlBase: body.urlBase,
          });
    const { externalHostname } = getSettings().jellyfin;
    // Try to find deviceId that corresponds to jellyfin user, else generate a new one
@@ -258,18 +271,31 @@ 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 jellyfinserver = new JellyfinAPI(hostname, undefined, deviceId);
-    let jellyfinHost =
+    const jellyfinHost =
      externalHostname && externalHostname.length > 0
        ? externalHostname
        : hostname;
-    jellyfinHost = jellyfinHost.endsWith('/')
+    const ip = req.ip;
-      ? jellyfinHost.slice(0, -1)
+    let clientIp;
-      : jellyfinHost;
+
    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
    );
    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 },
@@ -278,7 +304,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 Error('not_admin');
+        throw new ApiError(403, ApiErrorCode.NotAdmin);
      }
      logger.info(
@@ -306,15 +332,21 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        userType: UserType.JELLYFIN,
      });
-      settings.jellyfin.hostname = body.hostname ?? '';
+      const serverName = await jellyfinserver.getServerName();
      settings.jellyfin.name = serverName;
      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 (body.username === user?.jellyfinUsername) {
+    else if (account.User.Id === user?.jellyfinUserId) {
      logger.info(
        `Found matching ${
          settings.main.mediaServerType === MediaServerType.JELLYFIN
@@ -412,43 +444,68 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
    return res.status(200).json(user?.filter() ?? {});
  } catch (e) {
-    if (e.message === 'Unauthorized') {
+    switch (e.errorCode) {
-      logger.warn(
+      case ApiErrorCode.InvalidUrl:
-        'Failed login attempt from user with incorrect Jellyfin credentials',
+        logger.error(
-        {
+          `The provided ${
-          label: 'Auth',
+            process.env.JELLYFIN_TYPE == 'emby' ? 'Emby' : 'Jellyfin'
-          account: {
+          } is invalid or the server is not reachable.`,
-            ip: req.ip,
+          {
-            email: body.username,
+            label: 'Auth',
-            password: '__REDACTED__',
+            error: e.errorCode,
-          },
+            status: e.statusCode,
-        }
+            hostname: getHostname({
-      );
+              useSsl: body.useSsl,
-      return next({
+              ip: body.hostname,
-        status: 401,
+              port: body.port,
-        message: 'Unauthorized',
+              urlBase: body.urlBase,
-      });
+            }),
-    } else if (e.message === 'not_admin') {
+          }
-      return next({
+        );
-        status: 403,
+        return next({
-        message: 'CREDENTIAL_ERROR_NOT_ADMIN',
+          status: e.statusCode,
-      });
+          message: e.errorCode,
-    } else if (e.message === 'add_email') {
+        });
-      return next({
+
-        status: 406,
+      case ApiErrorCode.InvalidCredentials:
-        message: 'CREDENTIAL_ERROR_ADD_EMAIL',
+        logger.warn(
-      });
+          'Failed login attempt from user with incorrect Jellyfin credentials',
-    } else if (e.message === 'select_server_type') {
+          {
-      return next({
+            label: 'Auth',
-        status: 406,
+            account: {
-        message: 'CREDENTIAL_ERROR_NO_SERVER_TYPE',
+              ip: req.ip,
-      });
+              email: body.username,
-    } else {
+              password: '__REDACTED__',
-      logger.error(e.message, { label: 'Auth' });
+            },
-      return next({
+          }
-        status: 500,
+        );
-        message: 'Something went wrong.',
+        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.',
        });
    }
  }
 });
--- a/server/routes/collection.ts
+++ b/server/routes/collection.ts
@@ -12,7 +12,7 @@ collectionRoutes.get<{ id: string }>('/:id', async (req, res, next) => {
  try {
    const collection = await tmdb.getCollection({
      collectionId: Number(req.params.id),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    const media = await Media.getRelatedMedia(
--- a/server/routes/discover.ts
+++ b/server/routes/discover.ts
@@ -166,7 +166,7 @@ discoverRoutes.get<{ language: string }>(
      const data = await tmdb.getDiscoverMovies({
        page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
        originalLanguage: req.params.language,
      });
@@ -211,7 +211,7 @@ discoverRoutes.get<{ genreId: string }>(
    try {
      const genres = await tmdb.getMovieGenres({
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
      });
      const genre = genres.find(
@@ -224,7 +224,7 @@ discoverRoutes.get<{ genreId: string }>(
      const data = await tmdb.getDiscoverMovies({
        page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
        genre: req.params.genreId as string,
      });
@@ -272,7 +272,7 @@ discoverRoutes.get<{ studioId: string }>(
      const data = await tmdb.getDiscoverMovies({
        page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
        studio: req.params.studioId as string,
      });
@@ -322,7 +322,7 @@ discoverRoutes.get('/movies/upcoming', async (req, res, next) => {
  try {
    const data = await tmdb.getDiscoverMovies({
      page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
      primaryReleaseDateGte: date,
    });
@@ -447,7 +447,7 @@ discoverRoutes.get<{ language: string }>(
      const data = await tmdb.getDiscoverTv({
        page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
        originalLanguage: req.params.language,
      });
@@ -492,7 +492,7 @@ discoverRoutes.get<{ genreId: string }>(
    try {
      const genres = await tmdb.getTvGenres({
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
      });
      const genre = genres.find(
@@ -505,7 +505,7 @@ discoverRoutes.get<{ genreId: string }>(
      const data = await tmdb.getDiscoverTv({
        page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
        genre: req.params.genreId,
      });
@@ -553,7 +553,7 @@ discoverRoutes.get<{ networkId: string }>(
      const data = await tmdb.getDiscoverTv({
        page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
        network: Number(req.params.networkId),
      });
@@ -603,7 +603,7 @@ discoverRoutes.get('/tv/upcoming', async (req, res, next) => {
  try {
    const data = await tmdb.getDiscoverTv({
      page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
      firstAirDateGte: date,
    });
@@ -643,7 +643,7 @@ discoverRoutes.get('/trending', async (req, res, next) => {
  try {
    const data = await tmdb.getAllTrending({
      page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    const media = await Media.getRelatedMedia(
@@ -698,7 +698,7 @@ discoverRoutes.get<{ keywordId: string }>(
      const data = await tmdb.getMoviesByKeyword({
        keywordId: Number(req.params.keywordId),
        page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
      });
      const media = await Media.getRelatedMedia(
@@ -743,7 +743,7 @@ discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
      const mappedGenres: GenreSliderItem[] = [];
      const genres = await tmdb.getMovieGenres({
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
      });
      await Promise.all(
@@ -787,7 +787,7 @@ discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
      const mappedGenres: GenreSliderItem[] = [];
      const genres = await tmdb.getTvGenres({
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
      });
      await Promise.all(
--- a/server/routes/index.ts
+++ b/server/routes/index.ts
@@ -237,7 +237,7 @@ router.get('/genres/movie', isAuthenticated(), async (req, res, next) => {
  try {
    const genres = await tmdb.getMovieGenres({
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    return res.status(200).json(genres);
@@ -258,7 +258,7 @@ router.get('/genres/tv', isAuthenticated(), async (req, res, next) => {
  try {
    const genres = await tmdb.getTvGenres({
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    return res.status(200).json(genres);
--- a/server/routes/movie.ts
+++ b/server/routes/movie.ts
@@ -17,7 +17,7 @@ movieRoutes.get('/:id', async (req, res, next) => {
  try {
    const tmdbMovie = await tmdb.getMovie({
      movieId: Number(req.params.id),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    const media = await Media.getMedia(tmdbMovie.id, MediaType.MOVIE);
@@ -43,7 +43,7 @@ movieRoutes.get('/:id/recommendations', async (req, res, next) => {
    const results = await tmdb.getMovieRecommendations({
      movieId: Number(req.params.id),
      page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    const media = await Media.getRelatedMedia(
@@ -85,7 +85,7 @@ movieRoutes.get('/:id/similar', async (req, res, next) => {
    const results = await tmdb.getMovieSimilar({
      movieId: Number(req.params.id),
      page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    const media = await Media.getRelatedMedia(
--- a/server/routes/person.ts
+++ b/server/routes/person.ts
@@ -16,7 +16,7 @@ personRoutes.get('/:id', async (req, res, next) => {
  try {
    const person = await tmdb.getPerson({
      personId: Number(req.params.id),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    return res.status(200).json(mapPersonDetails(person));
  } catch (e) {
@@ -38,7 +38,7 @@ personRoutes.get('/:id/combined_credits', async (req, res, next) => {
  try {
    const combinedCredits = await tmdb.getPersonCombinedCredits({
      personId: Number(req.params.id),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    const castMedia = await Media.getRelatedMedia(
--- a/server/routes/search.ts
+++ b/server/routes/search.ts
@@ -20,7 +20,7 @@ searchRoutes.get('/', async (req, res, next) => {
        .match(searchProvider.pattern) as RegExpMatchArray;
      results = await searchProvider.search({
        id,
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
        query: queryString,
      });
    } else {
@@ -29,7 +29,7 @@ searchRoutes.get('/', async (req, res, next) => {
      results = await tmdb.searchMulti({
        query: queryString,
        page: Number(req.query.page),
-        language: req.locale ?? (req.query.language as string),
+        language: (req.query.language as string) ?? req.locale,
      });
    }
--- a/server/routes/settings/index.ts
+++ b/server/routes/settings/index.ts
@@ -2,6 +2,7 @@ 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';
@@ -24,8 +25,10 @@ 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';
@@ -252,16 +255,64 @@ settingsRoutes.get('/jellyfin', (_req, res) => {
  res.status(200).json(settings.jellyfin);
 });
-settingsRoutes.post('/jellyfin', (req, res) => {
+settingsRoutes.post('/jellyfin', async (req, res, next) => {
  const userRepository = getRepository(User);
  const settings = getSettings();
-  settings.jellyfin = merge(settings.jellyfin, req.body);
+  try {
-  settings.save();
+    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,
      });
    }
  }
  return res.status(200).json(settings.jellyfin);
 });
-settingsRoutes.get('/jellyfin/library', async (req, res) => {
+settingsRoutes.get('/jellyfin/library', async (req, res, next) => {
  const settings = getSettings();
  if (req.query.sync) {
@@ -272,7 +323,7 @@ settingsRoutes.get('/jellyfin/library', async (req, res) => {
      order: { id: 'ASC' },
    });
    const jellyfinClient = new JellyfinAPI(
-      settings.jellyfin.hostname ?? '',
+      getHostname(),
      admin.jellyfinAuthToken ?? '',
      admin.jellyfinDeviceId ?? ''
    );
@@ -281,6 +332,22 @@ settingsRoutes.get('/jellyfin/library', async (req, res) => {
    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
@@ -309,16 +376,12 @@ settingsRoutes.get('/jellyfin/library', async (req, res) => {
 });
 settingsRoutes.get('/jellyfin/users', async (req, res) => {
-  const settings = getSettings();
+  const { externalHostname } = getSettings().jellyfin;
-  const { hostname, externalHostname } = getSettings().jellyfin;
+  const jellyfinHost =
  let jellyfinHost =
    externalHostname && externalHostname.length > 0
      ? externalHostname
-      : hostname;
+      : getHostname();
  jellyfinHost = jellyfinHost.endsWith('/')
    ? jellyfinHost.slice(0, -1)
    : jellyfinHost;
  const userRepository = getRepository(User);
  const admin = await userRepository.findOneOrFail({
    select: ['id', 'jellyfinAuthToken', 'jellyfinDeviceId', 'jellyfinUserId'],
@@ -326,7 +389,6 @@ 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(
-          'ascii'
+          'utf8'
        )
      ),
    },
--- a/server/routes/tv.ts
+++ b/server/routes/tv.ts
@@ -14,7 +14,7 @@ tvRoutes.get('/:id', async (req, res, next) => {
  try {
    const tv = await tmdb.getTvShow({
      tvId: Number(req.params.id),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    const media = await Media.getMedia(tv.id, MediaType.TV);
@@ -40,7 +40,7 @@ tvRoutes.get('/:id/season/:seasonNumber', async (req, res, next) => {
    const season = await tmdb.getTvSeason({
      tvId: Number(req.params.id),
      seasonNumber: Number(req.params.seasonNumber),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    return res.status(200).json(mapSeasonWithEpisodes(season));
@@ -65,7 +65,7 @@ tvRoutes.get('/:id/recommendations', async (req, res, next) => {
    const results = await tmdb.getTvRecommendations({
      tvId: Number(req.params.id),
      page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    const media = await Media.getRelatedMedia(
@@ -106,7 +106,7 @@ tvRoutes.get('/:id/similar', async (req, res, next) => {
    const results = await tmdb.getTvSimilar({
      tvId: Number(req.params.id),
      page: Number(req.query.page),
-      language: req.locale ?? (req.query.language as string),
+      language: (req.query.language as string) ?? req.locale,
    });
    const media = await Media.getRelatedMedia(
--- a/server/routes/user/index.ts
+++ b/server/routes/user/index.ts
@@ -20,6 +20,7 @@ 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';
@@ -496,7 +497,6 @@ router.post(
        order: { id: 'ASC' },
      });
      const jellyfinClient = new JellyfinAPI(
        settings.jellyfin.hostname ?? '',
        admin.jellyfinAuthToken ?? '',
        admin.jellyfinDeviceId ?? ''
      );
@@ -504,15 +504,14 @@ router.post(
      //const jellyfinUsersResponse = await jellyfinClient.getUsers();
      const createdUsers: User[] = [];
-      const { hostname, externalHostname } = getSettings().jellyfin;
+      const { externalHostname } = getSettings().jellyfin;
-      let jellyfinHost =
+      const hostname = getHostname();
      const 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,6 +98,7 @@ 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 (
@@ -127,20 +128,19 @@ 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;
    }
-    await userRepository.save(user);
+    const savedUser = await userRepository.save(user);
    return res.status(200).json({
-      username: user.username,
+      username: savedUser.username,
-      discordId: user.settings.discordId,
+      discordId: savedUser.settings?.discordId,
-      locale: user.settings.locale,
+      locale: savedUser.settings?.locale,
-      region: user.settings.region,
+      region: savedUser.settings?.region,
-      originalLanguage: user.settings.originalLanguage,
+      originalLanguage: savedUser.settings?.originalLanguage,
-      watchlistSyncMovies: user.settings.watchlistSyncMovies,
+      watchlistSyncMovies: savedUser.settings?.watchlistSyncMovies,
-      watchlistSyncTv: user.settings.watchlistSyncTv,
+      watchlistSyncTv: savedUser.settings?.watchlistSyncTv,
-      email: user.email,
+      email: savedUser.email,
    });
  } catch (e) {
    next({ status: 500, message: e.message });
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -5,6 +5,7 @@
    "module": "commonjs",
    "outDir": "../dist",
    "noEmit": false,
    "incremental": true,
    "baseUrl": ".",
    "paths": {
      "@server/*": ["*"]
--- a/server/types/error.ts
+++ b/server/types/error.ts
@@ -0,0 +1,9 @@
 import type { ApiErrorCode } from '@server/constants/error';
 export class ApiError extends Error {
  constructor(public statusCode: number, public errorCode: ApiErrorCode) {
    super();
    this.name = 'apiError';
  }
 }
--- a/Show More
+++ b/Show More
`@@ -1 +1 @@`
	`github: [Fallenbagel]`	`buy_me_a_coffee: fallen.bagel`