Video title filter / blacklist

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

@@ -120,13 +120,16 @@ export default defineComponent({
         return ch
       })
     },
+    forbiddenVideoTitleText: function() {
+      return JSON.parse(this.$store.getters.getForbiddenVideoTitleText)
+    },
     hideSubscriptionsLiveTooltip: function () {
       return this.$t('Tooltips.Distraction Free Settings.Hide Subscriptions Live', {
         appWideSetting: this.$t('Settings.Distraction Free Settings.Hide Live Streams'),
         subsection: this.$t('Settings.Distraction Free Settings.Sections.General'),
         settingsSection: this.$t('Settings.Distraction Free Settings.Distraction Free Settings')
       })
-    }
+    },
   },
   mounted: function () {
     this.verifyChannelsHidden()
@@ -148,6 +151,9 @@ export default defineComponent({
     handleChannelsHidden: function (value) {
       this.updateChannelsHidden(JSON.stringify(value))
     },
+    handleForbiddenVideoTitleText: function (value) {
+      this.updateForbiddenVideoTitleText(JSON.stringify(value))
+    },
     handleChannelsExists: function () {
       showToast(this.$t('Settings.Distraction Free Settings.Hide Channels Already Exists'))
     },
@@ -206,6 +212,7 @@ export default defineComponent({
       'updateHideSharingActions',
       'updateHideChapters',
       'updateChannelsHidden',
+      'updateForbiddenVideoTitleText',
       'updateShowDistractionFreeTitles',
       'updateHideFeaturedChannels',
       'updateHideChannelShorts',

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

@@ -239,12 +239,24 @@
         :tooltip="$t('Tooltips.Distraction Free Settings.Hide Channels')"
         :validate-tag-name="validateChannelId"
         :find-tag-info="findChannelTagInfo"
+        :are-channel-tags="true"
         @invalid-name="handleInvalidChannel"
         @error-find-tag-info="handleChannelAPIError"
         @change="handleChannelsHidden"
         @already-exists="handleChannelsExists"
       />
     </ft-flex-box>
+    <ft-flex-box>
+      <ft-input-tags
+        :label="$t('Settings.Distraction Free Settings.Hide Videos Containing Text')"
+        :tag-name-placeholder="$t('Settings.Distraction Free Settings.Hide Videos Containing Text Placeholder')"
+        :show-action-button="true"
+        :tag-list="forbiddenVideoTitleText"
+        :min-input-length="3"
+        :tooltip="$t('Tooltips.Distraction Free Settings.Hide Videos Containing Text')"
+        @change="handleForbiddenVideoTitleText"
+      />
+    </ft-flex-box>
   </ft-settings-section>
 </template>
 

src/renderer/components/ft-community-post/ft-community-post.js

@@ -27,6 +27,10 @@ export default defineComponent({
     appearance: {
       type: String,
       required: true
+    },
+    hideVideosWithForbiddenTextInTitle: {
+      type: Boolean,
+      default: true
     }
   },
   data: function () {
@@ -57,6 +61,15 @@ export default defineComponent({
 
     listType: function () {
       return this.$store.getters.getListType
+    },
+
+    forbiddenVideoTitleText() {
+      if (!this.hideVideosWithForbiddenTextInTitle) { return [] }
+      return JSON.parse(this.$store.getters.getForbiddenVideoTitleText)
+    },
+
+    hideVideo() {
+      return this.forbiddenVideoTitleText.some((text) => this.data.postContent.content.title?.toLowerCase().includes(text.toLowerCase()))
     }
   },
   created: function () {

src/renderer/components/ft-community-post/ft-community-post.scss

@@ -13,6 +13,12 @@
   box-sizing: border-box;
 }
 
+.hiddenVideo {
+  font-style: italic;
+  opacity: 0.85;
+  text-align: center;
+}
+
 .communityImage {
   block-size: 100%;
   inline-size: 100%;

src/renderer/components/ft-community-post/ft-community-post.vue

@@ -82,9 +82,16 @@
       v-if="type === 'video'"
     >
       <ft-list-video
+        v-if="!hideVideo"
         :data="data.postContent.content"
         appearance=""
       />
+      <p
+        v-else
+        class="hiddenVideo"
+      >
+        {{ '[' + $t('Channel.Community.Video hidden by FreeTube') + ']' }}
+      </p>
     </div>
     <div
       v-if="type === 'poll' || type === 'quiz'"

src/renderer/components/ft-element-list/ft-element-list.js

@@ -26,6 +26,10 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    hideVideosWithForbiddenTextInTitle: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     listType: function () {

src/renderer/components/ft-element-list/ft-element-list.vue

@@ -11,6 +11,7 @@
       :layout="displayValue"
       :show-video-with-last-viewed-playlist="showVideoWithLastViewedPlaylist"
       :use-channels-hidden-preference="useChannelsHiddenPreference"
+      :hide-videos-with-forbidden-text-in-title="hideVideosWithForbiddenTextInTitle"
     />
   </ft-auto-grid>
 </template>

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

@@ -7,6 +7,10 @@ export default defineComponent({
     'ft-input': FtInput,
   },
   props: {
+    areChannelTags: {
+      type: Boolean,
+      default: false
+    },
     disabled: {
       type: Boolean,
       default: false
@@ -23,6 +27,10 @@ export default defineComponent({
       type: String,
       required: true
     },
+    minInputLength: {
+      type: Number,
+      default: 1
+    },
     showActionButton: {
       type: Boolean,
       default: true
@@ -46,6 +54,21 @@ export default defineComponent({
   },
   methods: {
     updateTags: async function (text, _e) {
+      if (this.areChannelTags) {
+        await this.updateChannelTags(text, _e)
+        return
+      }
+      // text entered add tag and update tag list
+      const trimmedText = text.trim()
+      if (!this.tagList.includes(trimmedText)) {
+        const newList = this.tagList.slice(0)
+        newList.push(trimmedText)
+        this.$emit('change', newList)
+      }
+      // clear input box
+      this.$refs.tagNameInput.handleClearTextClick()
+    },
+    updateChannelTags: async function (text, _e) {
       // text entered add tag and update tag list
       const name = text.trim()
 
@@ -73,6 +96,20 @@ export default defineComponent({
       this.$refs.tagNameInput.handleClearTextClick()
     },
     removeTag: function (tag) {
+      if (this.areChannelTags) {
+        this.removeChannelTag(tag)
+        return
+      }
+      // Remove tag from list
+      const tagName = tag.trim()
+      if (this.tagList.includes(tagName)) {
+        const newList = this.tagList.slice(0)
+        const index = newList.indexOf(tagName)
+        newList.splice(index, 1)
+        this.$emit('change', newList)
+      }
+    },
+    removeChannelTag: function (tag) {
       // Remove tag from list
       if (this.tagList.some((tmpTag) => tmpTag.name === tag.name)) {
         const newList = this.tagList.filter((tmpTag) => tmpTag.name !== tag.name)

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

@@ -13,6 +13,7 @@
       :disabled="disabled"
       :placeholder="tagNamePlaceholder"
       :label="label"
+      :min-input-length="minInputLength"
       :show-label="true"
       :tooltip="tooltip"
       :show-action-button="showActionButton"
@@ -26,18 +27,21 @@
           v-for="tag in tagList"
           :key="tag.id"
         >
-          <router-link
-            v-if="tag.icon"
-            :to="tag.iconHref ?? ''"
-            class="tag-icon-link"
-          >
-            <img
-              :src="tag.icon"
-              alt=""
-              class="tag-icon"
+          <template v-if="areChannelTags">
+            <router-link
+              v-if="tag.icon"
+              :to="tag.iconHref ?? ''"
+              class="tag-icon-link"
             >
-          </router-link>
-          <span>{{ (tag.preferredName) ? tag.preferredName : tag.name }}</span>
+              <img
+                :src="tag.icon"
+                alt=""
+                class="tag-icon"
+              >
+            </router-link>
+            <span>{{ (tag.preferredName) ? tag.preferredName : tag.name }}</span>
+          </template>
+          <span v-else>{{ tag }}</span>
           <font-awesome-icon
             v-if="!disabled"
             :icon="['fas', 'fa-times']"

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

@@ -54,6 +54,10 @@ export default defineComponent({
       type: Boolean,
       default: true
     },
+    minInputLength: {
+      type: Number,
+      default: 1
+    },
     dataList: {
       type: Array,
       default: () => { return [] }
@@ -99,7 +103,7 @@ export default defineComponent({
     },
 
     inputDataPresent: function () {
-      return this.inputData.length > 0
+      return this.inputData.length >= this.minInputLength
     },
     inputDataDisplayed() {
       if (!this.isSearch) { return this.inputData }

src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js

@@ -39,6 +39,10 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    hideVideosWithForbiddenTextInTitle: {
+      type: Boolean,
+      default: true
+    },
   },
   data: function () {
     return {
@@ -61,6 +65,10 @@ export default defineComponent({
         return ch
       })
     },
+    forbiddenVideoTitleText: function() {
+      if (!this.hideVideosWithForbiddenTextInTitle) { return [] }
+      return JSON.parse(this.$store.getters.getForbiddenVideoTitleText)
+    },
     hideUpcomingPremieres: function () {
       return this.$store.getters.getHideUpcomingPremieres
     },
@@ -97,6 +105,9 @@ export default defineComponent({
           // hide videos by author
           return false
         }
+        if (this.forbiddenVideoTitleText.some((text) => this.data.title?.toLowerCase().includes(text.toLowerCase()))) {
+          return false
+        }
       } else if (data.type === 'channel') {
         const attrsToCheck = [
           // Local API

src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue

@@ -31,6 +31,7 @@
       />
       <ft-community-post
         v-else-if="data.type === 'community'"
+        :hide-videos-with-forbidden-text-in-title="hideVideosWithForbiddenTextInTitle"
         :appearance="appearance"
         :data="data"
       />

src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js

@@ -47,6 +47,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    hideVideosWithForbiddenTextInTitle: {
+      type: Boolean,
+      default: false
+    }
   },
   data: function () {
     return {
@@ -67,9 +71,15 @@ export default defineComponent({
       })
     },
 
+    forbiddenVideoTitleText() {
+      if (!this.hideVideosWithForbiddenTextInTitle) { return [] }
+      return JSON.parse(this.$store.getters.getForbiddenVideoTitleText)
+    },
+
     shouldBeVisible() {
       return !(this.channelsHidden.some(ch => ch.name === this.data.authorId) ||
-        this.channelsHidden.some(ch => ch.name === this.data.author))
+        this.channelsHidden.some(ch => ch.name === this.data.author) ||
+        this.forbiddenVideoTitleText.some((text) => this.data.title?.toLowerCase().includes(text.toLowerCase())))
     }
   },
   created() {

src/renderer/components/ft-video-player/ft-video-player.js

@@ -771,7 +771,7 @@ export default defineComponent({
       let newTime = null
       let skippedCategory = null
       skipSegments.forEach(({ category, segment: [startTime, endTime] }) => {
-        if (startTime <= currentTime && currentTime < endTime) {
+        if (startTime <= currentTime && currentTime <= endTime) {
           newTime = endTime
           skippedCategory = category
         }

src/renderer/components/subscriptions-tab-ui/subscriptions-tab-ui.vue

@@ -43,6 +43,7 @@
       v-if="!isLoading && activeVideoList.length > 0"
       :data="activeVideoList"
       :use-channels-hidden-preference="false"
+      :hide-videos-with-forbidden-text-in-title="true"
       :display="isCommunity ? 'list' : ''"
     />
     <ft-flex-box

src/renderer/components/watch-video-recommendations/watch-video-recommendations.vue

@@ -23,6 +23,7 @@
       appearance="recommendation"
       force-list-type="list"
       :use-channels-hidden-preference="true"
+      :hide-videos-with-forbidden-text-in-title="true"
     />
   </ft-card>
 </template>

src/renderer/store/modules/settings.js

@@ -204,6 +204,7 @@ const state = {
   hideComments: false,
   hideFeaturedChannels: false,
   channelsHidden: '[]',
+  forbiddenVideoTitleText: '[]',
   hideVideoDescription: false,
   hideLiveChat: false,
   hideLiveStreams: false,