Merge 4ade0d900a into a70a5c6ab2

src/renderer/components/distraction-settings/distraction-settings.js

@@ -111,6 +111,12 @@ export default defineComponent({
     showDistractionFreeTitles: function () {
       return this.$store.getters.getShowDistractionFreeTitles
     },
+    showHiddenChannels: function () {
+      return this.$store.getters.getShowHiddenChannels
+    },
+    showHiddenText: function () {
+      return this.$store.getters.getShowHiddenText
+    },
     channelsHidden: function () {
       return JSON.parse(this.$store.getters.getChannelsHidden).map((ch) => {
         // Legacy support
@@ -224,6 +230,8 @@ export default defineComponent({
       'updateHideSubscriptionsShorts',
       'updateHideSubscriptionsLive',
       'updateHideSubscriptionsCommunity',
+      'updateShowHiddenChannels',
+      'updateShowHiddenText'
     ])
   }
 })

src/renderer/components/distraction-settings/distraction-settings.vue

@@ -228,6 +228,25 @@
       </div>
     </div>
     <br class="hide-on-mobile">
+    <h4
+      class="groupTitle"
+    >
+      {{ $t('Settings.Distraction Free Settings.Sections.Content Filter') }}
+    </h4>
+    <div class="switchColumnGrid">
+      <ft-toggle-switch
+        :label="$t('Settings.Distraction Free Settings.Show Hidden Channels')"
+        :compact="true"
+        :default-value="showHiddenChannels"
+        @change="updateShowHiddenChannels"
+      />
+      <ft-toggle-switch
+        :label="$t('Settings.Distraction Free Settings.Show Hidden Text')"
+        :compact="true"
+        :default-value="showHiddenText"
+        @change="updateShowHiddenText"
+      />
+    </div>
     <ft-flex-box>
       <ft-input-tags
         :disabled="channelHiderDisabled"
@@ -236,6 +255,7 @@
         :tag-name-placeholder="$t('Settings.Distraction Free Settings.Hide Channels Placeholder')"
         :show-action-button="true"
         :tag-list="channelsHidden"
+        :show-tags="showHiddenChannels"
         :tooltip="$t('Tooltips.Distraction Free Settings.Hide Channels')"
         :validate-tag-name="validateChannelId"
         :find-tag-info="findChannelTagInfo"
@@ -252,6 +272,7 @@
         :tag-name-placeholder="$t('Settings.Distraction Free Settings.Hide Videos and Playlists Containing Text Placeholder')"
         :show-action-button="true"
         :tag-list="forbiddenTitles"
+        :show-tags="showHiddenText"
         :min-input-length="3"
         :tooltip="$t('Tooltips.Distraction Free Settings.Hide Videos and Playlists Containing Text')"
         @change="handleForbiddenTitles"

src/renderer/components/ft-input-tags/ft-input-tags.js

@@ -28,6 +28,10 @@ export default defineComponent({
       type: String,
       required: true
     },
+    showTags: {
+      type: Boolean,
+      required: true
+    },
     minInputLength: {
       type: Number,
       default: 1

src/renderer/components/ft-input-tags/ft-input-tags.vue

@@ -21,7 +21,10 @@
       :force-action-button-icon-name="['fas', 'arrow-right']"
       @click="updateTags"
     />
-    <div class="ft-tag-box">
+    <div
+      v-if="showTags"
+      class="ft-tag-box"
+    >
       <ul>
         <li
           v-for="tag in tagList"

src/renderer/store/modules/settings.js

@@ -296,6 +296,8 @@ const state = {
   screenshotFolderPath: '',
   screenshotFilenamePattern: '%Y%M%D-%H%N%S',
   settingsSectionSortEnabled: false,
+  showHiddenChannels: true,
+  showHiddenText: true,
   fetchSubscriptionsAutomatically: true,
   settingsPassword: '',
   useDeArrowTitles: false,

static/locales/en-US.yaml

@@ -484,6 +484,7 @@ Settings:
       Channel Page: Channel Page
       Watch Page: Watch Page
       General: General
+      Content Filter: Content Filter
     Hide Video Views: Hide Video Views
     Hide Video Likes And Dislikes: Hide Video Likes And Dislikes
     Hide Channel Subscribers: Hide Channel Subscribers
@@ -520,6 +521,8 @@ Settings:
     Hide Subscriptions Shorts: Hide Subscriptions Shorts
     Hide Subscriptions Live: Hide Subscriptions Live
     Hide Subscriptions Community: Hide Subscriptions Community
+    Show Hidden Channels: Show Hidden Channels
+    Show Hidden Text: Show Hidden Text
   Data Settings:
     Data Settings: Data
     Select Import Type: Select Import Type