fix(jellyfinscanner): conditionally assign the jellyfinMediaId and jellyfinMediaId4k

Previously `jellyfinMediaId4k` was being assigned even if 4k server was not setup or even if 4k
content were not present. This fixes it by conditionally assigning the jellyfinMediaId and
JellyfinMediaId4k

fix #681

.all-contributorsrc

@@ -322,87 +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"
-      ]
-    },
-    {
-      "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"
-      ]
     }
   ]
 }

.eslintrc.js

@@ -5,7 +5,9 @@ module.exports = {
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
     'plugin:jsx-a11y/recommended',
-    'plugin:@next/next/recommended',
+    'plugin:react/recommended',
+    'plugin:react-hooks/recommended',
+    'plugin:react/jsx-runtime',
     'prettier',
   ],
   parserOptions: {

.github/FUNDING.yml

@@ -1 +1 @@
-buy_me_a_coffee: fallen.bagel
+github: [Fallenbagel]

.github/workflows/ci.yml

@@ -13,35 +13,20 @@ jobs:
     name: Lint & Test Build
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-22.04
-    container: node:20-alpine
+    container: node:18.18-alpine
     steps:
       - name: Checkout
-        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-
+        uses: actions/checkout@v3
       - name: Install dependencies
         env:
           HUSKY: 0
-        run: pnpm install
+        run: yarn
       - name: Lint
-        run: pnpm lint
+        run: yarn lint
       - name: Formatting
-        run: pnpm format:check
+        run: yarn format:check
       - name: Build
-        run: pnpm build
+        run: yarn build
 
   build_and_push:
     name: Build & Publish Docker Images
@@ -49,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 }}
@@ -71,11 +56,11 @@ 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
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           build-args: |
             COMMIT_TAG=${{ github.sha }}

.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

.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 }}'

.github/workflows/cypress.yml

@@ -13,20 +13,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Pnpm Setup
-        uses: pnpm/action-setup@v4
-        with:
-          version: 9
+        uses: actions/checkout@v3
       - name: Cypress run
-        uses: cypress-io/github-action@v6
+        uses: cypress-io/github-action@v4
         with:
-          build: pnpm cypress:build
-          start: pnpm start
+          build: yarn cypress:build
+          start: yarn start
           wait-on: 'http://localhost:5055'
           record: true
         env:

.github/workflows/preview.yml

@@ -11,25 +11,25 @@ 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
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           build-args: |
             COMMIT_TAG=${{ github.sha }}

.github/workflows/release.yml

@@ -10,39 +10,24 @@ 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: 20
+          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 }}
-      - 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: pnpm install
+        run: yarn
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -50,59 +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
-  #   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

.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 }}
 
@@ -30,9 +26,10 @@ jobs:
         architecture:
           - amd64
           - arm64
+          - armhf
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Prepare
         id: prepare
         run: |
@@ -43,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
@@ -52,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 }}

.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'

.npmrc

@@ -1 +0,0 @@
-engine-strict=true

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine AS BUILD_IMAGE
+FROM node:18.18-alpine AS BUILD_IMAGE
 
 WORKDIR /app
 
@@ -10,24 +10,22 @@ RUN \
   'linux/arm64' | 'linux/arm/v7') \
   apk update && \
   apk add --no-cache python3 make g++ gcc libc6-compat bash && \
-  npm install --global node-gyp \
+  yarn global add node-gyp \
   ;; \
   esac
 
-Run npm install --global pnpm
-
-COPY package.json pnpm-lock.yaml ./
-RUN CYPRESS_INSTALL_BINARY=0 pnpm install --frozen-lockfile
+COPY package.json yarn.lock ./
+RUN CYPRESS_INSTALL_BINARY=0 yarn install --frozen-lockfile --network-timeout 1000000
 
 COPY . ./
 
 ARG COMMIT_TAG
 ENV COMMIT_TAG=${COMMIT_TAG}
 
-RUN pnpm build
+RUN yarn build
 
 # remove development dependencies
