feat(settings): add blocklist region and language options (#1802)

Author: 0xSysR3ll

docs/using-seerr/settings/general.md

@@ -40,6 +40,15 @@ Set the default display language for Seerr. Users can override this setting in t
 
 These settings filter content shown on the "Discover" home page based on regional availability and original language, respectively. The Streaming Region filters the available streaming providers on the media page. Users can override these global settings by configuring these same options in their user settings.
 
+## Blocklist Region and Blocklist Language
+
+These settings control the region and language used specifically for blocklist content scanning. The "Process Blocklisted Tags" job uses these settings to determine which content to scan for blocklisting, independent of the general Discover settings.
+
+- **Blocklist Region**: The region used for blocklist content scanning. Leave empty to scan all regions.
+- **Blocklist Language**: The language used for blocklist content scanning. Leave empty to scan all languages.
+
+These settings are separate from the general "Discover Region" and "Discover Language" settings, allowing you to blocklist content from specific regions/languages regardless of what users see in their Discover pages.
+
 ## Blocklist Content with Tags and Limit Content Blocklisted per Tag
 
 These settings blocklist any TV shows or movies that have one of the entered tags. The "Process Blocklisted Tags" job adds entries to the blocklist based on the configured blocklisted tags. If a blocklisted tag is removed, any media blocklisted under that tag will be removed from the blocklist when the "Process Blocklisted Tags" job runs.

server/job/blocklistedTagsProcessor.ts

@@ -14,7 +14,7 @@ import type {
 } from '@server/lib/scanners/baseScanner';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import { createTmdbWithRegionLanguage } from '@server/routes/discover';
+import { createTmdbWithBlocklistSettings } from '@server/routes/discover';
 import type { EntityManager } from 'typeorm';
 
 const TMDB_API_DELAY_MS = 250;
@@ -65,7 +65,7 @@ class BlocklistedTagProcessor implements RunnableScanner<StatusBase> {
   }
 
   private async createBlocklistEntries(em: EntityManager) {
-    const tmdb = createTmdbWithRegionLanguage();
+    const tmdb = createTmdbWithBlocklistSettings();
 
     const settings = getSettings();
     const blocklistedTags = settings.main.blocklistedTags;

server/lib/settings/index.ts

@@ -146,6 +146,8 @@ export interface MainSettings {
   discoverRegion: string;
   streamingRegion: string;
   originalLanguage: string;
+  blocklistRegion: string;
+  blocklistLanguage: string;
   blocklistedTags: string;
   blocklistedTagsLimit: number;
   mediaServerType: number;
@@ -410,6 +412,8 @@ class Settings {
         discoverRegion: '',
         streamingRegion: '',
         originalLanguage: '',
+        blocklistRegion: '',
+        blocklistLanguage: '',
         blocklistedTags: '',
         blocklistedTagsLimit: 50,
         mediaServerType: MediaServerType.NOT_CONFIGURED,

server/routes/discover.ts

@@ -49,6 +49,15 @@ export const createTmdbWithRegionLanguage = (user?: User): TheMovieDb => {
   });
 };
 
+export const createTmdbWithBlocklistSettings = (): TheMovieDb => {
+  const settings = getSettings();
+
+  return new TheMovieDb({
+    discoverRegion: settings.main.blocklistRegion,
+    originalLanguage: settings.main.blocklistLanguage,
+  });
+};
+
 const discoverRoutes = Router();
 
 const QueryFilterOptions = z.object({

src/components/LanguageSelector/index.tsx

@@ -34,6 +34,7 @@ interface LanguageSelectorProps {
   serverValue?: string;
   isUserSettings?: boolean;
   isDisabled?: boolean;
+  fieldName?: string;
 }
 
 const LanguageSelector = ({
@@ -42,6 +43,7 @@ const LanguageSelector = ({
   serverValue,
   isUserSettings = false,
   isDisabled,
+  fieldName = 'originalLanguage',
 }: LanguageSelectorProps) => {
   const intl = useIntl();
   const { data: languages } = useSWR<Language[]>('/api/v1/languages');
@@ -151,7 +153,7 @@ const LanguageSelector = ({
             options.option?.value === 'server') ||
           value.every((v) => v.value === 'server')
         ) {
-          return setFieldValue('originalLanguage', '');
+          return setFieldValue(fieldName, '');
         }
 
         if (
@@ -160,11 +162,11 @@ const LanguageSelector = ({
             options.option?.value === 'all') ||
           value.every((v) => v.value === 'all')
         ) {
-          return setFieldValue('originalLanguage', isUserSettings ? 'all' : '');
+          return setFieldValue(fieldName, isUserSettings ? 'all' : '');
         }
 
         setFieldValue(
-          'originalLanguage',
+          fieldName,
           value
             .map((lang) => lang.value)
             .filter((v) => v !== 'all')

src/components/RegionSelector/index.tsx

@@ -89,7 +89,7 @@ const RegionSelector = ({
   };
 
   return (
-    <div className="z-40 w-full">
+    <div className="w-full">
       <Listbox as="div" value={selectedRegion} onChange={handleRegionSelect}>
         {({ open }) => (
           <div className="relative">
@@ -131,7 +131,7 @@ const RegionSelector = ({
               leave="transition-opacity ease-in duration-100"
               leaveFrom="opacity-100"
               leaveTo="opacity-0"
-              className="absolute mt-1 w-full rounded-md bg-gray-800 shadow-lg"
+              className="absolute z-50 mt-1 w-full rounded-md bg-gray-800 shadow-lg"
             >
               <Listbox.Options
                 static

src/components/Settings/SettingsMain/index.tsx

@@ -38,6 +38,12 @@ const messages = defineMessages('components.Settings.SettingsMain', {
   discoverRegionTip: 'Filter content by regional availability',
   originallanguage: 'Discover Language',
   originallanguageTip: 'Filter content by original language',
+  blocklistRegion: 'Blocklist Region',
+  blocklistRegionTip:
+    'Region used for blocklist content scanning (independent of discover settings)',
+  blocklistLanguage: 'Blocklist Language',
+  blocklistLanguageTip:
+    'Language used for blocklist content scanning (independent of discover settings)',
   blocklistedTags: 'Blocklist Content with Tags',
   blocklistedTagsTip:
     'Automatically add content with tags to the blocklist using the "Process Blocklisted Tags" job',
@@ -169,6 +175,8 @@ const SettingsMain = () => {
             discoverRegion: data?.discoverRegion,
             originalLanguage: data?.originalLanguage,
             streamingRegion: data?.streamingRegion || 'US',
+            blocklistRegion: data?.blocklistRegion || '',
+            blocklistLanguage: data?.blocklistLanguage || '',
             blocklistedTags: data?.blocklistedTags,
             blocklistedTagsLimit: data?.blocklistedTagsLimit || 50,
             partialRequestsEnabled: data?.partialRequestsEnabled,
@@ -189,6 +197,8 @@ const SettingsMain = () => {
                 discoverRegion: values.discoverRegion,
                 streamingRegion: values.streamingRegion,
                 originalLanguage: values.originalLanguage,
+                blocklistRegion: values.blocklistRegion,
+                blocklistLanguage: values.blocklistLanguage,
                 blocklistedTags: values.blocklistedTags,
                 blocklistedTagsLimit: values.blocklistedTagsLimit,
                 partialRequestsEnabled: values.partialRequestsEnabled,
@@ -379,6 +389,7 @@ const SettingsMain = () => {
                       <LanguageSelector
                         setFieldValue={setFieldValue}
                         value={values.originalLanguage}
+                        fieldName="originalLanguage"
                       />
                     </div>
                   </div>
@@ -391,7 +402,7 @@ const SettingsMain = () => {
                     </span>
                   </label>
                   <div className="form-input-area">
-                    <div className="form-input-field relative z-20">
+                    <div className="form-input-field relative">
                       <RegionSelector
                         value={values.streamingRegion}
                         name="streamingRegion"
@@ -402,6 +413,44 @@ const SettingsMain = () => {
                     </div>
                   </div>
                 </div>
+                <div className="form-row">
+                  <label htmlFor="blocklistRegion" className="text-label">
+                    <span>{intl.formatMessage(messages.blocklistRegion)}</span>
+                    <span className="label-tip">
+                      {intl.formatMessage(messages.blocklistRegionTip)}
+                    </span>
+                  </label>
+                  <div className="form-input-area">
+                    <div className="form-input-field">
+                      <RegionSelector
+                        value={values.blocklistRegion}
+                        name="blocklistRegion"
+                        onChange={setFieldValue}
+                        regionType="discover"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div className="form-row">
+                  <label htmlFor="blocklistLanguage" className="text-label">
+                    <span>
+                      {intl.formatMessage(messages.blocklistLanguage)}
+                    </span>
+                    <span className="label-tip">
+                      {intl.formatMessage(messages.blocklistLanguageTip)}
+                    </span>
+                  </label>
+                  <div className="form-input-area">
+                    <div className="form-input-field relative z-20">
+                      <LanguageSelector
+                        setFieldValue={setFieldValue}
+                        serverValue={data?.blocklistLanguage}
+                        value={values.blocklistLanguage}
+                        fieldName="blocklistLanguage"
+                      />
+                    </div>
+                  </div>
+                </div>
                 <div className="form-row">
                   <label htmlFor="blocklistedTags" className="text-label">
                     <span>{intl.formatMessage(messages.blocklistedTags)}</span>

src/i18n/locale/en.json

@@ -991,6 +991,10 @@
   "components.Settings.SettingsMain.apikeyCopied": "Copied API key to clipboard.",
   "components.Settings.SettingsMain.applicationTitle": "Application Title",
   "components.Settings.SettingsMain.applicationurl": "Application URL",
+  "components.Settings.SettingsMain.blocklistLanguage": "Blocklist Language",
+  "components.Settings.SettingsMain.blocklistLanguageTip": "Language used for blocklist content scanning (independent of discover settings)",
+  "components.Settings.SettingsMain.blocklistRegion": "Blocklist Region",
+  "components.Settings.SettingsMain.blocklistRegionTip": "Region used for blocklist content scanning (independent of discover settings)",
   "components.Settings.SettingsMain.blocklistedTags": "Blocklist Content with Tags",
   "components.Settings.SettingsMain.blocklistedTagsLimit": "Limit Content Blocklisted per Tag",
   "components.Settings.SettingsMain.blocklistedTagsLimitTip": "The \"Process Blocklisted Tags\" job will blocklist this many pages into each sort. Larger numbers will create a more accurate blocklist, but use more space.",