fix(base-scanner): derive media availability from actual season state instead of scanner input

The media-level status was incorrectly set to AVAILABLE when only some seasons were available. The
issue was isAllStandardSeasons/isAll4kSeasons checked the scanner's input array which only contains
seasons found by current scanner (e.g. 1 seaason in jellyfin). If that single season was fully
available, the check passes and the media gets marked AVAILABLE regardless of how many total seasons
existed. And the shouldStayAvailable (and its 4k check) locked the AVAILABLE status once set, as
long as no new seasons were added with a status which prevented the incorrect status from correcting
itself.

.github/cliff.toml

@@ -33,9 +33,9 @@ body = """
         {{ self::print_commit(commit=commit) }}
     {%- endfor %}
     {%- for commit in commits %}
-        {%- if not commit.scope %}
+        {%- if not commit.scope -%}
             {{ self::print_commit(commit=commit) }}
-        {%- endif %}
+        {%- endif -%}
     {%- endfor -%}
 {%- endfor -%}
 

.github/renovate/helm.json5

@@ -16,7 +16,7 @@
       description: 'Update appVersion in Chart.yaml to match Docker image',
       fileMatch: ['(^|/)Chart\\.yaml$'],
       matchStrings: [
-        "#\\s+renovate:\\s+image=(?<depName>\\S*)\nappVersion:\\s+'(?<currentValue>\\S*)'",
+        '#\\s+renovate:\\s+image=(?<depName>\\S*)\nappVersion:\\s+"(?<currentValue>\\S*)"',
       ],
       datasourceTemplate: 'docker',
     },

.github/workflows/docs-deploy.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - develop
+      - legacy-jellyseerr
     paths:
       - 'docs/**'
       - 'gen-docs/**'

.github/workflows/release.yml

@@ -279,17 +279,17 @@ jobs:
             --certificate-identity "https://github.com/${{ github.workflow_ref }}" \
             --certificate-oidc-issuer "https://token.actions.githubusercontent.com"
 
-      # - name: Verify attestations
-      #   run: |
-      #     cosign verify-attestation "ghcr.io/${{ github.repository }}@${{ needs.publish.outputs.image_digest }}" \
-      #       --type cyclonedx \
-      #       --certificate-identity "https://github.com/${{ github.workflow_ref }}" \
-      #       --certificate-oidc-issuer "https://token.actions.githubusercontent.com" > /dev/null
+      - name: Verify attestations
+        run: |
+          cosign verify-attestation "ghcr.io/${{ github.repository }}@${{ needs.publish.outputs.image_digest }}" \
+            --type cyclonedx \
+            --certificate-identity "https://github.com/${{ github.workflow_ref }}" \
+            --certificate-oidc-issuer "https://token.actions.githubusercontent.com" > /dev/null
 
-      #     cosign verify-attestation "${{ env.DOCKER_HUB }}@${{ needs.publish.outputs.image_digest }}" \
-      #       --type cyclonedx \
-      #       --certificate-identity "https://github.com/${{ github.workflow_ref }}" \
-      #       --certificate-oidc-issuer "https://token.actions.githubusercontent.com" > /dev/null
+          cosign verify-attestation "${{ env.DOCKER_HUB }}@${{ needs.publish.outputs.image_digest }}" \
+            --type cyclonedx \
+            --certificate-identity "https://github.com/${{ github.workflow_ref }}" \
+            --certificate-oidc-issuer "https://token.actions.githubusercontent.com" > /dev/null
 
   publish-release:
     name: Publish release

README.md

@@ -1,6 +1,6 @@
-<p align="center">
-<img src="./public/logo_full.svg" alt="Seerr" style="margin: 20px 0;">
-</p>
+<div align="center">⚠️ <strong>NOTE:</strong> We are currently in the process of merging Overseerr and Jellyseerr into this unified repository.</div>
+
+<h1 align="center" style="font-size: 4em;">🚧 Seerr</h1>
 <p align="center">
 <img src="https://github.com/seerr-team/seerr/actions/workflows/release.yml/badge.svg" alt="Seerr Release" />
 <img src="https://github.com/seerr-team/seerr/actions/workflows/ci.yml/badge.svg" alt="Seerr CI">
@@ -26,25 +26,37 @@
 - Granular permission system.
 - Support for various notification agents.
 - Mobile-friendly design, for when you need to approve requests on the go!
-- Support for watchlisting & blocklisting media.
+- Support for watchlisting & blacklisting media.
 
 With more features on the way! Check out our [issue tracker](/../../issues) to see the features which have already been requested.
 
 ## Getting Started
 
-Check out our documentation for instructions on how to install and run Seerr:
+For instructions on how to install and run **Jellyseerr**, please refer to the official documentation:
 
 https://docs.seerr.dev/getting-started/
 
+> [!IMPORTANT]
+> **Seerr is not officially released yet.**  
+> The project is currently available **only on the `develop` branch** and is intended for **beta testing only**.
+
+The documentation linked above is for running the **latest Jellyseerr** release.
+
+> [!WARNING]
+> If you are migrating from **Overseerr** to **Seerr** for beta testing, **do not follow the Jellyseerr latest setup guide**.
+
+Instead, follow the dedicated migration guide (with `:develop` tag):
+https://github.com/seerr-team/seerr/blob/develop/docs/migration-guide.mdx
+
+> [!CAUTION]
+> **DO NOT run Jellyseerr (latest) using an existing Overseerr database. This includes third-party images with `seerr:latest` (as it points to jellyseerr 2.7.3 and not seerr.**  
+> Doing so **may cause database corruption and/or irreversible data loss and/or weird unintended behaviour**. 
+
+For migration assistance, beta testing questions, or troubleshooting, please join our **Discord** and ask for support there.
+
 ## Preview
 
-<img src="./public/preview.jpg" alt="Seerr application preview" />
-
-## Migrating from Overseerr/Jellyseerr to Seerr
-
-Read our [release announcement](https://docs.seerr.dev/blog/seerr-release) to learn what Seerr means for Jellyseerr and Overseerr users.
-
-Please follow our [migration guide](https://docs.seerr.dev/migration-guide) for detailed instructions on migrating from Overseerr or Jellyseerr.
+<img src="./public/preview.jpg">
 
 ## Support
 

charts/seerr-chart/Chart.yaml

@@ -3,9 +3,9 @@ kubeVersion: '>=1.23.0-0'
 name: seerr-chart
 description: Seerr helm chart for Kubernetes
 type: application
-version: 3.0.2
+version: 3.0.0
 # renovate: image=ghcr.io/seerr-team/seerr
-appVersion: 'v3.0.1'
+appVersion: '3.0.0'
 maintainers:
   - name: Seerr Team
     url: https://github.com/orgs/seerr-team/people

charts/seerr-chart/README.md

@@ -1,6 +1,6 @@
 # seerr-chart
 
-![Version: 3.0.2](https://img.shields.io/badge/Version-3.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.0.1](https://img.shields.io/badge/AppVersion-v3.0.1-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: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
 
 Seerr helm chart for Kubernetes
 

cypress/config/settings.cypress.json

@@ -18,8 +18,8 @@
     "discoverRegion": "",
     "streamingRegion": "",
     "originalLanguage": "",
-    "blocklistedTags": "",
-    "blocklistedTagsLimit": 50,
+    "blacklistedTags": "",
+    "blacklistedTagsLimit": 50,
     "trustProxy": false,
     "mediaServerType": 1,
     "partialRequestsEnabled": true,

docs/README.md

@@ -23,7 +23,7 @@ Welcome to the Seerr Documentation.
 - Localization into other languages.
 - Support for **PostgreSQL** and **SQLite** databases.
 - Support for various notification agents.
-- Easily **Watchlist** or **Blocklist** media.
+- Easily **Watchlist** or **Blacklist** media.
 - More features to come!
 
 ## We need your help!

docs/getting-started/third-parties/unraid.mdx

@@ -5,7 +5,12 @@ sidebar_position: 3
 ---
 
 # Unraid
+:::danger
+This method has not yet been updated for Seerr and is awaiting a community contribution.
+Feel free to open a pull request on GitHub to update this installation method.
+:::
 
+<!--
 :::warning
 Third-party installation methods are maintained by the community. The Seerr team is not responsible for these packages.
 :::
@@ -14,68 +19,9 @@ Third-party installation methods are maintained by the community. The Seerr team
 This method is not recommended for most users. It is intended for advanced users who are using Unraid.
 :::
 
-
-If an official Unraid Community Applications template for Seerr isn't available in your catalog, you can install Seerr manually using Unraid's Docker UI.
-
-## Fresh Installation
-
-### 1. Create the config directory
-
-Open the Unraid terminal and run:
-
-```bash
-mkdir -p /mnt/user/appdata/seerr
-chown -R 1000:1000 /mnt/user/appdata/seerr
-```
-
-### 2. Add the Docker container
-
-Navigate to the **Docker** tab in Unraid and click **Add Container**. Fill in the following:
-
-| Field | Value |
-|---|---|
-| **Name** | `seerr` |
-| **Repository** | `ghcr.io/seerr-team/seerr:latest` |
-| **Registry URL** (optional) | `https://ghcr.io` |
-| **Icon URL** | `https://raw.githubusercontent.com/seerr-team/seerr/develop/public/android-chrome-512x512.png` |
-| **WebUI** | `http://[IP]:[PORT:5055]` |
-| **Extra Parameters** | `--init` |
-| **Network Type** | `bridge` |
-| **Privileged** | `Off` |
-
-Then click **Add another Path, Port, Variable** to add:
-
-**Port:**
-| Field | Value |
-|---|---|
-| Container Port | `5055` |
-| Host Port | `5055` |
-| Connection Type | `TCP` |
-
-**Path:**
-| Field | Value |
-|---|---|
-| Container Path | `/app/config` |
-| Host Path | `/mnt/user/appdata/seerr` |
-
-**Variable:**
-| Field | Value |
-|---|---|
-| Key | `TZ` |
-| Value | Your [TZ database name](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) (e.g., `America/New_York`) |
-
-**Variable (optional):**
-| Field | Value |
-|---|---|
-| Key | `LOG_LEVEL` |
-| Value | `info` |
-
-Click **Apply** to create and start the container.
-
-### 3. Access Seerr
-
-Open the WebUI at `http://<your-unraid-ip>:5055` and follow the setup wizard.
-
-:::info
-The `--init` flag in **Extra Parameters** is required. Seerr does not include its own init process, so `--init` ensures proper signal handling and clean container shutdowns.
-:::
+1. Ensure you have the **Community Applications** plugin installed.
+2. Inside the **Community Applications** app store, search for **Seerr**.
+3. Click the **Install Button**.
+4. On the following **Add Container** screen, make changes to the **Host Port** and **Host Path 1** \(Appdata\) as needed.
+5. Click apply and access "Seerr" at your `<ServerIP:HostPort>` in a web browser.
+-->

docs/migration-guide.mdx

@@ -23,6 +23,7 @@ Installation methods are now divided into two categories: official and third-par
 The Seerr team is only responsible for official installation methods, while third-party methods are maintained by the community.
 Some methods are currently not maintained, but this does not mean they are permanently discontinued. The community may restore and support them if they choose to do so.
 
+- **Unraid app:** Not maintained
 - **Snap package:** Not maintained
 :::
 
@@ -199,82 +200,14 @@ Summary of changes :
   </TabItem>
 </Tabs>
 
-## Third-party installation methods
-### Nix
+### Nix (Third-party installation methods)
 
 Waiting for https://github.com/NixOS/nixpkgs/pull/450096 and https://github.com/NixOS/nixpkgs/pull/450093
 
-### AUR
+### AUR (Third-party installation methods)
 
 See https://aur.archlinux.org/packages/seerr
 
-### TrueNAS
+### TrueNAS (Third-party installation methods)
 
 Waiting for https://github.com/truenas/apps/issues/3374
-
-### Unraid
-
-Refer to [Seerr Unraid Documentation](/getting-started/third-parties/unraid), all of our examples have been updated to reflect the below change.
-
-Seerr will automatically migrate your existing Overseerr or Jellyseerr data on first startup. No manual database migration is needed.
-
-1. Stop and remove the old Overseerr (or Jellyseerr) container from the Unraid **Docker** tab. Click the container icon, then **Stop**, then **Remove**. **⚠️ Do not delete the appdata folder ⚠️**
-
-2. Back up your existing appdata folder:
-```bash
-cp -a /mnt/user/appdata/overseerr /mnt/user/appdata/overseerr-backup
-```
-
-3. Fix config folder permissions — Seerr runs as the `node` user (UID 1000) instead of root:
-```bash
-chown -R 1000:1000 /mnt/user/appdata/overseerr
-```
-For Jellyseerr users, replace `overseerr` with `jellyseerr` in the path above.
-
-4. Add a new container in the Unraid **Docker** tab. Click **Add Container** and fill in the following:
-
-| Field | Value |
-|---|---|
-| **Name** | `seerr` |
-| **Repository** | `ghcr.io/seerr-team/seerr:latest` |
-| **Registry URL** (optional) | `https://ghcr.io` |
-| **Icon URL** | `https://raw.githubusercontent.com/seerr-team/seerr/develop/public/android-chrome-512x512.png` |
-| **WebUI** | `http://[IP]:[PORT:5055]` |
-| **Extra Parameters** | `--init` |
-| **Network Type** | `bridge` |
-| **Privileged** | `Off` |
-
-Then click **Add another Path, Port, Variable** to add:
-
-**Port:**
-| Field | Value |
-|---|---|
-| Container Port | `5055` |
-| Host Port | `5055` |
-| Connection Type | `TCP` |
-
-**Path** — point this to your existing config folder:
-| Field | Value |
-|---|---|
-| Container Path | `/app/config` |
-| Host Path | `/mnt/user/appdata/overseerr` |
-
-For Jellyseerr users, use `/mnt/user/appdata/jellyseerr`.
-
-**Variable:**
-| Field | Value |
-|---|---|
-| Key | `TZ` |
-| Value | Your [TZ database name](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) (e.g., `America/New_York`) |
-
-**Variable (optional):**
-| Field | Value |
-|---|---|
-| Key | `LOG_LEVEL` |
-| Value | `info` |
-
-5. Click **Apply** to start the container. Check the container logs to confirm the automatic migration completed successfully.
-
-:::tip
-If you are using a reverse proxy (such as SWAG or Nginx Proxy Manager), update your proxy configuration to point to the new container name `seerr`. The default port remains `5055`.
-:::

docs/using-seerr/backups.md

@@ -13,7 +13,7 @@ These settings are stored in the `settings.json` file located in the Seerr data
 
 ## User Data  
 
-Apart from the settings, all other data—including user accounts, media requests, blocklist etc. are stored in the database (either SQLite or PostgreSQL).
+Apart from the settings, all other data—including user accounts, media requests, blacklist etc. are stored in the database (either SQLite or PostgreSQL).
 
 # Backup
 

docs/using-seerr/settings/general.md

@@ -62,13 +62,13 @@ Set the default display language for Seerr. Users can override this setting in t
 
 These settings filter content shown on the "Discover" home page based on regional availability and original language, respectively. The Streaming Region filters the available streaming providers on the media page. Users can override these global settings by configuring these same options in their user settings.
 
-## Blocklist Content with Tags and Limit Content Blocklisted per Tag
+## Blacklist Content with Tags and Limit Content Blacklisted per Tag
 
-These settings blocklist any TV shows or movies that have one of the entered tags. The "Process Blocklisted Tags" job adds entries to the blocklist based on the configured blocklisted tags. If a blocklisted tag is removed, any media blocklisted under that tag will be removed from the blocklist when the "Process Blocklisted Tags" job runs.
+These settings blacklist any TV shows or movies that have one of the entered tags. The "Process Blacklisted Tags" job adds entries to the blacklist based on the configured blacklisted tags. If a blacklisted tag is removed, any media blacklisted under that tag will be removed from the blacklist when the "Process Blacklisted Tags" job runs.
 
-The limit setting determines how many pages per tag the job will process, with each page containing 20 entries. The job cycles through all 16 available discovery sort options, querying the defined number of pages to blocklist media that is most likely to appear at the top of each sort. Higher limits will create a more accurate blocklist, but will require more storage.
+The limit setting determines how many pages per tag the job will process, with each page containing 20 entries. The job cycles through all 16 available discovery sort options, querying the defined number of pages to blacklist media that is most likely to appear at the top of each sort. Higher limits will create a more accurate blacklist, but will require more storage.
 
-Blocklisted tags are disabled until at least one tag is entered. These settings cannot be overridden in user settings.
+Blacklisted tags are disabled until at least one tag is entered. These settings cannot be overridden in user settings.
 
 ## Hide Available Media
 
@@ -78,9 +78,9 @@ Available media will still appear in search results, however, so it is possible
 
 This setting is **disabled** by default.
 
-## Hide Blocklisted Items
+## Hide Blacklisted Items
 
-When enabled, media that has been blocklisted will not appear on the "Discover" home page, for all administrators. This can be useful to hide content that you don't want to see, such as content with specific tags or content that has been manually blocklisted when you have the "Manage Blocklist" permission.
+When enabled, media that has been blacklisted will not appear on the "Discover" home page, for all administrators. This can be useful to hide content that you don't want to see, such as content with specific tags or content that has been manually blacklisted when you have the "Manage Blacklist" permission.
 
 This setting is **disabled** by default.
 

gen-docs/blog/2026-02-10/seerr-release.md

@@ -21,7 +21,7 @@ Seerr brings several features that were previously available in Jellyseerr but m
 
 * **Alternative media solution:** Added support for Jellyfin and Emby in addition to the existing Plex integration.
 * **PostgreSQL support**: In addition to SQLite, you can now opt in to using a PostgreSQL database.
-* **Blocklist for movies, series, and tags**: Allows permitted users to hide movies, series, or tags from regular users.
+* **Blacklist for movies, series, and tags**: Allows permitted users to hide movies, series, or tags from regular users.
 * **Override rules**: Adjust default request settings based on conditions such as user, tag, or other criteria.
 * **TVDB metadata**: Option to use TheTVDB metadata for series (as in Sonarr) instead of TMDB.
 * **DNS caching**: Reduces lookup times and external requests, especially useful when using systems like Pi-Hole/Adguard Home.

public/sw.js

@@ -3,7 +3,7 @@
 // previously cached resources to be updated from the network.
 // This variable is intentionally declared and unused.
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const OFFLINE_VERSION = 5;
+const OFFLINE_VERSION = 4;
 const CACHE_NAME = 'offline';
 // Customize this with a different URL if needed.
 const OFFLINE_URL = '/offline.html';

seerr-api.yml

@@ -38,8 +38,8 @@ tags:
     description: Endpoints related to getting service (Radarr/Sonarr) details.
   - name: watchlist
     description: Collection of media to watch later
-  - name: blocklist
-    description: Blocklisted media from discovery page.
+  - name: blacklist
+    description: Blacklisted media from discovery page.
 servers:
   - url: '{server}/api/v1'
     variables:
@@ -48,7 +48,7 @@ servers:
 
 components:
   schemas:
-    Blocklist:
+    Blacklist:
       type: object
       properties:
         tmdbId:
@@ -577,9 +577,21 @@ components:
           example: false
         baseUrl:
           type: string
+        activeProfileId:
+          type: number
+          example: 1
+        activeProfileName:
+          type: string
+          example: 720p/1080p
+        activeDirectory:
+          type: string
+          example: '/movies'
         is4k:
           type: boolean
           example: false
+        minimumAvailability:
+          type: string
+          example: 'In Cinema'
         isDefault:
           type: boolean
           example: false
@@ -598,7 +610,11 @@ components:
         - port
         - apiKey
         - useSsl
+        - activeProfileId
+        - activeProfileName
+        - activeDirectory
         - is4k
+        - minimumAvailability
         - isDefault
     SonarrSettings:
       type: object
@@ -624,6 +640,31 @@ components:
           example: false
         baseUrl:
           type: string
+        activeProfileId:
+          type: number
+          example: 1
+        activeProfileName:
+          type: string
+          example: 720p/1080p
+        activeDirectory:
+          type: string
+          example: '/tv/'
+        activeLanguageProfileId:
+          type: number
+          example: 1
+        activeAnimeProfileId:
+          type: number
+          nullable: true
+        activeAnimeLanguageProfileId:
+          type: number
+          nullable: true
+        activeAnimeProfileName:
+          type: string
+          example: 720p/1080p
+          nullable: true
+        activeAnimeDirectory:
+          type: string
+          nullable: true
         is4k:
           type: boolean
           example: false
@@ -648,6 +689,9 @@ components:
         - port
         - apiKey
         - useSsl
+        - activeProfileId
+        - activeProfileName
+        - activeDirectory
         - is4k
         - enableSeasonFolders
         - isDefault
@@ -2039,138 +2083,11 @@ components:
           type: string
         native_name:
           type: string
-    RoutingRule:
+    OverrideRule:
       type: object
       properties:
         id:
-          type: number
-          readOnly: true
-        name:
           type: string
-          example: 'Anime Content'
-        serviceType:
-          type: string
-          enum:
-            - radarr
-            - sonarr
-        is4k:
-          type: boolean
-        priority:
-          type: number
-        users:
-          type: string
-          nullable: true
-          description: Comma-separated user IDs
-        genres:
-          type: string
-          nullable: true
-          description: Comma-separated genre IDs
-        languages:
-          type: string
-          nullable: true
-          description: Pipe-separated language codes (e.g. "ja|ko")
-        keywords:
-          type: string
-          nullable: true
-          description: Comma-separated keyword IDs
-        targetServiceId:
-          type: number
-          description: ID of the target Radarr/Sonarr instance
-        activeProfileId:
-          type: number
-          nullable: true
-        rootFolder:
-          type: string
-          nullable: true
-        minimumAvailability:
-          type: string
-          nullable: true
-          enum:
-            - announced
-            - inCinemas
-            - released
-            - null
-        seriesType:
-          type: string
-          nullable: true
-          enum:
-            - standard
-            - daily
-            - anime
-            - null
-        tags:
-          type: string
-          nullable: true
-          description: Comma-separated tag IDs
-        isFallback:
-          type: boolean
-        createdAt:
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          type: string
-          format: date-time
-          readOnly: true
-    RoutingRuleRequest:
-      type: object
-      required:
-        - name
-        - serviceType
-        - targetServiceId
-      properties:
-        name:
-          type: string
-        serviceType:
-          type: string
-          enum:
-            - radarr
-            - sonarr
-        is4k:
-          type: boolean
-        priority:
-          type: number
-        users:
-          type: string
-          nullable: true
-        genres:
-          type: string
-          nullable: true
-        languages:
-          type: string
-          nullable: true
-        keywords:
-          type: string
-          nullable: true
-        targetServiceId:
-          type: number
-        activeProfileId:
-          type: number
-          nullable: true
-        minimumAvailability:
-          type: string
-          nullable: true
-          enum:
-            - announced
-            - inCinemas
-            - released
-            - null
-        rootFolder:
-          type: string
-          nullable: true
-        seriesType:
-          type: string
-          nullable: true
-          enum:
-            - standard
-            - daily
-            - anime
-            - null
-        tags:
-          type: string
-          nullable: true
-        isFallback:
-          type: boolean
     Certification:
       type: object
       properties:
@@ -4612,123 +4529,12 @@ paths:
                       restricted:
                         type: boolean
                         example: false
-  /blocklist:
-    get:
-      summary: Returns blocklisted items
-      description: Returns list of all blocklisted media
-      tags:
-        - blocklist
-      parameters:
-        - in: query
-          name: take
-          schema:
-            type: number
-            nullable: true
-            example: 25
-        - in: query
-          name: skip
-          schema:
-            type: number
-            nullable: true
-            example: 0
-        - in: query
-          name: search
-          schema:
-            type: string
-            nullable: true
-            example: dune
-        - in: query
-          name: filter
-          schema:
-            type: string
-            enum: [all, manual, blocklistedTags]
-            default: manual
-      responses:
-        '200':
-          description: Blocklisted items returned
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  pageInfo:
-                    $ref: '#/components/schemas/PageInfo'
-                  results:
-                    type: array
-                    items:
-                      type: object
-                      properties:
-                        user:
-                          $ref: '#/components/schemas/User'
-                        createdAt:
-                          type: string
-                          example: 2024-04-21T01:55:44.000Z
-                        id:
-                          type: number
-                          example: 1
-                        mediaType:
-                          type: string
-                          example: movie
-                        title:
-                          type: string
-                          example: Dune
-                        tmdbId:
-                          type: number
-                          example: 438631
-    post:
-      summary: Add media to blocklist
-      tags:
-        - blocklist
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Blocklist'
-      responses:
-        '201':
-          description: Item succesfully blocklisted
-        '412':
-          description: Item has already been blocklisted
-  /blocklist/{tmdbId}:
-    get:
-      summary: Get media from blocklist
-      tags:
-        - blocklist
-      parameters:
-        - in: path
-          name: tmdbId
-          description: tmdbId ID
-          required: true
-          example: '1'
-          schema:
-            type: string
-      responses:
-        '200':
-          description: Blocklist details in JSON
-    delete:
-      summary: Remove media from blocklist
-      tags:
-        - blocklist
-      parameters:
-        - in: path
-          name: tmdbId
-          description: tmdbId ID
-          required: true
-          example: '1'
-          schema:
-            type: string
-      responses:
-        '204':
-          description: Succesfully removed media item
   /blacklist:
     get:
-      summary: Returns blocklisted items
-      description: |
-        **DEPRECATED**: Use `/blocklist` instead. This endpoint will be deprecated soon.
-      deprecated: true
+      summary: Returns blacklisted items
+      description: Returns list of all blacklisted media
       tags:
-        - blocklist
+        - settings
       parameters:
         - in: query
           name: take
@@ -4752,11 +4558,11 @@ paths:
           name: filter
           schema:
             type: string
-            enum: [all, manual, blocklistedTags]
+            enum: [all, manual, blacklistedTags]
             default: manual
       responses:
         '200':
-          description: Blocklisted items returned
+          description: Blacklisted items returned
           content:
             application/json:
               schema:
@@ -4787,31 +4593,25 @@ paths:
                           type: number
                           example: 438631
     post:
-      summary: Add media to blocklist
-      description: |
-        **DEPRECATED**: Use `/blocklist` instead. This endpoint will be deprecated soon.
-      deprecated: true
+      summary: Add media to blacklist
       tags:
-        - blocklist
+        - blacklist
       requestBody:
         required: true
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Blocklist'
+              $ref: '#/components/schemas/Blacklist'
       responses:
         '201':
-          description: Item succesfully blocklisted
+          description: Item succesfully blacklisted
         '412':
-          description: Item has already been blocklisted
+          description: Item has already been blacklisted
   /blacklist/{tmdbId}:
     get:
-      summary: Get media from blocklist
-      description: |
-        **DEPRECATED**: Use `/blocklist/{tmdbId}` instead. This endpoint will be deprecated soon.
-      deprecated: true
+      summary: Get media from blacklist
       tags:
-        - blocklist
+        - blacklist
       parameters:
         - in: path
           name: tmdbId
@@ -4822,14 +4622,11 @@ paths:
             type: string
       responses:
         '200':
-          description: Blocklist details in JSON
+          description: Blacklist details in JSON
     delete:
-      summary: Remove media from blocklist
-      description: |
-        **DEPRECATED**: Use `/blocklist/{tmdbId}` instead. This endpoint will be deprecated soon.
-      deprecated: true
+      summary: Remove media from blacklist
       tags:
-        - blocklist
+        - blacklist
       parameters:
         - in: path
           name: tmdbId
@@ -7890,72 +7687,41 @@ paths:
                   message:
                     type: string
                     example: Unable to retrieve TV certifications.
-  /routingRule:
+  /overrideRule:
     get:
-      summary: Get all routing rules
-      description: Returns all routing rules ordered by priority (highest first).
+      summary: Get override rules
+      description: Returns a list of all override rules with their conditions and settings
       tags:
-        - settings
+        - overriderule
       responses:
         '200':
-          description: Routing rules returned
+          description: Override rules returned
           content:
             application/json:
               schema:
                 type: array
                 items:
-                  $ref: '#/components/schemas/RoutingRule'
+                  $ref: '#/components/schemas/OverrideRule'
     post:
-      summary: Create a new routing rule
-      description: Creates a new routing rule. Priority is auto-assigned (highest existing + 10).
+      summary: Create override rule
+      description: Creates a new Override Rule from the request body.
       tags:
-        - settings
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RoutingRuleRequest'
+        - overriderule
       responses:
-        '201':
-          description: Routing rule created
+        '200':
+          description: 'Values were successfully created'
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/RoutingRule'
-
-  /routingRule/{ruleId}:
+                type: array
+                items:
+                  $ref: '#/components/schemas/OverrideRule'
+  /overrideRule/{ruleId}:
     put:
-      summary: Update a routing rule
-      description: Updates an existing routing rule by ID.
+      summary: Update override rule
+      description: Updates an Override Rule from the request body.
       tags:
-        - settings
-      parameters:
-        - in: path
-          name: ruleId
-          required: true
-          schema:
-            type: number
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RoutingRuleRequest'
-      responses:
-        '200':
-          description: Routing rule updated
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RoutingRule'
-        '404':
-          description: Routing rule not found
-    delete:
-      summary: Delete a routing rule
-      description: Deletes a routing rule by ID.
-      tags:
-        - settings
+        - overriderule
       parameters:
         - in: path
           name: ruleId
@@ -7964,42 +7730,31 @@ paths:
             type: number
       responses:
         '200':
-          description: Routing rule deleted
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RoutingRule'
-        '404':
-          description: Routing rule not found
-
-  /routingRule/reorder:
-    post:
-      summary: Reorder routing rules
-      description: Bulk update priorities by providing an ordered list of rule IDs (highest priority first).
-      tags:
-        - settings
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              required:
-                - ruleIds
-              properties:
-                ruleIds:
-                  type: array
-                  items:
-                    type: number
-      responses:
-        '200':
-          description: Rules reordered
+          description: 'Values were successfully updated'
           content:
             application/json:
               schema:
                 type: array
                 items:
-                  $ref: '#/components/schemas/RoutingRule'
+                  $ref: '#/components/schemas/OverrideRule'
+    delete:
+      summary: Delete override rule by ID
+      description: Deletes the override rule with the provided ruleId.
+      tags:
+        - overriderule
+      parameters:
+        - in: path
+          name: ruleId
+          required: true
+          schema:
+            type: number
+      responses:
+        '200':
+          description: Override rule successfully deleted
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OverrideRule'
 security:
   - cookieAuth: []
   - apiKey: []

server/api/servarr/base.ts

@@ -92,7 +92,7 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
     apiKey,
     cacheName,
     apiName,
-    timeout = 10000,
+    timeout = 5000,
   }: {
     url: string;
     apiKey: string;

server/constants/media.ts

@@ -17,6 +17,6 @@ export enum MediaStatus {
   PROCESSING,
   PARTIALLY_AVAILABLE,
   AVAILABLE,
-  BLOCKLISTED,
+  BLACKLISTED,
   DELETED,
 }

server/entity/Blacklist.ts

@@ -2,7 +2,7 @@ import { MediaStatus, type MediaType } from '@server/constants/media';
 import dataSource from '@server/datasource';
 import Media from '@server/entity/Media';
 import { User } from '@server/entity/User';
-import type { BlocklistItem } from '@server/interfaces/api/blocklistInterfaces';
+import type { BlacklistItem } from '@server/interfaces/api/blacklistInterfaces';
 import { DbAwareColumn } from '@server/utils/DbColumnHelper';
 import type { EntityManager } from 'typeorm';
 import {
@@ -19,7 +19,7 @@ import type { ZodNumber, ZodOptional, ZodString } from 'zod';
 
 @Entity()
 @Unique(['tmdbId'])
-export class Blocklist implements BlocklistItem {
+export class Blacklist implements BlacklistItem {
   @PrimaryGeneratedColumn()
   public id: number;
 
@@ -38,65 +38,65 @@ export class Blocklist implements BlocklistItem {
   })
   user?: User;
 
-  @OneToOne(() => Media, (media) => media.blocklist, {
+  @OneToOne(() => Media, (media) => media.blacklist, {
     onDelete: 'CASCADE',
   })
   @JoinColumn()
   public media: Media;
 
   @Column({ nullable: true, type: 'varchar' })
-  public blocklistedTags?: string;
+  public blacklistedTags?: string;
 
   @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
   public createdAt: Date;
 
-  constructor(init?: Partial<Blocklist>) {
+  constructor(init?: Partial<Blacklist>) {
     Object.assign(this, init);
   }
 
-  public static async addToBlocklist(
+  public static async addToBlacklist(
     {
-      blocklistRequest,
+      blacklistRequest,
     }: {
-      blocklistRequest: {
+      blacklistRequest: {
         mediaType: MediaType;
         title?: ZodOptional<ZodString>['_output'];
         tmdbId: ZodNumber['_output'];
-        blocklistedTags?: string;
+        blacklistedTags?: string;
       };
     },
     entityManager?: EntityManager
   ): Promise<void> {
     const em = entityManager ?? dataSource;
-    const blocklist = new this({
-      ...blocklistRequest,
+    const blacklist = new this({
+      ...blacklistRequest,
     });
 
     const mediaRepository = em.getRepository(Media);
     let media = await mediaRepository.findOne({
       where: {
-        tmdbId: blocklistRequest.tmdbId,
+        tmdbId: blacklistRequest.tmdbId,
       },
     });
 
-    const blocklistRepository = em.getRepository(this);
+    const blacklistRepository = em.getRepository(this);
 
-    await blocklistRepository.save(blocklist);
+    await blacklistRepository.save(blacklist);
 
     if (!media) {
       media = new Media({
-        tmdbId: blocklistRequest.tmdbId,
-        status: MediaStatus.BLOCKLISTED,
-        status4k: MediaStatus.BLOCKLISTED,
-        mediaType: blocklistRequest.mediaType,
-        blocklist: Promise.resolve(blocklist),
+        tmdbId: blacklistRequest.tmdbId,
+        status: MediaStatus.BLACKLISTED,
+        status4k: MediaStatus.BLACKLISTED,
+        mediaType: blacklistRequest.mediaType,
+        blacklist: Promise.resolve(blacklist),
       });
 
       await mediaRepository.save(media);
     } else {
-      media.blocklist = Promise.resolve(blocklist);
-      media.status = MediaStatus.BLOCKLISTED;
-      media.status4k = MediaStatus.BLOCKLISTED;
+      media.blacklist = Promise.resolve(blacklist);
+      media.status = MediaStatus.BLACKLISTED;
+      media.status4k = MediaStatus.BLACKLISTED;
 
       await mediaRepository.save(media);
     }

server/entity/Media.ts

@@ -3,7 +3,7 @@ import SonarrAPI from '@server/api/servarr/sonarr';
 import { MediaStatus, MediaType } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import { getRepository } from '@server/datasource';
-import { Blocklist } from '@server/entity/Blocklist';
+import { Blacklist } from '@server/entity/Blacklist';
 import type { User } from '@server/entity/User';
 import { Watchlist } from '@server/entity/Watchlist';
 import type { DownloadingItem } from '@server/lib/downloadtracker';
@@ -126,8 +126,8 @@ class Media {
   @OneToMany(() => Issue, (issue) => issue.media, { cascade: true })
   public issues: Issue[];
 
-  @OneToOne(() => Blocklist, (blocklist) => blocklist.media)
-  public blocklist: Promise<Blocklist>;
+  @OneToOne(() => Blacklist, (blacklist) => blacklist.media)
+  public blacklist: Promise<Blacklist>;
 
   @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
   public createdAt: Date;

server/entity/MediaRequest.ts

@@ -1,4 +1,5 @@
 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,
@@ -6,10 +7,10 @@ import {
   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 { Permission } from '@server/lib/permissions';
-import { resolveRoute } from '@server/lib/routingResolver';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { DbAwareColumn } from '@server/utils/DbColumnHelper';
@@ -34,7 +35,7 @@ export class RequestPermissionError extends Error {}
 export class QuotaRestrictedError extends Error {}
 export class DuplicateMediaRequestError extends Error {}
 export class NoSeasonsAvailableError extends Error {}
-export class BlocklistedMediaError extends Error {}
+export class BlacklistedMediaError extends Error {}
 
 type MediaRequestOptions = {
   isAutoRequest?: boolean;
@@ -139,14 +140,14 @@ export class MediaRequest {
         mediaType: requestBody.mediaType,
       });
     } else {
-      if (media.status === MediaStatus.BLOCKLISTED) {
-        logger.warn('Request for media blocked due to being blocklisted', {
+      if (media.status === MediaStatus.BLACKLISTED) {
+        logger.warn('Request for media blocked due to being blacklisted', {
           tmdbId: tmdbMedia.id,
           mediaType: requestBody.mediaType,
           label: 'Media Request',
         });
 
-        throw new BlocklistedMediaError('This media is blocklisted.');
+        throw new BlacklistedMediaError('This media is blacklisted.');
       }
 
       if (media.status === MediaStatus.UNKNOWN && !requestBody.is4k) {
@@ -201,41 +202,133 @@ export class MediaRequest {
       }
     }
 
-    // apply routing rules to determine request settings (server/profile/folder/tags)
-    let tmdbKeywords: number[] = [];
-    if ('keywords' in tmdbMedia.keywords) {
-      tmdbKeywords = tmdbMedia.keywords.keywords.map((k: TmdbKeyword) => k.id);
-    } else if ('results' in tmdbMedia.keywords) {
-      tmdbKeywords = tmdbMedia.keywords.results.map((k: TmdbKeyword) => k.id);
-    }
-
-    const isAdmin = user.hasPermission([Permission.MANAGE_REQUESTS], {
+    // Apply overrides if the user is not an admin or has the "advanced request" permission
+    const useOverrides = !user.hasPermission([Permission.MANAGE_REQUESTS], {
       type: 'or',
     });
 
-    const route = await resolveRoute({
-      serviceType:
-        requestBody.mediaType === MediaType.MOVIE ? 'radarr' : 'sonarr',
-      is4k: requestBody.is4k ?? false,
-      userId: requestUser.id,
-      genres: tmdbMedia.genres.map((g) => g.id),
-      language: tmdbMedia.original_language,
-      keywords: tmdbKeywords,
-    });
+    let rootFolder = requestBody.rootFolder;
+    let profileId = requestBody.profileId;
+    let tags = requestBody.tags;
 
-    const serverId =
-      isAdmin && requestBody.serverId != null
-        ? requestBody.serverId
-        : route.serviceId;
-    const profileId =
-      isAdmin && requestBody.profileId != null
-        ? requestBody.profileId
-        : route.profileId;
-    const rootFolder =
-      isAdmin && requestBody.rootFolder
-        ? requestBody.rootFolder
-        : route.rootFolder;
-    const tags = isAdmin && requestBody.tags ? requestBody.tags : route.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 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 (requestBody.mediaType === MediaType.MOVIE) {
       await mediaRepository.save(media);
@@ -274,7 +367,7 @@ export class MediaRequest {
           ? user
           : undefined,
         is4k: requestBody.is4k,
-        serverId: serverId,
+        serverId: requestBody.serverId,
         profileId: profileId,
         rootFolder: rootFolder,
         tags: tags,
@@ -384,7 +477,7 @@ export class MediaRequest {
           ? user
           : undefined,
         is4k: requestBody.is4k,
-        serverId: serverId,
+        serverId: requestBody.serverId,
         profileId: profileId,
         rootFolder: rootFolder,
         languageProfileId: requestBody.languageProfileId,

server/entity/RoutingRule.ts

@@ -1,69 +0,0 @@
-import { DbAwareColumn } from '@server/utils/DbColumnHelper';
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity()
-class RoutingRule {
-  @PrimaryGeneratedColumn()
-  public id: number;
-
-  @Column({ type: 'varchar' })
-  public name: string;
-
-  @Column({ type: 'varchar' })
-  public serviceType: 'radarr' | 'sonarr';
-
-  @Column({ default: false })
-  public is4k: boolean;
-
-  @Column({ type: 'int', default: 0 })
-  public priority: number;
-
-  @Column({ nullable: true })
-  public users?: string;
-
-  @Column({ nullable: true })
-  public genres?: string;
-
-  @Column({ nullable: true })
-  public languages?: string;
-
-  @Column({ nullable: true })
-  public keywords?: string;
-
-  @Column({ type: 'int' })
-  public targetServiceId: number;
-
-  @Column({ type: 'int', nullable: true })
-  public activeProfileId?: number;
-
-  @Column({ nullable: true })
-  public rootFolder?: string;
-
-  @Column({ nullable: true })
-  public seriesType?: string;
-
-  @Column({ nullable: true })
-  public tags?: string;
-
-  @Column({ type: 'varchar', nullable: true })
-  public minimumAvailability?: 'announced' | 'inCinemas' | 'released';
-
-  @Column({ default: false })
-  public isFallback: boolean;
-
-  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
-  public createdAt: Date;
-
-  @DbAwareColumn({
-    type: 'datetime',
-    default: () => 'CURRENT_TIMESTAMP',
-    onUpdate: 'CURRENT_TIMESTAMP',
-  })
-  public updatedAt: Date;
-
-  constructor(init?: Partial<RoutingRule>) {
-    Object.assign(this, init);
-  }
-}
-
-export default RoutingRule;

server/interfaces/api/blacklistInterfaces.ts

@@ -1,15 +1,15 @@
 import type { User } from '@server/entity/User';
 import type { PaginatedResponse } from '@server/interfaces/api/common';
 
-export interface BlocklistItem {
+export interface BlacklistItem {
   tmdbId: number;
   mediaType: 'movie' | 'tv';
   title?: string;
   createdAt?: Date;
   user?: User;
-  blocklistedTags?: string;
+  blacklistedTags?: string;
 }
 
-export interface BlocklistResultsResponse extends PaginatedResponse {
-  results: BlocklistItem[];
+export interface BlacklistResultsResponse extends PaginatedResponse {
+  results: BlacklistItem[];
 }

server/interfaces/api/settingsInterfaces.ts

@@ -30,7 +30,7 @@ export interface PublicSettingsResponse {
   applicationTitle: string;
   applicationUrl: string;
   hideAvailable: boolean;
-  hideBlocklisted: boolean;
+  hideBlacklisted: boolean;
   localLogin: boolean;
   mediaServerLogin: boolean;
   movie4kEnabled: boolean;

server/job/blacklistedTagsProcessor.ts

@@ -6,7 +6,7 @@ import type {
 } from '@server/api/themoviedb/interfaces';
 import { MediaType } from '@server/constants/media';
 import dataSource from '@server/datasource';
-import { Blocklist } from '@server/entity/Blocklist';
+import { Blacklist } from '@server/entity/Blacklist';
 import Media from '@server/entity/Media';
 import type {
   RunnableScanner,
@@ -20,7 +20,7 @@ import type { EntityManager } from 'typeorm';
 const TMDB_API_DELAY_MS = 250;
 class AbortTransaction extends Error {}
 
-class BlocklistedTagProcessor implements RunnableScanner<StatusBase> {
+class BlacklistedTagProcessor implements RunnableScanner<StatusBase> {
   private running = false;
   private progress = 0;
   private total = 0;
@@ -30,12 +30,12 @@ class BlocklistedTagProcessor implements RunnableScanner<StatusBase> {
 
     try {
       await dataSource.transaction(async (em) => {
-        await this.cleanBlocklist(em);
-        await this.createBlocklistEntries(em);
+        await this.cleanBlacklist(em);
+        await this.createBlacklistEntries(em);
       });
     } catch (err) {
       if (err instanceof AbortTransaction) {
-        logger.info('Aborting job: Process Blocklisted Tags', {
+        logger.info('Aborting job: Process Blacklisted Tags', {
           label: 'Jobs',
         });
       } else {
@@ -64,37 +64,37 @@ class BlocklistedTagProcessor implements RunnableScanner<StatusBase> {
     this.cancel();
   }
 
-  private async createBlocklistEntries(em: EntityManager) {
+  private async createBlacklistEntries(em: EntityManager) {
     const tmdb = createTmdbWithRegionLanguage();
 
     const settings = getSettings();
-    const blocklistedTags = settings.main.blocklistedTags;
-    const blocklistedTagsArr = blocklistedTags.split(',');
+    const blacklistedTags = settings.main.blacklistedTags;
+    const blacklistedTagsArr = blacklistedTags.split(',');
 
-    const pageLimit = settings.main.blocklistedTagsLimit;
+    const pageLimit = settings.main.blacklistedTagsLimit;
     const invalidKeywords = new Set<string>();
 
-    if (blocklistedTags.length === 0) {
+    if (blacklistedTags.length === 0) {
       return;
     }
 
     // The maximum number of queries we're expected to execute
     this.total =
-      2 * blocklistedTagsArr.length * pageLimit * SortOptionsIterable.length;
+      2 * blacklistedTagsArr.length * pageLimit * SortOptionsIterable.length;
 
     for (const type of [MediaType.MOVIE, MediaType.TV]) {
       const getDiscover =
         type === MediaType.MOVIE ? tmdb.getDiscoverMovies : tmdb.getDiscoverTv;
 
       // Iterate for each tag
-      for (const tag of blocklistedTagsArr) {
+      for (const tag of blacklistedTagsArr) {
         const keywordDetails = await tmdb.getKeywordDetails({
           keywordId: Number(tag),
         });
 
         if (keywordDetails === null) {
-          logger.warn('Skipping invalid keyword in blocklisted tags', {
-            label: 'Blocklisted Tags Processor',
+          logger.warn('Skipping invalid keyword in blacklisted tags', {
+            label: 'Blacklisted Tags Processor',
             keywordId: tag,
           });
           invalidKeywords.add(tag);
@@ -134,8 +134,8 @@ class BlocklistedTagProcessor implements RunnableScanner<StatusBase> {
               queryMax = response.total_pages;
             }
           } catch (error) {
-            logger.error('Error processing keyword in blocklisted tags', {
-              label: 'Blocklisted Tags Processor',
+            logger.error('Error processing keyword in blacklisted tags', {
+              label: 'Blacklisted Tags Processor',
               keywordId: tag,
               errorMessage: error.message,
             });
@@ -145,19 +145,19 @@ class BlocklistedTagProcessor implements RunnableScanner<StatusBase> {
     }
 
     if (invalidKeywords.size > 0) {
-      const currentTags = blocklistedTagsArr.filter(
+      const currentTags = blacklistedTagsArr.filter(
         (tag) => !invalidKeywords.has(tag)
       );
       const cleanedTags = currentTags.join(',');
 
-      if (cleanedTags !== blocklistedTags) {
-        settings.main.blocklistedTags = cleanedTags;
+      if (cleanedTags !== blacklistedTags) {
+        settings.main.blacklistedTags = cleanedTags;
         await settings.save();
 
         logger.info('Cleaned up invalid keywords from settings', {
-          label: 'Blocklisted Tags Processor',
+          label: 'Blacklisted Tags Processor',
           removedKeywords: Array.from(invalidKeywords),
-          newBlocklistedTags: cleanedTags,
+          newBlacklistedTags: cleanedTags,
         });
       }
     }
@@ -169,33 +169,33 @@ class BlocklistedTagProcessor implements RunnableScanner<StatusBase> {
     mediaType: MediaType,
     em: EntityManager
   ) {
-    const blocklistRepository = em.getRepository(Blocklist);
+    const blacklistRepository = em.getRepository(Blacklist);
 
     for (const entry of response.results) {
-      const blocklistEntry = await blocklistRepository.findOne({
+      const blacklistEntry = await blacklistRepository.findOne({
         where: { tmdbId: entry.id },
       });
 
-      if (blocklistEntry) {
-        // Don't mark manual blocklists with tags
-        // If media wasn't previously blocklisted for this tag, add the tag to the media's blocklist
+      if (blacklistEntry) {
+        // Don't mark manual blacklists with tags
+        // If media wasn't previously blacklisted for this tag, add the tag to the media's blacklist
         if (
-          blocklistEntry.blocklistedTags &&
-          !blocklistEntry.blocklistedTags.includes(`,${keywordId},`)
+          blacklistEntry.blacklistedTags &&
+          !blacklistEntry.blacklistedTags.includes(`,${keywordId},`)
         ) {
-          await blocklistRepository.update(blocklistEntry.id, {
-            blocklistedTags: `${blocklistEntry.blocklistedTags}${keywordId},`,
+          await blacklistRepository.update(blacklistEntry.id, {
+            blacklistedTags: `${blacklistEntry.blacklistedTags}${keywordId},`,
           });
         }
       } else {
-        // Media wasn't previously blocklisted, add it to the blocklist
-        await Blocklist.addToBlocklist(
+        // Media wasn't previously blacklisted, add it to the blacklist
+        await Blacklist.addToBlacklist(
           {
-            blocklistRequest: {
+            blacklistRequest: {
               mediaType,
               title: 'title' in entry ? entry.title : entry.name,
               tmdbId: entry.id,
-              blocklistedTags: `,${keywordId},`,
+              blacklistedTags: `,${keywordId},`,
             },
           },
           em
@@ -204,22 +204,22 @@ class BlocklistedTagProcessor implements RunnableScanner<StatusBase> {
     }
   }
 
-  private async cleanBlocklist(em: EntityManager) {
-    // Remove blocklist and media entries blocklisted by tags
+  private async cleanBlacklist(em: EntityManager) {
+    // Remove blacklist and media entries blacklisted by tags
     const mediaRepository = em.getRepository(Media);
     const mediaToRemove = await mediaRepository
       .createQueryBuilder('media')
-      .innerJoinAndSelect(Blocklist, 'blist', 'blist.tmdbId = media.tmdbId')
-      .where(`blist.blocklistedTags IS NOT NULL`)
+      .innerJoinAndSelect(Blacklist, 'blist', 'blist.tmdbId = media.tmdbId')
+      .where(`blist.blacklistedTags IS NOT NULL`)
       .getMany();
 
     // Batch removes so the query doesn't get too large
     for (let i = 0; i < mediaToRemove.length; i += 500) {
-      await mediaRepository.remove(mediaToRemove.slice(i, i + 500)); // This also deletes the blocklist entries via cascading
+      await mediaRepository.remove(mediaToRemove.slice(i, i + 500)); // This also deletes the blacklist entries via cascading
     }
   }
 }
 
-const blocklistedTagsProcessor = new BlocklistedTagProcessor();
+const blacklistedTagsProcessor = new BlacklistedTagProcessor();
 
-export default blocklistedTagsProcessor;
+export default blacklistedTagsProcessor;

server/job/schedule.ts

@@ -1,5 +1,5 @@
 import { MediaServerType } from '@server/constants/server';
-import blocklistedTagsProcessor from '@server/job/blocklistedTagsProcessor';
+import blacklistedTagsProcessor from '@server/job/blacklistedTagsProcessor';
 import availabilitySync from '@server/lib/availabilitySync';
 import downloadTracker from '@server/lib/downloadtracker';
 import ImageProxy from '@server/lib/imageproxy';
@@ -239,19 +239,19 @@ export const startJobs = (): void => {
   });
 
   scheduledJobs.push({
-    id: 'process-blocklisted-tags',
-    name: 'Process Blocklisted Tags',
+    id: 'process-blacklisted-tags',
+    name: 'Process Blacklisted Tags',
     type: 'process',
     interval: 'days',
-    cronSchedule: jobs['process-blocklisted-tags'].schedule,
-    job: schedule.scheduleJob(jobs['process-blocklisted-tags'].schedule, () => {
-      logger.info('Starting scheduled job: Process Blocklisted Tags', {
+    cronSchedule: jobs['process-blacklisted-tags'].schedule,
+    job: schedule.scheduleJob(jobs['process-blacklisted-tags'].schedule, () => {
+      logger.info('Starting scheduled job: Process Blacklisted Tags', {
         label: 'Jobs',
       });
-      blocklistedTagsProcessor.run();
+      blacklistedTagsProcessor.run();
     }),
-    running: () => blocklistedTagsProcessor.status().running,
-    cancelFn: () => blocklistedTagsProcessor.cancel(),
+    running: () => blacklistedTagsProcessor.status().running,
+    cancelFn: () => blacklistedTagsProcessor.cancel(),
   });
 
   logger.info('Scheduled jobs loaded', { label: 'Jobs' });

server/lib/permissions.ts

@@ -27,8 +27,8 @@ export enum Permission {
   AUTO_REQUEST_TV = 33554432,
   RECENT_VIEW = 67108864,
   WATCHLIST_VIEW = 134217728,
-  MANAGE_BLOCKLIST = 268435456,
-  VIEW_BLOCKLIST = 1073741824,
+  MANAGE_BLACKLIST = 268435456,
+  VIEW_BLACKLIST = 1073741824,
 }
 
 export interface PermissionCheckOptions {

server/lib/routingResolver.ts

@@ -1,136 +0,0 @@
-import { getRepository } from '@server/datasource';
-import RoutingRule from '@server/entity/RoutingRule';
-import { getSettings } from '@server/lib/settings';
-import logger from '@server/logger';
-
-export interface ResolvedRoute {
-  serviceId: number;
-  profileId?: number;
-  rootFolder?: string;
-  seriesType?: string;
-  tags?: number[];
-  minimumAvailability?: string;
-}
-
-interface RouteParams {
-  serviceType: 'radarr' | 'sonarr';
-  is4k: boolean;
-  userId: number;
-  genres: number[];
-  language: string;
-  keywords: number[];
-}
-
-/**
- * Evaluates routing rules top-to-bottom (by priority DESC).
- * First match wins. Falls back to the default instance if no rules match.
- */
-export async function resolveRoute(
-  params: RouteParams
-): Promise<ResolvedRoute> {
-  const routingRuleRepository = getRepository(RoutingRule);
-  const settings = getSettings();
-
-  const rules = await routingRuleRepository.find({
-    where: {
-      serviceType: params.serviceType,
-      is4k: params.is4k,
-    },
-    order: { priority: 'DESC' },
-  });
-
-  for (const rule of rules) {
-    if (matchesAllConditions(rule, params)) {
-      logger.debug('Routing rule matched', {
-        label: 'Routing',
-        ruleId: rule.id,
-        ruleName: rule.name,
-        targetServiceId: rule.targetServiceId,
-      });
-
-      return {
-        serviceId: rule.targetServiceId,
-        profileId: rule.activeProfileId ?? undefined,
-        rootFolder: rule.rootFolder ?? undefined,
-        seriesType: rule.seriesType ?? undefined,
-        tags: rule.tags ? rule.tags.split(',').map(Number) : undefined,
-        minimumAvailability: rule.minimumAvailability ?? undefined,
-      };
-    }
-  }
-
-  logger.warn(
-    'No routing rules matched (including fallback rules). Falling back to settings default.',
-    {
-      label: 'Routing',
-      serviceType: params.serviceType,
-      is4k: params.is4k,
-    }
-  );
-
-  const services =
-    params.serviceType === 'radarr' ? settings.radarr : settings.sonarr;
-  const defaultServiceIdx = services.findIndex(
-    (s) => (params.is4k ? s.is4k : !s.is4k) && s.isDefault
-  );
-
-  if (defaultServiceIdx === -1) {
-    throw new Error(
-      `No default ${params.serviceType} instance configured for ${
-        params.is4k ? '4K' : 'non-4K'
-      } content.`
-    );
-  }
-
-  return { serviceId: services[defaultServiceIdx].id };
-}
-
-/**
- * Check if a rule's conditions all match the request parameters.
- *
- * - No conditions (fallback) = always matches
- * - AND between condition types (all populated conditions must pass)
- * - OR within a condition type (any value can match)
- */
-function matchesAllConditions(rule: RoutingRule, params: RouteParams): boolean {
-  if (rule.isFallback) {
-    return true;
-  }
-
-  const hasConditions =
-    rule.users || rule.genres || rule.languages || rule.keywords;
-
-  if (!hasConditions) {
-    return true;
-  }
-
-  if (rule.users) {
-    const ruleUserIds = rule.users.split(',').map(Number);
-    if (!ruleUserIds.includes(params.userId)) {
-      return false;
-    }
-  }
-
-  if (rule.genres) {
-    const ruleGenreIds = rule.genres.split(',').map(Number);
-    if (!ruleGenreIds.some((g) => params.genres.includes(g))) {
-      return false;
-    }
-  }
-
-  if (rule.languages) {
-    const ruleLangs = rule.languages.split('|');
-    if (!ruleLangs.includes(params.language)) {
-      return false;
-    }
-  }
-
-  if (rule.keywords) {
-    const ruleKeywordIds = rule.keywords.split(',').map(Number);
-    if (!ruleKeywordIds.some((k) => params.keywords.includes(k))) {
-      return false;
-    }
-  }
-
-  return true;
-}

server/lib/settings/index.ts

@@ -132,15 +132,15 @@ export interface MainSettings {
     tv: Quota;
   };
   hideAvailable: boolean;
-  hideBlocklisted: boolean;
+  hideBlacklisted: boolean;
   localLogin: boolean;
   mediaServerLogin: boolean;
   newPlexLogin: boolean;
   discoverRegion: string;
   streamingRegion: string;
   originalLanguage: string;
-  blocklistedTags: string;
-  blocklistedTagsLimit: number;
+  blacklistedTags: string;
+  blacklistedTagsLimit: number;
   mediaServerType: number;
   partialRequestsEnabled: boolean;
   enableSpecialEpisodes: boolean;
@@ -181,7 +181,7 @@ interface FullPublicSettings extends PublicSettings {
   applicationTitle: string;
   applicationUrl: string;
   hideAvailable: boolean;
-  hideBlocklisted: boolean;
+  hideBlacklisted: boolean;
   localLogin: boolean;
   mediaServerLogin: boolean;
   movie4kEnabled: boolean;
@@ -346,7 +346,7 @@ export type JobId =
   | 'jellyfin-full-scan'
   | 'image-cache-cleanup'
   | 'availability-sync'
-  | 'process-blocklisted-tags';
+  | 'process-blacklisted-tags';
 
 export interface AllSettings {
   clientId: string;
@@ -389,15 +389,15 @@ class Settings {
           tv: {},
         },
         hideAvailable: false,
-        hideBlocklisted: false,
+        hideBlacklisted: false,
         localLogin: true,
         mediaServerLogin: true,
         newPlexLogin: true,
         discoverRegion: '',
         streamingRegion: '',
         originalLanguage: '',
-        blocklistedTags: '',
-        blocklistedTagsLimit: 50,
+        blacklistedTags: '',
+        blacklistedTagsLimit: 50,
         mediaServerType: MediaServerType.NOT_CONFIGURED,
         partialRequestsEnabled: true,
         enableSpecialEpisodes: false,
@@ -570,7 +570,7 @@ class Settings {
         'image-cache-cleanup': {
           schedule: '0 0 5 * * *',
         },
-        'process-blocklisted-tags': {
+        'process-blacklisted-tags': {
           schedule: '0 30 1 */7 * *',
         },
       },
@@ -671,7 +671,7 @@ class Settings {
       applicationTitle: this.data.main.applicationTitle,
       applicationUrl: this.data.main.applicationUrl,
       hideAvailable: this.data.main.hideAvailable,
-      hideBlocklisted: this.data.main.hideBlocklisted,
+      hideBlacklisted: this.data.main.hideBlacklisted,
       localLogin: this.data.main.localLogin,
       mediaServerLogin: this.data.main.mediaServerLogin,
       jellyfinExternalHost: this.data.jellyfin.externalHostname,

server/lib/settings/migrations/0008_migrate_blacklist_to_blocklist.ts

@@ -1,40 +0,0 @@
-import type { AllSettings } from '@server/lib/settings';
-
-const migrateBlacklistToBlocklist = (settings: any): AllSettings => {
-  if (
-    Array.isArray(settings.migrations) &&
-    settings.migrations.includes('0008_migrate_blacklist_to_blocklist')
-  ) {
-    return settings;
-  }
-
-  if (settings.main?.hideBlacklisted !== undefined) {
-    settings.main.hideBlocklisted = settings.main.hideBlacklisted;
-    delete settings.main.hideBlacklisted;
-  }
-
-  if (settings.main?.blacklistedTags !== undefined) {
-    settings.main.blocklistedTags = settings.main.blacklistedTags;
-    delete settings.main.blacklistedTags;
-  }
-
-  if (settings.main?.blacklistedTagsLimit !== undefined) {
-    settings.main.blocklistedTagsLimit = settings.main.blacklistedTagsLimit;
-    delete settings.main.blacklistedTagsLimit;
-  }
-
-  if (settings.jobs?.['process-blacklisted-tags']) {
-    settings.jobs['process-blocklisted-tags'] =
-      settings.jobs['process-blacklisted-tags'];
-    delete settings.jobs['process-blacklisted-tags'];
-  }
-
-  if (!Array.isArray(settings.migrations)) {
-    settings.migrations = [];
-  }
-  settings.migrations.push('0008_migrate_blacklist_to_blocklist');
-
-  return settings;
-};
-
-export default migrateBlacklistToBlocklist;

server/lib/settings/migrations/0009_migrate_to_routing_rules.ts

@@ -1,187 +0,0 @@
-import { getRepository } from '@server/datasource';
-import OverrideRule from '@server/entity/OverrideRule';
-import RoutingRule from '@server/entity/RoutingRule';
-import type { AllSettings } from '@server/lib/settings';
-
-const ANIME_KEYWORD_ID = '210024';
-
-const migrateToRoutingRules = async (settings: any): Promise<AllSettings> => {
-  if (
-    Array.isArray(settings.migrations) &&
-    settings.migrations.includes('0009_migrate_to_routing_rules')
-  ) {
-    return settings;
-  }
-
-  const routingRuleRepo = getRepository(RoutingRule);
-  let errorOccurred = false;
-
-  for (const radarr of settings.radarr || []) {
-    if (!radarr.isDefault) continue;
-
-    try {
-      await routingRuleRepo.save(
-        new RoutingRule({
-          name: `${radarr.name} Default Route`,
-          serviceType: 'radarr',
-          targetServiceId: radarr.id,
-          is4k: radarr.is4k,
-          isFallback: true,
-          priority: 0,
-          activeProfileId: radarr.activeProfileId || undefined,
-          rootFolder: radarr.activeDirectory || undefined,
-          minimumAvailability: radarr.minimumAvailability || 'released',
-          tags:
-            radarr.tags && radarr.tags.length > 0
-              ? radarr.tags.join(',')
-              : undefined,
-        })
-      );
-    } catch (error) {
-      console.error(
-        `Failed to create Radarr fallback routing rule for "${radarr.name}".`,
-        error.message
-      );
-      errorOccurred = true;
-    }
-  }
-
-  for (const sonarr of settings.sonarr || []) {
-    if (!sonarr.isDefault) continue;
-
-    try {
-      await routingRuleRepo.save(
-        new RoutingRule({
-          name: `${sonarr.name} Default Route`,
-          serviceType: 'sonarr',
-          targetServiceId: sonarr.id,
-          is4k: sonarr.is4k,
-          isFallback: true,
-          priority: 0,
-          activeProfileId: sonarr.activeProfileId || undefined,
-          rootFolder: sonarr.activeDirectory || undefined,
-          seriesType: sonarr.seriesType || 'standard',
-          tags:
-            sonarr.tags && sonarr.tags.length > 0
-              ? sonarr.tags.join(',')
-              : undefined,
-        })
-      );
-    } catch (error) {
-      console.error(
-        `Failed to create Sonarr fallback routing rule for "${sonarr.name}".`,
-        error.message
-      );
-      errorOccurred = true;
-    }
-
-    const hasAnimeOverrides =
-      sonarr.activeAnimeProfileId ||
-      sonarr.activeAnimeDirectory ||
-      (sonarr.animeTags && sonarr.animeTags.length > 0);
-
-    if (hasAnimeOverrides) {
-      try {
-        await routingRuleRepo.save(
-          new RoutingRule({
-            name: 'Anime',
-            serviceType: 'sonarr',
-            targetServiceId: sonarr.id,
-            is4k: sonarr.is4k,
-            isFallback: false,
-            priority: 10,
-            keywords: ANIME_KEYWORD_ID,
-            activeProfileId:
-              sonarr.activeAnimeProfileId ||
-              sonarr.activeProfileId ||
-              undefined,
-            rootFolder:
-              sonarr.activeAnimeDirectory ||
-              sonarr.activeDirectory ||
-              undefined,
-            seriesType: sonarr.animeSeriesType || 'anime',
-            tags:
-              sonarr.animeTags && sonarr.animeTags.length > 0
-                ? sonarr.animeTags.join(',')
-                : undefined,
-          })
-        );
-      } catch (error) {
-        console.error(
-          `Failed to create Sonarr anime routing rule for "${sonarr.name}".`,
-          error.message
-        );
-        errorOccurred = true;
-      }
-    }
-  }
-
-  let overrideRules: OverrideRule[] = [];
-  try {
-    const overrideRuleRepo = getRepository(OverrideRule);
-    overrideRules = await overrideRuleRepo.find();
-  } catch {
-    // If the OverrideRule table doesn't exist or can't be queried, we can skip this step.
-  }
-
-  let priority = 20;
-
-  for (const rule of overrideRules) {
-    const isRadarr = rule.radarrServiceId != null;
-    const serviceType: 'radarr' | 'sonarr' = isRadarr ? 'radarr' : 'sonarr';
-
-    const serviceIndex = isRadarr
-      ? rule.radarrServiceId!
-      : rule.sonarrServiceId!;
-    const services =
-      serviceType === 'radarr' ? settings.radarr || [] : settings.sonarr || [];
-    const targetService = services[serviceIndex];
-
-    if (!targetService) {
-      console.error(
-        `Skipping override rule #${rule.id}: ${serviceType} instance at index ${serviceIndex} not found in settings.`
-      );
-      errorOccurred = true;
-      continue;
-    }
-
-    try {
-      await routingRuleRepo.save(
-        new RoutingRule({
-          name: `Migrated Rule #${rule.id}`,
-          serviceType,
-          targetServiceId: targetService.id,
-          is4k: targetService.is4k,
-          isFallback: false,
-          priority,
-          users: rule.users || undefined,
-          genres: rule.genre || undefined,
-          languages: rule.language || undefined,
-          keywords: rule.keywords || undefined,
-          activeProfileId: rule.profileId || undefined,
-          rootFolder: rule.rootFolder || undefined,
-          tags: rule.tags || undefined,
-        })
-      );
-
-      priority += 10;
-    } catch (error) {
-      console.error(
-        `Failed to migrate override rule #${rule.id} to routing rule.`,
-        error.message
-      );
-      errorOccurred = true;
-    }
-  }
-
-  if (!errorOccurred) {
-    if (!Array.isArray(settings.migrations)) {
-      settings.migrations = [];
-    }
-    settings.migrations.push('0009_migrate_to_routing_rules');
-  }
-
-  return settings;
-};
-
-export default migrateToRoutingRules;

server/lib/watchlistsync.ts

@@ -3,7 +3,7 @@ import { MediaStatus, MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import {
-  BlocklistedMediaError,
+  BlacklistedMediaError,
   DuplicateMediaRequestError,
   MediaRequest,
   NoSeasonsAvailableError,
@@ -145,8 +145,8 @@ class WatchlistSync {
               errorMessage: e.message,
             });
             break;
-          // Blocklisted media should be silently ignored during watchlist sync to avoid spam
-          case BlocklistedMediaError:
+          // Blacklisted media should be silently ignored during watchlist sync to avoid spam
+          case BlacklistedMediaError:
             break;
           default:
             logger.error('Failed to create media request from watchlist', {

server/middleware/deprecation.ts

@@ -1,49 +0,0 @@
-import logger from '@server/logger';
-import type { NextFunction, Request, Response } from 'express';
-
-interface DeprecationOptions {
-  oldPath: string;
-  newPath: string;
-  sunsetDate?: string;
-  documentationUrl?: string;
-}
-
-/**
- * Mark an API route as deprecated.
- * @see https://datatracker.ietf.org/doc/html/rfc8594
- */
-export const deprecatedRoute = ({
-  oldPath,
-  newPath,
-  sunsetDate,
-  documentationUrl,
-}: DeprecationOptions) => {
-  return (req: Request, res: Response, next: NextFunction) => {
-    logger.warn(
-      `Deprecated API endpoint accessed: ${oldPath} → use ${newPath} instead`,
-      {
-        label: 'API Deprecation',
-        ip: req.ip,
-        userAgent: req.get('User-Agent'),
-        method: req.method,
-        path: req.originalUrl,
-      }
-    );
-
-    res.setHeader('Deprecation', 'true');
-
-    const links: string[] = [`<${newPath}>; rel="successor-version"`];
-    if (documentationUrl) {
-      links.push(`<${documentationUrl}>; rel="deprecation"`);
-    }
-    res.setHeader('Link', links.join(', '));
-
-    if (sunsetDate) {
-      res.setHeader('Sunset', new Date(sunsetDate).toUTCString());
-    }
-
-    next();
-  };
-};
-
-export default deprecatedRoute;

server/migration/postgres/1771080196816-RenameBlacklistToBlocklist.ts

@@ -1,19 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class RenameBlacklistToBlocklist1771080196816 implements MigrationInterface {
-  name = 'RenameBlacklistToBlocklist1771080196816';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`ALTER TABLE "blacklist" RENAME TO "blocklist"`);
-    await queryRunner.query(
-      `ALTER TABLE "blocklist" RENAME COLUMN "blacklistedTags" TO "blocklistedTags"`
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "blocklist" RENAME COLUMN "blocklistedTags" TO "blacklistedTags"`
-    );
-    await queryRunner.query(`ALTER TABLE "blocklist" RENAME TO "blacklist"`);
-  }
-}

server/migration/sqlite/1771080196816-RenameBlacklistToBlocklist.ts

@@ -1,66 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class RenameBlacklistToBlocklist1771080196816 implements MigrationInterface {
-  name = 'RenameBlacklistToBlocklist1771080196816';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`
-      CREATE TABLE "temporary_blocklist" (
-        "id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-        "mediaType" varchar NOT NULL,
-        "title" varchar,
-        "tmdbId" integer NOT NULL,
-        "blocklistedTags" varchar,
-        "createdAt" datetime NOT NULL DEFAULT (datetime('now')),
-        "userId" integer,
-        "mediaId" integer,
-        CONSTRAINT "UQ_6bbafa28411e6046421991ea21c" UNIQUE ("tmdbId"),
-        CONSTRAINT "REL_62b7ade94540f9f8d8bede54b9" UNIQUE ("mediaId"),
-        CONSTRAINT "FK_53c1ab62c3e5875bc3ac474823e" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION,
-        CONSTRAINT "FK_62b7ade94540f9f8d8bede54b99" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION
-      )
-    `);
-    await queryRunner.query(`
-      INSERT INTO "temporary_blocklist" ("id", "mediaType", "title", "tmdbId", "blocklistedTags", "createdAt", "userId", "mediaId")
-      SELECT "id", "mediaType", "title", "tmdbId", "blacklistedTags", "createdAt", "userId", "mediaId" FROM "blacklist"
-    `);
-    await queryRunner.query(`DROP TABLE "blacklist"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_blocklist" RENAME TO "blocklist"`
-    );
-    await queryRunner.query(
-      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blocklist" ("tmdbId")`
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`ALTER TABLE "blocklist" RENAME TO "blacklist"`);
-    await queryRunner.query(`
-      CREATE TABLE "temporary_blacklist" (
-        "id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-        "mediaType" varchar NOT NULL,
-        "title" varchar,
-        "tmdbId" integer NOT NULL,
-        "blacklistedTags" varchar,
-        "createdAt" datetime NOT NULL DEFAULT (datetime('now')),
-        "userId" integer,
-        "mediaId" integer,
-        CONSTRAINT "UQ_6bbafa28411e6046421991ea21c" UNIQUE ("tmdbId"),
-        CONSTRAINT "REL_62b7ade94540f9f8d8bede54b9" UNIQUE ("mediaId"),
-        CONSTRAINT "FK_53c1ab62c3e5875bc3ac474823e" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION,
-        CONSTRAINT "FK_62b7ade94540f9f8d8bede54b99" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION
-      )
-    `);
-    await queryRunner.query(`
-      INSERT INTO "temporary_blacklist" ("id", "mediaType", "title", "tmdbId", "blacklistedTags", "createdAt", "userId", "mediaId")
-      SELECT "id", "mediaType", "title", "tmdbId", "blocklistedTags", "createdAt", "userId", "mediaId" FROM "blacklist"
-    `);
-    await queryRunner.query(`DROP TABLE "blacklist"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_blacklist" RENAME TO "blacklist"`
-    );
-    await queryRunner.query(
-      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId")`
-    );
-  }
-}

server/routes/blacklist.ts

@@ -1,8 +1,8 @@
 import { MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
-import { Blocklist } from '@server/entity/Blocklist';
+import { Blacklist } from '@server/entity/Blacklist';
 import Media from '@server/entity/Media';
-import type { BlocklistResultsResponse } from '@server/interfaces/api/blocklistInterfaces';
+import type { BlacklistResultsResponse } from '@server/interfaces/api/blacklistInterfaces';
 import { Permission } from '@server/lib/permissions';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
@@ -10,53 +10,53 @@ import { Router } from 'express';
 import { EntityNotFoundError, QueryFailedError } from 'typeorm';
 import { z } from 'zod';
 
-const blocklistRoutes = Router();
+const blacklistRoutes = Router();
 
-export const blocklistAdd = z.object({
+export const blacklistAdd = z.object({
   tmdbId: z.coerce.number(),
   mediaType: z.nativeEnum(MediaType),
   title: z.coerce.string().optional(),
   user: z.coerce.number(),
 });
 
-const blocklistGet = z.object({
+const blacklistGet = z.object({
   take: z.coerce.number().int().positive().default(25),
   skip: z.coerce.number().int().nonnegative().default(0),
   search: z.string().optional(),
-  filter: z.enum(['all', 'manual', 'blocklistedTags']).optional(),
+  filter: z.enum(['all', 'manual', 'blacklistedTags']).optional(),
 });
 
-blocklistRoutes.get(
+blacklistRoutes.get(
   '/',
-  isAuthenticated([Permission.MANAGE_BLOCKLIST, Permission.VIEW_BLOCKLIST], {
+  isAuthenticated([Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST], {
     type: 'or',
   }),
   async (req, res, next) => {
-    const { take, skip, search, filter } = blocklistGet.parse(req.query);
+    const { take, skip, search, filter } = blacklistGet.parse(req.query);
 
     try {
-      let query = getRepository(Blocklist)
-        .createQueryBuilder('blocklist')
-        .leftJoinAndSelect('blocklist.user', 'user')
+      let query = getRepository(Blacklist)
+        .createQueryBuilder('blacklist')
+        .leftJoinAndSelect('blacklist.user', 'user')
         .where('1 = 1'); // Allow use of andWhere later
 
       switch (filter) {
         case 'manual':
-          query = query.andWhere('blocklist.blocklistedTags IS NULL');
+          query = query.andWhere('blacklist.blacklistedTags IS NULL');
           break;
-        case 'blocklistedTags':
-          query = query.andWhere('blocklist.blocklistedTags IS NOT NULL');
+        case 'blacklistedTags':
+          query = query.andWhere('blacklist.blacklistedTags IS NOT NULL');
           break;
       }
 
       if (search) {
-        query = query.andWhere('blocklist.title like :title', {
+        query = query.andWhere('blacklist.title like :title', {
           title: `%${search}%`,
         });
       }
 
-      const [blocklistedItems, itemsCount] = await query
-        .orderBy('blocklist.createdAt', 'DESC')
+      const [blacklistedItems, itemsCount] = await query
+        .orderBy('blacklist.createdAt', 'DESC')
         .take(take)
         .skip(skip)
         .getManyAndCount();
@@ -68,35 +68,35 @@ blocklistRoutes.get(
           results: itemsCount,
           page: Math.ceil(skip / take) + 1,
         },
-        results: blocklistedItems,
-      } as BlocklistResultsResponse);
+        results: blacklistedItems,
+      } as BlacklistResultsResponse);
     } catch (error) {
-      logger.error('Something went wrong while retrieving blocklisted items', {
-        label: 'Blocklist',
+      logger.error('Something went wrong while retrieving blacklisted items', {
+        label: 'Blacklist',
         errorMessage: error.message,
       });
       return next({
         status: 500,
-        message: 'Unable to retrieve blocklisted items.',
+        message: 'Unable to retrieve blacklisted items.',
       });
     }
   }
 );
 
-blocklistRoutes.get(
+blacklistRoutes.get(
   '/:id',
-  isAuthenticated([Permission.MANAGE_BLOCKLIST], {
+  isAuthenticated([Permission.MANAGE_BLACKLIST], {
     type: 'or',
   }),
   async (req, res, next) => {
     try {
-      const blocklisteRepository = getRepository(Blocklist);
+      const blacklisteRepository = getRepository(Blacklist);
 
-      const blocklistItem = await blocklisteRepository.findOneOrFail({
+      const blacklistItem = await blacklisteRepository.findOneOrFail({
         where: { tmdbId: Number(req.params.id) },
       });
 
-      return res.status(200).send(blocklistItem);
+      return res.status(200).send(blacklistItem);
     } catch (e) {
       if (e instanceof EntityNotFoundError) {
         return next({
@@ -109,17 +109,17 @@ blocklistRoutes.get(
   }
 );
 
-blocklistRoutes.post(
+blacklistRoutes.post(
   '/',
-  isAuthenticated([Permission.MANAGE_BLOCKLIST], {
+  isAuthenticated([Permission.MANAGE_BLACKLIST], {
     type: 'or',
   }),
   async (req, res, next) => {
     try {
-      const values = blocklistAdd.parse(req.body);
+      const values = blacklistAdd.parse(req.body);
 
-      await Blocklist.addToBlocklist({
-        blocklistRequest: values,
+      await Blacklist.addToBlacklist({
+        blacklistRequest: values,
       });
 
       return res.status(201).send();
@@ -131,12 +131,12 @@ blocklistRoutes.post(
       if (error instanceof QueryFailedError) {
         switch (error.driverError.errno) {
           case 19:
-            return next({ status: 412, message: 'Item already blocklisted' });
+            return next({ status: 412, message: 'Item already blacklisted' });
           default:
-            logger.warn('Something wrong with data blocklist', {
+            logger.warn('Something wrong with data blacklist', {
               tmdbId: req.body.tmdbId,
               mediaType: req.body.mediaType,
-              label: 'Blocklist',
+              label: 'Blacklist',
             });
             return next({ status: 409, message: 'Something wrong' });
         }
@@ -147,20 +147,20 @@ blocklistRoutes.post(
   }
 );
 
-blocklistRoutes.delete(
+blacklistRoutes.delete(
   '/:id',
-  isAuthenticated([Permission.MANAGE_BLOCKLIST], {
+  isAuthenticated([Permission.MANAGE_BLACKLIST], {
     type: 'or',
   }),
   async (req, res, next) => {
     try {
-      const blocklisteRepository = getRepository(Blocklist);
+      const blacklisteRepository = getRepository(Blacklist);
 
-      const blocklistItem = await blocklisteRepository.findOneOrFail({
+      const blacklistItem = await blacklisteRepository.findOneOrFail({
         where: { tmdbId: Number(req.params.id) },
       });
 
-      await blocklisteRepository.remove(blocklistItem);
+      await blacklisteRepository.remove(blacklistItem);
 
       const mediaRepository = getRepository(Media);
 
@@ -183,4 +183,4 @@ blocklistRoutes.delete(
   }
 );
 
-export default blocklistRoutes;
+export default blacklistRoutes;

server/routes/index.ts

@@ -12,12 +12,11 @@ import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { checkUser, isAuthenticated } from '@server/middleware/auth';
-import deprecatedRoute from '@server/middleware/deprecation';
 import { mapProductionCompany } from '@server/models/Movie';
 import { mapNetwork } from '@server/models/Tv';
 import { mapWatchProviderDetails } from '@server/models/common';
+import overrideRuleRoutes from '@server/routes/overrideRule';
 import settingsRoutes from '@server/routes/settings';
-import routingRuleRoutes from '@server/routes/settings/routingRule';
 import watchlistRoutes from '@server/routes/watchlist';
 import {
   appDataPath,
@@ -29,7 +28,7 @@ import restartFlag from '@server/utils/restartFlag';
 import { isPerson } from '@server/utils/typeHelpers';
 import { Router } from 'express';
 import authRoutes from './auth';
-import blocklistRoutes from './blocklist';
+import blacklistRoutes from './blacklist';
 import collectionRoutes from './collection';
 import discoverRoutes, { createTmdbWithRegionLanguage } from './discover';
 import issueRoutes from './issue';
@@ -152,17 +151,7 @@ router.use('/search', isAuthenticated(), searchRoutes);
 router.use('/discover', isAuthenticated(), discoverRoutes);
 router.use('/request', isAuthenticated(), requestRoutes);
 router.use('/watchlist', isAuthenticated(), watchlistRoutes);
-router.use('/blocklist', isAuthenticated(), blocklistRoutes);
-router.use(
-  '/blacklist',
-  isAuthenticated(),
-  deprecatedRoute({
-    oldPath: '/api/v1/blacklist',
-    newPath: '/api/v1/blocklist',
-    sunsetDate: '2026-06-01',
-  }),
-  blocklistRoutes
-);
+router.use('/blacklist', isAuthenticated(), blacklistRoutes);
 router.use('/movie', isAuthenticated(), movieRoutes);
 router.use('/tv', isAuthenticated(), tvRoutes);
 router.use('/media', isAuthenticated(), mediaRoutes);
@@ -173,9 +162,9 @@ router.use('/issue', isAuthenticated(), issueRoutes);
 router.use('/issueComment', isAuthenticated(), issueCommentRoutes);
 router.use('/auth', authRoutes);
 router.use(
-  '/routingRule',
+  '/overrideRule',
   isAuthenticated(Permission.ADMIN),
-  routingRuleRoutes
+  overrideRuleRoutes
 );
 
 router.get('/regions', isAuthenticated(), async (req, res, next) => {

server/routes/overrideRule.ts

@@ -0,0 +1,136 @@
+import { getRepository } from '@server/datasource';
+import OverrideRule from '@server/entity/OverrideRule';
+import type { OverrideRuleResultsResponse } from '@server/interfaces/api/overrideRuleInterfaces';
+import { Permission } from '@server/lib/permissions';
+import { isAuthenticated } from '@server/middleware/auth';
+import { Router } from 'express';
+
+const overrideRuleRoutes = Router();
+
+overrideRuleRoutes.get(
+  '/',
+  isAuthenticated(Permission.ADMIN),
+  async (req, res, next) => {
+    const overrideRuleRepository = getRepository(OverrideRule);
+
+    try {
+      const rules = await overrideRuleRepository.find({});
+
+      return res.status(200).json(rules as OverrideRuleResultsResponse);
+    } catch (e) {
+      next({ status: 404, message: e.message });
+    }
+  }
+);
+
+overrideRuleRoutes.post<
+  Record<string, string>,
+  OverrideRule,
+  {
+    users?: string;
+    genre?: string;
+    language?: string;
+    keywords?: string;
+    profileId?: number;
+    rootFolder?: string;
+    tags?: string;
+    radarrServiceId?: number;
+    sonarrServiceId?: number;
+  }
+>('/', isAuthenticated(Permission.ADMIN), async (req, res, next) => {
+  const overrideRuleRepository = getRepository(OverrideRule);
+
+  try {
+    const rule = new OverrideRule({
+      users: req.body.users,
+      genre: req.body.genre,
+      language: req.body.language,
+      keywords: req.body.keywords,
+      profileId: req.body.profileId,
+      rootFolder: req.body.rootFolder,
+      tags: req.body.tags,
+      radarrServiceId: req.body.radarrServiceId,
+      sonarrServiceId: req.body.sonarrServiceId,
+    });
+
+    const newRule = await overrideRuleRepository.save(rule);
+
+    return res.status(200).json(newRule);
+  } catch (e) {
+    next({ status: 404, message: e.message });
+  }
+});
+
+overrideRuleRoutes.put<
+  { ruleId: string },
+  OverrideRule,
+  {
+    users?: string;
+    genre?: string;
+    language?: string;
+    keywords?: string;
+    profileId?: number;
+    rootFolder?: string;
+    tags?: string;
+    radarrServiceId?: number;
+    sonarrServiceId?: number;
+  }
+>('/:ruleId', isAuthenticated(Permission.ADMIN), async (req, res, next) => {
+  const overrideRuleRepository = getRepository(OverrideRule);
+
+  try {
+    const rule = await overrideRuleRepository.findOne({
+      where: {
+        id: Number(req.params.ruleId),
+      },
+    });
+
+    if (!rule) {
+      return next({ status: 404, message: 'Override Rule not found.' });
+    }
+
+    rule.users = req.body.users;
+    rule.genre = req.body.genre;
+    rule.language = req.body.language;
+    rule.keywords = req.body.keywords;
+    rule.profileId = req.body.profileId;
+    rule.rootFolder = req.body.rootFolder;
+    rule.tags = req.body.tags;
+    rule.radarrServiceId = req.body.radarrServiceId;
+    rule.sonarrServiceId = req.body.sonarrServiceId;
+
+    const newRule = await overrideRuleRepository.save(rule);
+
+    return res.status(200).json(newRule);
+  } catch (e) {
+    next({ status: 404, message: e.message });
+  }
+});
+
+overrideRuleRoutes.delete<{ ruleId: string }, OverrideRule>(
+  '/:ruleId',
+  isAuthenticated(Permission.ADMIN),
+  async (req, res, next) => {
+    const overrideRuleRepository = getRepository(OverrideRule);
+
+    try {
+      const rule = await overrideRuleRepository.findOne({
+        where: {
+          id: Number(req.params.ruleId),
+        },
+      });
+
+      if (!rule) {
+        return next({ status: 404, message: 'Override Rule not found.' });
+      }
+
+      await overrideRuleRepository.remove(rule);
+
+      return res.status(200).json(rule);
+    } catch (e) {
+      next({ status: 404, message: e.message });
+    }
+  }
+);
+
+export default overrideRuleRoutes;

server/routes/request.ts

@@ -8,7 +8,7 @@ import {
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import {
-  BlocklistedMediaError,
+  BlacklistedMediaError,
   DuplicateMediaRequestError,
   MediaRequest,
   NoSeasonsAvailableError,
@@ -326,7 +326,7 @@ requestRoutes.post<never, MediaRequest, MediaRequestBody>(
           return next({ status: 409, message: error.message });
         case NoSeasonsAvailableError:
           return next({ status: 202, message: error.message });
-        case BlocklistedMediaError:
+        case BlacklistedMediaError:
           return next({ status: 403, message: error.message });
         default:
           return next({ status: 500, message: error.message });

server/routes/settings/radarr.ts

@@ -1,6 +1,4 @@
 import RadarrAPI from '@server/api/servarr/radarr';
-import { getRepository } from '@server/datasource';
-import RoutingRule from '@server/entity/RoutingRule';
 import type { RadarrSettings } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
@@ -138,7 +136,6 @@ radarrRoutes.get<{ id: string }>('/:id/profiles', async (req, res, next) => {
 
 radarrRoutes.delete<{ id: string }>('/:id', async (req, res, next) => {
   const settings = getSettings();
-  const routingRuleRepository = getRepository(RoutingRule);
 
   const radarrIndex = settings.radarr.findIndex(
     (r) => r.id === Number(req.params.id)
@@ -148,19 +145,6 @@ radarrRoutes.delete<{ id: string }>('/:id', async (req, res, next) => {
     return next({ status: '404', message: 'Settings instance not found' });
   }
 
-  const instanceId = Number(req.params.id);
-
-  const rulesToDelete = await routingRuleRepository.find({
-    where: {
-      serviceType: 'radarr',
-      targetServiceId: instanceId,
-    },
-  });
-
-  if (rulesToDelete.length > 0) {
-    await routingRuleRepository.remove(rulesToDelete);
-  }
-
   const removed = settings.radarr.splice(radarrIndex, 1);
   await settings.save();
 

server/routes/settings/routingRule.ts

@@ -1,370 +0,0 @@
-import { getRepository } from '@server/datasource';
-import RoutingRule from '@server/entity/RoutingRule';
-import { Permission } from '@server/lib/permissions';
-import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
-import { getSettings } from '@server/lib/settings';
-import { isAuthenticated } from '@server/middleware/auth';
-import { Router } from 'express';
-import { In, Not } from 'typeorm';
-
-const routingRuleRoutes = Router();
-
-type ServiceType = 'radarr' | 'sonarr';
-
-function resolveTargetService(
-  serviceType: ServiceType,
-  targetServiceId: number
-): RadarrSettings | SonarrSettings | undefined {
-  const settings = getSettings();
-  const services = serviceType === 'radarr' ? settings.radarr : settings.sonarr;
-  return services.find((s) => s.id === targetServiceId);
-}
-
-function hasAnyCondition(body: Record<string, unknown>): boolean {
-  return !!(body.users || body.genres || body.languages || body.keywords);
-}
-
-function parseActiveProfileId(
-  raw: string | number | null | undefined
-): number | null {
-  if (raw === '' || raw == null) return null;
-  const n = Number(raw);
-  return Number.isFinite(n) ? n : null;
-}
-
-routingRuleRoutes.get(
-  '/',
-  isAuthenticated(Permission.ADMIN),
-  async (_req, res, next) => {
-    const routingRuleRepository = getRepository(RoutingRule);
-    try {
-      const rules = await routingRuleRepository.find({
-        order: { isFallback: 'ASC', priority: 'DESC' },
-      });
-      return res.status(200).json(rules);
-    } catch (e) {
-      next({ status: 500, message: e.message });
-    }
-  }
-);
-
-routingRuleRoutes.post(
-  '/',
-  isAuthenticated(Permission.ADMIN),
-  async (req, res, next) => {
-    const routingRuleRepository = getRepository(RoutingRule);
-    try {
-      const serviceType = req.body.serviceType as ServiceType;
-      const targetServiceId = Number(req.body.targetServiceId);
-
-      if (!serviceType || !['radarr', 'sonarr'].includes(serviceType)) {
-        return next({ status: 400, message: 'Invalid serviceType.' });
-      }
-      if (!Number.isFinite(targetServiceId) || targetServiceId < 0) {
-        return next({ status: 400, message: 'Invalid targetServiceId.' });
-      }
-
-      const target = resolveTargetService(serviceType, targetServiceId);
-      if (!target) {
-        return next({ status: 400, message: 'Target instance not found.' });
-      }
-
-      const derivedIs4k = !!target.is4k;
-      const isFallback = !!req.body.isFallback;
-
-      if (isFallback) {
-        const existing = await routingRuleRepository.findOne({
-          where: { serviceType, is4k: derivedIs4k, isFallback: true },
-        });
-
-        if (existing) {
-          return next({
-            status: 409,
-            message: 'Fallback already exists for this serviceType/is4k.',
-          });
-        }
-
-        if (!target.isDefault) {
-          return next({
-            status: 400,
-            message: 'Fallback rules must target a default instance.',
-          });
-        }
-      }
-
-      if (!isFallback && !hasAnyCondition(req.body)) {
-        return next({
-          status: 400,
-          message: 'Non-fallback rules must have at least one condition.',
-        });
-      }
-
-      const activeProfileId = parseActiveProfileId(req.body.activeProfileId);
-
-      if (isFallback) {
-        if (!req.body.rootFolder) {
-          return next({
-            status: 400,
-            message: 'Fallback requires rootFolder.',
-          });
-        }
-
-        if (activeProfileId == null) {
-          return next({
-            status: 400,
-            message: 'Fallback requires activeProfileId.',
-          });
-        }
-
-        if (serviceType === 'radarr' && !req.body.minimumAvailability) {
-          return next({
-            status: 400,
-            message: 'Fallback requires minimumAvailability for radarr.',
-          });
-        }
-      }
-
-      let priority = 0;
-      if (!isFallback) {
-        const highestRule = await routingRuleRepository.findOne({
-          where: { serviceType, is4k: derivedIs4k, isFallback: false },
-          order: { priority: 'DESC' },
-        });
-        priority = (highestRule?.priority ?? 0) + 10;
-      }
-
-      const rule = new RoutingRule({
-        name: req.body.name,
-        serviceType,
-        targetServiceId,
-        is4k: derivedIs4k,
-        isFallback,
-        priority,
-        users: isFallback ? null : req.body.users,
-        genres: isFallback ? null : req.body.genres,
-        languages: isFallback ? null : req.body.languages,
-        keywords: isFallback ? null : req.body.keywords,
-        activeProfileId: activeProfileId ?? undefined,
-        rootFolder: req.body.rootFolder,
-        seriesType: req.body.seriesType,
-        tags: req.body.tags,
-        minimumAvailability: req.body.minimumAvailability ?? null,
-      });
-
-      const newRule = await routingRuleRepository.save(rule);
-      return res.status(201).json(newRule);
-    } catch (e) {
-      next({ status: 500, message: e.message });
-    }
-  }
-);
-
-routingRuleRoutes.put<{ ruleId: string }>(
-  '/:ruleId',
-  isAuthenticated(Permission.ADMIN),
-  async (req, res, next) => {
-    const routingRuleRepository = getRepository(RoutingRule);
-    try {
-      const rule = await routingRuleRepository.findOne({
-        where: { id: Number(req.params.ruleId) },
-      });
-
-      if (!rule) {
-        return next({ status: 404, message: 'Routing rule not found.' });
-      }
-
-      const nextServiceType = (req.body.serviceType ??
-        rule.serviceType) as ServiceType;
-      const nextTargetServiceId = Number(
-        req.body.targetServiceId ?? rule.targetServiceId
-      );
-
-      const target = resolveTargetService(nextServiceType, nextTargetServiceId);
-      if (!target) {
-        return next({ status: 400, message: 'Target instance not found.' });
-      }
-
-      const derivedIs4k = !!target.is4k;
-      const derivedIsDefault = !!target.isDefault;
-      const nextIsFallback = !!(req.body.isFallback ?? rule.isFallback);
-
-      if (nextIsFallback) {
-        const existing = await routingRuleRepository.findOne({
-          where: {
-            serviceType: nextServiceType,
-            is4k: derivedIs4k,
-            isFallback: true,
-            id: Not(rule.id),
-          },
-        });
-
-        if (existing) {
-          return next({
-            status: 409,
-            message: 'Fallback already exists for this serviceType/is4k.',
-          });
-        }
-      }
-
-      const mergedForConditionCheck = { ...rule, ...req.body };
-      if (!nextIsFallback && !hasAnyCondition(mergedForConditionCheck)) {
-        return next({
-          status: 400,
-          message: 'Non-fallback rules must have at least one condition.',
-        });
-      }
-
-      if (nextIsFallback && !derivedIsDefault) {
-        return next({
-          status: 400,
-          message: 'Fallback rules must target a default instance.',
-        });
-      }
-
-      const nextActiveProfileId = parseActiveProfileId(
-        req.body.activeProfileId ?? rule.activeProfileId
-      );
-
-      const nextRootFolder = (req.body.rootFolder ?? rule.rootFolder) as
-        | string
-        | undefined;
-
-      const nextMinimumAvailability =
-        nextServiceType === 'radarr'
-          ? (req.body.minimumAvailability ?? rule.minimumAvailability)
-          : null;
-
-      if (nextIsFallback) {
-        if (!nextRootFolder) {
-          return next({
-            status: 400,
-            message: 'Fallback requires rootFolder.',
-          });
-        }
-        if (nextActiveProfileId == null) {
-          return next({
-            status: 400,
-            message: 'Fallback requires activeProfileId.',
-          });
-        }
-        if (nextServiceType === 'radarr' && !nextMinimumAvailability) {
-          return next({
-            status: 400,
-            message: 'Fallback requires minimumAvailability for radarr.',
-          });
-        }
-      }
-
-      if (nextIsFallback) {
-        rule.priority = 0;
-      } else if (typeof req.body.priority === 'number') {
-        rule.priority = req.body.priority;
-      } else {
-        const groupChanged =
-          rule.serviceType !== nextServiceType ||
-          rule.is4k !== derivedIs4k ||
-          rule.isFallback;
-
-        if (groupChanged) {
-          const highestRule = await routingRuleRepository.findOne({
-            where: {
-              serviceType: nextServiceType,
-              is4k: derivedIs4k,
-              isFallback: false,
-            },
-            order: { priority: 'DESC' },
-          });
-          rule.priority = (highestRule?.priority ?? 0) + 10;
-        }
-      }
-
-      rule.name = req.body.name ?? rule.name;
-      rule.serviceType = nextServiceType;
-      rule.targetServiceId = nextTargetServiceId;
-      rule.is4k = derivedIs4k;
-      rule.isFallback = nextIsFallback;
-      rule.users = nextIsFallback ? null : req.body.users;
-      rule.genres = nextIsFallback ? null : req.body.genres;
-      rule.languages = nextIsFallback ? null : req.body.languages;
-      rule.keywords = nextIsFallback ? null : req.body.keywords;
-      rule.activeProfileId = nextActiveProfileId ?? undefined;
-      rule.rootFolder = nextRootFolder;
-      rule.minimumAvailability = nextMinimumAvailability;
-      rule.tags = req.body.tags;
-
-      const updatedRule = await routingRuleRepository.save(rule);
-      return res.status(200).json(updatedRule);
-    } catch (e) {
-      next({ status: 500, message: e.message });
-    }
-  }
-);
-
-routingRuleRoutes.delete<{ ruleId: string }>(
-  '/:ruleId',
-  isAuthenticated(Permission.ADMIN),
-  async (req, res, next) => {
-    const routingRuleRepository = getRepository(RoutingRule);
-    try {
-      const rule = await routingRuleRepository.findOne({
-        where: { id: Number(req.params.ruleId) },
-      });
-
-      if (!rule) {
-        return next({ status: 404, message: 'Routing rule not found.' });
-      }
-
-      await routingRuleRepository.remove(rule);
-      return res.status(200).json(rule);
-    } catch (e) {
-      next({ status: 500, message: e.message });
-    }
-  }
-);
-
-routingRuleRoutes.post(
-  '/reorder',
-  isAuthenticated(Permission.ADMIN),
-  async (req, res, next) => {
-    const routingRuleRepository = getRepository(RoutingRule);
-
-    try {
-      const { ruleIds } = req.body as { ruleIds: number[] };
-
-      const MAX_RULE_IDS = 1000;
-
-      if (!Array.isArray(ruleIds)) {
-        return next({ status: 400, message: 'ruleIds must be an array.' });
-      }
-
-      if (ruleIds.length > MAX_RULE_IDS) {
-        return next({
-          status: 400,
-          message: `Too many ruleIds provided. Maximum allowed is ${MAX_RULE_IDS}.`,
-        });
-      }
-
-      const rules = await routingRuleRepository.findBy({ id: In(ruleIds) });
-      const fallbackIds = new Set(
-        rules.filter((r) => r.isFallback).map((r) => r.id)
-      );
-      const orderedIds = ruleIds.filter((id) => !fallbackIds.has(id));
-
-      for (let i = 0; i < orderedIds.length; i++) {
-        await routingRuleRepository.update(orderedIds[i], {
-          priority: (orderedIds.length - i) * 10,
-        });
-      }
-
-      const refreshed = await routingRuleRepository.find({
-        order: { isFallback: 'ASC', priority: 'DESC' },
-      });
-
-      return res.status(200).json(refreshed);
-    } catch (e) {
-      next({ status: 500, message: e.message });
-    }
-  }
-);
-
-export default routingRuleRoutes;

server/routes/settings/sonarr.ts

@@ -1,6 +1,4 @@
 import SonarrAPI from '@server/api/servarr/sonarr';
-import { getRepository } from '@server/datasource';
-import RoutingRule from '@server/entity/RoutingRule';
 import type { SonarrSettings } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
@@ -110,7 +108,6 @@ sonarrRoutes.put<{ id: string }>('/:id', async (req, res) => {
 
 sonarrRoutes.delete<{ id: string }>('/:id', async (req, res) => {
   const settings = getSettings();
-  const routingRuleRepository = getRepository(RoutingRule);
 
   const sonarrIndex = settings.sonarr.findIndex(
     (r) => r.id === Number(req.params.id)
@@ -122,19 +119,6 @@ sonarrRoutes.delete<{ id: string }>('/:id', async (req, res) => {
       .json({ status: '404', message: 'Settings instance not found' });
   }
 
-  const instanceId = Number(req.params.id);
-
-  const rulesToDelete = await routingRuleRepository.find({
-    where: {
-      serviceType: 'sonarr',
-      targetServiceId: instanceId,
-    },
-  });
-
-  if (rulesToDelete.length > 0) {
-    await routingRuleRepository.remove(rulesToDelete);
-  }
-
   const removed = settings.sonarr.splice(sonarrIndex, 1);
   await settings.save();
 

src/components/Blacklist/index.tsx

@@ -1,4 +1,4 @@
-import BlocklistedTagsBadge from '@app/components/BlocklistedTagsBadge';
+import BlacklistedTagsBadge from '@app/components/BlacklistedTagsBadge';
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
@@ -20,9 +20,9 @@ import {
   TrashIcon,
 } from '@heroicons/react/24/solid';
 import type {
-  BlocklistItem,
-  BlocklistResultsResponse,
-} from '@server/interfaces/api/blocklistInterfaces';
+  BlacklistItem,
+  BlacklistResultsResponse,
+} from '@server/interfaces/api/blacklistInterfaces';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
 import axios from 'axios';
@@ -35,31 +35,31 @@ import { FormattedRelativeTime, useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 
-const messages = defineMessages('components.Blocklist', {
-  blocklistsettings: 'Blocklist Settings',
-  blocklistSettingsDescription: 'Manage blocklisted media.',
+const messages = defineMessages('components.Blacklist', {
+  blacklistsettings: 'Blacklist Settings',
+  blacklistSettingsDescription: 'Manage blacklisted media.',
   mediaName: 'Name',
   mediaType: 'Type',
   mediaTmdbId: 'tmdb Id',
-  blocklistdate: 'date',
-  blocklistedby: '{date} by {user}',
-  blocklistNotFoundError: '<strong>{title}</strong> is not blocklisted.',
+  blacklistdate: 'date',
+  blacklistedby: '{date} by {user}',
+  blacklistNotFoundError: '<strong>{title}</strong> is not blacklisted.',
   filterManual: 'Manual',
-  filterBlocklistedTags: 'Blocklisted Tags',
-  showAllBlocklisted: 'Show All Blocklisted Media',
+  filterBlacklistedTags: 'Blacklisted Tags',
+  showAllBlacklisted: 'Show All Blacklisted Media',
 });
 
 enum Filter {
   ALL = 'all',
   MANUAL = 'manual',
-  BLOCKLISTEDTAGS = 'blocklistedTags',
+  BLACKLISTEDTAGS = 'blacklistedTags',
 }
 
 const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
   return (movie as MovieDetails).title !== undefined;
 };
 
-const Blocklist = () => {
+const Blacklist = () => {
   const [currentPageSize, setCurrentPageSize] = useState<number>(10);
   const [searchFilter, debouncedSearchFilter, setSearchFilter] =
     useDebouncedState('');
@@ -75,8 +75,8 @@ const Blocklist = () => {
     data,
     error,
     mutate: revalidate,
-  } = useSWR<BlocklistResultsResponse>(
-    `/api/v1/blocklist/?take=${currentPageSize}&skip=${
+  } = useSWR<BlacklistResultsResponse>(
+    `/api/v1/blacklist/?take=${currentPageSize}&skip=${
       pageIndex * currentPageSize
     }&filter=${currentFilter}${
       debouncedSearchFilter ? `&search=${debouncedSearchFilter}` : ''
@@ -107,9 +107,9 @@ const Blocklist = () => {
 
   return (
     <>
-      <PageTitle title={[intl.formatMessage(globalMessages.blocklist)]} />
+      <PageTitle title={[intl.formatMessage(globalMessages.blacklist)]} />
       <div className="mb-4 flex flex-col justify-between lg:flex-row lg:items-end">
-        <Header>{intl.formatMessage(globalMessages.blocklist)}</Header>
+        <Header>{intl.formatMessage(globalMessages.blacklist)}</Header>
 
         <div className="mt-2 flex flex-grow flex-col sm:flex-row lg:flex-grow-0">
           <div className="mb-2 flex flex-grow sm:mb-0 sm:mr-2 lg:flex-grow-0">
@@ -137,8 +137,8 @@ const Blocklist = () => {
               <option value="manual">
                 {intl.formatMessage(messages.filterManual)}
               </option>
-              <option value="blocklistedTags">
-                {intl.formatMessage(messages.filterBlocklistedTags)}
+              <option value="blacklistedTags">
+                {intl.formatMessage(messages.filterBlacklistedTags)}
               </option>
             </select>
           </div>
@@ -170,16 +170,16 @@ const Blocklist = () => {
                 buttonType="primary"
                 onClick={() => setCurrentFilter(Filter.ALL)}
               >
-                {intl.formatMessage(messages.showAllBlocklisted)}
+                {intl.formatMessage(messages.showAllBlacklisted)}
               </Button>
             </div>
           )}
         </div>
       ) : (
-        data.results.map((item: BlocklistItem) => {
+        data.results.map((item: BlacklistItem) => {
           return (
             <div className="py-2" key={`request-list-${item.tmdbId}`}>
-              <BlocklistedItem item={item} revalidateList={revalidate} />
+              <BlacklistedItem item={item} revalidateList={revalidate} />
             </div>
           );
         })
@@ -260,14 +260,14 @@ const Blocklist = () => {
   );
 };
 
-export default Blocklist;
+export default Blacklist;
 
-interface BlocklistedItemProps {
-  item: BlocklistItem;
+interface BlacklistedItemProps {
+  item: BlacklistItem;
   revalidateList: () => void;
 }
 
-const BlocklistedItem = ({ item, revalidateList }: BlocklistedItemProps) => {
+const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
   const [isUpdating, setIsUpdating] = useState<boolean>(false);
   const { addToast } = useToasts();
   const { ref, inView } = useInView({
@@ -293,15 +293,15 @@ const BlocklistedItem = ({ item, revalidateList }: BlocklistedItemProps) => {
     );
   }
 
-  const removeFromBlocklist = async (tmdbId: number, title?: string) => {
+  const removeFromBlacklist = async (tmdbId: number, title?: string) => {
     setIsUpdating(true);
 
     try {
-      await axios.delete(`/api/v1/blocklist/${tmdbId}`);
+      await axios.delete(`/api/v1/blacklist/${tmdbId}`);
 
       addToast(
         <span>
-          {intl.formatMessage(globalMessages.removeFromBlocklistSuccess, {
+          {intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
             title,
             strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
           })}
@@ -309,7 +309,7 @@ const BlocklistedItem = ({ item, revalidateList }: BlocklistedItemProps) => {
         { appearance: 'success', autoDismiss: true }
       );
     } catch {
-      addToast(intl.formatMessage(globalMessages.blocklistError), {
+      addToast(intl.formatMessage(globalMessages.blacklistError), {
         appearance: 'error',
         autoDismiss: true,
       });
@@ -389,17 +389,17 @@ const BlocklistedItem = ({ item, revalidateList }: BlocklistedItemProps) => {
           <div className="card-field">
             <span className="card-field-name">Status</span>
             <Badge badgeType="danger">
-              {intl.formatMessage(globalMessages.blocklisted)}
+              {intl.formatMessage(globalMessages.blacklisted)}
             </Badge>
           </div>
 
           {item.createdAt && (
             <div className="card-field">
               <span className="card-field-name">
-                {intl.formatMessage(globalMessages.blocklisted)}
+                {intl.formatMessage(globalMessages.blacklisted)}
               </span>
               <span className="flex truncate text-sm text-gray-300">
-                {intl.formatMessage(messages.blocklistedby, {
+                {intl.formatMessage(messages.blacklistedby, {
                   date: (
                     <FormattedRelativeTime
                       value={Math.floor(
@@ -426,9 +426,9 @@ const BlocklistedItem = ({ item, revalidateList }: BlocklistedItemProps) => {
                         </span>
                       </span>
                     </Link>
-                  ) : item.blocklistedTags ? (
+                  ) : item.blacklistedTags ? (
                     <span className="ml-1">
-                      <BlocklistedTagsBadge data={item} />
+                      <BlacklistedTagsBadge data={item} />
                     </span>
                   ) : (
                     <span className="ml-1 truncate text-sm font-semibold">
@@ -457,10 +457,10 @@ const BlocklistedItem = ({ item, revalidateList }: BlocklistedItemProps) => {
         </div>
       </div>
       <div className="z-10 mt-4 flex w-full flex-col justify-center space-y-2 pl-4 pr-4 xl:mt-0 xl:w-96 xl:items-end xl:pl-0">
-        {hasPermission(Permission.MANAGE_BLOCKLIST) && (
+        {hasPermission(Permission.MANAGE_BLACKLIST) && (
           <ConfirmButton
             onClick={() =>
-              removeFromBlocklist(
+              removeFromBlacklist(
                 item.tmdbId,
                 title && (isMovie(title) ? title.title : title.name)
               )
@@ -474,7 +474,7 @@ const BlocklistedItem = ({ item, revalidateList }: BlocklistedItemProps) => {
           >
             <TrashIcon />
             <span>
-              {intl.formatMessage(globalMessages.removefromBlocklist)}
+              {intl.formatMessage(globalMessages.removefromBlacklist)}
             </span>
           </ConfirmButton>
         )}

src/components/BlacklistBlock/index.tsx

@@ -1,4 +1,4 @@
-import BlocklistedTagsBadge from '@app/components/BlocklistedTagsBadge';
+import BlacklistedTagsBadge from '@app/components/BlacklistedTagsBadge';
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import LoadingSpinner from '@app/components/Common/LoadingSpinner';
@@ -7,7 +7,7 @@ import { useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { CalendarIcon, TrashIcon, UserIcon } from '@heroicons/react/24/solid';
-import type { Blocklist } from '@server/entity/Blocklist';
+import type { Blacklist } from '@server/entity/Blacklist';
 import axios from 'axios';
 import Link from 'next/link';
 import { useState } from 'react';
@@ -15,37 +15,37 @@ import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR from 'swr';
 
-const messages = defineMessages('component.BlocklistBlock', {
-  blocklistedby: 'Blocklisted By',
-  blocklistdate: 'Blocklisted date',
+const messages = defineMessages('component.BlacklistBlock', {
+  blacklistedby: 'Blacklisted By',
+  blacklistdate: 'Blacklisted date',
 });
 
-interface BlocklistBlockProps {
+interface BlacklistBlockProps {
   tmdbId: number;
   onUpdate?: () => void;
   onDelete?: () => void;
 }
 
-const BlocklistBlock = ({
+const BlacklistBlock = ({
   tmdbId,
   onUpdate,
   onDelete,
-}: BlocklistBlockProps) => {
+}: BlacklistBlockProps) => {
   const { user } = useUser();
   const intl = useIntl();
   const [isUpdating, setIsUpdating] = useState(false);
   const { addToast } = useToasts();
-  const { data } = useSWR<Blocklist>(`/api/v1/blocklist/${tmdbId}`);
+  const { data } = useSWR<Blacklist>(`/api/v1/blacklist/${tmdbId}`);
 
-  const removeFromBlocklist = async (tmdbId: number, title?: string) => {
+  const removeFromBlacklist = async (tmdbId: number, title?: string) => {
     setIsUpdating(true);
 
     try {
-      await axios.delete('/api/v1/blocklist/' + tmdbId);
+      await axios.delete('/api/v1/blacklist/' + tmdbId);
 
       addToast(
         <span>
-          {intl.formatMessage(globalMessages.removeFromBlocklistSuccess, {
+          {intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
             title,
             strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
           })}
@@ -53,7 +53,7 @@ const BlocklistBlock = ({
         { appearance: 'success', autoDismiss: true }
       );
     } catch {
-      addToast(intl.formatMessage(globalMessages.blocklistError), {
+      addToast(intl.formatMessage(globalMessages.blacklistError), {
         appearance: 'error',
         autoDismiss: true,
       });
@@ -80,7 +80,7 @@ const BlocklistBlock = ({
           <div className="white mb-1 flex flex-nowrap">
             {data.user ? (
               <>
-                <Tooltip content={intl.formatMessage(messages.blocklistedby)}>
+                <Tooltip content={intl.formatMessage(messages.blacklistedby)}>
                   <UserIcon className="mr-1.5 h-5 w-5 min-w-0 flex-shrink-0" />
                 </Tooltip>
                 <span className="w-40 truncate md:w-auto">
@@ -97,23 +97,23 @@ const BlocklistBlock = ({
                   </Link>
                 </span>
               </>
-            ) : data.blocklistedTags ? (
+            ) : data.blacklistedTags ? (
               <>
                 <span className="w-40 truncate md:w-auto">
-                  {intl.formatMessage(messages.blocklistedby)}:&nbsp;
+                  {intl.formatMessage(messages.blacklistedby)}:&nbsp;
                 </span>
-                <BlocklistedTagsBadge data={data} />
+                <BlacklistedTagsBadge data={data} />
               </>
             ) : null}
           </div>
         </div>
         <div className="ml-2 flex flex-shrink-0 flex-wrap">
           <Tooltip
-            content={intl.formatMessage(globalMessages.removefromBlocklist)}
+            content={intl.formatMessage(globalMessages.removefromBlacklist)}
           >
             <Button
               buttonType="danger"
-              onClick={() => removeFromBlocklist(data.tmdbId, data.title)}
+              onClick={() => removeFromBlacklist(data.tmdbId, data.title)}
               disabled={isUpdating}
             >
               <TrashIcon className="icon-sm" />
@@ -125,12 +125,12 @@ const BlocklistBlock = ({
         <div className="sm:flex">
           <div className="mr-6 flex items-center text-sm leading-5">
             <Badge badgeType="danger">
-              {intl.formatMessage(globalMessages.blocklisted)}
+              {intl.formatMessage(globalMessages.blacklisted)}
             </Badge>
           </div>
         </div>
         <div className="mt-2 flex items-center text-sm leading-5 sm:mt-0">
-          <Tooltip content={intl.formatMessage(messages.blocklistdate)}>
+          <Tooltip content={intl.formatMessage(messages.blacklistdate)}>
             <CalendarIcon className="mr-1.5 h-5 w-5 flex-shrink-0" />
           </Tooltip>
           <span>
@@ -146,4 +146,4 @@ const BlocklistBlock = ({
   );
 };
 
-export default BlocklistBlock;
+export default BlacklistBlock;