-RUN pnpm prune --prod --ignore-scripts
+RUN yarn install --production --ignore-scripts --prefer-offline
 
 RUN rm -rf src server .next/cache
 
@@ -36,7 +34,7 @@ RUN touch config/DOCKER
 RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
 
 
-FROM node:20-alpine
+FROM node:18.18-alpine
 
 # Metadata for Github Package Registry
 LABEL org.opencontainers.image.source="https://github.com/Fallenbagel/jellyseerr"
@@ -49,6 +47,6 @@ RUN apk add --no-cache tzdata tini && rm -rf /tmp/*
 COPY --from=BUILD_IMAGE /app ./
 
 ENTRYPOINT [ "/sbin/tini", "--" ]
-CMD [ "pnpm", "start" ]
+CMD [ "yarn", "start" ]
 
 EXPOSE 5055

Dockerfile.local

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:18.18-alpine
 
 COPY . /app
 WORKDIR /app

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.
@@ -53,7 +53,7 @@ https://hub.docker.com/r/fallenbagel/jellyseerr
 
 Pre-requisites:
 
-- Nodejs [v20](https://nodejs.org/en/download)
+- Nodejs [v18](https://nodejs.org/download/release/v18.18.2)
 - [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 [v20](https://nodejs.org/en/download)
+- Nodejs [v18](https://nodejs.org/en/download/package-manager)
 - [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,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>
@@ -378,9 +370,6 @@ 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>

babel.config.js

@@ -0,0 +1,25 @@
+module.exports = function (api) {
+  api.cache(true);
+
+  return {
+    presets: [
+      [
+        'next/babel',
+        {
+          'preset-env': {
+            useBuiltIns: 'entry',
+            corejs: '3',
+          },
+        },
+      ],
+    ],
+    plugins: [
+      [
+        'react-intl-auto',
+        {
+          removePrefix: 'src/',
+        },
+      ],
+    ],
+  };
+};

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 * * *"
     }
   }
 }

cypress/support/e2e.ts

@@ -2,6 +2,6 @@ import './commands';
 
 before(() => {
   if (Cypress.env('SEED_DATABASE')) {
-    cy.exec('pnpm cypress:prepare');
+    cy.exec('yarn cypress:prepare');
   }
 });

next.config.js

@@ -10,11 +10,7 @@ module.exports = {
     JELLYFIN_TYPE: process.env.JELLYFIN_TYPE,
   },
   images: {
-    remotePatterns: [
-      { hostname: 'gravatar.com' },
-      { hostname: 'image.tmdb.org' },
-      { hostname: '*', protocol: 'https' },
-    ],
+    domains: ['image.tmdb.org'],
   },
   webpack(config) {
     config.module.rules.push({

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: |

package.json

@@ -3,27 +3,26 @@
   "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": "pnpm build:next && pnpm build:server",
+    "build": "yarn build:next && yarn 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": "ts-node --project server/tsconfig.json src/i18n/extractMessages.ts",
+    "i18n:extract": "extract-messages -l=en -o src/i18n/locale -d en --flat true --overwriteDefault true \"./src/**/!(*.test).{ts,tsx}\"",
     "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": "pnpm typecheck:server && pnpm typecheck:client",
