chrisryn/requestarr
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(movie,tv): respect display language for trailers (#2674)

Browse Source
This commit is contained in:
0xsysr3ll
2026-03-16 18:29:40 +01:00
committed by GitHub
parent 36243a0deb
commit 90d407d410
1 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
server/api/themoviedb/index.ts
View File

@@ -289,12 +289,50 @@ class TheMovieDb extends ExternalAPI implements TvShowProvider {
language,
append_to_response:
'credits,external_ids,videos,keywords,release_dates,watch/providers',
include_video_language: language + ', en',
include_video_language: language,
},
},
43200
);
if (
(!language || !language.startsWith('en')) &&
!data.videos?.results?.some((video) => video.type === 'Trailer')
) {
try {
const fallback = await this.get<TmdbMovieDetails>(
`/movie/${movieId}`,
{
params: {
language,
append_to_response: 'videos',
include_video_language: 'en',
},
},
43200
);
const localizedVideos = data.videos?.results ?? [];
const localizedVideoKeys = new Set(
localizedVideos.map((video) => video.key)
);
const englishFallbackTrailers =
fallback.videos?.results?.filter(
(video) =>
video.type === 'Trailer' && !localizedVideoKeys.has(video.key)
) ?? [];
if (englishFallbackTrailers.length > 0) {
data.videos = {
...(data.videos ?? { results: [] }),
results: [...localizedVideos, ...englishFallbackTrailers],
};
}
} catch {
// Ignore trailer fallback failures; return the original data.
}
}
return data;
} catch (e) {
throw new Error(`[TMDB] Failed to fetch movie details: ${e.message}`, {
@@ -318,12 +356,50 @@ class TheMovieDb extends ExternalAPI implements TvShowProvider {
language,
append_to_response:
'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
include_video_language: language + ', en',
include_video_language: language,
},
},
43200
);
if (
(!language || !language.startsWith('en')) &&
!data.videos?.results?.some((video) => video.type === 'Trailer')
) {
try {
const fallback = await this.get<TmdbTvDetails>(
`/tv/${tvId}`,
{
params: {
language,
append_to_response: 'videos',
include_video_language: 'en',
},
},
43200
);
const localizedVideos = data.videos?.results ?? [];
const localizedVideoKeys = new Set(
localizedVideos.map((video) => video.key)
);
const englishFallbackTrailers =
fallback.videos?.results?.filter(
(video) =>
video.type === 'Trailer' && !localizedVideoKeys.has(video.key)
) ?? [];
if (englishFallbackTrailers.length > 0) {
data.videos = {
...(data.videos ?? { results: [] }),
results: [...localizedVideos, ...englishFallbackTrailers],
};
}
} catch {
// Ignore trailer fallback failures; return the original data.
}
}
return data;
} catch (e) {
throw new Error(`[TMDB] Failed to fetch TV show details: ${e.message}`, {