chore: prepare 3.0.0 release

Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>

.github/workflows/docs-deploy.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - legacy-jellyseerr
+      - develop
     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 @@
-<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="./public/logo_full.svg" alt="Seerr" style="margin: 20px 0;">
+</p>
 <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,37 +26,25 @@
 - Granular permission system.
 - Support for various notification agents.
 - Mobile-friendly design, for when you need to approve requests on the go!
-- Support for watchlisting & blacklisting media.
+- Support for watchlisting & blocklisting media.
 
 With more features on the way! Check out our [issue tracker](/../../issues) to see the features which have already been requested.
 
 ## Getting Started
 
-For instructions on how to install and run **Jellyseerr**, please refer to the official documentation:
+Check out our documentation for instructions on how to install and run Seerr:
 
 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">
+<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.
 
 ## Support
 

cypress/config/settings.cypress.json

@@ -18,8 +18,8 @@
     "discoverRegion": "",
     "streamingRegion": "",
     "originalLanguage": "",
-    "blacklistedTags": "",
-    "blacklistedTagsLimit": 50,
+    "blocklistedTags": "",
+    "blocklistedTagsLimit": 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 **Blacklist** media.
+- Easily **Watchlist** or **Blocklist** media.
 - More features to come!
 
 ## We need your help!

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, blacklist etc. are stored in the database (either SQLite or PostgreSQL).
+Apart from the settings, all other data—including user accounts, media requests, blocklist 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.
 
-## Blacklist Content with Tags and Limit Content Blacklisted per Tag
+## Blocklist Content with Tags and Limit Content Blocklisted per Tag
 
-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.
+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.
 
-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.
+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.
 
-Blacklisted tags are disabled until at least one tag is entered. These settings cannot be overridden in user settings.
+Blocklisted 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 Blacklisted Items
+## Hide Blocklisted Items
 
-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.
+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.
 
 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.
-* **Blacklist for movies, series, and tags**: Allows permitted users to hide movies, series, or tags from regular users.
+* **Blocklist 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.

package.json

@@ -208,4 +208,4 @@
       "@types/express-session": "1.18.2"
     }
   }
-}
+}

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 = 4;
+const OFFLINE_VERSION = 5;
 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: blacklist
-    description: Blacklisted media from discovery page.
+  - name: blocklist
+    description: Blocklisted media from discovery page.
 servers:
   - url: '{server}/api/v1'
     variables:
@@ -48,7 +48,7 @@ servers:
 
 components:
   schemas:
-    Blacklist:
+    Blocklist:
       type: object
       properties:
         tmdbId:
@@ -4529,12 +4529,12 @@ paths:
                       restricted:
                         type: boolean
                         example: false
-  /blacklist:
+  /blocklist:
     get:
-      summary: Returns blacklisted items
-      description: Returns list of all blacklisted media
+      summary: Returns blocklisted items
+      description: Returns list of all blocklisted media
       tags:
-        - settings
+        - blocklist
       parameters:
         - in: query
           name: take
@@ -4558,11 +4558,11 @@ paths:
           name: filter
           schema:
             type: string
-            enum: [all, manual, blacklistedTags]
+            enum: [all, manual, blocklistedTags]
             default: manual
       responses:
         '200':
-          description: Blacklisted items returned
+          description: Blocklisted items returned
           content:
             application/json:
               schema:
@@ -4593,25 +4593,25 @@ paths:
                           type: number
                           example: 438631
     post:
-      summary: Add media to blacklist
+      summary: Add media to blocklist
       tags:
-        - blacklist
+        - blocklist
       requestBody:
         required: true
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/Blacklist'
+              $ref: '#/components/schemas/Blocklist'
       responses:
         '201':
-          description: Item succesfully blacklisted
+          description: Item succesfully blocklisted
         '412':
-          description: Item has already been blacklisted
-  /blacklist/{tmdbId}:
+          description: Item has already been blocklisted
+  /blocklist/{tmdbId}:
     get:
-      summary: Get media from blacklist
+      summary: Get media from blocklist
       tags:
-        - blacklist
+        - blocklist
       parameters:
         - in: path
           name: tmdbId
@@ -4622,11 +4622,131 @@ paths:
             type: string
       responses:
         '200':
-          description: Blacklist details in JSON
+          description: Blocklist details in JSON
     delete:
-      summary: Remove media from blacklist
+      summary: Remove media from blocklist
       tags:
-        - blacklist
+        - 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
+      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
+      description: |
+        **DEPRECATED**: Use `/blocklist` instead. This endpoint will be deprecated soon.
+      deprecated: true
+      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
+  /blacklist/{tmdbId}:
+    get:
+      summary: Get media from blocklist
+      description: |
+        **DEPRECATED**: Use `/blocklist/{tmdbId}` instead. This endpoint will be deprecated soon.
+      deprecated: true
+      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
+      description: |
+        **DEPRECATED**: Use `/blocklist/{tmdbId}` instead. This endpoint will be deprecated soon.
+      deprecated: true
+      tags:
+        - blocklist
       parameters:
         - in: path
           name: tmdbId

server/constants/media.ts

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

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

server/entity/MediaRequest.ts

