+ {{ '[' + $t('Channel.Community.Video hidden by FreeTube') + ']' }} +
+
{ this.toggleCopyVideosPrompt(true) }) diff --git a/src/renderer/components/playlist-info/playlist-info.vue b/src/renderer/components/playlist-info/playlist-info.vue index b064a1837be5b..d5af7424e0b15 100644 --- a/src/renderer/components/playlist-info/playlist-info.vue +++ b/src/renderer/components/playlist-info/playlist-info.vue @@ -47,9 +47,9 @@ {{ title }}
- {{ videoCount }} {{ $t("Playlist.Videos") }}
-
- - {{ viewCount }} {{ $t("Playlist.Views") }}
+ {{ $tc('Global.Counts.Video Count', videoCount, {count: parsedVideoCount}) }}
+
+ - {{ $tc('Global.Counts.View Count', viewCount, {count: parsedViewCount}) }}
-
@@ -79,7 +79,7 @@
class="channelShareWrapper"
>
- {{ index + 1 }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ publishedString }} {{ dateString }}
-
-
- {{ parsedViewCount }}
+
+
+
+
+ {{ publishedString }} {{ dateString }} • {{ parsedViewCount }}
-
-
+
+
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 72095878449bf..9a7ec7acd98a0 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -457,7 +457,7 @@ function handleSearchResponse(response) {
const results = response.results
.filter((item) => {
- return item.type === 'Video' || item.type === 'Channel' || item.type === 'Playlist' || item.type === 'HashtagTile'
+ return item.type === 'Video' || item.type === 'Channel' || item.type === 'Playlist' || item.type === 'HashtagTile' || item.type === 'Movie'
})
.map((item) => parseListItem(item))
@@ -537,22 +537,41 @@ export function parseLocalPlaylistVideo(video) {
}
/**
- * @param {import('youtubei.js').YTNodes.Video} video
+ * @param {import('youtubei.js').YTNodes.Video | import('youtubei.js').YTNodes.Movie} item
*/
-export function parseLocalListVideo(video) {
- return {
- type: 'video',
- videoId: video.id,
- title: video.title.text,
- author: video.author.name,
- authorId: video.author.id,
- description: video.description,
- viewCount: extractNumberFromString(video.view_count.text),
- publishedText: video.published.isEmpty() ? null : video.published.text,
- lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds,
- liveNow: video.is_live,
- isUpcoming: video.is_upcoming || video.is_premiere,
- premiereDate: video.upcoming
+export function parseLocalListVideo(item) {
+ if (item.type === 'Movie') {
+ /** @type {import('youtubei.js').YTNodes.Movie} */
+ const movie = item
+
+ return {
+ type: 'video',
+ videoId: movie.id,
+ title: movie.title.text,
+ author: movie.author.name,
+ authorId: movie.author.id !== 'N/A' ? movie.author.id : null,
+ description: movie.description_snippet?.text,
+ lengthSeconds: isNaN(movie.duration.seconds) ? '' : movie.duration.seconds,
+ liveNow: false,
+ isUpcoming: false,
+ }
+ } else {
+ /** @type {import('youtubei.js').YTNodes.Video} */
+ const video = item
+ return {
+ type: 'video',
+ videoId: video.id,
+ title: video.title.text,
+ author: video.author.name,
+ authorId: video.author.id,
+ description: video.description,
+ viewCount: video.view_count == null ? null : extractNumberFromString(video.view_count.text),
+ publishedText: (video.published == null || video.published.isEmpty()) ? null : video.published.text,
+ lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds,
+ liveNow: video.is_live,
+ isUpcoming: video.is_upcoming || video.is_premiere,
+ premiereDate: video.upcoming
+ }
}
}
@@ -561,6 +580,7 @@ export function parseLocalListVideo(video) {
*/
function parseListItem(item) {
switch (item.type) {
+ case 'Movie':
case 'Video':
return parseLocalListVideo(item)
case 'Channel': {
@@ -627,8 +647,8 @@ export function parseLocalWatchNextVideo(video) {
title: video.title.text,
author: video.author.name,
authorId: video.author.id,
- viewCount: extractNumberFromString(video.view_count.text),
- publishedText: video.published.isEmpty() ? null : video.published.text,
+ viewCount: video.view_count == null ? null : extractNumberFromString(video.view_count.text),
+ publishedText: (video.published == null || video.published.isEmpty()) ? null : video.published.text,
lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds,
liveNow: video.is_live,
isUpcoming: video.is_premiere
diff --git a/src/renderer/store/modules/playlists.js b/src/renderer/store/modules/playlists.js
index 704d6ebb58887..2d24234a8bd6b 100644
--- a/src/renderer/store/modules/playlists.js
+++ b/src/renderer/store/modules/playlists.js
@@ -63,10 +63,13 @@ const actions = {
payload.createdAt = Date.now()
payload.lastUpdatedAt = Date.now()
// Ensure all videos has required attributes
+
+ const currentTime = new Date().getTime()
+
if (Array.isArray(payload.videos)) {
payload.videos.forEach(videoData => {
if (videoData.timeAdded == null) {
- videoData.timeAdded = new Date().getTime()
+ videoData.timeAdded = currentTime
}
if (videoData.playlistItemId == null) {
videoData.playlistItemId = generateRandomUniqueId()
@@ -149,11 +152,14 @@ const actions = {
// Since this action will ensure uniqueness of `playlistItemId` of added video entries
try {
const { _id, videos } = payload
+
+ const currentTime = new Date().getTime()
+
const newVideoObjects = videos.map((video) => {
// Create a new object to prevent changing existing values outside
const videoData = Object.assign({}, video)
if (videoData.timeAdded == null) {
- videoData.timeAdded = new Date().getTime()
+ videoData.timeAdded = currentTime
}
videoData.playlistItemId = generateRandomUniqueId()
// For backward compatibility
@@ -188,6 +194,9 @@ const actions = {
dispatch('addPlaylist', playlist)
})
} else {
+ const dateNow = Date.now()
+ const currentTime = new Date().getTime()
+
payload.forEach((playlist) => {
let anythingUpdated = false
// Assign generated playlist ID in case DB data corrupted
@@ -205,19 +214,19 @@ const actions = {
// Assign current time as created time in case DB data corrupted
if (playlist.createdAt == null) {
// Time now in unix time, in ms
- playlist.createdAt = Date.now()
+ playlist.createdAt = dateNow
anythingUpdated = true
}
// Assign current time as last updated time in case DB data corrupted
if (playlist.lastUpdatedAt == null) {
// Time now in unix time, in ms
- playlist.lastUpdatedAt = Date.now()
+ playlist.lastUpdatedAt = dateNow
anythingUpdated = true
}
playlist.videos.forEach((v) => {
// Ensure all videos has `timeAdded` property
if (v.timeAdded == null) {
- v.timeAdded = new Date().getTime()
+ v.timeAdded = currentTime
anythingUpdated = true
}
@@ -257,8 +266,9 @@ const actions = {
return playlist.playlistName === 'Watch Later' || playlist._id === 'watchLater'
})
- const defaultFavoritesPlaylist = state.defaultPlaylists.find((e) => e._id === 'favorites')
if (favoritesPlaylist != null) {
+ const defaultFavoritesPlaylist = state.defaultPlaylists.find((e) => e._id === 'favorites')
+
// Update existing matching playlist only if it exists
if (favoritesPlaylist._id !== defaultFavoritesPlaylist._id || favoritesPlaylist.protected !== defaultFavoritesPlaylist.protected) {
const oldId = favoritesPlaylist._id
@@ -277,8 +287,9 @@ const actions = {
}
}
- const defaultWatchLaterPlaylist = state.defaultPlaylists.find((e) => e._id === 'watchLater')
if (watchLaterPlaylist != null) {
+ const defaultWatchLaterPlaylist = state.defaultPlaylists.find((e) => e._id === 'watchLater')
+
// Update existing matching playlist only if it exists
if (watchLaterPlaylist._id !== defaultWatchLaterPlaylist._id || watchLaterPlaylist.protected !== defaultWatchLaterPlaylist.protected) {
const oldId = watchLaterPlaylist._id
@@ -394,7 +405,7 @@ const mutations = {
addVideos(state, payload) {
const playlist = state.playlists.find(playlist => playlist._id === payload._id)
if (playlist) {
- playlist.videos = [].concat(playlist.videos).concat(payload.videos)
+ playlist.videos = [].concat(playlist.videos, payload.videos)
}
},
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index 7933dfcd17be0..27c37dffd1d0d 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -206,6 +206,7 @@ const state = {
hideComments: false,
hideFeaturedChannels: false,
channelsHidden: '[]',
+ forbiddenTitles: '[]',
hideVideoDescription: false,
hideLiveChat: false,
hideLiveStreams: false,
@@ -317,18 +318,20 @@ const stateWithSideEffects = {
let targetLocale = value
if (value === 'system') {
const systemLocaleName = (await getSystemLocale()).replace('-', '_') // ex: en_US
- const systemLocaleLang = systemLocaleName.split('_')[0] // ex: en
- const targetLocaleOptions = allLocales.filter((locale) => { // filter out other languages
+ const systemLocaleSplit = systemLocaleName.split('_') // ex: en
+ const targetLocaleOptions = allLocales.filter((locale) => {
+ // filter out other languages
const localeLang = locale.replace('-', '_').split('_')[0]
- return localeLang.includes(systemLocaleLang)
+ return localeLang.includes(systemLocaleSplit[0])
}).sort((a, b) => {
const aLocaleName = a.replace('-', '_')
const bLocaleName = b.replace('-', '_')
const aLocale = aLocaleName.split('_') // ex: [en, US]
const bLocale = bLocaleName.split('_')
- if (aLocale.includes(systemLocaleName)) { // country & language match, prefer a
+
+ if (aLocaleName === systemLocaleName) { // country & language match, prefer a
return -1
- } else if (bLocale.includes(systemLocaleName)) { // country & language match, prefer b
+ } else if (bLocaleName === systemLocaleName) { // country & language match, prefer b
return 1
} else if (aLocale.length === 1) { // no country code for a, prefer a
return -1
@@ -338,12 +341,11 @@ const stateWithSideEffects = {
return aLocaleName.localeCompare(bLocaleName)
}
})
+
if (targetLocaleOptions.length > 0) {
targetLocale = targetLocaleOptions[0]
- }
-
- // Go back to default value if locale is unavailable
- if (!targetLocale) {
+ } else {
+ // Go back to default value if locale is unavailable
targetLocale = defaultLocale
// Translating this string isn't necessary
// because the user will always see it in the default locale
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index 1ee49526bf987..428c92e69ac73 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -580,7 +580,9 @@ const actions = {
urlType: 'channel',
channelId,
subPath,
- url: url.toString()
+ // The original URL could be from Invidious.
+ // We need to make sure it starts with youtube.com, so that YouTube's resolve endpoint can recognise it
+ url: `https://www.youtube.com${url.pathname}`
}
}
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index 37171495b5d74..9b5171584c099 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -497,6 +497,7 @@ export default defineComponent({
const expectedId = this.id
try {
+ /** @type {import('youtubei.js').YT.Channel|undefined} */
let channel
if (!this.channelInstance) {
channel = await getLocalChannel(this.id)
@@ -653,19 +654,44 @@ export default defineComponent({
this.bannerUrl = null
}
- this.relatedChannels = channel.channels.map(({ author }) => {
- let thumbnailUrl = author.best_thumbnail.url
+ let relatedChannels = channel.channels.map(({ author }) => ({
+ name: author.name,
+ id: author.id,
+ thumbnailUrl: author.best_thumbnail.url
+ }))
- if (thumbnailUrl.startsWith('//')) {
- thumbnailUrl = `https:${thumbnailUrl}`
- }
+ if (channel.memo.has('GameDetails')) {
+ /** @type {import('youtubei.js').YTNodes.GameDetails[]} */
+ const games = channel.memo.get('GameDetails')
- return {
- name: author.name,
- id: author.id,
- thumbnailUrl
- }
- })
+ relatedChannels.push(...games.map(game => ({
+ id: game.endpoint.payload.browseId,
+ name: game.title.text,
+ thumbnailUrl: game.box_art[0].url
+ })))
+ }
+
+ if (relatedChannels.length > 0) {
+ /** @type {Set
+
+
+
+
+
+
-
+ :data="item"
+ :playlist-id="playlistId"
+ :playlist-type="infoSource"
+ :playlist-index="index"
+ :playlist-item-id="item.playlistItemId"
+ appearance="result"
+ :always-show-add-to-playlist-button="true"
+ :quick-bookmark-button-enabled="quickBookmarkButtonEnabled"
+ :can-move-video-up="index > 0"
+ :can-move-video-down="index < visiblePlaylistItems.length - 1"
+ :can-remove-from-playlist="true"
+ :video-index="index"
+ :initial-visible-state="index < 10"
+ @move-video-up="moveVideoUp(item.videoId, item.playlistItemId)"
+ @move-video-down="moveVideoDown(item.videoId, item.playlistItemId)"
+ @remove-from-playlist="removeVideoFromPlaylist(item.videoId, item.playlistItemId)"
+ />