refactor(videodetail): fix episode urls

jwplayer · Jun 17, 2021 · 453cfb4 · 453cfb4
1 parent cd5fe77
commit 453cfb4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/screens/Series/Series.tsx b/src/screens/Series/Series.tsx
@@ -8,7 +8,7 @@ import CardGrid from '../../components/CardGrid/CardGrid';
 import { useFavorites } from '../../stores/FavoritesStore';
 import { ConfigContext } from '../../providers/ConfigProvider';
 import useBlurImageUpdater from '../../hooks/useBlurImageUpdater';
-import { cardUrl, episodeURL, videoUrl } from '../../utils/formatting';
+import { episodeURL } from '../../utils/formatting';
 import type { PlaylistItem } from '../../../types/playlist';
 import VideoComponent from '../../components/Video/Video';
 import PlaylistContainer from '../../containers/Playlist/PlaylistContainer';
@@ -51,10 +51,10 @@ const Series = ({
 
   const isFavorited = !!item && hasItem(item);
 
-  const startPlay = () => item && history.push(videoUrl(item, searchParams.get('r'), true));
-  const goBack = () => item && history.push(videoUrl(item, searchParams.get('r'), false));
+  const startPlay = () => item && seriesPlaylist && history.push(episodeURL(seriesPlaylist, item.mediaid, true));
+  const goBack = () => item && seriesPlaylist && history.push(episodeURL(seriesPlaylist, item.mediaid, false));
 
-  const onCardClick = (item: PlaylistItem) => history.push(cardUrl(item));
+  const onCardClick = (item: PlaylistItem) => seriesPlaylist && history.push(episodeURL(seriesPlaylist, item.mediaid));
 
   const onShareClick = (): void => {
     if (!item) return;

diff --git a/src/utils/formatting.ts b/src/utils/formatting.ts
@@ -47,8 +47,10 @@ const movieURL = (item: PlaylistItem, playlistId?: string | null) =>
 const seriesURL = (item: PlaylistItem, playlistId?: string | null) =>
   `/s/${item.seriesId}/${slugify(item.title)}?r=${playlistId}`;
 
-const episodeURL = (seriesPlaylist: Playlist, episodeId?: string) =>
-  `/s/${seriesPlaylist.feedid}/${slugify(seriesPlaylist.title)}${episodeId ? `?e=${episodeId}` : ''}`;
+const episodeURL = (seriesPlaylist: Playlist, episodeId?: string, play: boolean = false) =>
+  `/s/${seriesPlaylist.feedid}/${slugify(seriesPlaylist.title)}${episodeId ? `?e=${episodeId}` : ''}${
+    play ? '&play=1' : ''
+  }`;
 
 const cardUrl = (item: PlaylistItem, playlistId?: string | null) =>
   item.seriesId ? seriesURL(item, playlistId) : movieURL(item, playlistId);