@@ -35,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 BlacklistedMediaError extends Error {}
+export class BlocklistedMediaError extends Error {}
 
 type MediaRequestOptions = {
   isAutoRequest?: boolean;
@@ -140,14 +140,14 @@ export class MediaRequest {
         mediaType: requestBody.mediaType,
       });
     } else {
-      if (media.status === MediaStatus.BLACKLISTED) {
-        logger.warn('Request for media blocked due to being blacklisted', {
+      if (media.status === MediaStatus.BLOCKLISTED) {
+        logger.warn('Request for media blocked due to being blocklisted', {
           tmdbId: tmdbMedia.id,
           mediaType: requestBody.mediaType,
           label: 'Media Request',
         });
 
-        throw new BlacklistedMediaError('This media is blacklisted.');
+        throw new BlocklistedMediaError('This media is blocklisted.');
       }
 
       if (media.status === MediaStatus.UNKNOWN && !requestBody.is4k) {

server/interfaces/api/blocklistInterfaces.ts

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

server/interfaces/api/settingsInterfaces.ts

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

server/job/blocklistedTagsProcessor.ts

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

server/job/schedule.ts

@@ -1,5 +1,5 @@
 import { MediaServerType } from '@server/constants/server';
-import blacklistedTagsProcessor from '@server/job/blacklistedTagsProcessor';
+import blocklistedTagsProcessor from '@server/job/blocklistedTagsProcessor';
 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-blacklisted-tags',
-    name: 'Process Blacklisted Tags',
+    id: 'process-blocklisted-tags',
+    name: 'Process Blocklisted Tags',
     type: 'process',
     interval: 'days',
-    cronSchedule: jobs['process-blacklisted-tags'].schedule,
-    job: schedule.scheduleJob(jobs['process-blacklisted-tags'].schedule, () => {
-      logger.info('Starting scheduled job: Process Blacklisted Tags', {
+    cronSchedule: jobs['process-blocklisted-tags'].schedule,
+    job: schedule.scheduleJob(jobs['process-blocklisted-tags'].schedule, () => {
+      logger.info('Starting scheduled job: Process Blocklisted Tags', {
         label: 'Jobs',
       });
-      blacklistedTagsProcessor.run();
+      blocklistedTagsProcessor.run();
     }),
-    running: () => blacklistedTagsProcessor.status().running,
-    cancelFn: () => blacklistedTagsProcessor.cancel(),
+    running: () => blocklistedTagsProcessor.status().running,
+    cancelFn: () => blocklistedTagsProcessor.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_BLACKLIST = 268435456,
-  VIEW_BLACKLIST = 1073741824,
+  MANAGE_BLOCKLIST = 268435456,
+  VIEW_BLOCKLIST = 1073741824,
 }
 
 export interface PermissionCheckOptions {

server/lib/scanners/baseScanner.ts

@@ -385,26 +385,6 @@ class BaseScanner<T> {
         }
       }
 
-      // We want to skip specials when checking if a show is available
-      const isAllStandardSeasons =
-        seasons.length &&
-        seasons
-          .filter((season) => season.seasonNumber !== 0)
-          .every(
-            (season) =>
-              season.episodes === season.totalEpisodes && season.episodes > 0
-          );
-
-      const isAll4kSeasons =
-        seasons.length &&
-        seasons
-          .filter((season) => season.seasonNumber !== 0)
-          .every(
-            (season) =>
-              season.episodes4k === season.totalEpisodes &&
-              season.episodes4k > 0
-          );
-
       if (media) {
         media.seasons = [...media.seasons, ...newSeasons];
 
@@ -464,43 +444,38 @@ class BaseScanner<T> {
             externalServiceSlug;
         }
 
-        // If the show is already available, and there are no new seasons, dont adjust
-        // the status. Skip specials when performing availability check
-        const shouldStayAvailable =
-          media.status === MediaStatus.AVAILABLE &&
-          newSeasons.filter(
-            (season) =>
-              season.status !== MediaStatus.UNKNOWN &&
-              season.status !== MediaStatus.DELETED &&
-              season.seasonNumber !== 0
-          ).length === 0;
-        const shouldStayAvailable4k =
-          media.status4k === MediaStatus.AVAILABLE &&
-          newSeasons.filter(
-            (season) =>
-              season.status4k !== MediaStatus.UNKNOWN &&
-              season.status4k !== MediaStatus.DELETED &&
-              season.seasonNumber !== 0
-          ).length === 0;
-        media.status =
-          isAllStandardSeasons || shouldStayAvailable
-            ? MediaStatus.AVAILABLE
-            : media.seasons.some(
-                  (season) =>
-                    season.status === MediaStatus.PARTIALLY_AVAILABLE ||
-                    season.status === MediaStatus.AVAILABLE
+        const nonSpecialSeasons = media.seasons.filter(
+          (s) => s.seasonNumber !== 0
+        );
+
+        // Check the actual season objects instead scanner input
+        // to determine overall availability status
+        const isAllStandardSeasonsAvailable =
+          nonSpecialSeasons.length > 0 &&
+          nonSpecialSeasons.every((s) => s.status === MediaStatus.AVAILABLE);
+
+        const isAll4kSeasonsAvailable =
+          nonSpecialSeasons.length > 0 &&
+          nonSpecialSeasons.every((s) => s.status4k === MediaStatus.AVAILABLE);
+
+        media.status = isAllStandardSeasonsAvailable
+          ? MediaStatus.AVAILABLE
+          : media.seasons.some(
+                (season) =>
+                  season.status === MediaStatus.PARTIALLY_AVAILABLE ||
+                  season.status === MediaStatus.AVAILABLE
+              )
+            ? MediaStatus.PARTIALLY_AVAILABLE
+            : (!seasons.length && media.status !== MediaStatus.DELETED) ||
+                media.seasons.some(
+                  (season) => season.status === MediaStatus.PROCESSING
                 )
-              ? MediaStatus.PARTIALLY_AVAILABLE
-              : (!seasons.length && media.status !== MediaStatus.DELETED) ||
-                  media.seasons.some(
-                    (season) => season.status === MediaStatus.PROCESSING
-                  )
-                ? MediaStatus.PROCESSING
-                : media.status === MediaStatus.DELETED
-                  ? MediaStatus.DELETED
-                  : MediaStatus.UNKNOWN;
+              ? MediaStatus.PROCESSING
+              : media.status === MediaStatus.DELETED
+                ? MediaStatus.DELETED
+                : MediaStatus.UNKNOWN;
         media.status4k =
-          (isAll4kSeasons || shouldStayAvailable4k) && this.enable4kShow
+          isAll4kSeasonsAvailable && this.enable4kShow
             ? MediaStatus.AVAILABLE
             : this.enable4kShow &&
                 media.seasons.some(
@@ -520,6 +495,22 @@ class BaseScanner<T> {
         await mediaRepository.save(media);
         this.log(`Updating existing title: ${title}`);
       } else {
+        // For new media, check actual newSeasons objects instead of scanner
+        // input to determine overall availability status
+        const nonSpecialNewSeasons = newSeasons.filter(
+          (s) => s.seasonNumber !== 0
+        );
+
+        const isAllStandardSeasonsAvailable =
+          nonSpecialNewSeasons.length > 0 &&
+          nonSpecialNewSeasons.every((s) => s.status === MediaStatus.AVAILABLE);
+
+        const isAll4kSeasonsAvailable =
+          nonSpecialNewSeasons.length > 0 &&
+          nonSpecialNewSeasons.every(
+            (s) => s.status4k === MediaStatus.AVAILABLE
+          );
+
         const newMedia = new Media({
           mediaType: MediaType.TV,
           seasons: newSeasons,
@@ -564,7 +555,7 @@ class BaseScanner<T> {
             )
               ? jellyfinMediaId
               : undefined,
-          status: isAllStandardSeasons
+          status: isAllStandardSeasonsAvailable
             ? MediaStatus.AVAILABLE
             : newSeasons.some(
                   (season) =>
@@ -578,7 +569,7 @@ class BaseScanner<T> {
                 ? MediaStatus.PROCESSING
                 : MediaStatus.UNKNOWN,
           status4k:
-            isAll4kSeasons && this.enable4kShow
+            isAll4kSeasonsAvailable && this.enable4kShow
               ? MediaStatus.AVAILABLE
               : this.enable4kShow &&
                   newSeasons.some(

server/lib/settings/index.ts

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

@@ -0,0 +1,40 @@
+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/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 {
-  BlacklistedMediaError,
+  BlocklistedMediaError,
   DuplicateMediaRequestError,
   MediaRequest,
   NoSeasonsAvailableError,
@@ -145,8 +145,8 @@ class WatchlistSync {
               errorMessage: e.message,
             });
             break;
-          // Blacklisted media should be silently ignored during watchlist sync to avoid spam
-          case BlacklistedMediaError:
+          // Blocklisted media should be silently ignored during watchlist sync to avoid spam
+          case BlocklistedMediaError:
             break;
           default:
             logger.error('Failed to create media request from watchlist', {

server/middleware/deprecation.ts

@@ -0,0 +1,49 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,66 @@
+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/blocklist.ts

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

server/routes/index.ts

@@ -12,6 +12,7 @@ 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';
@@ -28,7 +29,7 @@ import restartFlag from '@server/utils/restartFlag';
 import { isPerson } from '@server/utils/typeHelpers';
 import { Router } from 'express';
 import authRoutes from './auth';
-import blacklistRoutes from './blacklist';
+import blocklistRoutes from './blocklist';
 import collectionRoutes from './collection';
 import discoverRoutes, { createTmdbWithRegionLanguage } from './discover';
 import issueRoutes from './issue';
@@ -151,7 +152,17 @@ router.use('/search', isAuthenticated(), searchRoutes);
 router.use('/discover', isAuthenticated(), discoverRoutes);
 router.use('/request', isAuthenticated(), requestRoutes);
 router.use('/watchlist', isAuthenticated(), watchlistRoutes);
-router.use('/blacklist', isAuthenticated(), blacklistRoutes);
+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('/movie', isAuthenticated(), movieRoutes);
 router.use('/tv', isAuthenticated(), tvRoutes);
 router.use('/media', isAuthenticated(), mediaRoutes);

server/routes/request.ts

@@ -8,7 +8,7 @@ import {
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import {
-  BlacklistedMediaError,
+  BlocklistedMediaError,
   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 BlacklistedMediaError:
+        case BlocklistedMediaError:
           return next({ status: 403, message: error.message });
         default:
           return next({ status: 500, message: error.message });

server/subscriber/MediaRequestSubscriber.ts

@@ -15,6 +15,7 @@ import {
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import { MediaRequest } from '@server/entity/MediaRequest';
+import Season from '@server/entity/Season';
 import SeasonRequest from '@server/entity/SeasonRequest';
 import notificationManager, { Notification } from '@server/lib/notifications';
 import { getSettings } from '@server/lib/settings';
@@ -27,7 +28,7 @@ import type {
   RemoveEvent,
   UpdateEvent,
 } from 'typeorm';
-import { EventSubscriber } from 'typeorm';
+import { EventSubscriber, Not } from 'typeorm';
 
 const sanitizeDisplayName = (displayName: string): string => {
   return displayName
@@ -397,10 +398,23 @@ export class MediaRequestSubscriber implements EntitySubscriberInterface<MediaRe
             await mediaRepository.save(media);
           })
           .catch(async () => {
-            const requestRepository = getRepository(MediaRequest);
+            try {
+              const requestRepository = getRepository(MediaRequest);
 
-            entity.status = MediaRequestStatus.FAILED;
-            requestRepository.save(entity);
+              if (entity.status !== MediaRequestStatus.FAILED) {
+                entity.status = MediaRequestStatus.FAILED;
+                await requestRepository.save(entity);
+              }
+            } catch (saveError) {
+              logger.error('Failed to mark request as FAILED', {
+                label: 'Media Request',
+                requestId: entity.id,
+                errorMessage:
+                  saveError instanceof Error
+                    ? saveError.message
+                    : String(saveError),
+              });
+            }
 
             logger.warn(
               'Something went wrong sending movie request to Radarr, marking status as FAILED',
@@ -503,7 +517,6 @@ export class MediaRequestSubscriber implements EntitySubscriberInterface<MediaRe
 
         const media = await mediaRepository.findOne({
           where: { id: entity.media.id },
-          relations: { requests: true },
         });
 
         if (!media) {
@@ -690,7 +703,6 @@ export class MediaRequestSubscriber implements EntitySubscriberInterface<MediaRe
             // We grab media again here to make sure we have the latest version of it
             const media = await mediaRepository.findOne({
               where: { id: entity.media.id },
-              relations: { requests: true },
             });
 
             if (!media) {
@@ -707,10 +719,23 @@ export class MediaRequestSubscriber implements EntitySubscriberInterface<MediaRe
             await mediaRepository.save(media);
           })
           .catch(async () => {
-            const requestRepository = getRepository(MediaRequest);
+            try {
+              const requestRepository = getRepository(MediaRequest);
 
-            entity.status = MediaRequestStatus.FAILED;
-            requestRepository.save(entity);
+              if (entity.status !== MediaRequestStatus.FAILED) {
+                entity.status = MediaRequestStatus.FAILED;
+                await requestRepository.save(entity);
+              }
+            } catch (saveError) {
+              logger.error('Failed to mark request as FAILED', {
+                label: 'Media Request',
+                requestId: entity.id,
+                errorMessage:
+                  saveError instanceof Error
+                    ? saveError.message
+                    : String(saveError),
+              });
+            }
 
             logger.warn(
               'Something went wrong sending series request to Sonarr, marking status as FAILED',
@@ -758,7 +783,6 @@ export class MediaRequestSubscriber implements EntitySubscriberInterface<MediaRe
     const mediaRepository = getRepository(Media);
     const media = await mediaRepository.findOne({
       where: { id: entity.media.id },
-      relations: { requests: true },
     });
     if (!media) {
       logger.error('Media data not found', {
@@ -768,26 +792,29 @@ export class MediaRequestSubscriber implements EntitySubscriberInterface<MediaRe
       });
       return;
     }
+
+    const statusKey = entity.is4k ? 'status4k' : 'status';
     const seasonRequestRepository = getRepository(SeasonRequest);
+    const requestRepository = getRepository(MediaRequest);
+
     if (
       entity.status === MediaRequestStatus.APPROVED &&
       // Do not update the status if the item is already partially available or available
-      media[entity.is4k ? 'status4k' : 'status'] !== MediaStatus.AVAILABLE &&
-      media[entity.is4k ? 'status4k' : 'status'] !==
-        MediaStatus.PARTIALLY_AVAILABLE &&
-      media[entity.is4k ? 'status4k' : 'status'] !== MediaStatus.PROCESSING
+      media[statusKey] !== MediaStatus.AVAILABLE &&
+      media[statusKey] !== MediaStatus.PARTIALLY_AVAILABLE &&
+      media[statusKey] !== MediaStatus.PROCESSING
     ) {
-      media[entity.is4k ? 'status4k' : 'status'] = MediaStatus.PROCESSING;
-      mediaRepository.save(media);
+      media[statusKey] = MediaStatus.PROCESSING;
+      await mediaRepository.save(media);
     }
 
     if (
       media.mediaType === MediaType.MOVIE &&
       entity.status === MediaRequestStatus.DECLINED &&
-      media[entity.is4k ? 'status4k' : 'status'] !== MediaStatus.DELETED
+      media[statusKey] !== MediaStatus.DELETED
     ) {
-      media[entity.is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
-      mediaRepository.save(media);
+      media[statusKey] = MediaStatus.UNKNOWN;
+      await mediaRepository.save(media);
     }
 
     /**
@@ -799,14 +826,71 @@ export class MediaRequestSubscriber implements EntitySubscriberInterface<MediaRe
     if (
       media.mediaType === MediaType.TV &&
       entity.status === MediaRequestStatus.DECLINED &&
-      media.requests.filter(
-        (request) => request.status === MediaRequestStatus.PENDING
-      ).length === 0 &&
-      media[entity.is4k ? 'status4k' : 'status'] === MediaStatus.PENDING &&
-      media[entity.is4k ? 'status4k' : 'status'] !== MediaStatus.DELETED
+      media[statusKey] === MediaStatus.PENDING
     ) {
-      media[entity.is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
-      mediaRepository.save(media);
+      const pendingCount = await requestRepository.count({
+        where: {
+          media: { id: media.id },
+          status: MediaRequestStatus.PENDING,
+          is4k: entity.is4k,
+          id: Not(entity.id),
+        },
+      });
+
+      if (pendingCount === 0) {
+        // Re-fetch media without requests to avoid cascade issues
+        const freshMedia = await mediaRepository.findOne({
+          where: { id: media.id },
+        });
+        if (freshMedia) {
+          freshMedia[statusKey] = MediaStatus.UNKNOWN;
+          await mediaRepository.save(freshMedia);
+        }
+      }
+    }
+
+    // Reset season statuses when a TV request is declined
+    if (
+      media.mediaType === MediaType.TV &&
+      entity.status === MediaRequestStatus.DECLINED
+    ) {
+      const seasonRepository = getRepository(Season);
+      const actualSeasons = await seasonRepository.find({
+        where: { media: { id: media.id } },
+      });
+
+      for (const seasonRequest of entity.seasons) {
+        seasonRequest.status = MediaRequestStatus.DECLINED;
+        await seasonRequestRepository.save(seasonRequest);
+
+        const season = actualSeasons.find(
+          (s) => s.seasonNumber === seasonRequest.seasonNumber
+        );
+
+        if (season && season[statusKey] === MediaStatus.PENDING) {
+          const otherActiveRequests = await requestRepository
+            .createQueryBuilder('request')
+            .leftJoinAndSelect('request.seasons', 'season')
+            .where('request.mediaId = :mediaId', { mediaId: media.id })
+            .andWhere('request.id != :requestId', { requestId: entity.id })
+            .andWhere('request.is4k = :is4k', { is4k: entity.is4k })
+            .andWhere('request.status NOT IN (:...statuses)', {
+              statuses: [
+                MediaRequestStatus.DECLINED,
+                MediaRequestStatus.COMPLETED,
+              ],
+            })
+            .andWhere('season.seasonNumber = :seasonNumber', {
+              seasonNumber: season.seasonNumber,
+            })
+            .getCount();
+
+          if (otherActiveRequests === 0) {
+            season[statusKey] = MediaStatus.UNKNOWN;
+            await seasonRepository.save(season);
+          }
+        }
+      }
     }
 
     // Approve child seasons if parent is approved
@@ -830,54 +914,74 @@ export class MediaRequestSubscriber implements EntitySubscriberInterface<MediaRe
       relations: { requests: true },
     });
 
-    if (!fullMedia) return;
-
-    if (
+    const needsStatusUpdate =
       !fullMedia.requests.some((request) => !request.is4k) &&
-      fullMedia.status !== MediaStatus.AVAILABLE
-    ) {
-      fullMedia.status = MediaStatus.UNKNOWN;
-    }
+      fullMedia.status !== MediaStatus.AVAILABLE;
 
-    if (
+    const needs4kStatusUpdate =
       !fullMedia.requests.some((request) => request.is4k) &&
-      fullMedia.status4k !== MediaStatus.AVAILABLE
-    ) {
-      fullMedia.status4k = MediaStatus.UNKNOWN;
-    }
+      fullMedia.status4k !== MediaStatus.AVAILABLE;
 
-    await manager.save(fullMedia);
+    if (needsStatusUpdate || needs4kStatusUpdate) {
+      // Re-fetch WITHOUT requests to avoid cascade issues on save
+      const cleanMedia = await manager.findOneOrFail(Media, {
+        where: { id: entity.media.id },
+      });
+
+      if (needsStatusUpdate) {
+        cleanMedia.status = MediaStatus.UNKNOWN;
+      }
+      if (needs4kStatusUpdate) {
+        cleanMedia.status4k = MediaStatus.UNKNOWN;
+      }
+
+      await manager.save(cleanMedia);
+    }
   }
 
-  public afterUpdate(event: UpdateEvent<MediaRequest>): void {
+  public async afterUpdate(event: UpdateEvent<MediaRequest>): Promise<void> {
     if (!event.entity) {
       return;
     }
 
-    this.sendToRadarr(event.entity as MediaRequest);
-    this.sendToSonarr(event.entity as MediaRequest);
+    try {
+      await this.sendToRadarr(event.entity as MediaRequest);
+      await this.sendToSonarr(event.entity as MediaRequest);
+      await this.updateParentStatus(event.entity as MediaRequest);
 
-    this.updateParentStatus(event.entity as MediaRequest);
-
-    if (event.entity.status === MediaRequestStatus.COMPLETED) {
-      if (event.entity.media.mediaType === MediaType.MOVIE) {
-        this.notifyAvailableMovie(event.entity as MediaRequest, event);
-      }
-      if (event.entity.media.mediaType === MediaType.TV) {
-        this.notifyAvailableSeries(event.entity as MediaRequest, event);
+      if (event.entity.status === MediaRequestStatus.COMPLETED) {
+        if (event.entity.media.mediaType === MediaType.MOVIE) {
+          await this.notifyAvailableMovie(event.entity as MediaRequest, event);
+        }
+        if (event.entity.media.mediaType === MediaType.TV) {
+          await this.notifyAvailableSeries(event.entity as MediaRequest, event);
+        }
       }
+    } catch (e) {
+      logger.error('Error in afterUpdate subscriber', {
+        label: 'Media Request',
+        requestId: (event.entity as MediaRequest).id,
+        errorMessage: e instanceof Error ? e.message : String(e),
+      });
     }
   }
 
-  public afterInsert(event: InsertEvent<MediaRequest>): void {
+  public async afterInsert(event: InsertEvent<MediaRequest>): Promise<void> {
     if (!event.entity) {
       return;
     }
 
-    this.sendToRadarr(event.entity as MediaRequest);
-    this.sendToSonarr(event.entity as MediaRequest);
-
-    this.updateParentStatus(event.entity as MediaRequest);
+    try {
+      await this.sendToRadarr(event.entity as MediaRequest);
+      await this.sendToSonarr(event.entity as MediaRequest);
+      await this.updateParentStatus(event.entity as MediaRequest);
+    } catch (e) {
+      logger.error('Error in afterInsert subscriber', {
+        label: 'Media Request',
+        requestId: (event.entity as MediaRequest).id,
+        errorMessage: e instanceof Error ? e.message : String(e),
+      });
+    }
   }
 
   public async afterRemove(event: RemoveEvent<MediaRequest>): Promise<void> {

src/components/Blocklist/index.tsx

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

src/components/BlocklistBlock/index.tsx

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

src/components/BlocklistModal/index.tsx

@@ -8,7 +8,7 @@ import axios from 'axios';
 import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 
-interface BlacklistModalProps {
+interface BlocklistModalProps {
   tmdbId: number;
   type: 'movie' | 'tv' | 'collection';
   show: boolean;
@@ -17,8 +17,8 @@ interface BlacklistModalProps {
   isUpdating?: boolean;
 }
 
-const messages = defineMessages('component.BlacklistModal', {
-  blacklisting: 'Blacklisting',
+const messages = defineMessages('component.BlocklistModal', {
+  blocklisting: 'Blocklisting',
 });
 
 const isMovie = (
@@ -28,14 +28,14 @@ const isMovie = (
   return (movie as MovieDetails).title !== undefined;
 };
 
-const BlacklistModal = ({
+const BlocklistModal = ({
   tmdbId,
   type,
   show,
   onComplete,
   onCancel,
   isUpdating,
-}: BlacklistModalProps) => {
+}: BlocklistModalProps) => {
   const intl = useIntl();
   const [data, setData] = useState<TvDetails | MovieDetails | null>(null);
   const [error, setError] = useState(null);
@@ -67,7 +67,7 @@ const BlacklistModal = ({
       <Modal
         loading={!data && !error}
         backgroundClickable
-        title={`${intl.formatMessage(globalMessages.blacklist)} ${
+        title={`${intl.formatMessage(globalMessages.blocklist)} ${
           isMovie(data)
             ? intl.formatMessage(globalMessages.movie)
             : intl.formatMessage(globalMessages.tvshow)
@@ -77,8 +77,8 @@ const BlacklistModal = ({
         onOk={onComplete}
         okText={
           isUpdating
-            ? intl.formatMessage(messages.blacklisting)
-            : intl.formatMessage(globalMessages.blacklist)
+            ? intl.formatMessage(messages.blocklisting)
+            : intl.formatMessage(globalMessages.blocklist)
         }
         okButtonType="danger"
         okDisabled={isUpdating}
@@ -88,4 +88,4 @@ const BlacklistModal = ({
   );
 };
 
-export default BlacklistModal;
+export default BlocklistModal;

src/components/BlocklistedTagsBadge/index.tsx

@@ -2,31 +2,31 @@ import Badge from '@app/components/Common/Badge';
 import Tooltip from '@app/components/Common/Tooltip';
 import defineMessages from '@app/utils/defineMessages';
 import { TagIcon } from '@heroicons/react/20/solid';
-import type { BlacklistItem } from '@server/interfaces/api/blacklistInterfaces';
+import type { BlocklistItem } from '@server/interfaces/api/blocklistInterfaces';
 import type { Keyword } from '@server/models/common';
 import axios from 'axios';
 import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 
 const messages = defineMessages('components.Settings', {
-  blacklistedTagsText: 'Blacklisted Tags',
+  blocklistedTagsText: 'Blocklisted Tags',
 });
 
-interface BlacklistedTagsBadgeProps {
-  data: BlacklistItem;
+interface BlocklistedTagsBadgeProps {
+  data: BlocklistItem;
 }
 
-const BlacklistedTagsBadge = ({ data }: BlacklistedTagsBadgeProps) => {
-  const [tagNamesBlacklistedFor, setTagNamesBlacklistedFor] =
+const BlocklistedTagsBadge = ({ data }: BlocklistedTagsBadgeProps) => {
+  const [tagNamesBlocklistedFor, setTagNamesBlocklistedFor] =
     useState<string>('Loading...');
   const intl = useIntl();
 
   useEffect(() => {
-    if (!data.blacklistedTags) {
+    if (!data.blocklistedTags) {
       return;
     }
 
-    const keywordIds = data.blacklistedTags.slice(1, -1).split(',');
+    const keywordIds = data.blocklistedTags.slice(1, -1).split(',');
     Promise.all(
       keywordIds.map(async (keywordId) => {
         const { data } = await axios.get<Keyword | null>(
@@ -35,13 +35,13 @@ const BlacklistedTagsBadge = ({ data }: BlacklistedTagsBadgeProps) => {
         return data?.name || `[Invalid: ${keywordId}]`;
       })
     ).then((keywords) => {
-      setTagNamesBlacklistedFor(keywords.join(', '));
+      setTagNamesBlocklistedFor(keywords.join(', '));
     });
-  }, [data.blacklistedTags]);
+  }, [data.blocklistedTags]);
 
   return (
     <Tooltip
-      content={tagNamesBlacklistedFor}
+      content={tagNamesBlocklistedFor}
       tooltipConfig={{ followCursor: false }}
     >
       <Badge
@@ -49,10 +49,10 @@ const BlacklistedTagsBadge = ({ data }: BlacklistedTagsBadgeProps) => {
         className="items-center border border-red-500 !text-red-400"
       >
         <TagIcon className="mr-1 h-4" />
-        {intl.formatMessage(messages.blacklistedTagsText)}
+        {intl.formatMessage(messages.blocklistedTagsText)}
       </Badge>
     </Tooltip>
   );
 };
 
-export default BlacklistedTagsBadge;
+export default BlocklistedTagsBadge;

src/components/BlocklistedTagsSelector/index.tsx

@@ -26,19 +26,19 @@ import { components } from 'react-select';
 import AsyncSelect from 'react-select/async';
 
 const messages = defineMessages('components.Settings', {
-  copyBlacklistedTags: 'Copied blacklisted tags to clipboard.',
-  copyBlacklistedTagsTip: 'Copy blacklisted tag configuration',
-  copyBlacklistedTagsEmpty: 'Nothing to copy',
-  importBlacklistedTagsTip: 'Import blacklisted tag configuration',
-  clearBlacklistedTagsConfirm:
-    'Are you sure you want to clear the blacklisted tags?',
+  copyBlocklistedTags: 'Copied blocklisted tags to clipboard.',
+  copyBlocklistedTagsTip: 'Copy blocklisted tag configuration',
+  copyBlocklistedTagsEmpty: 'Nothing to copy',
+  importBlocklistedTagsTip: 'Import blocklisted tag configuration',
+  clearBlocklistedTagsConfirm:
+    'Are you sure you want to clear the blocklisted tags?',
   yes: 'Yes',
   no: 'No',
   searchKeywords: 'Search keywords…',
   starttyping: 'Starting typing to search.',
   nooptions: 'No results.',
-  blacklistedTagImportTitle: 'Import Blacklisted Tag Configuration',
-  blacklistedTagImportInstructions: 'Paste blacklist tag configuration below.',
+  blocklistedTagImportTitle: 'Import Blocklisted Tag Configuration',
+  blocklistedTagImportInstructions: 'Paste blocklist tag configuration below.',
   valueRequired: 'You must provide a value.',
   noSpecialCharacters:
     'Configuration must be a comma delimited list of TMDB keyword ids, and must not start or end with a comma.',
@@ -50,13 +50,13 @@ type SingleVal = {
   value: number;
 };
 
-type BlacklistedTagsSelectorProps = {
+type BlocklistedTagsSelectorProps = {
   defaultValue?: string;
 };
 
-const BlacklistedTagsSelector = ({
+const BlocklistedTagsSelector = ({
   defaultValue,
-}: BlacklistedTagsSelectorProps) => {
+}: BlocklistedTagsSelectorProps) => {
   const { setFieldValue } = useFormikContext();
   const [value, setValue] = useState<string | undefined>(defaultValue);
   const intl = useIntl();
@@ -68,7 +68,7 @@ const BlacklistedTagsSelector = ({
       const strVal = value?.map((v) => v.value).join(',');
       setSelectorValue(value);
       setValue(strVal);
-      setFieldValue('blacklistedTags', strVal);
+      setFieldValue('blocklistedTags', strVal);
     },
     [setSelectorValue, setValue, setFieldValue]
   );
@@ -91,15 +91,15 @@ const BlacklistedTagsSelector = ({
       <CopyButton
         textToCopy={value ?? ''}
         disabled={copyDisabled}
-        toastMessage={intl.formatMessage(messages.copyBlacklistedTags)}
+        toastMessage={intl.formatMessage(messages.copyBlocklistedTags)}
         tooltipContent={intl.formatMessage(
           copyDisabled
-            ? messages.copyBlacklistedTagsEmpty
-            : messages.copyBlacklistedTagsTip
+            ? messages.copyBlocklistedTagsEmpty
+            : messages.copyBlocklistedTagsTip
         )}
         tooltipConfig={{ followCursor: false }}
       />
-      <BlacklistedTagsImportButton setSelector={update} />
+      <BlocklistedTagsImportButton setSelector={update} />
     </>
   );
 };
@@ -162,7 +162,7 @@ const ControlledKeywordSelector = ({
 
   return (
     <AsyncSelect
-      key={`keyword-select-blacklistedTags`}
+      key={`keyword-select-blocklistedTags`}
       inputId="data"
       isMulti
       className="react-select-container"
@@ -181,13 +181,13 @@ const ControlledKeywordSelector = ({
   );
 };
 
-type BlacklistedTagsImportButtonProps = {
+type BlocklistedTagsImportButtonProps = {
   setSelector: (value: MultiValue<SingleVal>) => void;
 };
 
-const BlacklistedTagsImportButton = ({
+const BlocklistedTagsImportButton = ({
   setSelector,
-}: BlacklistedTagsImportButtonProps) => {
+}: BlocklistedTagsImportButtonProps) => {
   const [show, setShow] = useState(false);
   const formRef = useRef<HTMLFormElement>(null);
   const intl = useIntl();
@@ -218,17 +218,17 @@ const BlacklistedTagsImportButton = ({
         show={show}
       >
         <Modal
-          title={intl.formatMessage(messages.blacklistedTagImportTitle)}
+          title={intl.formatMessage(messages.blocklistedTagImportTitle)}
           okText="Confirm"
           onOk={onConfirm}
           onCancel={() => setShow(false)}
         >
-          <BlacklistedTagImportForm ref={formRef} setSelector={setSelector} />
+          <BlocklistedTagImportForm ref={formRef} setSelector={setSelector} />
         </Modal>
       </Transition>
 
       <Tooltip
-        content={intl.formatMessage(messages.importBlacklistedTagsTip)}
+        content={intl.formatMessage(messages.importBlocklistedTagsTip)}
         tooltipConfig={{ followCursor: false }}
       >
         <button className="input-action" onClick={onClick} type="button">
@@ -239,11 +239,11 @@ const BlacklistedTagsImportButton = ({
   );
 };
 
-type BlacklistedTagImportFormProps = BlacklistedTagsImportButtonProps;
+type BlocklistedTagImportFormProps = BlocklistedTagsImportButtonProps;
 
-const BlacklistedTagImportForm = forwardRef<
+const BlocklistedTagImportForm = forwardRef<
   Partial<HTMLFormElement>,
-  BlacklistedTagImportFormProps
+  BlocklistedTagImportFormProps
 >((props, ref) => {
   const { setSelector } = props;
   const intl = useIntl();
@@ -306,7 +306,7 @@ const BlacklistedTagImportForm = forwardRef<
     <form onSubmit={handleSubmit}>
       <div>
         <label htmlFor="value">
-          {intl.formatMessage(messages.blacklistedTagImportInstructions)}
+          {intl.formatMessage(messages.blocklistedTagImportInstructions)}
         </label>
         <textarea
           id="value"
@@ -392,7 +392,7 @@ const VerifyClearIndicator = <
         show={show}
       >
         <Modal
-          subTitle={intl.formatMessage(messages.clearBlacklistedTagsConfirm)}
+          subTitle={intl.formatMessage(messages.clearBlocklistedTagsConfirm)}
           okText={intl.formatMessage(messages.yes)}
           cancelText={intl.formatMessage(messages.no)}
           onOk={clearValue}
@@ -406,4 +406,4 @@ const VerifyClearIndicator = <
   );
 };
 
-export default BlacklistedTagsSelector;
+export default BlocklistedTagsSelector;

src/components/CollectionDetails/index.tsx

@@ -188,8 +188,8 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
     );
   }
 
-  const blacklistVisibility = hasPermission(
-    [Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST],
+  const blocklistVisibility = hasPermission(
+    [Permission.MANAGE_BLOCKLIST, Permission.VIEW_BLOCKLIST],
     { type: 'or' }
   );
 
@@ -349,8 +349,8 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
         isEmpty={data.parts.length === 0}
         items={data.parts
           .filter((title) => {
-            if (!blacklistVisibility)
-              return title.mediaInfo?.status !== MediaStatus.BLACKLISTED;
+            if (!blocklistVisibility)
+              return title.mediaInfo?.status !== MediaStatus.BLOCKLISTED;
             return title;
           })
           .map((title) => (

src/components/Common/ListView/index.tsx

@@ -37,8 +37,8 @@ const ListView = ({
   const { hasPermission } = useUser();
   useVerticalScroll(onScrollBottom, !isLoading && !isEmpty && !isReachingEnd);
 
-  const blacklistVisibility = hasPermission(
-    [Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST],
+  const blocklistVisibility = hasPermission(
+    [Permission.MANAGE_BLOCKLIST, Permission.VIEW_BLOCKLIST],
     { type: 'or' }
   );
 
@@ -66,10 +66,10 @@ const ListView = ({
         })}
         {items
           ?.filter((title) => {
-            if (!blacklistVisibility)
+            if (!blocklistVisibility)
               return (
                 (title as TvResult | MovieResult).mediaInfo?.status !==
-                MediaStatus.BLACKLISTED
+                MediaStatus.BLOCKLISTED
               );
             return title;
           })

src/components/Common/StatusBadgeMini/index.tsx

@@ -50,7 +50,7 @@ const StatusBadgeMini = ({
       );
       indicatorIcon = <BellIcon />;
       break;
-    case MediaStatus.BLACKLISTED:
+    case MediaStatus.BLOCKLISTED:
       badgeStyle.push('bg-red-500 border-white-400 ring-white-400 text-white');
       indicatorIcon = <EyeSlashIcon />;
       break;

src/components/Layout/MobileMenu/index.tsx

@@ -100,14 +100,14 @@ const MobileMenu = ({
       activeRegExp: /^\/requests/,
     },
     {
-      href: '/blacklist',
-      content: intl.formatMessage(menuMessages.blacklist),
+      href: '/blocklist',
+      content: intl.formatMessage(menuMessages.blocklist),
       svgIcon: <EyeSlashIcon className="h-6 w-6" />,
       svgIconSelected: <FilledEyeSlashIcon className="h-6 w-6" />,
-      activeRegExp: /^\/blacklist/,
+      activeRegExp: /^\/blocklist/,
       requiredPermission: [
-        Permission.MANAGE_BLACKLIST,
-        Permission.VIEW_BLACKLIST,
+        Permission.MANAGE_BLOCKLIST,
+        Permission.VIEW_BLOCKLIST,
       ],
       permissionType: 'or',
     },

src/components/Layout/Sidebar/index.tsx

@@ -27,7 +27,7 @@ export const menuMessages = defineMessages('components.Layout.Sidebar', {
   browsemovies: 'Movies',
   browsetv: 'Series',
   requests: 'Requests',
-  blacklist: 'Blacklist',
+  blocklist: 'Blocklist',
   issues: 'Issues',
   users: 'Users',
   settings: 'Settings',
@@ -79,13 +79,13 @@ const SidebarLinks: SidebarLinkProps[] = [
     activeRegExp: /^\/requests/,
   },
   {
-    href: '/blacklist',
-    messagesKey: 'blacklist',
+    href: '/blocklist',
+    messagesKey: 'blocklist',
     svgIcon: <EyeSlashIcon className="mr-3 h-6 w-6" />,
-    activeRegExp: /^\/blacklist/,
+    activeRegExp: /^\/blocklist/,
     requiredPermission: [
-      Permission.MANAGE_BLACKLIST,
-      Permission.VIEW_BLACKLIST,
+      Permission.MANAGE_BLOCKLIST,
+      Permission.VIEW_BLOCKLIST,
     ],
     permissionType: 'or',
   },

src/components/ManageSlideOver/index.tsx

@@ -1,4 +1,4 @@
-import BlacklistBlock from '@app/components/BlacklistBlock';
+import BlocklistBlock from '@app/components/BlocklistBlock';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
 import ConfirmButton from '@app/components/Common/ConfirmButton';
@@ -314,13 +314,13 @@ const ManageSlideOver = ({
             </div>
           </div>
         )}
-        {data.mediaInfo?.status === MediaStatus.BLACKLISTED && (
+        {data.mediaInfo?.status === MediaStatus.BLOCKLISTED && (
           <div>
             <h3 className="mb-2 text-xl font-bold">
-              {intl.formatMessage(globalMessages.blacklist)}
+              {intl.formatMessage(globalMessages.blocklist)}
             </h3>
             <div className="overflow-hidden rounded-md border border-gray-700 shadow">
-              <BlacklistBlock
+              <BlocklistBlock
                 tmdbId={data.mediaInfo.tmdbId}
                 onUpdate={() => revalidate()}
                 onDelete={() => onClose()}
@@ -651,7 +651,7 @@ const ManageSlideOver = ({
           )}
         {hasPermission(Permission.ADMIN) &&
           data?.mediaInfo &&
-          data.mediaInfo.status !== MediaStatus.BLACKLISTED && (
+          data.mediaInfo.status !== MediaStatus.BLOCKLISTED && (
             <div>
               <h3 className="mb-2 text-xl font-bold">
                 {intl.formatMessage(messages.manageModalAdvanced)}

src/components/MediaSlider/index.tsx

@@ -74,11 +74,11 @@ const MediaSlider = ({
     );
   }
 
-  if (settings.currentSettings.hideBlacklisted) {
+  if (settings.currentSettings.hideBlocklisted) {
     titles = titles.filter(
       (i) =>
         (i.mediaType === 'movie' || i.mediaType === 'tv') &&
-        i.mediaInfo?.status !== MediaStatus.BLACKLISTED
+        i.mediaInfo?.status !== MediaStatus.BLOCKLISTED
     );
   }
 
@@ -102,18 +102,18 @@ const MediaSlider = ({
     return null;
   }
 
-  const blacklistVisibility = hasPermission(
-    [Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST],
+  const blocklistVisibility = hasPermission(
+    [Permission.MANAGE_BLOCKLIST, Permission.VIEW_BLOCKLIST],
     { type: 'or' }
   );
 
   const finalTitles = titles
     .slice(0, 20)
     .filter((title) => {
-      if (!blacklistVisibility)
+      if (!blocklistVisibility)
         return (
           (title as TvResult | MovieResult).mediaInfo?.status !==
-          MediaStatus.BLACKLISTED
+          MediaStatus.BLOCKLISTED
         );
       return title;
     })