fix(favorite): fix wrong livestream tab filter

stephane-r · Oct 12, 2023 · a621b12 · a621b12
1 parent 7d29f97
commit a621b12
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/components/Card.tsx b/src/components/Card.tsx
@@ -28,7 +28,6 @@ import {
 } from "../providers/Player";
 import { useTranslation } from "react-i18next";
 import { CardImage } from "./CardImage";
-import { useColorScheme } from "@mantine/hooks";
 
 const useStyles = createStyles((theme) => ({
   card: {
@@ -75,6 +74,9 @@ interface CardProps {
   component?: "div" | "li";
 }
 
+export const isLiveStream = (video: Video) =>
+  video.type === "livestream" || video.liveNow || video.lengthSeconds === 0;
+
 export const Card: React.FC<CardProps> = memo(
   ({ video, component = "div" }) => {
     const { handlePlay, loading } = usePlayVideo();
@@ -85,8 +87,6 @@ export const Card: React.FC<CardProps> = memo(
       (thumbnail) => thumbnail.quality === "maxresdefault"
     ) as VideoThumbnail;
 
-    const videoDuration = displayTimeBySeconds(video.lengthSeconds);
-
     return (
       <MCard
         withBorder
@@ -108,12 +108,12 @@ export const Card: React.FC<CardProps> = memo(
               gap="xs"
               style={{ zIndex: 2, position: "relative" }}
             >
-              {videoDuration !== "00:00" ? (
+              {video.lengthSeconds > 0 ? (
                 <Badge variant="filled" size="xs">
-                  {videoDuration}
+                  {displayTimeBySeconds(video.lengthSeconds)}
                 </Badge>
               ) : null}
-              {video.liveNow || videoDuration === "00:00" ? (
+              {isLiveStream(video) ? (
                 <Badge variant="filled" size="xs" color="red">
                   {t("live")}
                 </Badge>

diff --git a/src/components/FavoritePlaylist.tsx b/src/components/FavoritePlaylist.tsx
@@ -10,6 +10,7 @@ import {
   IconUser,
   IconVideo,
 } from "@tabler/icons-react";
+import { isLiveStream } from "./Card";
 
 export const FavoritePlaylist = memo(() => {
   const favorite = useFavorite();
@@ -26,11 +27,11 @@ export const FavoritePlaylist = memo(() => {
   }
 
   const videos = data.filter(
-    (video) => video.type === "video" || video.type === "scheduled"
-  );
-  const livestream = data.filter(
-    (video) => video.type === "livestream" || video.liveNow
+    (video) =>
+      (video.type === "video" || video.type === "scheduled") &&
+      video.lengthSeconds > 0
   );
+  const livestream = data.filter((video) => isLiveStream(video));
   const playlists = data.filter((video) => video.type === "playlist");
   const channels = data.filter((video) => video.type === "channel");