+    "typecheck": "yarn typecheck:server && yarn 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": "pnpm build && pnpm cypress:prepare"
+    "cypress:build": "yarn build && yarn cypress:prepare"
   },
   "repository": {
     "type": "git",
@@ -35,7 +34,6 @@
     "@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",
@@ -46,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",
@@ -61,10 +58,11 @@
     "express-openapi-validator": "4.13.8",
     "express-rate-limit": "6.7.0",
     "express-session": "1.17.3",
-    "formik": "^2.4.6",
+    "formik": "2.2.9",
     "gravatar-url": "3.1.0",
+    "intl": "1.2.5",
     "lodash": "4.17.21",
-    "next": "^14.2.4",
+    "next": "12.3.4",
     "node-cache": "5.1.2",
     "node-gyp": "9.3.1",
     "node-schedule": "2.1.1",
@@ -72,13 +70,13 @@
     "openpgp": "5.7.0",
     "plex-api": "5.3.2",
     "pug": "3.0.2",
-    "react": "^18.3.1",
+    "react": "18.2.0",
     "react-ace": "10.1.0",
     "react-animate-height": "2.1.2",
     "react-aria": "3.23.0",
-    "react-dom": "^18.3.1",
+    "react-dom": "18.2.0",
     "react-intersection-observer": "9.4.3",
-    "react-intl": "^6.6.8",
+    "react-intl": "6.2.10",
     "react-markdown": "8.0.5",
     "react-popper-tooltip": "4.4.2",
     "react-select": "5.7.0",
@@ -90,10 +88,9 @@
     "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.2.5",
+    "swr": "2.0.4",
     "typeorm": "0.3.12",
     "web-push": "3.5.0",
     "winston": "3.8.2",
@@ -104,6 +101,7 @@
     "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",
@@ -124,8 +122,8 @@
     "@types/node": "17.0.36",
     "@types/node-schedule": "2.1.0",
     "@types/nodemailer": "6.4.7",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
+    "@types/react": "18.0.28",
+    "@types/react-dom": "18.0.11",
     "@types/react-transition-group": "4.4.5",
     "@types/secure-random-password": "0.2.1",
     "@types/semver": "7.3.13",
@@ -137,13 +135,15 @@
     "@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": "^14.2.4",
+    "eslint-config-next": "12.3.4",
     "eslint-config-prettier": "8.6.0",
     "eslint-plugin-formatjs": "4.9.0",
     "eslint-plugin-jsx-a11y": "6.7.1",
@@ -151,6 +151,7 @@
     "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",
@@ -166,12 +167,10 @@
     "tsconfig-paths": "4.1.2",
     "typescript": "4.9.5"
   },
-  "engines": {
-    "node": "^20.0.0",
-    "pnpm": "^9.0.0"
-  },
-  "overrides": {
+  "resolutions": {
     "sqlite3/node-gyp": "8.4.1",
+    "@types/react": "18.0.28",
+    "@types/react-dom": "18.0.11",
     "@types/express-session": "1.17.6"
   },
   "config": {
@@ -237,7 +236,8 @@
         ],
         "platforms": [
           "linux/amd64",
-          "linux/arm64"
+          "linux/arm64",
+          "linux/arm/v7"
         ]
       },
       "@semantic-release/github"

server/api/jellyfin.ts

@@ -1,22 +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;
-  };
   PrimaryImageTag?: string;
 }
 
