Skip to content

Fix cross channel videos link sometimes broken #8276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PikachuEXE wants to merge 4 commits into
base: development
Choose a base branch
from
+31 −2
Open

Fix cross channel videos link sometimes broken #8276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a16205d
! Fix cross channel videos link sometimes broken (Local API
PikachuEXE Nov 13, 2025
9af908f
! Fix cross channel videos link sometimes broken (IV API
PikachuEXE Nov 13, 2025
9c0be5d
Merge branch 'development' into fix/local-cross-channel-author-link
PikachuEXE Nov 18, 2025
051a095
Merge branch 'development' into fix/local-cross-channel-author-link
PikachuEXE Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions src/renderer/helpers/api/invidious.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ export async function getInvidiousChannelVideos(channelId, sortBy, continuation)
/** @type {{continuation: string?, videos: InvidiousVideoType[]}} */
const response = await getInvidiousChannelTab('videos', channelId, continuation, sortBy)

normalizeManyInvidiousVideosAttributes(response.videos, channelId)
setMultiplePublishedTimestamps(response.videos)

return response
Expand Down Expand Up @@ -215,6 +216,7 @@ export async function getInvidiousChannelLive(channelId, sortBy, continuation) {
/** @type {{continuation: string?, videos: InvidiousVideoType[]}} */
const response = await getInvidiousChannelTab('streams', channelId, continuation, sortBy)

normalizeManyInvidiousVideosAttributes(response.videos, channelId)
setMultiplePublishedTimestamps(response.videos)

return response
Expand Down Expand Up @@ -276,6 +278,7 @@ export async function searchInvidiousChannel(channelId, query, page) {

response.forEach((item) => {
if (item.type === 'video') {
normalizeOneInvidiousVideoAttributes(item, channelId)
setPublishedTimestamp(item)
}
})
Expand Down Expand Up @@ -314,6 +317,7 @@ export async function invidiousGetPlaylistInfo(playlistId) {
id: playlistId,
})

normalizeManyInvidiousVideosAttributes(playlist.videos)
setMultiplePublishedTimestamps(playlist.videos)

return playlist
Expand Down Expand Up @@ -522,6 +526,7 @@ export async function getInvidiousPopularFeed() {

items.forEach((item) => {
if (item.type === 'video' || item.type === 'shortVideo') {
normalizeOneInvidiousVideoAttributes(item)
setPublishedTimestamp(item)
}
})
Expand Down Expand Up @@ -560,6 +565,7 @@ export async function getInvidiousSearchResults(query, page, searchSettings) {

results.forEach((item) => {
if (item.type === 'video') {
normalizeOneInvidiousVideoAttributes(item)
setPublishedTimestamp(item)
}
})
Expand Down Expand Up @@ -825,6 +831,7 @@ export async function getHashtagInvidious(hashtag, page = 1) {
}
})

normalizeManyInvidiousVideosAttributes(response.results)
setMultiplePublishedTimestamps(response.results)

return response.results
Expand Down Expand Up @@ -942,6 +949,28 @@ export function mapInvidiousLegacyFormat(format) {
}
}

/**
* @param {{
* authorId: string | null,
* }[]} videos
* @param {string|null} [fallbackAuthorId]
*/
function normalizeManyInvidiousVideosAttributes(videos, fallbackAuthorId = null) {
const actualFallbackAuthorId = fallbackAuthorId === '' ? null : fallbackAuthorId

videos.forEach((v) => normalizeOneInvidiousVideoAttributes(v, actualFallbackAuthorId))
}

/**
* @param {{
* authorId: string | null,
* }} video
* @param {string|null} [fallbackAuthorId]
*/
function normalizeOneInvidiousVideoAttributes(video, fallbackAuthorId = null) {
if (video.authorId === '') video.authorId = fallbackAuthorId
}

/**
* @param {{
* liveNow: boolean,
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/helpers/api/local.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ export function parseLocalPlaylistVideo(video) {
videoId: video_.id,
title: video_.title.text,
author: video_.author.name,
authorId: video_.author.id,
authorId: video_.author?.id !== 'N/A' ? video_.author?.id : null,
viewCount,
published,
lengthSeconds: isNaN(video_.duration.seconds) ? '' : video_.duration.seconds,
Expand Down Expand Up @@ -1387,7 +1387,7 @@ export function parseLocalListVideo(item, channelId, channelName) {
videoId: video.video_id,
title: video.title.text,
author: video.author?.name ?? channelName,
authorId: video.author?.id ?? channelId,
authorId: (video.author?.id != null && video.author?.id !== 'N/A') ? video.author?.id : channelId,
viewCount: video.views.text == null ? null : extractNumberFromString(video.views.text),
published,
lengthSeconds: isLive ? '' : Utils.timeToSeconds(video.duration.text),
Expand Down