chore: enhance videos selectors

AXeL-dev · Oct 15, 2022 · e823934 · e823934
1 parent 36c491d
commit e823934
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/store/selectors/settings.ts b/src/store/selectors/settings.ts
@@ -67,7 +67,9 @@ export const selectHasExtraVideoAction = (action: ExtraVideoAction) =>
   );
 
 export const selectVideosSeniority = (view: HomeView) =>
-  createSelector(
-    selectSettings,
-    (settings) => settings.viewOptions[view].videosSeniority,
-  );
+  createSelector(selectSettings, (settings) => {
+    if (settings.viewOptions[view].videosSeniority === undefined) {
+      return defaultSettings.viewOptions[view].videosSeniority;
+    }
+    return settings.viewOptions[view].videosSeniority;
+  });
diff --git a/src/store/selectors/videos.ts b/src/store/selectors/videos.ts
@@ -16,7 +16,7 @@ import {
   selectVideosSeniority,
   selectViewFilters,
 } from './settings';
-import { elapsedDays, getDateBefore } from 'helpers/utils';
+import { elapsedDays } from 'helpers/utils';
 
 export const selectVideos = (state: RootState) => state.videos.list;
 
@@ -120,7 +120,7 @@ export const selectWatchLaterVideos = (channel?: Channel) =>
             (!channel || channel.id === video.channelId) &&
             filterVideoByFlags(video, filters) &&
             (videosSeniority === VideosSeniority.Any ||
-              video.publishedAt >= getDateBefore(videosSeniority).getTime()),
+              elapsedDays(video.publishedAt) <= videosSeniority),
         )
         .sort((a, b) => b.publishedAt - a.publishedAt),
   );
@@ -138,7 +138,7 @@ export const selectBookmarkedVideos = (channel?: Channel) =>
             (!channel || channel.id === video.channelId) &&
             filterVideoByFlags(video, filters) &&
             (videosSeniority === VideosSeniority.Any ||
-              video.publishedAt >= getDateBefore(videosSeniority).getTime()),
+              elapsedDays(video.publishedAt) <= videosSeniority),
         )
         .sort((a, b) => b.publishedAt - a.publishedAt),
   );
@@ -156,7 +156,7 @@ export const selectBookmarkedVideosCount = createSelector(
         activeChannelsIds.includes(video.channelId) &&
         filterVideoByFlags(video, filters) &&
         (videosSeniority === VideosSeniority.Any ||
-          video.publishedAt >= getDateBefore(videosSeniority).getTime()),
+          elapsedDays(video.publishedAt) <= videosSeniority),
     ).length;
   },
 );
@@ -174,7 +174,7 @@ export const selectWatchLaterVideosCount = createSelector(
         activeChannelsIds.includes(video.channelId) &&
         filterVideoByFlags(video, filters) &&
         (videosSeniority === VideosSeniority.Any ||
-          video.publishedAt >= getDateBefore(videosSeniority).getTime()),
+          elapsedDays(video.publishedAt) <= videosSeniority),
     ).length;
   },
 );