Skip to content

Refactor CATEGORY_FETCHERS to use Map and improve readability #62

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

Merged
TheSawkit merged 2 commits into from
Jun 9, 2026
Merged

Refactor CATEGORY_FETCHERS to use Map and improve readability #62

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
718e696
Refactor : Change CATEGORY_FETCHERS to use Map for improved access an…
TheSawkit Jun 9, 2026
f2a9155
Refactor : Format CATEGORY_FETCHERS for improved readability and main…
TheSawkit Jun 9, 2026
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
83 changes: 54 additions & 29 deletions app/actions/media.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,28 +47,58 @@ export async function mergeMediaWithWatchlist(

type CategoryFetcher = (page: number) => Promise<MediaItem[]>;

const CATEGORY_FETCHERS: Record<string, CategoryFetcher> = {
popular: (page) =>
getPopularMovies(page).then((r) => r.map(movieToMediaItem)),
'top-rated': (page) =>
getTopRatedMovies(page).then((r) => r.map(movieToMediaItem)),
upcoming: (page) =>
getUpcomingMovies(page).then((r) => r.map(movieToMediaItem)),
'now-playing': (page) =>
getNowPlayingMovies(page).then((r) => r.map(movieToMediaItem)),
trending: (page) =>
getTrendingMovies('week', page).then((r) => r.map(movieToMediaItem)),
'tv-popular': (page) =>
getPopularTvShows(page).then((r) => r.map(tvShowToMediaItem)),
'tv-top-rated': (page) =>
getTopRatedTvShows(page).then((r) => r.map(tvShowToMediaItem)),
'tv-trending': (page) =>
getTrendingTvShows('week', page).then((r) => r.map(tvShowToMediaItem)),
'tv-airing-today': (page) =>
getAiringTodayTvShows(page).then((r) => r.map(tvShowToMediaItem)),
'tv-on-the-air': (page) =>
getOnTheAirTvShows(page).then((r) => r.map(tvShowToMediaItem)),
};
const CATEGORY_FETCHERS: Map<string, CategoryFetcher> = new Map([
[
'popular',
(page) => getPopularMovies(page).then((r) => r.map(movieToMediaItem)),
],
[
'top-rated',
(page) => getTopRatedMovies(page).then((r) => r.map(movieToMediaItem)),
],
[
'upcoming',
(page) => getUpcomingMovies(page).then((r) => r.map(movieToMediaItem)),
],
[
'now-playing',
(page) =>
getNowPlayingMovies(page).then((r) => r.map(movieToMediaItem)),
],
[
'trending',
(page) =>
getTrendingMovies('week', page).then((r) =>
r.map(movieToMediaItem)
),
],
[
'tv-popular',
(page) => getPopularTvShows(page).then((r) => r.map(tvShowToMediaItem)),
],
[
'tv-top-rated',
(page) =>
getTopRatedTvShows(page).then((r) => r.map(tvShowToMediaItem)),
],
[
'tv-trending',
(page) =>
getTrendingTvShows('week', page).then((r) =>
r.map(tvShowToMediaItem)
),
],
[
'tv-airing-today',
(page) =>
getAiringTodayTvShows(page).then((r) => r.map(tvShowToMediaItem)),
],
[
'tv-on-the-air',
(page) =>
getOnTheAirTvShows(page).then((r) => r.map(tvShowToMediaItem)),
],
]);

/**
* Fetches a paginated list of media items for a given category and merges watchlist data.
Expand All @@ -81,13 +111,8 @@ export async function fetchMoreMedia(
category: string,
page: number
): Promise<MediaItem[]> {
if (!Object.prototype.hasOwnProperty.call(CATEGORY_FETCHERS, category)) {
return [];
}

const fetcher = CATEGORY_FETCHERS[category];
if (typeof fetcher !== 'function') return [];

if (!CATEGORY_FETCHERS.has(category)) return [];
const fetcher = CATEGORY_FETCHERS.get(category)!;
const items = await fetcher(page);
return mergeMediaWithWatchlist(items);
}
Expand Down