fix: remove useless tags

fix: missing file
feat(overriderules): apply override rules to advanced requests
2025-12-24 10:49:30 -05:00 · 2025-12-01 22:03:16 +01:00 · 2025-11-21 22:19:56 +01:00 · 2025-11-21 22:15:17 +01:00
30 changed files with 3414 additions and 2688 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,33 +1,14 @@
-<!--
-    Please read contributing guide before submitting
-    your pull request. Please fill in each section below to help us better prioritize your pull request. Thanks!
-->
+#### Description

-## Description
+#### Screenshot (if UI-related)

-<!--- Describe your changes in detail -->
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
+#### To-Dos

- Fixes #XXXX
-
-## How Has This Been Tested?
-
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-## Screenshots / Logs (if applicable)
-
-## Checklist:
-
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-
- [ ] I have read and followed the contribution [guidelines](https://github.com/seerr-team/seerr/blob/develop/CONTRIBUTING.md).
 - [ ] Disclosed any use of AI (see our [policy](https://github.com/seerr-team/seerr/blob/develop/CONTRIBUTING.md#ai-assistance-notice))
- [ ] I have updated the documentation accordingly.
- [ ] All new and existing tests passed.
 - [ ] Successful build `pnpm build`
 - [ ] Translation keys `pnpm i18n:extract`
 - [ ] Database migration (if required)
+
+#### Issues Fixed or Closed
+
+- Fixes #XXXX
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,6 +2,7 @@
 .next/
 dist/
 config/
+CHANGELOG.md
 pnpm-lock.yaml
 cypress/config/settings.cypress.json

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -151,9 +151,9 @@ When adding new UI text, please try to adhere to the following guidelines:

 ## Translation

-We use [Weblate](https://translate.seerr.dev/projects/seerr/seerr-frontend/) for our translations, and your help with localizing Seerr would be greatly appreciated! If your language is not listed below, please [open a feature request](/../../issues/new/choose).
+We use [Weblate](https://jellyseerr.borgcube.de/projects/jellyseerr/jellyseerr-frontend/) for our translations, and your help with localizing Seerr would be greatly appreciated! If your language is not listed below, please [open a feature request](/../../issues/new/choose).

-<a href="https://translate.seerr.dev/engage/seerr/"><img src="https://translate.seerr.dev/widget/seerr/multi-auto.svg" alt="Translation status" /></a>
+<a href="https://jellyseerr.borgcube.de/engage/jellysseerr/"><img src="https://jellyseerr.borgcube.de/widget/jellyseerr/multi-auto.svg" alt="Translation status" /></a>

 ## Migrations

--- a/README.md
+++ b/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="http://translate.seerr.dev/engage/seerr/"><img src="http://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/)**.
--- a/charts/seerr-chart/Chart.yaml
+++ b/charts/seerr-chart/Chart.yaml
@@ -5,7 +5,7 @@ description: Seerr helm chart for Kubernetes
 type: application
 version: 3.0.0
 # renovate: image=ghcr.io/seerr-team/seerr
-appVersion: '3.0.0'
+appVersion: '2.7.3'
 maintainers:
  - name: Seerr Team
    url: https://github.com/orgs/seerr-team/people
--- a/charts/seerr-chart/README.md
+++ b/charts/seerr-chart/README.md
@@ -1,6 +1,6 @@
 # seerr-chart

-![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
+![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.3](https://img.shields.io/badge/AppVersion-2.7.3-informational?style=flat-square)

 Seerr helm chart for Kubernetes

@@ -22,7 +22,7 @@ Kubernetes: `>=1.23.0-0`

 ## Installation

-Refer to [Seerr kubernetes documentation](https://docs.seerr.dev/getting-started/kubernetes)
+Refer to [https://docs.seerr.dev/getting-started/kubernetes](Seerr kubernetes documentation)

 ## Update Notes

--- a/charts/seerr-chart/README.md.gotmpl
+++ b/charts/seerr-chart/README.md.gotmpl
@@ -16,7 +16,7 @@

 ## Installation

-Refer to [Seerr kubernetes documentation](https://docs.seerr.dev/getting-started/kubernetes)
+Refer to [https://docs.seerr.dev/getting-started/kubernetes](Seerr kubernetes documentation)

 ## Update Notes

--- a/docs/getting-started/buildfromsource.mdx
+++ b/docs/getting-started/buildfromsource.mdx
@@ -26,7 +26,8 @@ sudo mkdir -p /opt/seerr && cd /opt/seerr
 ```
 2. Clone the Seerr repository and checkout the main branch:
 ```bash
-git clone https://github.com/seerr-team/seerr.git .
+git clone https://github.com/seerr-team/seerr.git
+cd seerr
 git checkout main
 ```
 3. Install the dependencies:
--- a/docs/migration-guide.mdx
+++ b/docs/migration-guide.mdx
@@ -28,7 +28,7 @@ Changes :

 If you're migrating from a previous installation, you may need to update the ownership of your config folder:
 ```bash
-docker run --rm -v /path/to/appdata/config:/data alpine chown -R 1000:1000 /data
+sudo chown -R 1000:1000 /path/to/appdata/config
 ```

 This ensures the `node` user (UID 1000) owns the config directory and can read and write to it.
--- a/docs/troubleshooting.mdx
+++ b/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.
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "seerr",
  "version": "0.1.0",
  "private": true,
-  "packageManager": "pnpm@10.24.0",
+  "packageManager": "pnpm@10.17.1",
  "scripts": {
    "preinstall": "npx only-allow pnpm",
    "postinstall": "node postinstall-win.js",
@@ -33,38 +33,38 @@
  },
  "license": "MIT",
  "dependencies": {
-    "@dr.pogodin/csurf": "^1.16.6",
-    "@formatjs/intl-displaynames": "6.8.13",
+    "@dr.pogodin/csurf": "^1.14.1",
+    "@formatjs/intl-displaynames": "6.2.6",
    "@formatjs/intl-locale": "3.1.1",
-    "@formatjs/intl-pluralrules": "5.4.6",
+    "@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.2.0",
+    "@heroicons/react": "2.0.16",
    "@supercharge/request-ip": "1.2.0",
    "@svgr/webpack": "6.5.1",
-    "@tanem/react-nprogress": "5.0.56",
+    "@tanem/react-nprogress": "5.0.30",
    "@types/ua-parser-js": "^0.7.36",
    "@types/wink-jaro-distance": "^2.0.2",
-    "ace-builds": "1.43.4",
-    "axios": "1.13.2",
-    "axios-rate-limit": "1.4.0",
+    "ace-builds": "1.15.2",
+    "axios": "1.10.0",
+    "axios-rate-limit": "1.3.0",
    "bcrypt": "5.1.0",
-    "bowser": "2.13.1",
+    "bowser": "2.11.0",
    "connect-typeorm": "1.1.4",
    "cookie-parser": "1.4.7",
    "copy-to-clipboard": "3.3.3",
-    "country-flag-icons": "1.6.4",
+    "country-flag-icons": "1.5.5",
    "cronstrue": "2.23.0",
    "date-fns": "2.29.3",
-    "dayjs": "1.11.19",
+    "dayjs": "1.11.7",
    "dns-caching": "^0.2.7",
-    "email-templates": "12.0.3",
+    "email-templates": "12.0.1",
    "express": "4.21.2",
    "express-openapi-validator": "4.13.8",
    "express-rate-limit": "6.7.0",
-    "express-session": "1.18.2",
-    "formik": "^2.4.9",
+    "express-session": "1.17.3",
+    "formik": "^2.4.6",
    "gravatar-url": "3.1.0",
    "http-proxy-agent": "^7.0.2",
    "https-proxy-agent": "^7.0.6",
@@ -76,19 +76,19 @@
    "node-schedule": "2.1.1",
    "nodemailer": "6.10.0",
    "openpgp": "5.11.2",
-    "pg": "8.16.3",
+    "pg": "8.11.0",
    "plex-api": "5.3.2",
    "pug": "3.0.3",
    "react": "^18.3.1",
    "react-ace": "10.1.0",
    "react-animate-height": "2.1.2",
-    "react-aria": "3.44.0",
+    "react-aria": "3.23.0",
    "react-dom": "^18.3.1",
    "react-intersection-observer": "9.4.3",
    "react-intl": "^6.6.8",
    "react-markdown": "8.0.5",
    "react-popper-tooltip": "4.4.2",
-    "react-select": "5.10.2",
+    "react-select": "5.7.0",
    "react-spring": "9.7.1",
    "react-tailwindcss-datepicker-sct": "1.3.4",
    "react-toast-notifications": "2.5.1",
@@ -97,19 +97,19 @@
    "react-use-clipboard": "1.0.9",
    "reflect-metadata": "0.1.13",
    "secure-random-password": "0.2.3",
-    "semver": "7.7.3",
+    "semver": "7.7.1",
    "sharp": "^0.33.4",
    "sqlite3": "5.1.7",
    "swagger-ui-express": "4.6.2",
-    "swr": "2.3.7",
+    "swr": "2.2.5",
    "tailwind-merge": "^2.6.0",
    "typeorm": "0.3.12",
    "ua-parser-js": "^1.0.35",
-    "undici": "^7.16.0",
-    "validator": "^13.15.23",
-    "web-push": "3.6.7",
+    "undici": "^7.3.0",
+    "validator": "^13.15.15",
+    "web-push": "3.5.0",
    "wink-jaro-distance": "^2.0.0",
-    "winston": "3.18.3",
+    "winston": "3.8.2",
    "winston-daily-rotate-file": "4.7.1",
    "xml2js": "0.4.23",
    "yamljs": "0.3.0",
@@ -123,33 +123,32 @@
    "@tailwindcss/forms": "0.5.10",
    "@tailwindcss/typography": "0.5.16",
    "@types/bcrypt": "5.0.0",
-    "@types/cookie-parser": "1.4.10",
-    "@types/country-flag-icons": "1.2.2",
-    "@types/csurf": "1.11.5",
+    "@types/cookie-parser": "1.4.3",
+    "@types/country-flag-icons": "1.2.0",
+    "@types/csurf": "1.11.2",
    "@types/email-templates": "8.0.4",
    "@types/express": "4.17.17",
-    "@types/express-session": "1.18.2",
-    "@types/lodash": "4.17.21",
+    "@types/express-session": "1.17.6",
+    "@types/lodash": "4.14.191",
    "@types/mime": "3",
    "@types/node": "22.10.5",
-    "@types/node-schedule": "2.1.8",
+    "@types/node-schedule": "2.1.0",
    "@types/nodemailer": "6.4.7",
    "@types/react": "^18.3.3",
    "@types/react-dom": "^18.3.0",
-    "@types/react-transition-group": "4.4.12",
+    "@types/react-transition-group": "4.4.5",
    "@types/secure-random-password": "0.2.1",
-    "@types/semver": "7.7.1",
-    "@types/swagger-ui-express": "4.1.8",
-    "@types/validator": "^13.15.10",
-    "@types/web-push": "3.6.4",
+    "@types/semver": "7.3.13",
+    "@types/swagger-ui-express": "4.1.3",
+    "@types/validator": "^13.15.3",
+    "@types/web-push": "3.3.2",
    "@types/xml2js": "0.4.11",
    "@types/yamljs": "0.2.31",
    "@types/yup": "0.29.14",
    "@typescript-eslint/eslint-plugin": "5.54.0",
    "@typescript-eslint/parser": "5.54.0",
-    "autoprefixer": "10.4.22",
-    "baseline-browser-mapping": "^2.8.32",
-    "commitizen": "4.3.1",
+    "autoprefixer": "10.4.13",
+    "commitizen": "4.3.0",
    "copyfiles": "2.4.1",
    "cy-mobile-commands": "0.3.0",
    "cypress": "14.1.0",
@@ -158,22 +157,22 @@
    "eslint-config-next": "^14.2.4",
    "eslint-config-prettier": "8.6.0",
    "eslint-plugin-formatjs": "4.9.0",
-    "eslint-plugin-jsx-a11y": "6.10.2",
-    "eslint-plugin-no-relative-import-paths": "1.6.1",
+    "eslint-plugin-jsx-a11y": "6.7.1",
+    "eslint-plugin-no-relative-import-paths": "1.5.2",
    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-react": "7.37.5",
+    "eslint-plugin-react": "7.32.2",
    "eslint-plugin-react-hooks": "4.6.0",
    "husky": "8.0.3",
    "lint-staged": "13.1.2",
-    "nodemon": "3.1.11",
-    "postcss": "8.5.6",
+    "nodemon": "3.1.9",
+    "postcss": "8.4.31",
    "prettier": "2.8.4",
    "prettier-plugin-organize-imports": "3.2.2",
    "prettier-plugin-tailwindcss": "0.2.3",
    "tailwindcss": "3.2.7",
-    "ts-node": "10.9.2",
-    "tsc-alias": "1.8.16",
-    "tsconfig-paths": "4.2.0",
+    "ts-node": "10.9.1",
+    "tsc-alias": "1.8.2",
+    "tsconfig-paths": "4.1.2",
    "typescript": "4.9.5"
  },
  "engines": {
@@ -182,7 +181,7 @@
  },
  "overrides": {
    "sqlite3/node-gyp": "8.4.1",
-    "@types/express-session": "1.18.2"
+    "@types/express-session": "1.17.6"
  },
  "config": {
    "commitizen": {
@@ -205,11 +204,8 @@
  },
  "pnpm": {
    "onlyBuiltDependencies": [
-      "@swc/core",
-      "bcrypt",
-      "cypress",
-      "sharp",
-      "sqlite3"
+      "sqlite3",
+      "bcrypt"
    ]
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/seerr-api.yml
+++ b/seerr-api.yml
@@ -7755,6 +7755,32 @@ paths:
            application/json:
              schema:
                $ref: '#/components/schemas/OverrideRule'
+  /overrideRule/advancedRequest:
+    post:
+      summary: Advanced override rule request
+      description: Processes an advanced override rule request.
+      tags:
+        - overriderule
+      responses:
+        '200':
+          description: Advanced override rule request processed
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  rootFolder:
+                    type: string
+                    nullable: true
+                  profileId:
+                    type: number
+                    nullable: true
+                  tags:
+                    type: array
+                    items:
+                      type: number
+                    nullable: true
+
 security:
  - cookieAuth: []
  - apiKey: []
--- a/server/api/jellyfin.ts
+++ b/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;
@@ -149,7 +145,7 @@ class JellyfinAPI extends ExternalAPI {
      {},
      {
        headers: {
-          Authorization: authHeaderVal,
+          'X-Emby-Authorization': authHeaderVal,
          'Content-Type': 'application/json',
          Accept: 'application/json',
        },
@@ -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(
--- a/server/entity/MediaRequest.ts
+++ b/server/entity/MediaRequest.ts
@@ -1,15 +1,13 @@
 import TheMovieDb from '@server/api/themoviedb';
-import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
-import type { TmdbKeyword } from '@server/api/themoviedb/interfaces';
 import {
  MediaRequestStatus,
  MediaStatus,
  MediaType,
 } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
-import OverrideRule from '@server/entity/OverrideRule';
 import type { MediaRequestBody } from '@server/interfaces/api/requestInterfaces';
 import notificationManager, { Notification } from '@server/lib/notifications';
+import overrideRules from '@server/lib/overrideRules';
 import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
@@ -211,121 +209,20 @@ export class MediaRequest {
    let tags = requestBody.tags;

    if (useOverrides) {
-      const defaultRadarrId = requestBody.is4k
-        ? settings.radarr.findIndex((r) => r.is4k && r.isDefault)
-        : settings.radarr.findIndex((r) => !r.is4k && r.isDefault);
-      const defaultSonarrId = requestBody.is4k
-        ? settings.sonarr.findIndex((s) => s.is4k && s.isDefault)
-        : settings.sonarr.findIndex((s) => !s.is4k && s.isDefault);
-
-      const overrideRuleRepository = getRepository(OverrideRule);
-      const overrideRules = await overrideRuleRepository.find({
-        where:
-          requestBody.mediaType === MediaType.MOVIE
-            ? { radarrServiceId: defaultRadarrId }
-            : { sonarrServiceId: defaultSonarrId },
+      const overrideRulesResult = await overrideRules({
+        mediaType: requestBody.mediaType,
+        is4k: requestBody.is4k || false,
+        tmdbMedia,
+        requestUser,
      });
-
-      const appliedOverrideRules = overrideRules.filter((rule) => {
-        const hasAnimeKeyword =
-          'results' in tmdbMedia.keywords &&
-          tmdbMedia.keywords.results.some(
-            (keyword: TmdbKeyword) => keyword.id === ANIME_KEYWORD_ID
-          );
-
-        // Skip override rules if the media is an anime TV show as anime TV
-        // is handled by default and override rules do not explicitly include
-        // the anime keyword
-        if (
-          requestBody.mediaType === MediaType.TV &&
-          hasAnimeKeyword &&
-          (!rule.keywords ||
-            !rule.keywords.split(',').map(Number).includes(ANIME_KEYWORD_ID))
-        ) {
-          return false;
-        }
-
-        if (
-          rule.users &&
-          !rule.users
-            .split(',')
-            .some((userId) => Number(userId) === requestUser.id)
-        ) {
-          return false;
-        }
-        if (
-          rule.genre &&
-          !rule.genre
-            .split(',')
-            .some((genreId) =>
-              tmdbMedia.genres
-                .map((genre) => genre.id)
-                .includes(Number(genreId))
-            )
-        ) {
-          return false;
-        }
-        if (
-          rule.language &&
-          !rule.language
-            .split('|')
-            .some((languageId) => languageId === tmdbMedia.original_language)
-        ) {
-          return false;
-        }
-        if (
-          rule.keywords &&
-          !rule.keywords.split(',').some((keywordId) => {
-            let keywordList: TmdbKeyword[] = [];
-
-            if ('keywords' in tmdbMedia.keywords) {
-              keywordList = tmdbMedia.keywords.keywords;
-            } else if ('results' in tmdbMedia.keywords) {
-              keywordList = tmdbMedia.keywords.results;
-            }
-
-            return keywordList
-              .map((keyword: TmdbKeyword) => keyword.id)
-              .includes(Number(keywordId));
-          })
-        ) {
-          return false;
-        }
-        return true;
-      });
-
-      // hacky way to prioritize rules
-      // TODO: make this better
-      const prioritizedRule = appliedOverrideRules.sort((a, b) => {
-        const keys: (keyof OverrideRule)[] = ['genre', 'language', 'keywords'];
-
-        const aSpecificity = keys.filter((key) => a[key] !== null).length;
-        const bSpecificity = keys.filter((key) => b[key] !== null).length;
-
-        // Take the rule with the most specific condition first
-        return bSpecificity - aSpecificity;
-      })[0];
-
-      if (prioritizedRule) {
-        if (prioritizedRule.rootFolder) {
-          rootFolder = prioritizedRule.rootFolder;
-        }
-        if (prioritizedRule.profileId) {
-          profileId = prioritizedRule.profileId;
-        }
-        if (prioritizedRule.tags) {
-          tags = [
-            ...new Set([
-              ...(tags || []),
-              ...prioritizedRule.tags.split(',').map((tag) => Number(tag)),
-            ]),
-          ];
-        }
-
-        logger.debug('Override rule applied.', {
-          label: 'Media Request',
-          overrides: prioritizedRule,
-        });
+      if (overrideRulesResult.rootFolder) {
+        rootFolder = overrideRulesResult.rootFolder;
+      }
+      if (overrideRulesResult.profileId) {
+        profileId = overrideRulesResult.profileId;
+      }
+      if (overrideRulesResult.tags) {
+        tags = overrideRulesResult.tags;
      }
    }

--- a/server/lib/overrideRules.ts
+++ b/server/lib/overrideRules.ts
@@ -0,0 +1,152 @@
+import { ANIME_KEYWORD_ID } from '@server/api/themoviedb/constants';
+import type {
+  TmdbKeyword,
+  TmdbMovieDetails,
+  TmdbTvDetails,
+} from '@server/api/themoviedb/interfaces';
+import { MediaType } from '@server/constants/media';
+import { getRepository } from '@server/datasource';
+import OverrideRule from '@server/entity/OverrideRule';
+import type { User } from '@server/entity/User';
+import { getSettings } from '@server/lib/settings';
+import logger from '@server/logger';
+
+export type OverrideRulesResult = {
+  rootFolder: string | null;
+  profileId: number | null;
+  tags: number[] | null;
+};
+
+async function overrideRules({
+  mediaType,
+  is4k,
+  tmdbMedia,
+  requestUser,
+}: {
+  mediaType: MediaType;
+  is4k: boolean;
+  tmdbMedia: TmdbMovieDetails | TmdbTvDetails;
+  requestUser: User;
+}): Promise<OverrideRulesResult> {
+  const settings = getSettings();
+
+  let rootFolder: string | null = null;
+  let profileId: number | null = null;
+  let tags: number[] | null = null;
+
+  const defaultRadarrId = is4k
+    ? settings.radarr.findIndex((r) => r.is4k && r.isDefault)
+    : settings.radarr.findIndex((r) => !r.is4k && r.isDefault);
+  const defaultSonarrId = is4k
+    ? settings.sonarr.findIndex((s) => s.is4k && s.isDefault)
+    : settings.sonarr.findIndex((s) => !s.is4k && s.isDefault);
+
+  const overrideRuleRepository = getRepository(OverrideRule);
+  const overrideRules = await overrideRuleRepository.find({
+    where:
+      mediaType === MediaType.MOVIE
+        ? { radarrServiceId: defaultRadarrId }
+        : { sonarrServiceId: defaultSonarrId },
+  });
+
+  const appliedOverrideRules = overrideRules.filter((rule) => {
+    const hasAnimeKeyword =
+      'results' in tmdbMedia.keywords &&
+      tmdbMedia.keywords.results.some(
+        (keyword: TmdbKeyword) => keyword.id === ANIME_KEYWORD_ID
+      );
+
+    // Skip override rules if the media is an anime TV show as anime TV
+    // is handled by default and override rules do not explicitly include
+    // the anime keyword
+    if (
+      mediaType === MediaType.TV &&
+      hasAnimeKeyword &&
+      (!rule.keywords ||
+        !rule.keywords.split(',').map(Number).includes(ANIME_KEYWORD_ID))
+    ) {
+      return false;
+    }
+
+    if (
+      rule.users &&
+      !rule.users.split(',').some((userId) => Number(userId) === requestUser.id)
+    ) {
+      return false;
+    }
+    if (
+      rule.genre &&
+      !rule.genre
+        .split(',')
+        .some((genreId) =>
+          tmdbMedia.genres.map((genre) => genre.id).includes(Number(genreId))
+        )
+    ) {
+      return false;
+    }
+    if (
+      rule.language &&
+      !rule.language
+        .split('|')
+        .some((languageId) => languageId === tmdbMedia.original_language)
+    ) {
+      return false;
+    }
+    if (
+      rule.keywords &&
+      !rule.keywords.split(',').some((keywordId) => {
+        let keywordList: TmdbKeyword[] = [];
+
+        if ('keywords' in tmdbMedia.keywords) {
+          keywordList = tmdbMedia.keywords.keywords;
+        } else if ('results' in tmdbMedia.keywords) {
+          keywordList = tmdbMedia.keywords.results;
+        }
+
+        return keywordList
+          .map((keyword: TmdbKeyword) => keyword.id)
+          .includes(Number(keywordId));
+      })
+    ) {
+      return false;
+    }
+    return true;
+  });
+
+  // hacky way to prioritize rules
+  // TODO: make this better
+  const prioritizedRule = appliedOverrideRules.sort((a, b) => {
+    const keys: (keyof OverrideRule)[] = ['genre', 'language', 'keywords'];
+
+    const aSpecificity = keys.filter((key) => a[key] !== null).length;
+    const bSpecificity = keys.filter((key) => b[key] !== null).length;
+
+    // Take the rule with the most specific condition first
+    return bSpecificity - aSpecificity;
+  })[0];
+
+  if (prioritizedRule) {
+    if (prioritizedRule.rootFolder) {
+      rootFolder = prioritizedRule.rootFolder;
+    }
+    if (prioritizedRule.profileId) {
+      profileId = prioritizedRule.profileId;
+    }
+    if (prioritizedRule.tags) {
+      tags = [
+        ...new Set([
+          ...prioritizedRule.tags.split(',').map((tag) => Number(tag)),
+        ]),
+      ];
+    }
+
+    logger.debug('Override rule applied.', {
+      label: 'Media Request',
+      overrides: prioritizedRule,
+    });
+  }
+
+  return { rootFolder, profileId, tags };
+}
+
+export default overrideRules;
--- a/server/lib/scanners/jellyfin/index.ts
+++ b/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) {
--- a/server/routes/auth.ts
+++ b/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,
      });
--- a/server/routes/overrideRule.ts
+++ b/server/routes/overrideRule.ts
@@ -1,6 +1,12 @@
+import TheMovieDb from '@server/api/themoviedb';
+import { MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import OverrideRule from '@server/entity/OverrideRule';
+import { User } from '@server/entity/User';
 import type { OverrideRuleResultsResponse } from '@server/interfaces/api/overrideRuleInterfaces';
+import overrideRules, {
+  type OverrideRulesResult,
+} from '@server/lib/overrideRules';
 import { Permission } from '@server/lib/permissions';
 import { isAuthenticated } from '@server/middleware/auth';
 import { Router } from 'express';
@@ -61,6 +67,40 @@ overrideRuleRoutes.post<
  }
 });

+overrideRuleRoutes.post(
+  '/advancedRequest',
+  isAuthenticated(Permission.REQUEST_ADVANCED),
+  async (req, res, next) => {
+    try {
+      const tmdb = new TheMovieDb();
+      const tmdbMedia =
+        req.body.mediaType === MediaType.MOVIE
+          ? await tmdb.getMovie({ movieId: req.body.tmdbId })
+          : await tmdb.getTvShow({ tvId: req.body.tmdbId });
+
+      const userRepository = getRepository(User);
+      const user = await userRepository.findOne({
+        where: { id: req.body.requestUser },
+        relations: { requests: true },
+      });
+      if (!user) {
+        return next({ status: 404, message: 'User not found.' });
+      }
+
+      const overrideRulesResult: OverrideRulesResult = await overrideRules({
+        mediaType: req.body.mediaType,
+        is4k: req.body.is4k,
+        tmdbMedia,
+        requestUser: user,
+      });
+
+      res.status(200).json(overrideRulesResult);
+    } catch {
+      next({ status: 404, message: 'Media not found' });
+    }
+  }
+);
+
 overrideRuleRoutes.put<
  { ruleId: string },
  OverrideRule,
--- a/src/components/Common/LabeledCheckbox/index.tsx
+++ b/src/components/Common/LabeledCheckbox/index.tsx
@@ -25,7 +25,7 @@ const LabeledCheckbox: React.FC<LabeledCheckboxProps> = ({
          <Field type="checkbox" id={id} name={id} onChange={onChange} />
        </div>
        <div className="ml-3 text-sm leading-6">
-          <label htmlFor="localLogin" className="block" aria-label={label}>
+          <label htmlFor="localLogin" className="block">
            <div className="flex flex-col">
              <span className="font-medium text-white">{label}</span>
              <span className="font-normal text-gray-400">{description}</span>
--- a/src/components/NotificationTypeSelector/NotificationType/index.tsx
+++ b/src/components/NotificationTypeSelector/NotificationType/index.tsx
@@ -46,7 +46,7 @@ const NotificationType = ({
          />
        </div>
        <div className="ml-3 text-sm leading-6">
-          <label htmlFor={option.id} className="block" aria-label={option.name}>
+          <label htmlFor={option.id} className="block">
            <div className="flex flex-col">
              <span className="font-medium text-white">{option.name}</span>
              <span className="font-normal text-gray-400">
--- a/src/components/PermissionOption/index.tsx
+++ b/src/components/PermissionOption/index.tsx
@@ -123,7 +123,7 @@ const PermissionOption = ({
          />
        </div>
        <div className="ml-3 text-sm leading-6">
-          <label htmlFor={option.id} className="block" aria-label={option.name}>
+          <label htmlFor={option.id} className="block">
            <div className="flex flex-col">
              <span className="font-medium text-white">{option.name}</span>
              <span className="font-normal text-gray-400">
--- a/src/components/RequestModal/AdvancedRequester/index.tsx
+++ b/src/components/RequestModal/AdvancedRequester/index.tsx
@@ -13,7 +13,9 @@ import type {
  ServiceCommonServerWithDetails,
 } from '@server/interfaces/api/serviceInterfaces';
 import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces';
+import type { OverrideRulesResult } from '@server/lib/overrideRules';
 import { hasPermission } from '@server/lib/permissions';
+import axios from 'axios';
 import { isEqual } from 'lodash';
 import { useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -51,6 +53,7 @@ export type RequestOverrides = {

 interface AdvancedRequesterProps {
  type: 'movie' | 'tv';
+  tmdbId?: number;
  is4k: boolean;
  isAnime?: boolean;
  defaultOverrides?: RequestOverrides;
@@ -60,6 +63,7 @@ interface AdvancedRequesterProps {

 const AdvancedRequester = ({
  type,
+  tmdbId,
  is4k = false,
  isAnime = false,
  defaultOverrides,
@@ -284,6 +288,35 @@ const AdvancedRequester = ({
    selectedTags,
  ]);

+  useEffect(() => {
+    (async () => {
+      if (tmdbId) {
+        try {
+          const { data: override } = await axios.post<OverrideRulesResult>(
+            '/api/v1/overrideRule/advancedRequest',
+            {
+              mediaType: type,
+              is4k,
+              requestUser: requestUser?.id ?? currentUser?.id,
+              tmdbId,
+            }
+          );
+          if (override.rootFolder) {
+            setSelectedFolder(override.rootFolder);
+          }
+          if (override.profileId) {
+            setSelectedProfile(override.profileId);
+          }
+          if (override.tags) {
+            setSelectedTags(override.tags);
+          }
+        } catch {
+          /* empty */
+        }
+      }
+    })();
+  }, [serverData, is4k, requestUser]);
+
  if (!data && !error) {
    return (
      <div className="mb-2 w-full">
--- a/src/components/RequestModal/MovieRequestModal.tsx
+++ b/src/components/RequestModal/MovieRequestModal.tsx
@@ -288,6 +288,7 @@ const MovieRequestModal = ({
          hasPermission(Permission.MANAGE_REQUESTS)) && (
          <AdvancedRequester
            type="movie"
+            tmdbId={tmdbId}
            is4k={is4k}
            requestUser={editRequest.requestedBy}
            defaultOverrides={{
@@ -357,6 +358,7 @@ const MovieRequestModal = ({
      {(hasPermission(Permission.REQUEST_ADVANCED) ||
        hasPermission(Permission.MANAGE_REQUESTS)) && (
        <AdvancedRequester
+          tmdbId={tmdbId}
          type="movie"
          is4k={is4k}
          onChange={(overrides) => {
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -722,6 +722,7 @@ const TvRequestModal = ({
        hasPermission(Permission.MANAGE_REQUESTS)) && (
        <AdvancedRequester
          type="tv"
+          tmdbId={tmdbId}
          is4k={is4k}
          isAnime={data?.keywords.some(
            (keyword) => keyword.id === ANIME_KEYWORD_ID
--- a/src/components/Selector/index.tsx
+++ b/src/components/Selector/index.tsx
@@ -12,6 +12,7 @@ import type {
  TmdbGenre,
  TmdbKeywordSearchResponse,
 } from '@server/api/themoviedb/interfaces';
+import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
 import type { UserResultsResponse } from '@server/interfaces/api/userInterfaces';
 import type {
  Keyword,
@@ -184,7 +185,9 @@ export const GenreSelector = ({
  }, [defaultValue, type]);

  const loadGenreOptions = async (inputValue: string) => {
-    const results = await axios.get<TmdbGenre[]>(`/api/v1/genres/${type}`);
+    const results = await axios.get<GenreSliderItem[]>(
+      `/api/v1/discover/genreslider/${type}`
+    );

    return results.data
      .map((result) => ({
@@ -198,7 +201,7 @@ export const GenreSelector = ({

  return (
    <AsyncSelect
-      key={`genre-select-${type}-${defaultDataValue}`}
+      key={`genre-select-${defaultDataValue}`}
      className="react-select-container"
      classNamePrefix="react-select"
      defaultValue={isMulti ? defaultDataValue : defaultDataValue?.[0]}
--- a/src/components/Settings/OverrideRule/OverrideRuleModal.tsx
+++ b/src/components/Settings/OverrideRule/OverrideRuleModal.tsx
@@ -337,13 +337,7 @@ const OverrideRuleModal = ({
                  <div className="form-input-area">
                    <div className="form-input-field">
                      <GenreSelector
-                        type={
-                          values.radarrServiceId != null
-                            ? 'movie'
-                            : values.sonarrServiceId != null
-                            ? 'tv'
-                            : 'tv'
-                        }
+                        type={values.radarrServiceId ? 'movie' : 'tv'}
                        defaultValue={values.genre}
                        isMulti
                        isDisabled={!isValidated || isTesting}
--- a/src/hooks/useUser.ts
+++ b/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,
  });
--- a/src/utils/plex.ts
+++ b/src/utils/plex.ts
@@ -63,7 +63,7 @@ class PlexOAuth {
      'X-Plex-Client-Identifier': clientId,
      'X-Plex-Model': 'Plex OAuth',
      'X-Plex-Platform': browser.getBrowserName(),
-      'X-Plex-Platform-Version': browser.getBrowserVersion() || 'Unknown',
+      'X-Plex-Platform-Version': browser.getBrowserVersion(),
      'X-Plex-Device': browser.getOSName(),
      'X-Plex-Device-Name': `${browser.getBrowserName()} (Seerr)`,
      'X-Plex-Device-Screen-Resolution':
Author	SHA1	Message	Date
gauthier-th	503c099cd1	fix: remove useless tags	2025-12-01 22:03:16 +01:00
Gauthier	4afcfbb598	fix: missing file	2025-11-21 22:19:56 +01:00
Gauthier	7ec5123cd0	feat(overriderules): apply override rules to advanced requests This PR apply the override rules to the Advanced Request Modal	2025-11-21 22:15:17 +01:00