+ {{ disabledMsg }}
+
-
- {{ tag }}
+
+ + {{ (tag.preferredName) ? tag.preferredName : tag.name }}+
{ + // Legacy support + if (typeof ch === 'string') { + return { name: ch, preferredName: '', icon: '' } + } + return ch + }) }, hideUpcomingPremieres: function () { return this.$store.getters.getHideUpcomingPremieres @@ -87,7 +93,7 @@ export default defineComponent({ // hide upcoming return false } - if (this.channelsHidden.includes(data.authorId) || this.channelsHidden.includes(data.author)) { + if (this.channelsHidden.some(ch => ch.name === data.authorId) || this.channelsHidden.some(ch => ch.name === data.author)) { // hide videos by author return false } @@ -101,7 +107,7 @@ export default defineComponent({ data.author, data.authorId, ] - if (attrsToCheck.some(a => a != null && this.channelsHidden.includes(a))) { + if (attrsToCheck.some(a => a != null && this.channelsHidden.some(ch => ch.name === a))) { // hide channels by author return false } @@ -115,7 +121,7 @@ export default defineComponent({ data.author, data.authorId, ] - if (attrsToCheck.some(a => a != null && this.channelsHidden.includes(a))) { + if (attrsToCheck.some(a => a != null && this.channelsHidden.some(ch => ch.name === a))) { // hide playlists by author return false } diff --git a/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js b/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js index c255110b4b3a8..3a4f3b6780054 100644 --- a/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js +++ b/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js @@ -58,12 +58,18 @@ export default defineComponent({ // Some component users like channel view will have this disabled if (!this.useChannelsHiddenPreference) { return [] } - return JSON.parse(this.$store.getters.getChannelsHidden) + return JSON.parse(this.$store.getters.getChannelsHidden).map((ch) => { + // Legacy support + if (typeof ch === 'string') { + return { name: ch, preferredName: '', icon: '' } + } + return ch + }) }, shouldBeVisible() { - return !(this.channelsHidden.includes(this.data.authorId) || - this.channelsHidden.includes(this.data.author)) + return !(this.channelsHidden.some(ch => ch.name === this.data.authorId) || + this.channelsHidden.some(ch => ch.name === this.data.author)) } }, created() { diff --git a/src/renderer/helpers/channels.js b/src/renderer/helpers/channels.js new file mode 100644 index 0000000000000..0d3fbb7867aea --- /dev/null +++ b/src/renderer/helpers/channels.js @@ -0,0 +1,72 @@ +import { invidiousGetChannelInfo } from './api/invidious' +import { getLocalChannel } from './api/local' + +/** + * @param {string} id + * @param {{ +* preference: string, +* fallback: boolean, +* invalid: boolean, +* }} backendOptions +*/ +async function findChannelById(id, backendOptions) { + try { + if (backendOptions.preference === 'invidious') { + return await invidiousGetChannelInfo(id) + } else { + return await getLocalChannel(id) + } + } catch (err) { + // don't bother with fallback if channel doesn't exist + if (err.message && err.message === 'This channel does not exist.') { + return { invalid: true } + } + if (backendOptions.fallback && backendOptions.preference === 'invidious') { + return await getLocalChannel(id) + } + if (backendOptions.fallback && backendOptions.preference === 'local') { + return await invidiousGetChannelInfo(id) + } + } +} + +/** + * @param {string} id + * @param {{ +* preference: string, +* fallback: boolean, +* }} backendOptions +* @returns {Promise<{icon: string, iconHref: string, preferredName: string, invalidId: boolean}>} +*/ +export async function findChannelTagInfo(id, backendOptions) { + if (!/UC\S{22}/.test(id)) return { invalidId: true } + try { + const channel = await findChannelById(id, backendOptions) + if (backendOptions.preference === 'invidious') { + if (channel.invalid) return { invalidId: true } + return { + preferredName: channel.author, + icon: channel.authorThumbnails[0].url + } + } else { + if (channel.alert) return { invalidId: true } + return { + preferredName: channel.header.author.name, + icon: channel.header.author.thumbnails.pop().url, + iconHref: `/channel/${id}` + } + } + } catch (err) { + console.error(err) + return { preferredName: '', icon: '', iconHref: '', err } + } +} + +/** + * Check whether Id provided might be a YouTube Id + * @param {string} id + * @returns {boolean} + */ +export function checkYoutubeId(id) { + return /UC\S{22}/.test(id) +} diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml index b1b6a720a6e2f..048b6ca209e40 100644 --- a/static/locales/en-US.yaml +++ b/static/locales/en-US.yaml @@ -364,7 +364,11 @@ Settings: Hide Sharing Actions: Hide Sharing Actions Hide Chapters: Hide Chapters Hide Channels: Hide Videos From Channels - Hide Channels Placeholder: Channel Name or ID + Hide Channels Disabled Message: Some channels were blocked using ID and weren't processed. Feature is blocked while those IDs are updating + Hide Channels Placeholder: Channel ID + Hide Channels Invalid: Channel ID provided was invalid + Hide Channels API Error: Error retrieving user with the ID provided. Please check again if the ID is correct. + Hide Channels Already Exists: Channel ID already exists Hide Featured Channels: Hide Featured Channels Hide Channel Playlists: Hide Channel Playlists Hide Channel Community: Hide Channel Community @@ -865,8 +869,8 @@ Tooltips: you want to be passed to the external player. DefaultCustomArgumentsTemplate: "(Default: '{defaultCustomArguments}')" Distraction Free Settings: - Hide Channels: Enter a channel name or channel ID to hide all videos, playlists and the channel itself from appearing in search, trending, most popular and recommended. - The channel name entered must be a complete match and is case sensitive. + Hide Channels: Enter a channel ID to hide all videos, playlists and the channel itself from appearing in search, trending, most popular and recommended. + The channel ID entered must be a complete match and is case sensitive. Hide Subscriptions Live: 'This setting is overridden by the app-wide "{appWideSetting}" setting, in the "{subsection}" section of the "{settingsSection}"' Subscription Settings: Fetch Feeds from RSS: When enabled, FreeTube will use RSS instead of its default