@@ -29,13 +21,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 +77,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 +127,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 +197,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 +222,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 +246,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 +284,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 +296,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');
     }
   }
 }

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',
-}

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,
@@ -152,11 +151,11 @@ class Media {
   @Column({ nullable: true, type: 'varchar' })
   public ratingKey4k?: string | null;
 
-  @Column({ nullable: true, type: 'varchar' })
-  public jellyfinMediaId?: string | null;
+  @Column({ nullable: true })
+  public jellyfinMediaId?: string;
 
-  @Column({ nullable: true, type: 'varchar' })
-  public jellyfinMediaId4k?: string | null;
+  @Column({ nullable: true })
+  public jellyfinMediaId4k?: string;
 
   public serviceUrl?: string;
   public serviceUrl4k?: string;
@@ -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}`;

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
@@ -146,7 +121,7 @@ app
       try {
         const descriptor = Object.getOwnPropertyDescriptor(req, 'ip');
         if (descriptor?.writable === true) {
-          (req as any).ip = getClientIp(req) ?? '';
+          req.ip = getClientIp(req) ?? '';
         }
       } catch (e) {
         logger.error('Failed to attach the ip to the request', {

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
           );
@@ -549,7 +548,7 @@ class AvailabilitySync {
         media[is4k ? 'ratingKey4k' : 'ratingKey'] =
           mediaStatus === MediaStatus.PROCESSING
             ? media[is4k ? 'ratingKey4k' : 'ratingKey']
-            : null;
+            : undefined;
       } else if (
         mediaServerType === MediaServerType.JELLYFIN ||
         mediaServerType === MediaServerType.EMBY
@@ -557,7 +556,7 @@ class AvailabilitySync {
         media[is4k ? 'jellyfinMediaId4k' : 'jellyfinMediaId'] =
           mediaStatus === MediaStatus.PROCESSING
             ? media[is4k ? 'jellyfinMediaId4k' : 'jellyfinMediaId']
-            : null;
+            : undefined;
       }
       logger.info(
         `The ${is4k ? '4K' : 'non-4K'} ${

server/lib/notifications/agents/pushover.ts

@@ -14,12 +14,7 @@ import {
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
 
-interface PushoverImagePayload {
-  attachment_base64: string;
-  attachment_type: string;
-}
-
-interface PushoverPayload extends PushoverImagePayload {
+interface PushoverPayload {
   token: string;
   user: string;
   title: string;
@@ -48,36 +43,10 @@ class PushoverAgent
     return true;
   }
 
-  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(
+  private getNotificationPayload(
     type: Notification,
     payload: NotificationPayload
-  ): Promise<Partial<PushoverPayload>> {
+  ): Partial<PushoverPayload> {
     const { applicationUrl, applicationTitle } = getSettings().main;
 
     const title = payload.event ?? payload.subject;
@@ -153,16 +122,6 @@ 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,
@@ -170,8 +129,6 @@ class PushoverAgent
       url_title,
       priority,
       html: 1,
-      attachment_base64,
-      attachment_type,
     };
   }
 
@@ -181,10 +138,7 @@ class PushoverAgent
   ): Promise<boolean> {
     const settings = this.getSettings();
     const endpoint = 'https://api.pushover.net/1/messages.json';
-    const notificationPayload = await this.getNotificationPayload(
-      type,
-      payload
-    );
+    const notificationPayload = this.getNotificationPayload(type, payload);
 
     // Send system notification
     if (

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));
 

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;
         });
       });
@@ -173,9 +168,9 @@ class JellyfinScanner {
           newMedia.jellyfinMediaId =
             hasOtherResolution || (!this.enable4kMovie && has4k)
               ? metadata.Id
-              : null;
+              : undefined;
           newMedia.jellyfinMediaId4k =
-            has4k && this.enable4kMovie ? metadata.Id : null;
+            has4k && this.enable4kMovie ? metadata.Id : undefined;
           await mediaRepository.save(newMedia);
           this.log(`Saved ${metadata.Name}`);
         }
