From a41a455d8077973d4dc11c485ecfc45d07787074 Mon Sep 17 00:00:00 2001 From: ozrendev Date: Wed, 22 Oct 2025 21:05:20 +0200 Subject: [PATCH 1/4] video options conditional based on subscriptions page --- .../components/ft-list-video/ft-list-video.js | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js index 9f69a7b6c1f79..d4159eafc5113 100644 --- a/src/renderer/components/ft-list-video/ft-list-video.js +++ b/src/renderer/components/ft-list-video/ft-list-video.js @@ -327,22 +327,25 @@ export default defineComponent({ if (this.channelId !== null) { const hiddenChannels = JSON.parse(this.$store.getters.getChannelsHidden) const channelShouldBeHidden = hiddenChannels.some(c => c.name === this.channelId) + const isSubscriptionsPage = window.location.href.endsWith('subscriptions') - options.push( - { - type: 'divider' - }, + if (!isSubscriptionsPage) { + options.push( + { + type: 'divider' + }, - channelShouldBeHidden - ? { - label: this.$t('Video.Unhide Channel'), - value: 'unhideChannel' - } - : { - label: this.$t('Video.Hide Channel'), - value: 'hideChannel' - } - ) + channelShouldBeHidden + ? { + label: this.$t('Video.Unhide Channel'), + value: 'unhideChannel' + } + : { + label: this.$t('Video.Hide Channel'), + value: 'hideChannel' + } + ) + } } return options From 4a3267f6e46131cae6fcd48f924f831c9180287e Mon Sep 17 00:00:00 2001 From: ozrendev Date: Thu, 23 Oct 2025 09:38:07 +0200 Subject: [PATCH 2/4] proper page validation using routes --- src/renderer/components/ft-list-video/ft-list-video.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js index d4159eafc5113..ac7a392f7d06a 100644 --- a/src/renderer/components/ft-list-video/ft-list-video.js +++ b/src/renderer/components/ft-list-video/ft-list-video.js @@ -173,6 +173,10 @@ export default defineComponent({ return this.$route.name === 'history' }, + inSubscriptions: function () { + return this.$route.name === 'subscriptions' + }, + inUserPlaylist: function () { return this.playlistTypeFinal === 'user' || this.selectedUserPlaylist != null }, @@ -327,9 +331,8 @@ export default defineComponent({ if (this.channelId !== null) { const hiddenChannels = JSON.parse(this.$store.getters.getChannelsHidden) const channelShouldBeHidden = hiddenChannels.some(c => c.name === this.channelId) - const isSubscriptionsPage = window.location.href.endsWith('subscriptions') - if (!isSubscriptionsPage) { + if (!this.inSubscriptions) { options.push( { type: 'divider' From 2b91435891136a1ae3183116039990451bf9bb5b Mon Sep 17 00:00:00 2001 From: ozrendev Date: Thu, 23 Oct 2025 10:09:22 +0200 Subject: [PATCH 3/4] change if inSubscriptions position --- .../components/ft-list-video/ft-list-video.js | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js index ac7a392f7d06a..8724e06a6494b 100644 --- a/src/renderer/components/ft-list-video/ft-list-video.js +++ b/src/renderer/components/ft-list-video/ft-list-video.js @@ -328,27 +328,25 @@ export default defineComponent({ } } - if (this.channelId !== null) { + if (this.channelId !== null && !this.inSubscriptions) { const hiddenChannels = JSON.parse(this.$store.getters.getChannelsHidden) const channelShouldBeHidden = hiddenChannels.some(c => c.name === this.channelId) - if (!this.inSubscriptions) { - options.push( - { - type: 'divider' - }, + options.push( + { + type: 'divider' + }, - channelShouldBeHidden - ? { - label: this.$t('Video.Unhide Channel'), - value: 'unhideChannel' - } - : { - label: this.$t('Video.Hide Channel'), - value: 'hideChannel' - } - ) - } + channelShouldBeHidden + ? { + label: this.$t('Video.Unhide Channel'), + value: 'unhideChannel' + } + : { + label: this.$t('Video.Hide Channel'), + value: 'hideChannel' + } + ) } return options From 4f152e370897a1ca205e99b28606d689c7b8d307 Mon Sep 17 00:00:00 2001 From: ozrendev <60355164+ozrendev@users.noreply.github.com> Date: Sun, 26 Oct 2025 08:21:44 +0100 Subject: [PATCH 4/4] Update src/renderer/components/ft-list-video/ft-list-video.js Co-authored-by: absidue <48293849+absidue@users.noreply.github.com> --- src/renderer/components/ft-list-video/ft-list-video.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js index 8724e06a6494b..cb21a9e1c96ae 100644 --- a/src/renderer/components/ft-list-video/ft-list-video.js +++ b/src/renderer/components/ft-list-video/ft-list-video.js @@ -174,7 +174,7 @@ export default defineComponent({ }, inSubscriptions: function () { - return this.$route.name === 'subscriptions' + return this.$route.name === 'subscriptions' || this.$route.name === 'default' }, inUserPlaylist: function () {