chore(deps): update dependency @headlessui/react to v2

README.md

@@ -8,7 +8,7 @@
 <p align="center">
 <a href="https://discord.gg/seerr"><img src="https://img.shields.io/discord/783137440809746482" alt="Discord"></a>
 <a href="https://hub.docker.com/r/seerr/seerr"><img src="https://img.shields.io/docker/pulls/seerr/seerr" alt="Docker pulls"></a>
-<a href="https://translate.seerr.dev/engage/seerr/"><img src="https://translate.seerr.dev/widget/seerr/svg-badge.svg" alt="Translation status" /></a>
+<a href="https://translate.seerr.dev/engage/seerr/"><img src="https://translate.seerr.dev/widget/seerr/seerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/seerr-team/seerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/seerr-team/seerr"></a>
 
 **Seerr** is a free and open source software application for managing requests for your media library. It integrates with the media server of your choice: [Jellyfin](https://jellyfin.org), [Plex](https://plex.tv), and [Emby](https://emby.media/). In addition, it integrates with your existing services, such as **[Sonarr](https://sonarr.tv/)**, **[Radarr](https://radarr.video/)**.

docs/troubleshooting.mdx

@@ -174,36 +174,4 @@ This can happen if you have a new installation of Jellyfin/Emby or if you have c
 
 This process should restore your admin privileges while preserving your settings.
 
-## Failed to enable web push notifications
-
-### Option 1: You are using Pi-hole
-
-When using Pi-hole, you need to whitelist the proper domains in order for the queries to not be intercepted and blocked by Pi-hole.
-If you are using a chromium based browser (eg: Chrome, Brave, Edge...), the domain you need to whitelist is `fcm.googleapis.com`
-If you are using Firefox, the domain you need to whitelist is `push.services.mozilla.com`
-
-1. Log into your Pi-hole through the admin interface, then click on Domains situated under GROUP MANAGEMENT.
-2. Add the domain corresponding to your browser in the `Domain to be added` field and then click on Add to allowed domains.
-3. Now in order for those changes to be used you need to flush your current dns cache.
-4. You can do so by using this command line in your Pi-hole terminal:
-    ```bash
-    pihole restartdns
-    ```
-If this command fails (which is unlikely), use this equivalent:
-    ```bash
-    pihole -f && pihole restartdns
-    ```
-5. Then restart your Seerr instance and try to enable the web push notifications again.
-
-
-### Option 2: You are using Brave browser
-
-Brave is a "De-Googled" browser. So by default or if you refused a prompt in the past, it cuts the access to the FCM (Firebase Cloud Messaging) service, which is mandatory for the web push notifications on Chromium based browsers.
-
-1. Open Brave and paste this address in the url bar: `brave://settings/privacy`
-2. Look for the option: "Use Google services for push messaging"
-3. Activate this option
-4. Relaunch Brave completely
-5. You should now see the notifications prompt appearing instead of an error message.
-
 If you still encounter issues, please reach out on our support channels.

package.json

@@ -39,7 +39,7 @@
     "@formatjs/intl-pluralrules": "5.4.6",
     "@formatjs/intl-utils": "3.8.4",
     "@formatjs/swc-plugin-experimental": "^0.4.0",
-    "@headlessui/react": "1.7.12",
+    "@headlessui/react": "2.2.9",
     "@heroicons/react": "2.2.0",
     "@supercharge/request-ip": "1.2.0",
     "@svgr/webpack": "6.5.1",

server/api/jellyfin.ts

@@ -112,10 +112,6 @@ export interface JellyfinLibraryItemExtended extends JellyfinLibraryItem {
   DateCreated?: string;
 }
 
-type EpisodeReturn<T> = T extends { includeMediaInfo: true }
-  ? JellyfinLibraryItemExtended[]
-  : JellyfinLibraryItem[];
-
 export interface JellyfinItemsReponse {
   Items: JellyfinLibraryItemExtended[];
   TotalRecordCount: number;
@@ -419,22 +415,13 @@ class JellyfinAPI extends ExternalAPI {
     }
   }
 
-  public async getEpisodes<
-    T extends { includeMediaInfo?: boolean } | undefined = undefined
-  >(
+  public async getEpisodes(
     seriesID: string,
-    seasonID: string,
-    options?: T
-  ): Promise<EpisodeReturn<T>> {
+    seasonID: string
+  ): Promise<JellyfinLibraryItem[]> {
     try {
       const episodeResponse = await this.get<any>(
-        `/Shows/${seriesID}/Episodes`,
-        {
-          params: {
-            seasonId: seasonID,
-            ...(options?.includeMediaInfo && { fields: 'MediaSources' }),
-          },
-        }
+        `/Shows/${seriesID}/Episodes?seasonId=${seasonID}`
       );
 
       return episodeResponse.Items.filter(

server/lib/scanners/jellyfin/index.ts

@@ -374,10 +374,9 @@ class JellyfinScanner {
             ) ?? []
           ).length;
 
-          const jellyfinSeasons = await this.jfClient.getSeasons(Id);
-
           for (const season of seasons) {
-            const matchedJellyfinSeason = jellyfinSeasons.find((md) => {
+            const JellyfinSeasons = await this.jfClient.getSeasons(Id);
+            const matchedJellyfinSeason = JellyfinSeasons.find((md) => {
               if (tvdbSeasonFromAnidb) {
                 // In AniDB we don't have the concept of seasons,
                 // we have multiple shows with only Season 1 (and sometimes a season with index 0 for specials).
@@ -398,52 +397,38 @@ class JellyfinScanner {
 
             // Check if we found the matching season and it has all the available episodes
             if (matchedJellyfinSeason) {
+              // If we have a matched Jellyfin season, get its children metadata so we can check details
+              const episodes = await this.jfClient.getEpisodes(
+                Id,
+                matchedJellyfinSeason.Id
+              );
+
+              //Get count of episodes that are HD and 4K
               let totalStandard = 0;
               let total4k = 0;
 
-              if (!this.enable4kShow) {
-                const episodes = await this.jfClient.getEpisodes(
-                  Id,
-                  matchedJellyfinSeason.Id
-                );
+              //use for loop to make sure this loop _completes_ in full
+              //before the next section
+              for (const episode of episodes) {
+                let episodeCount = 1;
 
-                for (const episode of episodes) {
-                  let episodeCount = 1;
-
-                  // count number of combined episodes
-                  if (
-                    episode.IndexNumber !== undefined &&
-                    episode.IndexNumberEnd !== undefined
-                  ) {
-                    episodeCount =
-                      episode.IndexNumberEnd - episode.IndexNumber + 1;
-                  }
-
-                  totalStandard += episodeCount;
+                // count number of combined episodes
+                if (
+                  episode.IndexNumber !== undefined &&
+                  episode.IndexNumberEnd !== undefined
+                ) {
+                  episodeCount =
+                    episode.IndexNumberEnd - episode.IndexNumber + 1;
                 }
-              } else {
-                // 4K detection enabled - request media info to check resolution
-                const episodes = await this.jfClient.getEpisodes(
-                  Id,
-                  matchedJellyfinSeason.Id,
-                  { includeMediaInfo: true }
-                );
 
-                for (const episode of episodes) {
-                  let episodeCount = 1;
+                if (!this.enable4kShow) {
+                  totalStandard += episodeCount;
+                } else {
+                  const ExtendedEpisodeData = await this.jfClient.getItemData(
+                    episode.Id
+                  );
 
-                  // count number of combined episodes
-                  if (
-                    episode.IndexNumber !== undefined &&
-                    episode.IndexNumberEnd !== undefined
-                  ) {
-                    episodeCount =
-                      episode.IndexNumberEnd - episode.IndexNumber + 1;
-                  }
-
-                  // MediaSources field is included in response when includeMediaInfo is true
-                  // We iterate all MediaSources to detect if episode has both standard AND 4K versions
-                  episode.MediaSources?.some((MediaSource) => {
+                  ExtendedEpisodeData?.MediaSources?.some((MediaSource) => {
                     return MediaSource.MediaStreams.some((MediaStream) => {
                       if (MediaStream.Type === 'Video') {
                         if ((MediaStream.Width ?? 0) >= 2000) {

server/routes/auth.ts

@@ -626,6 +626,76 @@ authRoutes.post('/local', async (req, res, next) => {
       });
     }
 
+    const mainUser = await userRepository.findOneOrFail({
+      select: { id: true, plexToken: true, plexId: true },
+      where: { id: 1 },
+    });
+    const mainPlexTv = new PlexTvAPI(mainUser.plexToken ?? '');
+
+    if (!user.plexId) {
+      try {
+        const plexUsersResponse = await mainPlexTv.getUsers();
+        const account = plexUsersResponse.MediaContainer.User.find(
+          (account) =>
+            account.$.email &&
+            account.$.email.toLowerCase() === user.email.toLowerCase()
+        )?.$;
+
+        if (
+          account &&
+          (await mainPlexTv.checkUserAccess(parseInt(account.id)))
+        ) {
+          logger.info(
+            'Found matching Plex user; updating user with Plex data',
+            {
+              label: 'API',
+              ip: req.ip,
+              email: body.email,
+              userId: user.id,
+              plexId: account.id,
+              plexUsername: account.username,
+            }
+          );
+
+          user.plexId = parseInt(account.id);
+          user.avatar = account.thumb;
+          user.email = account.email;
+          user.plexUsername = account.username;
+          user.userType = UserType.PLEX;
+
+          await userRepository.save(user);
+        }
+      } catch (e) {
+        logger.error('Something went wrong fetching Plex users', {
+          label: 'API',
+          errorMessage: e.message,
+        });
+      }
+    }
+
+    if (
+      user.plexId &&
+      user.plexId !== mainUser.plexId &&
+      !(await mainPlexTv.checkUserAccess(user.plexId))
+    ) {
+      logger.warn(
+        'Failed sign-in attempt from Plex user without access to the media server',
+        {
+          label: 'API',
+          account: {
+            ip: req.ip,
+            email: body.email,
+            userId: user.id,
+            plexId: user.plexId,
+          },
+        }
+      );
+      return next({
+        status: 403,
+        message: 'Access denied.',
+      });
+    }
+
     // Set logged in session
     if (user && req.session) {
       req.session.userId = user.id;
@@ -705,7 +775,7 @@ authRoutes.post('/logout', async (req, res, next) => {
         });
         return next({ status: 500, message: 'Failed to destroy session.' });
       }
-      logger.debug('Successfully logged out user', {
+      logger.info('Successfully logged out user', {
         label: 'Auth',
         userId,
       });

src/hooks/useUser.ts

@@ -2,7 +2,6 @@ import { UserType } from '@server/constants/user';
 import type { PermissionCheckOptions } from '@server/lib/permissions';
 import { hasPermission, Permission } from '@server/lib/permissions';
 import type { NotificationAgentKey } from '@server/lib/settings';
-import { useRouter } from 'next/router';
 import type { MutatorCallback } from 'swr';
 import useSWR from 'swr';
 
@@ -57,21 +56,13 @@ export const useUser = ({
   id,
   initialData,
 }: { id?: number; initialData?: User } = {}): UserHookResponse => {
-  const router = useRouter();
-  const isAuthPage = /^\/(login|setup|resetpassword(?:\/|$))/.test(
-    router.pathname
-  );
-
   const {
     data,
     error,
     mutate: revalidate,
   } = useSWR<User>(id ? `/api/v1/user/${id}` : `/api/v1/auth/me`, {
     fallbackData: initialData,
-    refreshInterval: !isAuthPage ? 30000 : 0,
-    revalidateOnFocus: !isAuthPage,
-    revalidateOnMount: !isAuthPage,
-    revalidateOnReconnect: !isAuthPage,
+    refreshInterval: 30000,
     errorRetryInterval: 30000,
     shouldRetryOnError: false,
   });