From 4876ead6a370c2d345272559b9528228b85c8487 Mon Sep 17 00:00:00 2001
From: Bnyro <yannick.fehler@web.de>
Date: Sat, 27 Aug 2022 16:44:01 +0200
Subject: [PATCH] block channels in trending too

---
 src/components/PreferencesPage.vue | 2 +-
 src/components/SearchResults.vue   | 4 ++--
 src/components/VideoItem.vue       | 5 ++++-
 src/locales/en.json                | 5 +++--
 src/main.js                        | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/PreferencesPage.vue b/src/components/PreferencesPage.vue
index 7942c229..808d8b5d 100644
--- a/src/components/PreferencesPage.vue
+++ b/src/components/PreferencesPage.vue
@@ -286,7 +286,7 @@
         </div>
         <br />
     </div>
-    <h2 class="text-center" v-t="'actions.blocked_channels'"></h2>
+    <h2 class="text-center" v-t="'titles.misc'"></h2>
     <label class="pref" for="blockedChannels">
         <strong v-t="'actions.blocked_channels'" />
         <input
diff --git a/src/components/SearchResults.vue b/src/components/SearchResults.vue
index 1ae0d0da..618d4cd7 100644
--- a/src/components/SearchResults.vue
+++ b/src/components/SearchResults.vue
@@ -143,9 +143,9 @@ export default {
         isBlocked(result) {
             if (!result.uploaderUrl) {
                 // item is a channel
-                return this.isChannelBlocked(result.url.replace("/channel/", ""));
+                return this.isChannelBlocked(result.url);
             }
-            return this.isChannelBlocked(result.uploaderUrl.replace("/channel/", ""));
+            return this.isChannelBlocked(result.uploaderUrl);
         },
     },
 };
diff --git a/src/components/VideoItem.vue b/src/components/VideoItem.vue
index d32706e2..da3ccfe8 100644
--- a/src/components/VideoItem.vue
+++ b/src/components/VideoItem.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-if="!isBlocked">
         <router-link
             :to="{
                 path: '/watch',
@@ -178,6 +178,9 @@ export default {
         short() {
             return this.video.duration > 0 && this.video.duration <= 61;
         },
+        isBlocked() {
+            return this.isChannelBlocked(this.video.uploaderUrl);
+        },
     },
     components: { PlaylistAddModal },
 };
diff --git a/src/locales/en.json b/src/locales/en.json
index 974bb550..8c65d6b4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -10,7 +10,8 @@
         "playlists": "Playlists",
         "account": "Account",
         "instance": "Instance",
-        "player": "Player"
+        "player": "Player",
+        "misc": "Miscellaneous"
     },
     "player": {
         "watch_on": "Watch on {0}"
@@ -98,7 +99,7 @@
         "backup_preferences": "Backup preferences",
         "restore_preferences": "Restore preferences",
         "back_to_home": "Back to home",
-        "blocked_channels": "Blocked channels"
+        "blocked_channels": "Blocked channels (IDs, seperated by ',')"
     },
     "comment": {
         "pinned_by": "Pinned by",
diff --git a/src/main.js b/src/main.js
index 1845e27d..2aa55a15 100644
--- a/src/main.js
+++ b/src/main.js
@@ -234,7 +234,7 @@ const mixin = {
         isChannelBlocked(channelId) {
             const blockedChannels = localStorage.getItem("blockedChannels");
             if (!blockedChannels) return false;
-            return blockedChannels.split(",").includes(channelId);
+            return blockedChannels.split(",").includes(channelId.replace("/channel/", ""));
         },
     },
     computed: {