Merge branch 'develop' into feat-media-availability-sync-emby/jellyfin-support

fix(availabilitysync): use the correct 4k jellyfinMediaId
feat(job): media availability support for jellyfin/emby
2025-12-24 02:39:18 -05:00 · 2023-11-30 09:14:51 +05:00 · 2023-11-15 17:27:04 +05:00 · 2023-11-05 17:24:46 +05:00
19 changed files with 136 additions and 292 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -277,51 +277,6 @@
      "contributions": [
        "doc"
      ]
-    },
-    {
-      "login": "mdll23",
-      "name": "Michael Dallinger",
-      "avatar_url": "https://avatars.githubusercontent.com/u/142844478?v=4",
-      "profile": "https://github.com/mdll23",
-      "contributions": [
-        "translation"
-      ]
-    },
-    {
-      "login": "xeruf",
-      "name": "Janek",
-      "avatar_url": "https://avatars.githubusercontent.com/u/13354331?v=4",
-      "profile": "https://github.com/xeruf",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "aleksasiriski",
-      "name": "Aleksa Siriški",
-      "avatar_url": "https://avatars.githubusercontent.com/u/31509435?v=4",
-      "profile": "https://aleksasiriski.dev",
-      "contributions": [
-        "infra"
-      ]
-    },
-    {
-      "login": "Danish-H",
-      "name": "Danish Humair",
-      "avatar_url": "https://avatars.githubusercontent.com/u/121830048?v=4",
-      "profile": "http://danishhumair.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "trackmastersteve",
-      "name": "Stephen Harris",
-      "avatar_url": "https://avatars.githubusercontent.com/u/16858514?v=4",
-      "profile": "https://arm0.red",
-      "contributions": [
-        "doc"
-      ]
    }
  ]
 }
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -29,7 +29,7 @@ jobs:
        with:
          context: .
          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: linux/amd64
          push: true
          build-args: |
            COMMIT_TAG=${{ github.sha }}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to Jellyseerr
+# Contributing to Overseerr

 All help is welcome and greatly appreciated! If you would like to contribute to the project, the following instructions should get you started...

