open-source-mirrors
/
overseerr
mirror of https://github.com/sct/overseerr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(promise): fixed a few API endpoints where I forgot to change the maps to await them

Browse Source 
I changed mapMovieResult and other equivalents to return Promises and forgot to fix some API
endpoints. So that's fixed now.
pull/3800/head
Anatole Sot 1 month ago
parent d750d736fa
commit fe7adb8d1e
3 changed files with 142 additions and 107 deletions
Show Stats Download Patch File Download Diff File

195
server/routes/discover.ts
Unescape View File

@ -127,12 +127,14 @@ discoverRoutes.get('/movies', async (req, res, next) => {
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
keywords: keywordData, keywords: keywordData,
results: data.results.map((result) => results: await Promise.all(
mapMovieResult( data.results.map((result) =>
result, mapMovieResult(
media.find( result,
(req) => media.find(
req.tmdbId === result.id && req.mediaType === MediaType.MOVIE (req) =>
req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
)
) )
) )
), ),
@ -180,12 +182,14 @@ discoverRoutes.get<{ language: string }>(
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
language, language,
results: data.results.map((result) => results: await Promise.all(
mapMovieResult( data.results.map((result) =>
result, mapMovieResult(
media.find( result,
(req) => media.find(
req.tmdbId === result.id && req.mediaType === MediaType.MOVIE (req) =>
req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
)
) )
) )
), ),
@ -237,12 +241,14 @@ discoverRoutes.get<{ genreId: string }>(
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
genre, genre,
results: data.results.map((result) => results: await Promise.all(
mapMovieResult( data.results.map((result) =>
result, mapMovieResult(
media.find( result,
(req) => media.find(
req.tmdbId === result.id && req.mediaType === MediaType.MOVIE (req) =>
req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
)
) )
) )
), ),
@ -284,12 +290,14 @@ discoverRoutes.get<{ studioId: string }>(
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
studio: mapProductionCompany(studio), studio: mapProductionCompany(studio),
results: data.results.map((result) => results: await Promise.all(
mapMovieResult( data.results.map((result) =>
result, mapMovieResult(
media.find( result,
(med) => media.find(
med.tmdbId === result.id && med.mediaType === MediaType.MOVIE (med) =>
med.tmdbId === result.id && med.mediaType === MediaType.MOVIE
)
) )
) )
), ),
@ -332,12 +340,14 @@ discoverRoutes.get('/movies/upcoming', async (req, res, next) => {
page: data.page, page: data.page,
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
results: data.results.map((result) => results: await Promise.all(
mapMovieResult( data.results.map((result) =>
result, mapMovieResult(
media.find( result,
(med) => media.find(
med.tmdbId === result.id && med.mediaType === MediaType.MOVIE (med) =>
med.tmdbId === result.id && med.mediaType === MediaType.MOVIE
)
) )
) )
), ),
@ -404,11 +414,14 @@ discoverRoutes.get('/tv', async (req, res, next) => {
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
keywords: keywordData, keywords: keywordData,
results: data.results.map((result) => results: await Promise.all(
mapTvResult( data.results.map((result) =>
result, mapTvResult(
media.find( result,
(med) => med.tmdbId === result.id && med.mediaType === MediaType.TV media.find(
(med) =>
med.tmdbId === result.id && med.mediaType === MediaType.TV
)
) )
) )
), ),
@ -456,12 +469,14 @@ discoverRoutes.get<{ language: string }>(
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
language, language,
results: data.results.map((result) => results: await Promise.all(
mapTvResult( data.results.map((result) =>
result, mapTvResult(
media.find( result,
(med) => media.find(
med.tmdbId === result.id && med.mediaType === MediaType.TV (med) =>
med.tmdbId === result.id && med.mediaType === MediaType.TV
)
) )
) )
), ),
@ -513,12 +528,14 @@ discoverRoutes.get<{ genreId: string }>(
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
genre, genre,
results: data.results.map((result) => results: await Promise.all(
mapTvResult( data.results.map((result) =>
result, mapTvResult(
media.find( result,
(med) => media.find(
med.tmdbId === result.id && med.mediaType === MediaType.TV (med) =>
med.tmdbId === result.id && med.mediaType === MediaType.TV
)
) )
) )
), ),
@ -560,12 +577,14 @@ discoverRoutes.get<{ networkId: string }>(
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
network: mapNetwork(network), network: mapNetwork(network),
results: data.results.map((result) => results: await Promise.all(
mapTvResult( data.results.map((result) =>
result, mapTvResult(
media.find( result,
(med) => media.find(
med.tmdbId === result.id && med.mediaType === MediaType.TV (med) =>
med.tmdbId === result.id && med.mediaType === MediaType.TV
)
) )
) )
), ),
@ -608,11 +627,14 @@ discoverRoutes.get('/tv/upcoming', async (req, res, next) => {
page: data.page, page: data.page,
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
results: data.results.map((result) => results: await Promise.all(
mapTvResult( data.results.map((result) =>
result, mapTvResult(
media.find( result,
(med) => med.tmdbId === result.id && med.mediaType === MediaType.TV media.find(
(med) =>
med.tmdbId === result.id && med.mediaType === MediaType.TV
)
) )
) )
), ),
@ -637,35 +659,36 @@ discoverRoutes.get('/trending', async (req, res, next) => {
page: Number(req.query.page), page: Number(req.query.page),
language: (req.query.language as string) ?? req.locale, language: (req.query.language as string) ?? req.locale,
}); });
const media = await Media.getRelatedMedia( const media = await Media.getRelatedMedia(
data.results.map((result) => result.id) data.results.map((result) => result.id)
); );
return res.status(200).json({ return res.status(200).json({
page: data.page, page: data.page,
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
results: data.results.map((result) => results: await Promise.all(
isMovie(result) data.results.map((result) => {
? mapMovieResult( return isMovie(result)
result, ? mapMovieResult(
media.find( result,
(med) => media.find(
med.tmdbId === result.id && med.mediaType === MediaType.MOVIE (med) =>
) med.tmdbId === result.id &&
) med.mediaType === MediaType.MOVIE
: isPerson(result) )
? mapPersonResult(result)
: isCollection(result)
? mapCollectionResult(result)
: mapTvResult(
result,
media.find(
(med) =>
med.tmdbId === result.id && med.mediaType === MediaType.TV
) )
) : isPerson(result)
? mapPersonResult(result)
: isCollection(result)
? mapCollectionResult(result)
: mapTvResult(
result,
media.find(
(med) =>
med.tmdbId === result.id && med.mediaType === MediaType.TV
)
);
})
), ),
}); });
} catch (e) { } catch (e) {
@ -700,12 +723,14 @@ discoverRoutes.get<{ keywordId: string }>(
page: data.page, page: data.page,
totalPages: data.total_pages, totalPages: data.total_pages,
totalResults: data.total_results, totalResults: data.total_results,
results: data.results.map((result) => results: await Promise.all(
mapMovieResult( data.results.map((result) =>
result, mapMovieResult(
media.find( result,
(med) => media.find(
med.tmdbId === result.id && med.mediaType === MediaType.MOVIE (med) =>
med.tmdbId === result.id && med.mediaType === MediaType.MOVIE
)
) )
) )
), ),

28
server/routes/movie.ts
Unescape View File

@ -54,12 +54,14 @@ movieRoutes.get('/:id/recommendations', async (req, res, next) => {
page: results.page, page: results.page,
totalPages: results.total_pages, totalPages: results.total_pages,
totalResults: results.total_results, totalResults: results.total_results,
results: results.results.map((result) => results: await Promise.all(
mapMovieResult( results.results.map((result) =>
result, mapMovieResult(
media.find( result,
(req) => media.find(
req.tmdbId === result.id && req.mediaType === MediaType.MOVIE (req) =>
req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
)
) )
) )
), ),
@ -95,12 +97,14 @@ movieRoutes.get('/:id/similar', async (req, res, next) => {
page: results.page, page: results.page,
totalPages: results.total_pages, totalPages: results.total_pages,
totalResults: results.total_results, totalResults: results.total_results,
results: results.results.map((result) => results: await Promise.all(
mapMovieResult( results.results.map((result) =>
result, mapMovieResult(
media.find( result,
(req) => media.find(
req.tmdbId === result.id && req.mediaType === MediaType.MOVIE (req) =>
req.tmdbId === result.id && req.mediaType === MediaType.MOVIE
)
) )
) )
), ),

26
server/routes/tv.ts
Unescape View File

@ -76,11 +76,14 @@ tvRoutes.get('/:id/recommendations', async (req, res, next) => {
page: results.page, page: results.page,
totalPages: results.total_pages, totalPages: results.total_pages,
totalResults: results.total_results, totalResults: results.total_results,
results: results.results.map((result) => results: await Promise.all(
mapTvResult( results.results.map((result) =>
result, mapTvResult(
media.find( result,
(req) => req.tmdbId === result.id && req.mediaType === MediaType.TV media.find(
(req) =>
req.tmdbId === result.id && req.mediaType === MediaType.TV
)
) )
) )
), ),
@ -116,11 +119,14 @@ tvRoutes.get('/:id/similar', async (req, res, next) => {
page: results.page, page: results.page,
totalPages: results.total_pages, totalPages: results.total_pages,
totalResults: results.total_results, totalResults: results.total_results,
results: results.results.map((result) => results: await Promise.all(
mapTvResult( results.results.map((result) =>
result, mapTvResult(
media.find( result,
(req) => req.tmdbId === result.id && req.mediaType === MediaType.TV media.find(
(req) =>
req.tmdbId === result.id && req.mediaType === MediaType.TV
)
) )
) )
), ),

Write Preview
Loading…
Cancel
Save