feat(settingsInterfaces.ts): setting to skip blocklist modal

server/interfaces/api/settingsInterfaces.ts

@@ -31,6 +31,7 @@ export interface PublicSettingsResponse {
   applicationUrl: string;
   hideAvailable: boolean;
   hideBlocklisted: boolean;
+  skipBlocklistModal: boolean;
   localLogin: boolean;
   mediaServerLogin: boolean;
   movie4kEnabled: boolean;

server/lib/settings/index.ts

@@ -141,6 +141,7 @@ export interface MainSettings {
   };
   hideAvailable: boolean;
   hideBlocklisted: boolean;
+  skipBlocklistModal: boolean;
   localLogin: boolean;
   mediaServerLogin: boolean;
   newPlexLogin: boolean;
@@ -193,6 +194,7 @@ interface FullPublicSettings extends PublicSettings {
   applicationUrl: string;
   hideAvailable: boolean;
   hideBlocklisted: boolean;
+  skipBlocklistModal: boolean;
   localLogin: boolean;
   mediaServerLogin: boolean;
   movie4kEnabled: boolean;
@@ -414,6 +416,7 @@ class Settings {
         },
         hideAvailable: false,
         hideBlocklisted: false,
+        skipBlocklistModal: false,
         localLogin: true,
         mediaServerLogin: true,
         newPlexLogin: true,
@@ -709,6 +712,7 @@ class Settings {
       applicationUrl: this.data.main.applicationUrl,
       hideAvailable: this.data.main.hideAvailable,
       hideBlocklisted: this.data.main.hideBlocklisted,
+      skipBlocklistModal: this.data.main.skipBlocklistModal,
       localLogin: this.data.main.localLogin,
       mediaServerLogin: this.data.main.mediaServerLogin,
       jellyfinExternalHost: this.data.jellyfin.externalHostname,

src/components/CollectionDetails/index.tsx

@@ -422,7 +422,11 @@ const CollectionDetails = ({ collection }: CollectionDetailsProps) => {
                   buttonType="ghost"
                   className="z-40 mr-2"
                   buttonSize="md"
-                  onClick={() => setShowBlocklistModal(true)}
+                  onClick={() =>
+                    settings.currentSettings.skipBlocklistModal
+                      ? onClickHideItemBtn()
+                      : setShowBlocklistModal(true)
+                  }
                   disabled={isBlocklistUpdating}
                 >
                   <EyeSlashIcon />

src/components/MovieDetails/index.tsx

@@ -579,7 +579,11 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
                   buttonType={'ghost'}
                   className="z-40 mr-2"
                   buttonSize={'md'}
-                  onClick={() => setShowBlocklistModal(true)}
+                  onClick={() =>
+                    settings.currentSettings.skipBlocklistModal
+                      ? onClickHideItemBtn()
+                      : setShowBlocklistModal(true)
+                  }
                 >
                   <EyeSlashIcon />
                 </Button>

src/components/Settings/SettingsMain/index.tsx

@@ -55,6 +55,9 @@ const messages = defineMessages('components.Settings.SettingsMain', {
   hideBlocklisted: 'Hide Blocklisted Items',
   hideBlocklistedTip:
     'Hide blocklisted items from discover pages for all users with the "Manage Blocklist" permission',
+  skipBlocklistModal: 'Skip Blocklist Confirmation',
+  skipBlocklistModalTip:
+    'Blocklist content immediately without showing the confirmation modal',
   toastApiKeySuccess: 'New API key generated successfully!',
   toastApiKeyFailure: 'Something went wrong while generating a new API key.',
   toastSettingsSuccess: 'Settings saved successfully!',
@@ -171,6 +174,7 @@ const SettingsMain = () => {
             applicationUrl: data?.applicationUrl,
             hideAvailable: data?.hideAvailable,
             hideBlocklisted: data?.hideBlocklisted,
+            skipBlocklistModal: data?.skipBlocklistModal,
             locale: data?.locale ?? 'en',
             discoverRegion: data?.discoverRegion,
             originalLanguage: data?.originalLanguage,
@@ -193,6 +197,7 @@ const SettingsMain = () => {
                 applicationUrl: values.applicationUrl,
                 hideAvailable: values.hideAvailable,
                 hideBlocklisted: values.hideBlocklisted,
+                skipBlocklistModal: values.skipBlocklistModal,
                 locale: values.locale,
                 discoverRegion: values.discoverRegion,
                 streamingRegion: values.streamingRegion,
@@ -538,6 +543,32 @@ const SettingsMain = () => {
                     />
                   </div>
                 </div>
+                <div className="form-row">
+                  <label
+                    htmlFor="skipBlocklistModal"
+                    className="checkbox-label"
+                  >
+                    <span className="mr-2">
+                      {intl.formatMessage(messages.skipBlocklistModal)}
+                    </span>
+                    <span className="label-tip">
+                      {intl.formatMessage(messages.skipBlocklistModalTip)}
+                    </span>
+                  </label>
+                  <div className="form-input-area">
+                    <Field
+                      type="checkbox"
+                      id="skipBlocklistModal"
+                      name="skipBlocklistModal"
+                      onChange={() => {
+                        setFieldValue(
+                          'skipBlocklistModal',
+                          !values.skipBlocklistModal
+                        );
+                      }}
+                    />
+                  </div>
+                </div>
                 <div className="form-row">
                   <label
                     htmlFor="partialRequestsEnabled"

src/components/TitleCard/index.tsx

@@ -8,6 +8,7 @@ import RequestModal from '@app/components/RequestModal';
 import ErrorCard from '@app/components/TitleCard/ErrorCard';
 import Placeholder from '@app/components/TitleCard/Placeholder';
 import { useIsTouch } from '@app/hooks/useIsTouch';
+import useSettings from '@app/hooks/useSettings';
 import useToasts from '@app/hooks/useToasts';
 import { Permission, UserType, useUser } from '@app/hooks/useUser';
 import globalMessages from '@app/i18n/globalMessages';
@@ -76,6 +77,7 @@ const TitleCard = ({
   const [showDetail, setShowDetail] = useState(false);
   const [showRequestModal, setShowRequestModal] = useState(false);
   const { addToast } = useToasts();
+  const settings = useSettings();
   const [toggleWatchlist, setToggleWatchlist] =
     useState<boolean>(!isAddedToWatchlist);
   const [showBlocklistModal, setShowBlocklistModal] = useState(false);
@@ -431,7 +433,11 @@ const TitleCard = ({
                       buttonType={'ghost'}
                       className="z-40"
                       buttonSize={'sm'}
-                      onClick={() => setShowBlocklistModal(true)}
+                      onClick={() =>
+                        settings.currentSettings.skipBlocklistModal
+                          ? onClickHideItemBtn()
+                          : setShowBlocklistModal(true)
+                      }
                     >
                       <EyeSlashIcon className={'h-3'} />
                     </Button>

src/components/TvDetails/index.tsx

@@ -623,7 +623,11 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
                   buttonType={'ghost'}
                   className="z-40 mr-2"
                   buttonSize={'md'}
-                  onClick={() => setShowBlocklistModal(true)}
+                  onClick={() =>
+                    settings.currentSettings.skipBlocklistModal
+                      ? onClickHideItemBtn()
+                      : setShowBlocklistModal(true)
+                  }
                 >
                   <EyeSlashIcon />
                 </Button>

src/context/SettingsContext.tsx

@@ -14,6 +14,7 @@ const defaultSettings = {
   applicationUrl: '',
   hideAvailable: false,
   hideBlocklisted: false,
+  skipBlocklistModal: false,
   localLogin: true,
   mediaServerLogin: true,
   movie4kEnabled: false,

src/i18n/locale/en.json

@@ -1034,6 +1034,8 @@
   "components.Settings.SettingsMain.originallanguage": "Discover Language",
   "components.Settings.SettingsMain.originallanguageTip": "Filter content by original language",
   "components.Settings.SettingsMain.partialRequestsEnabled": "Allow Partial Series Requests",
+  "components.Settings.SettingsMain.skipBlocklistModal": "Skip Blocklist Confirmation",
+  "components.Settings.SettingsMain.skipBlocklistModalTip": "Blocklist content immediately without showing the confirmation modal",
   "components.Settings.SettingsMain.streamingRegion": "Streaming Region",
   "components.Settings.SettingsMain.streamingRegionTip": "Show streaming sites by regional availability",
   "components.Settings.SettingsMain.toastApiKeyFailure": "Something went wrong while generating a new API key.",

src/pages/_app.tsx

@@ -244,6 +244,7 @@ CoreApp.getInitialProps = async (initialProps) => {
     applicationUrl: '',
     hideAvailable: false,
     hideBlocklisted: false,
+    skipBlocklistModal: false,
     movie4kEnabled: false,
     series4kEnabled: false,
     localLogin: true,