@@ -17,7 +17,7 @@ All help is welcome and greatly appreciated! If you would like to contribute to
 1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository to your own GitHub account and [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device:

   ```bash
-   git clone https://github.com/YOUR_USERNAME/jellyseerr.git
+   git clone https://github.com/YOUR_USERNAME/overseerr.git
   cd overseerr/
   ```

@@ -97,9 +97,9 @@ When adding new UI text, please try to adhere to the following guidelines:

 ## Translation

-We use [Weblate](https://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/) for our translations, and your help with localizing Overseerr would be greatly appreciated! If your language is not listed below, please [open a feature request](https://github.com/fallenbagel/jellyseerr/issues/new/choose).
+We use [Weblate](https://hosted.weblate.org/engage/overseerr/) for our translations, and your help with localizing Overseerr would be greatly appreciated! If your language is not listed below, please [open a feature request](https://github.com/fallenbagel/jellyseerr/issues/new/choose).

-<a href="https://jellyseerr.borgcube.de/engage/jellysseerr/"><img src="https://jellyseerr.borgcube.de/widget/jellyseerr/multi-auto.svg" alt="Translation status" /></a>
+<a href="https://hosted.weblate.org/engage/overseerr/"><img src="https://hosted.weblate.org/widgets/overseerr/-/overseerr-frontend/multi-auto.svg" alt="Translation status" /></a>

 ## Attribution

--- a/README.md
+++ b/README.md
@@ -2,28 +2,23 @@
 <img src="./public/logo_full.svg" alt="Jellyseerr" style="margin: 20px 0;">
 </p>
 <p align="center">
-<img src="https://github.com/Fallenbagel/jellyseerr/actions/workflows/release.yml/badge.svg" alt="Jellyseerr Release" />
-<img src="https://github.com/Fallenbagel/jellyseerr/actions/workflows/ci.yml/badge.svg" alt="Jellyseerr CI">
-</p>
-<p align="center">
-<a href="https://discord.gg/ckbvBtDJgC"><img src="https://img.shields.io/discord/952656177924300932" alt="Discord"></a>
+<a href="https://discord.gg/ckbvBtDJgC"><img src="https://img.shields.io/badge/Discord-Chat-lightgrey" alt="Discord"></a>
 <a href="https://hub.docker.com/r/fallenbagel/jellyseerr"><img src="https://img.shields.io/docker/pulls/fallenbagel/jellyseerr" alt="Docker pulls"></a>
-<a href="http://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-29-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

-**Jellyseerr** is a free and open source software application for managing requests for your media library.
-It is a fork of [Overseerr](https://github.com/sct/overseerr) built to bring support for [Jellyfin](https://github.com/jellyfin/jellyfin) & [Emby](https://github.com/MediaBrowser/Emby) media servers!
+**Jellyseerr** is a free and open source software application for managing requests for your media library. It is a a fork of Overseerr built to bring support for Jellyfin & Emby media servers!

 _The original Overseerr team have been busy and Jellyfin/Emby support aren't on their roadmap, so we started this project as we wanted to bring the Overseerr experience to the Jellyfin/Emby Community!_

 ## Current Features

- Full Jellyfin/Emby/Plex integration including authentication with user import & management
- Supports Movies, Shows and Mixed Libraries
+- Full Jellyfin/Emby/Plex integration. Authenticate and manage user access with Jellyfin/Emby/Plex!
+- Supports Movies, Shows, Mixed Libraries!
 - Ability to change email addresses for smtp purposes
+- Ability to import all jellyfin/emby users
 - Easy integration with your existing services. Currently, Jellyseerr supports Sonarr and Radarr. More to come!
 - Jellyfin/Emby/Plex library scan, to keep track of the titles which are already available.
 - Customizable request system, which allows users to request individual seasons or movies in a friendly, easy-to-use interface.
@@ -40,11 +35,11 @@ With more features on the way! Check out our [issue tracker](https://github.com/

 #### Pre-requisite (Important)

-_*On Jellyfin/Emby, ensure the `Settings > Home > Automatically group content from the following folders into views such as 'Movies', 'Music' and 'TV'` is turned off*_
+_*On Jellyfin/Emby, ensure the `settings > Home > Automatically group content from the following folders into views such as 'Movies', 'Music' and 'TV'` is turned off*_

 ### Launching Jellyseerr using Docker (Recommended)

-Check out our docker hub for instructions on how to install and run Jellyseerr:
+Check out our dockerhub for instructions on how to install and run Jellyseerr:
 https://hub.docker.com/r/fallenbagel/jellyseerr

 ### Building from source (ADVANCED):
@@ -54,7 +49,7 @@ https://hub.docker.com/r/fallenbagel/jellyseerr
 Pre-requisites:

 - Nodejs [v18](https://nodejs.org/download/release/v18.18.2)
- [Yarn](https://classic.yarnpkg.com/lang/en/docs/install)
+- [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)

 ```cmd
@@ -64,17 +59,16 @@ yarn install --frozen-lockfile --network-timeout 1000000
 yarn run build
 yarn start
 ```
+(you can use task scheduler to run a bat script with `@echo off` and `yarn start` to run jellyseerr in the background)

-(You can use task scheduler to run a bat script with `@echo off` and `yarn start` to run jellyseerr in the background)
-
-_To set env variables such as `JELLYFIN_TYPE=emby` create a file called `.env` in the root directory of jellyseerr_
+_to set env variables such as `JELLYFIN_TYPE=emby` create a file called `.env` in the root directory of jellyseerr_

 #### Linux

 **Pre-requisites:**

 - 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`)
+- [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

 **Steps:**
@@ -85,7 +79,7 @@ _To set env variables such as `JELLYFIN_TYPE=emby` create a file called `.env` i
 cd /opt
 ```

-2. Then execute the following commands to clone and checkout to the stable version
+2. Then clone the follow commands to clone and checkout to the stable version

 ```bash
 git clone https://github.com/Fallenbagel/jellyseerr.git && cd jellyseerr
@@ -104,9 +98,9 @@ yarn run build
 5. If you want to run jellyseerr as a _Systemd-service:_

 - assuming jellyseerr was cloned to `/opt/`
- first create the environment file at `/etc/jellyseerr/jellyseerr.conf`
+- first create the environmentfile at `/etc/jellyseerr/jellyseerr.conf`

-Environment file:
+Environmentfile:

 ```
 # Jellyseerr's default port is 5055, if you want to use both, change this.
@@ -142,7 +136,6 @@ ExecStart=/usr/bin/node dist/index.js
 [Install]
 WantedBy=multi-user.target
 ```
-
 ### Packages:

 Archlinux: [AUR](https://aur.archlinux.org/packages/jellyseerr)
@@ -224,11 +217,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://athfan.com"><img src="https://avatars.githubusercontent.com/u/13810742?v=4?s=100" width="100px;" alt="Athfan Khaleel"/><br /><sub><b>Athfan Khaleel</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=athphane" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mdll23"><img src="https://avatars.githubusercontent.com/u/142844478?v=4?s=100" width="100px;" alt="Michael Dallinger"/><br /><sub><b>Michael Dallinger</b></sub></a><br /><a href="#translation-mdll23" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xeruf"><img src="https://avatars.githubusercontent.com/u/13354331?v=4?s=100" width="100px;" alt="Janek"/><br /><sub><b>Janek</b></sub></a><br /><a href="https://github.com/Fallenbagel/jellyseerr/commits?author=xeruf" title="Documentation">📖</a></td>
-      <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>
    </tr>
  </tbody>
 </table>
--- a/overseerr-api.yml
+++ b/overseerr-api.yml
@@ -368,9 +368,6 @@ components:
        externalHostname:
          type: string
          example: 'http://my.jellyfin.host'
-        jellyfinForgotPasswordUrl:
-          type: string
-          example: 'http://my.jellyfin.host/web/index.html#!/forgotpassword.html'
        adminUser:
          type: string
          example: 'admin'
--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -269,7 +269,9 @@ class JellyfinAPI {
    try {
      const contents = await this.axios.get<any>(`/Shows/${seriesID}/Seasons`);

-      return contents.data.Items;
+      return contents.data.Items.filter(
+        (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
+      );
    } catch (e) {
      logger.error(
        `Something went wrong while getting the list of seasons from the Jellyfin server: ${e.message}`,
--- a/server/interfaces/api/settingsInterfaces.ts
+++ b/server/interfaces/api/settingsInterfaces.ts
@@ -24,7 +24,6 @@ export interface PublicSettingsResponse {
  jellyfinHost?: string;
  jellyfinExternalHost?: string;
  jellyfinServerName?: string;
-  jellyfinForgotPasswordUrl?: string;
  initialized: boolean;
  applicationTitle: string;
  applicationUrl: string;
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -299,42 +299,45 @@ class AvailabilitySync {
          const finalSeasons: Map<number, boolean> = new Map();

          if (mediaServerType === MediaServerType.PLEX) {
-            plexSeasonsMap.forEach((value, key) => {
+            const plexMap = new Map([
+              ...plexSeasonsMap,
+              ...filteredSeasonsMap,
+              ...sonarrSeasonsMap,
+            ]);
+            plexMap.forEach((value, key) => {
              finalSeasons.set(key, value);
            });
-
-            filteredSeasonsMap.forEach((value, key) => {
-              if (!finalSeasons.has(key)) {
-                finalSeasons.set(key, value);
-              }
-            });
-
-            sonarrSeasonsMap.forEach((value, key) => {
-              if (!finalSeasons.has(key)) {
-                finalSeasons.set(key, value);
-              }
-            });
          } else if (
            mediaServerType === MediaServerType.JELLYFIN ||
            mediaServerType === MediaServerType.EMBY
          ) {
+            // Adding values from jellyfinSeasonsMap
            jellyfinSeasonsMap.forEach((value, key) => {
              finalSeasons.set(key, value);
            });

+            // Adding values from filteredSeasonsMap and handling missing keys
            filteredSeasonsMap.forEach((value, key) => {
+              // Check if the key is missing in jellyfinSeasonsMap
              if (!finalSeasons.has(key)) {
                finalSeasons.set(key, value);
              }
            });

+            // Adding values from sonarrSeasonsMap and handling missing keys
            sonarrSeasonsMap.forEach((value, key) => {
+              // Check if the key is missing in jellyfinSeasonsMap and filteredSeasonsMap
              if (!finalSeasons.has(key)) {
                finalSeasons.set(key, value);
              }
            });
          }

+          // ...(mediaServerType === MediaServerType.PLEX ? plexSeasonsMap : []),
+          // ...(mediaServerType === MediaServerType.JELLYFIN ||
+          // mediaServerType === MediaServerType.EMBY  ? jellyfinSeasonsMap
+          //   : []),
+
          const filteredSeasonsMap4k: Map<number, boolean> = new Map();

          media.seasons
@@ -347,40 +350,50 @@ class AvailabilitySync {
              filteredSeasonsMap4k.set(season.seasonNumber, false)
            );

+          // const finalSeasons4k: Map<any, any> = new Map<any, any>([
+          //   ...(mediaServerType === MediaServerType.PLEX
+          //     ? plexSeasonsMap4k
+          //     : []),
+          //   ...(mediaServerType === MediaServerType.JELLYFIN ||
+          //   mediaServerType === MediaServerType.EMBY
+          //     ? jellyfinSeasonsMap4k
+          //     : []),
+          //   ...filteredSeasonsMap4k,
+          //   ...sonarrSeasonsMap4k,
+          // ]);
+
          // 4k
          const finalSeasons4k: Map<number, boolean> = new Map();

          if (mediaServerType === MediaServerType.PLEX) {
-            plexSeasonsMap4k.forEach((value, key) => {
+            const plexMap4k = new Map([
+              ...plexSeasonsMap4k,
+              ...filteredSeasonsMap4k,
+              ...sonarrSeasonsMap4k,
+            ]);
+            plexMap4k.forEach((value, key) => {
              finalSeasons4k.set(key, value);
            });
-
-            filteredSeasonsMap4k.forEach((value, key) => {
-              if (!finalSeasons4k.has(key)) {
-                finalSeasons4k.set(key, value);
-              }
-            });
-
-            sonarrSeasonsMap4k.forEach((value, key) => {
-              if (!finalSeasons4k.has(key)) {
-                finalSeasons4k.set(key, value);
-              }
-            });
          } else if (
            mediaServerType === MediaServerType.JELLYFIN ||
            mediaServerType === MediaServerType.EMBY
          ) {
+            // Adding values from jellyfinSeasonsMap
            jellyfinSeasonsMap4k.forEach((value, key) => {
              finalSeasons4k.set(key, value);
            });

+            // Adding values from filteredSeasonsMap and handling missing keys
            filteredSeasonsMap4k.forEach((value, key) => {
+              // Check if the key is missing in jellyfinSeasonsMap
              if (!finalSeasons4k.has(key)) {
                finalSeasons4k.set(key, value);
              }
            });

+            // Adding values from sonarrSeasonsMap and handling missing keys
            sonarrSeasonsMap4k.forEach((value, key) => {
+              // Check if the key is missing in jellyfinSeasonsMap and filteredSeasonsMap
              if (!finalSeasons4k.has(key)) {
                finalSeasons4k.set(key, value);
              }
--- a/server/lib/scanners/jellyfin/index.ts
+++ b/server/lib/scanners/jellyfin/index.ts
@@ -461,9 +461,8 @@ class JellyfinScanner {
              tmdbId: tvShow.id,
              tvdbId: tvShow.external_ids.tvdb_id,
              mediaAddedAt: new Date(metadata.DateCreated ?? ''),
-              jellyfinMediaId: isAllStandardSeasons ? Id : undefined,
-              jellyfinMediaId4k:
-                isAll4kSeasons && this.enable4kShow ? Id : undefined,
+              jellyfinMediaId: Id,
+              jellyfinMediaId4k: Id,
              status: isAllStandardSeasons
                ? MediaStatus.AVAILABLE
                : newSeasons.some(
--- a/server/lib/settings.ts
+++ b/server/lib/settings.ts
@@ -40,7 +40,6 @@ export interface JellyfinSettings {
  name: string;
  hostname: string;
  externalHostname?: string;
-  jellyfinForgotPasswordUrl?: string;
  libraries: Library[];
  serverId: string;
 }
@@ -132,7 +131,6 @@ interface FullPublicSettings extends PublicSettings {
  mediaServerType: number;
  jellyfinHost?: string;
  jellyfinExternalHost?: string;
-  jellyfinForgotPasswordUrl?: string;
  jellyfinServerName?: string;
  partialRequestsEnabled: boolean;
  cacheImages: boolean;
@@ -333,7 +331,6 @@ class Settings {
        name: '',
        hostname: '',
        externalHostname: '',
-        jellyfinForgotPasswordUrl: '',
        libraries: [],
        serverId: '',
      },
@@ -537,7 +534,6 @@ class Settings {
      applicationUrl: this.data.main.applicationUrl,
      hideAvailable: this.data.main.hideAvailable,
      localLogin: this.data.main.localLogin,
-      jellyfinForgotPasswordUrl: this.data.jellyfin.jellyfinForgotPasswordUrl,
      movie4kEnabled: this.data.radarr.some(
        (radarr) => radarr.is4k && radarr.isDefault
      ),
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -11,7 +11,6 @@ import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
 import * as EmailValidator from 'email-validator';
 import { Router } from 'express';
-import gravatarUrl from 'gravatar-url';

 const authRoutes = Router();

@@ -275,82 +274,24 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      where: { jellyfinUserId: account.User.Id },
    });

-    if (!user && !(await userRepository.count())) {
-      logger.info(
-        'Sign-in attempt from Jellyfin user with access to the media server; creating initial admin user for Overseerr',
-        {
-          label: 'API',
-          ip: req.ip,
-          jellyfinUsername: account.User.Name,
-        }
-      );
-
-      // User doesn't exist, and there are no users in the database, we'll create the user
-      // with admin permission
-      settings.main.mediaServerType = MediaServerType.JELLYFIN;
-      user = new User({
-        email: body.email,
-        jellyfinUsername: account.User.Name,
-        jellyfinUserId: account.User.Id,
-        jellyfinDeviceId: deviceId,
-        jellyfinAuthToken: account.AccessToken,
-        permissions: Permission.ADMIN,
-        avatar: account.User.PrimaryImageTag
-          ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
-          : gravatarUrl(body.email ?? '', { default: 'mm', size: 200 }),
-        userType: UserType.JELLYFIN,
-      });
-
-      settings.jellyfin.hostname = body.hostname ?? '';
-      settings.jellyfin.serverId = account.User.ServerId;
-      settings.save();
-      startJobs();
-
-      await userRepository.save(user);
-    }
-    // User already exists, let's update their information
-    else if (body.username === user?.jellyfinUsername) {
-      logger.info(
-        `Found matching ${
-          settings.main.mediaServerType === MediaServerType.JELLYFIN
-            ? 'Jellyfin'
-            : 'Emby'
-        } user; updating user with ${
-          settings.main.mediaServerType === MediaServerType.JELLYFIN
-            ? 'Jellyfin'
-            : 'Emby'
-        }`,
-        {
-          label: 'API',
-          ip: req.ip,
-          jellyfinUsername: account.User.Name,
-        }
-      );
+    if (user) {
      // Let's check if their authtoken is up to date
      if (user.jellyfinAuthToken !== account.AccessToken) {
        user.jellyfinAuthToken = account.AccessToken;
      }
+
      // Update the users avatar with their jellyfin profile pic (incase it changed)
      if (account.User.PrimaryImageTag) {
        user.avatar = `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`;
      } else {
-        user.avatar = gravatarUrl(user.email, {
-          default: 'mm',
-          size: 200,
-        });
+        user.avatar = '/os_logo_square.png';
      }
+
      user.jellyfinUsername = account.User.Name;

      if (user.username === account.User.Name) {
        user.username = '';
      }
-
-      // TODO: If JELLYFIN_TYPE is set to 'emby' then set mediaServerType to EMBY
-      // if (process.env.JELLYFIN_TYPE === 'emby') {
-      //   settings.main.mediaServerType = MediaServerType.EMBY;
-      //   settings.save();
-      // }
-
      await userRepository.save(user);
    } else if (!settings.main.newPlexLogin) {
      logger.warn(
@@ -366,38 +307,69 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        status: 403,
        message: 'Access denied.',
      });
-    } else if (!user) {
-      logger.info(
-        'Sign-in attempt from Jellyfin user with access to the media server; creating new Overseerr user',
-        {
-          label: 'API',
-          ip: req.ip,
+    } else {
+      // Here we check if it's the first user. If it is, we create the user with no check
+      // and give them admin permissions
+      const totalUsers = await userRepository.count();
+      if (totalUsers === 0) {
+        logger.info(
+          'Sign-in attempt from Jellyfin user with access to the media server; creating initial admin user for Overseerr',
+          {
+            label: 'API',
+            ip: req.ip,
+            jellyfinUsername: account.User.Name,
+          }
+        );
+        user = new User({
+          email: body.email,
          jellyfinUsername: account.User.Name,
+          jellyfinUserId: account.User.Id,
+          jellyfinDeviceId: deviceId,
+          jellyfinAuthToken: account.AccessToken,
+          permissions: Permission.ADMIN,
+          avatar: account.User.PrimaryImageTag
+            ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
+            : '/os_logo_square.png',
+          userType: UserType.JELLYFIN,
+        });
+        await userRepository.save(user);
+
+        //Update hostname in settings if it doesn't exist (initial configuration)
+        //Also set mediaservertype to JELLYFIN
+        if (settings.jellyfin.hostname === '') {
+          settings.main.mediaServerType = MediaServerType.JELLYFIN;
+          settings.jellyfin.hostname = body.hostname ?? '';
+          settings.jellyfin.serverId = account.User.ServerId;
+          settings.save();
+          startJobs();
        }
-      );
-
-      if (!body.email) {
-        throw new Error('add_email');
      }

-      user = new User({
-        email: body.email,
-        jellyfinUsername: account.User.Name,
-        jellyfinUserId: account.User.Id,
-        jellyfinDeviceId: deviceId,
-        jellyfinAuthToken: account.AccessToken,
-        permissions: settings.main.defaultPermissions,
-        avatar: account.User.PrimaryImageTag
-          ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
-          : gravatarUrl(body.email, { default: 'mm', size: 200 }),
-        userType: UserType.JELLYFIN,
-      });
-      //initialize Jellyfin/Emby users with local login
-      const passedExplicitPassword = body.password && body.password.length > 0;
-      if (passedExplicitPassword) {
-        await user.setPassword(body.password ?? '');
+      if (!user) {
+        if (!body.email) {
+          throw new Error('add_email');
+        }
+
+        user = new User({
+          email: body.email,
+          jellyfinUsername: account.User.Name,
+          jellyfinUserId: account.User.Id,
+          jellyfinDeviceId: deviceId,
+          jellyfinAuthToken: account.AccessToken,
+          permissions: settings.main.defaultPermissions,
+          avatar: account.User.PrimaryImageTag
+            ? `${jellyfinHost}/Users/${account.User.Id}/Images/Primary/?tag=${account.User.PrimaryImageTag}&quality=90`
+            : '/os_logo_square.png',
+          userType: UserType.JELLYFIN,
+        });
+        //initialize Jellyfin/Emby users with local login
+        const passedExplicitPassword =
+          body.password && body.password.length > 0;
+        if (passedExplicitPassword) {
+          await user.setPassword(body.password ?? '');
+        }
+        await userRepository.save(user);
      }
-      await userRepository.save(user);
    }

    // Set logged in session
@@ -428,11 +400,6 @@ authRoutes.post('/jellyfin', async (req, res, 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({
--- a/server/routes/settings/index.ts
+++ b/server/routes/settings/index.ts
@@ -29,7 +29,6 @@ import { getAppVersion } from '@server/utils/appVersion';
 import { Router } from 'express';
 import rateLimit from 'express-rate-limit';
 import fs from 'fs';
-import gravatarUrl from 'gravatar-url';
 import { escapeRegExp, merge, omit, set, sortBy } from 'lodash';
 import { rescheduleJob } from 'node-schedule';
 import path from 'path';
@@ -338,7 +337,7 @@ settingsRoutes.get('/jellyfin/users', async (req, res) => {
    id: user.Id,
    thumb: user.PrimaryImageTag
      ? `${jellyfinHost}/Users/${user.Id}/Images/Primary/?tag=${user.PrimaryImageTag}&quality=90`
-      : gravatarUrl(user.Name, { default: 'mm', size: 200 }),
+      : '/os_logo_square.png',
    email: user.Name,
  }));

--- a/server/routes/user/index.ts
+++ b/server/routes/user/index.ts
@@ -537,10 +537,7 @@ router.post(
            permissions: settings.main.defaultPermissions,
            avatar: jellyfinUser?.PrimaryImageTag
              ? `${jellyfinHost}/Users/${jellyfinUser.Id}/Images/Primary/?tag=${jellyfinUser.PrimaryImageTag}&quality=90`
-              : gravatarUrl(jellyfinUser?.Name ?? '', {
-                  default: 'mm',
-                  size: 200,
-                }),
+              : '/os_logo_square.png',
            userType: UserType.JELLYFIN,
          });

--- a/src/assets/services/letterboxd.svg
+++ b/src/assets/services/letterboxd.svg
--- a/src/components/ExternalLinkBlock/index.tsx
+++ b/src/components/ExternalLinkBlock/index.tsx
@@ -1,7 +1,6 @@
 import EmbyLogo from '@app/assets/services/emby.svg';
 import ImdbLogo from '@app/assets/services/imdb.svg';
 import JellyfinLogo from '@app/assets/services/jellyfin.svg';
-import LetterboxdLogo from '@app/assets/services/letterboxd.svg';
 import PlexLogo from '@app/assets/services/plex.svg';
 import RTLogo from '@app/assets/services/rt.svg';
 import TmdbLogo from '@app/assets/services/tmdb.svg';
@@ -104,16 +103,6 @@ const ExternalLinkBlock = ({
          <TraktLogo />
        </a>
      )}
-      {tmdbId && mediaType === MediaType.MOVIE && (
-        <a
-          href={`https://letterboxd.com/tmdb/${tmdbId}`}
-          className="w-8 opacity-50 transition duration-300 hover:opacity-100"
-          target="_blank"
-          rel="noreferrer"
-        >
-          <LetterboxdLogo />
-        </a>
-      )}
    </div>
  );
 };
--- a/src/components/Login/JellyfinLogin.tsx
+++ b/src/components/Login/JellyfinLogin.tsx
@@ -222,8 +222,6 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
    const baseUrl = settings.currentSettings.jellyfinExternalHost
      ? settings.currentSettings.jellyfinExternalHost
      : settings.currentSettings.jellyfinHost;
-    const jellyfinForgotPasswordUrl =
-      settings.currentSettings.jellyfinForgotPasswordUrl;
    return (
      <div>
        <Formik
@@ -300,15 +298,11 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
                        <Button
                          as="a"
                          buttonType="ghost"
-                          href={
-                            jellyfinForgotPasswordUrl
-                              ? `${jellyfinForgotPasswordUrl}`
-                              : `${baseUrl}/web/index.html#!/${
-                                  process.env.JELLYFIN_TYPE === 'emby'
-                                    ? 'startup/'
-                                    : ''
-                                }forgotpassword.html`
-                          }
+                          href={`${baseUrl}/web/index.html#!/${
+                            process.env.JELLYFIN_TYPE === 'emby'
+                              ? 'startup/'
+                              : ''
+                          }forgotpassword.html`}
                        >
                          {intl.formatMessage(messages.forgotpassword)}
                        </Button>
--- a/src/components/Settings/SettingsJellyfin.tsx
+++ b/src/components/Settings/SettingsJellyfin.tsx
@@ -30,10 +30,9 @@ const messages = defineMessages({
  jellyfinSettingsSuccess: '{mediaServerName} settings saved successfully!',
  jellyfinSettings: '{mediaServerName} Settings',
  jellyfinSettingsDescription:
-    'Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page.',
+    'Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL.',
  externalUrl: 'External URL',
  internalUrl: 'Internal URL',
-  jellyfinForgotPasswordUrl: 'Forgot Password URL',
  validationUrl: 'You must provide a valid URL',
  syncing: 'Syncing',
  syncJellyfin: 'Sync Libraries',
@@ -95,10 +94,6 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
      /^(https?:\/\/)?(?:[\w-]+\.)*[\w-]+(?::\d{2,5})?(?:\/[\w-]+)*(?:\/)?$/gm,
      intl.formatMessage(messages.validationUrl)
    ),
-    jellyfinForgotPasswordUrl: Yup.string().matches(
-      /^(https?:\/\/)?(?:[\w-]+\.)*[\w-]+(?::\d{2,5})?(?:\/[\w-]+)*(?:\/)?$/gm,
-      intl.formatMessage(messages.validationUrl)
-    ),
  });

  const activeLibraries =
@@ -358,7 +353,6 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
            initialValues={{
              jellyfinInternalUrl: data?.hostname || '',
              jellyfinExternalUrl: data?.externalHostname || '',
-              jellyfinForgotPasswordUrl: data?.jellyfinForgotPasswordUrl || '',
            }}
            validationSchema={JellyfinSettingsSchema}
            onSubmit={async (values) => {
@@ -366,7 +360,6 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
                await axios.post('/api/v1/settings/jellyfin', {
                  hostname: values.jellyfinInternalUrl,
                  externalHostname: values.jellyfinExternalUrl,
-                  jellyfinForgotPasswordUrl: values.jellyfinForgotPasswordUrl,
                } as JellyfinSettings);

                addToast(
@@ -444,30 +437,6 @@ const SettingsJellyfin: React.FC<SettingsJellyfinProps> = ({
                        )}
                    </div>
                  </div>
-                  <div className="form-row">
-                    <label
-                      htmlFor="jellyfinForgotPasswordUrl"
-                      className="text-label"
-                    >
-                      {intl.formatMessage(messages.jellyfinForgotPasswordUrl)}
-                    </label>
-                    <div className="form-input-area">
-                      <div className="form-input-field">
-                        <Field
-                          type="text"
-                          inputMode="url"
-                          id="jellyfinForgotPasswordUrl"
-                          name="jellyfinForgotPasswordUrl"
-                        />
-                      </div>
-                      {errors.jellyfinForgotPasswordUrl &&
-                        touched.jellyfinForgotPasswordUrl && (
-                          <div className="error">
-                            {errors.jellyfinForgotPasswordUrl}
-                          </div>
-                        )}
-                    </div>
-                  </div>
                  <div className="actions">
                    <div className="flex justify-end">
                      <span className="ml-3 inline-flex rounded-md shadow-sm">
--- a/src/i18n/locale/de.json
+++ b/src/i18n/locale/de.json
@@ -1235,7 +1235,7 @@
  "components.Discover.tmdbmoviestreamingservices": "TMDB Film-Streaming-Dienste",
  "components.Discover.tmdbtvstreamingservices": "TMDB TV-Streaming-Dienste",
  "i18n.collection": "Sammlung",
-  "components.Discover.FilterSlideover.tmdbuservotecount": "Anzahl an TMDB Benutzerbewertungen",
+  "components.Discover.FilterSlideover.tmdbuservotecount": "TMDB Kullanıcı Oy Sayısı",
  "components.Settings.RadarrModal.tagRequestsInfo": "Füge automatisch ein Tag hinzu mit der ID und dem Namen des anfordernden Nutzers",
  "components.MovieDetails.imdbuserscore": "IMDB Nutzer Bewertung",
  "components.Settings.SonarrModal.tagRequests": "Tag Anforderungen",
--- a/src/i18n/locale/en.json
+++ b/src/i18n/locale/en.json
@@ -938,7 +938,7 @@
  "components.Settings.internalUrl": "Internal URL",
  "components.Settings.is4k": "4K",
  "components.Settings.jellyfinSettings": "{mediaServerName} Settings",
-  "components.Settings.jellyfinSettingsDescription": "Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL. A custom password reset URL can also be set for {mediaServerName} login, in case you would like to redirect to a different password reset page.",
+  "components.Settings.jellyfinSettingsDescription": "Optionally configure the internal and external endpoints for your {mediaServerName} server. In most cases, the external URL is different to the internal URL.",
  "components.Settings.jellyfinSettingsFailure": "Something went wrong while saving {mediaServerName} settings.",
  "components.Settings.jellyfinSettingsSuccess": "{mediaServerName} settings saved successfully!",
  "components.Settings.jellyfinlibraries": "{mediaServerName} Libraries",
Author	SHA1	Message	Date
fallenbagel	19efb06faa	Merge branch 'develop' into feat-media-availability-sync-emby/jellyfin-support	2023-11-30 09:14:51 +05:00
fallenbagel	724b2f93b3	fix(availabilitysync): use the correct 4k jellyfinMediaId	2023-11-15 17:27:04 +05:00
fallenbagel	4676d4f0bb	feat(job): media availability support for jellyfin/emby This refactors the media availability job to support jellyfin/emby for media removal automatically. Needs further testing on 4k items (as I have not yet tested with 4k), however, non-4k items work as intended. fix #406, fix #193, fix #516, fix #362, fix #84	2023-11-05 17:24:46 +05:00