@@ -466,9 +461,9 @@ class JellyfinScanner {
               tmdbId: tvShow.id,
               tvdbId: tvShow.external_ids.tvdb_id,
               mediaAddedAt: new Date(metadata.DateCreated ?? ''),
-              jellyfinMediaId: isAllStandardSeasons ? Id : null,
+              jellyfinMediaId: isAllStandardSeasons ? Id : undefined,
               jellyfinMediaId4k:
-                isAll4kSeasons && this.enable4kShow ? Id : null,
+                isAll4kSeasons && this.enable4kShow ? Id : undefined,
               status: isAllStandardSeasons
                 ? MediaStatus.AVAILABLE
                 : newSeasons.some(
@@ -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
       );

server/lib/settings.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[];
@@ -134,6 +130,7 @@ interface FullPublicSettings extends PublicSettings {
   region: string;
   originalLanguage: string;
   mediaServerType: number;
+  jellyfinHost?: string;
   jellyfinExternalHost?: string;
   jellyfinForgotPasswordUrl?: string;
   jellyfinServerName?: string;
@@ -277,7 +274,7 @@ export type JobId =
   | 'image-cache-cleanup'
   | 'availability-sync';
 
-export interface AllSettings {
+interface AllSettings {
   clientId: string;
   vapidPublic: string;
   vapidPrivate: string;
@@ -294,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;
@@ -334,10 +331,7 @@ class Settings {
       },
       jellyfin: {
         name: '',
-        ip: '',
-        port: 8096,
-        useSsl: false,
-        urlBase: '',
+        hostname: '',
         externalHostname: '',
         jellyfinForgotPasswordUrl: '',
         libraries: [],
@@ -553,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,
@@ -641,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;

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;

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;
-};

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,42 +258,24 @@ 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 },
     });
 
     if (!user && !(await userRepository.count())) {
-      // Check if user is admin on jellyfin
-      if (account.User.Policy.IsAdministrator === false) {
-        throw new ApiError(403, ApiErrorCode.NotAdmin);
-      }
-
       logger.info(
         'Sign-in attempt from Jellyfin user with access to the media server; creating initial admin user for Overseerr',
         {
@@ -332,21 +301,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 +407,38 @@ 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 === '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.',
+      });
     }
   }
 });

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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     const media = await Media.getRelatedMedia(

server/routes/discover.ts

@@ -166,7 +166,7 @@ discoverRoutes.get<{ language: string }>(
 
       const data = await tmdb.getDiscoverMovies({
         page: Number(req.query.page),
-        language: (req.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
         originalLanguage: req.params.language,
       });
 
@@ -211,7 +211,7 @@ discoverRoutes.get<{ genreId: string }>(
 
     try {
       const genres = await tmdb.getMovieGenres({
-        language: (req.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
       });
 
       const genre = genres.find(
@@ -224,7 +224,7 @@ discoverRoutes.get<{ genreId: string }>(
 
       const data = await tmdb.getDiscoverMovies({
         page: Number(req.query.page),
-        language: (req.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
         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.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
         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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
       primaryReleaseDateGte: date,
     });
 
@@ -447,7 +447,7 @@ discoverRoutes.get<{ language: string }>(
 
       const data = await tmdb.getDiscoverTv({
         page: Number(req.query.page),
-        language: (req.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
         originalLanguage: req.params.language,
       });
 
@@ -492,7 +492,7 @@ discoverRoutes.get<{ genreId: string }>(
 
     try {
       const genres = await tmdb.getTvGenres({
-        language: (req.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
       });
 
       const genre = genres.find(
@@ -505,7 +505,7 @@ discoverRoutes.get<{ genreId: string }>(
 
       const data = await tmdb.getDiscoverTv({
         page: Number(req.query.page),
-        language: (req.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
         genre: req.params.genreId,
       });
 
@@ -553,7 +553,7 @@ discoverRoutes.get<{ networkId: string }>(
 
       const data = await tmdb.getDiscoverTv({
         page: Number(req.query.page),
-        language: (req.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
         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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
       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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     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.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
       });
 
       const media = await Media.getRelatedMedia(
@@ -743,7 +743,7 @@ discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
       const mappedGenres: GenreSliderItem[] = [];
 
       const genres = await tmdb.getMovieGenres({
-        language: (req.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
       });
 
       await Promise.all(
@@ -787,7 +787,7 @@ discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
       const mappedGenres: GenreSliderItem[] = [];
 
       const genres = await tmdb.getTvGenres({
-        language: (req.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
       });
 
       await Promise.all(

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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     return res.status(200).json(genres);

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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     const media = await Media.getRelatedMedia(

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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
     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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     const castMedia = await Media.getRelatedMedia(

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.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
         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.query.language as string) ?? req.locale,
+        language: req.locale ?? (req.query.language as string),
       });
     }
 

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 ?? ''
   );

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'
         )
       ),
     },

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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     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.query.language as string) ?? req.locale,
+      language: req.locale ?? (req.query.language as string),
     });
 
     const media = await Media.getRelatedMedia(

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();
 

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 });

server/tsconfig.json

@@ -5,7 +5,6 @@
     "module": "commonjs",
     "outDir": "../dist",
     "noEmit": false,
-    "incremental": true,
     "baseUrl": ".",
     "paths": {
       "@server/*": ["*"]

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';
-  }
-}