From 2351ee9cbaf837cc97ad9204102da70f738fa442 Mon Sep 17 00:00:00 2001
From: Jie Li <jieli.pro@protonmail.com>
Date: Tue, 12 Nov 2024 23:31:21 +0000
Subject: [PATCH 1/4] added buttons to hide hidden content

---
 .../distraction-settings.js                   |  8 +++++++
 .../distraction-settings.vue                  | 21 +++++++++++++++++++
 .../components/ft-input-tags/ft-input-tags.js |  4 ++++
 .../ft-input-tags/ft-input-tags.vue           |  5 ++++-
 src/renderer/store/modules/settings.js        |  2 ++
 static/locales/en-US.yaml                     |  3 +++
 6 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/distraction-settings/distraction-settings.js b/src/renderer/components/distraction-settings/distraction-settings.js
index cdb0f4f01..005054b64 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.js
+++ b/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'
     ])
   }
 })
diff --git a/src/renderer/components/distraction-settings/distraction-settings.vue b/src/renderer/components/distraction-settings/distraction-settings.vue
index 40fc7a6e7..87d8000b8 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.vue
+++ b/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"
@@ -240,6 +259,7 @@
         :validate-tag-name="validateChannelId"
         :find-tag-info="findChannelTagInfo"
         :are-channel-tags="true"
+        :show-hidden-content="showHiddenChannels"
         @invalid-name="handleInvalidChannel"
         @error-find-tag-info="handleChannelAPIError"
         @change="handleChannelsHidden"
@@ -254,6 +274,7 @@
         :tag-list="forbiddenTitles"
         :min-input-length="3"
         :tooltip="$t('Tooltips.Distraction Free Settings.Hide Videos and Playlists Containing Text')"
+        :show-hidden-content="showHiddenText"
         @change="handleForbiddenTitles"
       />
     </ft-flex-box>
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.js b/src/renderer/components/ft-input-tags/ft-input-tags.js
index 281b35171..3b4d97980 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.js
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.js
@@ -28,6 +28,10 @@ export default defineComponent({
       type: String,
       required: true
     },
+    showHiddenContent: {
+      type: String,
+      required: true
+    },
     minInputLength: {
       type: Number,
       default: 1
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.vue b/src/renderer/components/ft-input-tags/ft-input-tags.vue
index 4c387589e..a8b2f4ebc 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.vue
+++ b/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="showHiddenContent"
+      class="ft-tag-box"
+    >
       <ul>
         <li
           v-for="tag in tagList"
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index b790b4da2..395569ee7 100644
--- a/src/renderer/store/modules/settings.js
+++ b/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,
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 636a43eec..191d97ee5 100644
--- a/static/locales/en-US.yaml
+++ b/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

From 23882080fc5fa4881835b8b61ace72f15a5e993c Mon Sep 17 00:00:00 2001
From: Jie Li <jieli.pro@protonmail.com>
Date: Tue, 12 Nov 2024 23:52:17 +0000
Subject: [PATCH 2/4] renamed variables

---
 .../components/distraction-settings/distraction-settings.vue  | 4 ++--
 src/renderer/components/ft-input-tags/ft-input-tags.js        | 2 +-
 src/renderer/components/ft-input-tags/ft-input-tags.vue       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/distraction-settings/distraction-settings.vue b/src/renderer/components/distraction-settings/distraction-settings.vue
index 87d8000b8..73d7f014a 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.vue
+++ b/src/renderer/components/distraction-settings/distraction-settings.vue
@@ -255,11 +255,11 @@
         :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"
         :are-channel-tags="true"
-        :show-hidden-content="showHiddenChannels"
         @invalid-name="handleInvalidChannel"
         @error-find-tag-info="handleChannelAPIError"
         @change="handleChannelsHidden"
@@ -272,9 +272,9 @@
         :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')"
-        :show-hidden-content="showHiddenText"
         @change="handleForbiddenTitles"
       />
     </ft-flex-box>
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.js b/src/renderer/components/ft-input-tags/ft-input-tags.js
index 3b4d97980..807803a9e 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.js
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.js
@@ -28,7 +28,7 @@ export default defineComponent({
       type: String,
       required: true
     },
-    showHiddenContent: {
+    showTags: {
       type: String,
       required: true
     },
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.vue b/src/renderer/components/ft-input-tags/ft-input-tags.vue
index a8b2f4ebc..a3a7a5f31 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.vue
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.vue
@@ -22,7 +22,7 @@
       @click="updateTags"
     />
     <div
-      v-if="showHiddenContent"
+      v-if="showTags"
       class="ft-tag-box"
     >
       <ul>

From 18ae7292b268a73c1ac1faf06648ac7624142b9d Mon Sep 17 00:00:00 2001
From: Jie Li <jieli.pro@protonmail.com>
Date: Wed, 13 Nov 2024 00:25:15 +0000
Subject: [PATCH 3/4] capitalize text

---
 .../components/distraction-settings/distraction-settings.vue  | 4 ++--
 static/locales/en-US.yaml                                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/distraction-settings/distraction-settings.vue b/src/renderer/components/distraction-settings/distraction-settings.vue
index 73d7f014a..760103e95 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.vue
+++ b/src/renderer/components/distraction-settings/distraction-settings.vue
@@ -235,13 +235,13 @@
     </h4>
     <div class="switchColumnGrid">
       <ft-toggle-switch
-        :label="$t('Settings.Distraction Free Settings.Show hidden channels')"
+        :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')"
+        :label="$t('Settings.Distraction Free Settings.Show Hidden Text')"
         :compact="true"
         :default-value="showHiddenText"
         @change="updateShowHiddenText"
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 191d97ee5..e283743b8 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -521,8 +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
+    Show Hidden Channels: Show Hidden Channels
+    Show Hidden Text: Show Hidden Text
   Data Settings:
     Data Settings: Data
     Select Import Type: Select Import Type

From 4ade0d900adb3e3b0e0fe919a0863ba1f8d1136a Mon Sep 17 00:00:00 2001
From: Jie Li <jieli.pro@protonmail.com>
Date: Fri, 15 Nov 2024 12:08:37 +0000
Subject: [PATCH 4/4] changed showTags type to boolean

---
 src/renderer/components/ft-input-tags/ft-input-tags.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.js b/src/renderer/components/ft-input-tags/ft-input-tags.js
index 807803a9e..a3d7efd83 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.js
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.js
@@ -29,7 +29,7 @@ export default defineComponent({
       required: true
     },
     showTags: {
-      type: String,
+      type: Boolean,
       required: true
     },
     minInputLength: {