refactor: rename viewed flag to seen

AXeL-dev · Aug 31, 2022 · d081523 · d081523
1 parent 182b811
commit d081523
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 66 deletions.
diff --git a/src/store/reducers/settings.ts b/src/store/reducers/settings.ts
@@ -16,13 +16,13 @@ export const defaultSettings = {
   autoPlayVideos: true,
   recentVideosSeniority: VideosSeniority.OneDay,
   recentViewFilters: {
-    viewed: true,
+    seen: true,
     watchLater: true,
     ignored: false,
     others: true,
   },
   watchLaterViewFilters: {
-    viewed: true,
+    seen: true,
     archived: true,
     others: true,
   },

diff --git a/src/store/reducers/videos.ts b/src/store/reducers/videos.ts
@@ -98,16 +98,16 @@ export const videosSlice = createSlice({
     },
     clearWatchLaterList: (
       state,
-      action: PayloadAction<{ viewedOnly: boolean } | undefined>,
+      action: PayloadAction<{ seenOnly: boolean } | undefined>,
     ) => {
-      const { viewedOnly } = action.payload || {};
+      const { seenOnly } = action.payload || {};
       state.list = state.list.map((video) =>
         video.flags.toWatchLater
           ? {
               ...video,
               flags: {
                 ...video.flags,
-                toWatchLater: viewedOnly ? !video.flags.viewed : false,
+                toWatchLater: seenOnly ? !video.flags.seen : false,
               },
             }
           : video,

diff --git a/src/store/selectors/videos.ts b/src/store/selectors/videos.ts
@@ -50,11 +50,11 @@ export const selectRecentOnlyVideos = (channel?: Channel) =>
     ),
   );
 
-export const selectViewedVideos = (channel?: Channel) =>
+export const selectSeenVideos = (channel?: Channel) =>
   createSelector(selectVideos, (videos) =>
     videos.filter(
       ({ flags, channelId }) =>
-        flags.viewed && (!channel || channel.id === channelId),
+        flags.seen && (!channel || channel.id === channelId),
     ),
   );
 
@@ -126,15 +126,15 @@ export const selectWatchLaterVideosCount = createSelector(
   },
 );
 
-export const selectViewedWatchLaterVideosCount = createSelector(
+export const selectSeenWatchLaterVideosCount = createSelector(
   selectVideos,
   selectActiveChannels,
   (videos, activeChannels) => {
     const activeChannelsIds = activeChannels.map(({ id }) => id);
     return videos.filter(
       ({ flags, channelId }) =>
         flags.toWatchLater &&
-        flags.viewed &&
+        flags.seen &&
         activeChannelsIds.includes(channelId),
     ).length;
   },
@@ -144,7 +144,7 @@ export const selectVideoMeta = (video: Video) =>
   createSelector(selectVideos, (videos) => {
     const { flags } = videos.find(({ id }) => id === video.id) || {};
     return {
-      isViewed: flags?.viewed || false,
+      isSeen: flags?.seen || false,
       isToWatchLater: flags?.toWatchLater || false,
       isArchived: flags?.archived || false,
       isIgnored: flags?.ignored || false,

diff --git a/src/store/utils/preload.ts b/src/store/utils/preload.ts
@@ -36,7 +36,7 @@ const removeOutdatedVideos = (videos: VideoCache[], settings: Settings) => {
   log('Removing outdated videos.');
   return videos.filter(
     ({ flags, publishedAt }) =>
-      flags.viewed ||
+      flags.seen ||
       flags.toWatchLater ||
       ((flags.recent || flags.ignored) &&
         elapsedDays(publishedAt) <= settings.recentVideosSeniority) ||

diff --git a/src/types/Settings.ts b/src/types/Settings.ts
@@ -18,14 +18,14 @@ export interface HomeDisplayOptions {
 }
 
 export interface RecentViewFilters {
-  viewed: boolean;
+  seen: boolean;
   watchLater: boolean;
   ignored: boolean;
   others: boolean;
 }
 
 export interface WatchLaterViewFilters {
-  viewed: boolean;
+  seen: boolean;
   archived: boolean;
   others: boolean;
 }

diff --git a/src/types/Video.ts b/src/types/Video.ts
@@ -12,7 +12,7 @@ export interface Video {
 }
 
 export type VideoFlags = Partial<{
-  viewed: boolean;
+  seen: boolean;
   toWatchLater: boolean;
   notified: boolean;
   archived: boolean;

diff --git a/...elVideos/VideoCard/Badges/ViewedBadge.tsx → ...nnelVideos/VideoCard/Badges/SeenBadge.tsx b/...elVideos/VideoCard/Badges/ViewedBadge.tsx → ...nnelVideos/VideoCard/Badges/SeenBadge.tsx
@@ -5,16 +5,16 @@ import { Video } from 'types';
 import { useAppSelector } from 'store';
 import { selectVideoMeta } from 'store/selectors/videos';
 
-interface ViewedBadgeProps {
+interface SeenBadgeProps {
   video: Video;
 }
 
-function ViewedBadge(props: ViewedBadgeProps) {
+function SeenBadge(props: SeenBadgeProps) {
   const { video } = props;
-  const { isViewed } = useAppSelector(selectVideoMeta(video));
+  const { isSeen } = useAppSelector(selectVideoMeta(video));
 
-  return isViewed ? (
-    <Tooltip title="Viewed" aria-label="viewed">
+  return isSeen ? (
+    <Tooltip title="Seen" aria-label="seen">
       <Box
         sx={{
           display: 'flex',
@@ -33,4 +33,4 @@ function ViewedBadge(props: ViewedBadgeProps) {
   ) : null;
 }
 
-export default ViewedBadge;
+export default SeenBadge;
diff --git a/src/ui/components/pages/Home/ChannelRenderer/ChannelVideos/VideoCard/Badges/index.tsx b/src/ui/components/pages/Home/ChannelRenderer/ChannelVideos/VideoCard/Badges/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Box } from '@mui/material';
 import { HomeView, Video } from 'types';
-import ViewedBadge from './ViewedBadge';
+import SeenBadge from './SeenBadge';
 import ArchivedBadge from './ArchivedBadge';
 import IgnoredBadge from './IgnoredBadge';
 
@@ -24,7 +24,7 @@ function VideoBadges(props: VideoBadgesProps) {
         gap: '4px',
       }}
     >
-      <ViewedBadge video={video} />
+      <SeenBadge video={video} />
       <IgnoredBadge video={video} view={view} />
       <ArchivedBadge video={video} view={view} />
     </Box>

diff --git a/...eos/VideoCard/TopActions/ViewedAction.tsx → ...ideos/VideoCard/TopActions/SeenAction.tsx b/...eos/VideoCard/TopActions/ViewedAction.tsx → ...ideos/VideoCard/TopActions/SeenAction.tsx
@@ -7,17 +7,17 @@ import { useAppDispatch, useAppSelector } from 'store';
 import { addVideoFlag, removeVideoFlag } from 'store/reducers/videos';
 import { selectVideoMeta } from 'store/selectors/videos';
 
-interface ViewedActionProps {
+interface SeenActionProps {
   video: Video;
 }
 
-function ViewedAction(props: ViewedActionProps) {
+function SeenAction(props: SeenActionProps) {
   const { video } = props;
-  const { isViewed } = useAppSelector(selectVideoMeta(video));
+  const { isSeen } = useAppSelector(selectVideoMeta(video));
   const dispatch = useAppDispatch();
 
-  return !isViewed ? (
-    <Tooltip title="Mark as viewed" aria-label="mark-as-viewed">
+  return !isSeen ? (
+    <Tooltip title="Mark as seen" aria-label="mark-as-seen">
       <IconButton
         sx={{
           color: '#eee',
@@ -33,7 +33,7 @@ function ViewedAction(props: ViewedActionProps) {
           dispatch(
             addVideoFlag({
               video,
-              flag: 'viewed',
+              flag: 'seen',
             }),
           );
         }}
@@ -42,7 +42,7 @@ function ViewedAction(props: ViewedActionProps) {
       </IconButton>
     </Tooltip>
   ) : (
-    <Tooltip title="Mark as unviewed" aria-label="mark-as-unviewed">
+    <Tooltip title="Mark as unseen" aria-label="mark-as-unseen">
       <IconButton
         sx={{
           display: 'flex',
@@ -59,7 +59,7 @@ function ViewedAction(props: ViewedActionProps) {
           dispatch(
             removeVideoFlag({
               video,
-              flag: 'viewed',
+              flag: 'seen',
             }),
           );
         }}
@@ -70,4 +70,4 @@ function ViewedAction(props: ViewedActionProps) {
   );
 }
 
-export default ViewedAction;
+export default SeenAction;
diff --git a/src/ui/components/pages/Home/ChannelRenderer/ChannelVideos/VideoCard/TopActions/index.tsx b/src/ui/components/pages/Home/ChannelRenderer/ChannelVideos/VideoCard/TopActions/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Box } from '@mui/material';
 import { HomeView, Video } from 'types';
 import WatchLaterAction from './WatchLaterAction';
-import ViewedAction from './ViewedAction';
+import SeenAction from './SeenAction';
 import ArchiveAction from './ArchiveAction';
 import IgnoreAction from './IgnoreAction';
 
@@ -26,7 +26,7 @@ function VideoTopActions(props: VideoTopActionsProps) {
       }}
     >
       <IgnoreAction video={video} view={view} />
-      <ViewedAction video={video} />
+      <SeenAction video={video} />
       <ArchiveAction video={video} view={view} />
       <WatchLaterAction video={video} view={view} />
     </Box>

diff --git a/src/ui/components/pages/Home/ChannelRenderer/ChannelVideos/VideoCard/index.tsx b/src/ui/components/pages/Home/ChannelRenderer/ChannelVideos/VideoCard/index.tsx
@@ -103,7 +103,7 @@ function VideoCard(props: VideoCardProps) {
                 dispatch(
                   addVideoFlag({
                     video,
-                    flag: 'viewed',
+                    flag: 'seen',
                   }),
                 );
               }}
@@ -122,7 +122,7 @@ function VideoCard(props: VideoCardProps) {
                 dispatch(
                   addVideoFlag({
                     video,
-                    flag: 'viewed',
+                    flag: 'seen',
                   }),
                 );
               }}

diff --git a/src/ui/components/pages/Home/TabActions/RecentViewActions/RecentViewFilters.tsx b/src/ui/components/pages/Home/TabActions/RecentViewActions/RecentViewFilters.tsx
@@ -12,8 +12,8 @@ const options: {
   value: keyof Filters;
 }[] = [
   {
-    label: 'Viewed',
-    value: 'viewed',
+    label: 'Seen',
+    value: 'seen',
   },
   {
     label: 'Watch later',

diff --git a/src/ui/components/pages/Home/TabActions/RecentViewActions/RecentViewOptions.tsx b/src/ui/components/pages/Home/TabActions/RecentViewActions/RecentViewOptions.tsx
@@ -41,17 +41,17 @@ function RecentViewOptions(props: RecentViewOptionsProps) {
     setAnchorEl(null);
   };
 
-  const handleMarkVideosAsViewed = () => {
+  const handleMarkVideosAsSeen = () => {
     setConfirmationDialogProps({
       open: true,
-      title: `Mark unflagged videos as viewed (${videos.length})`,
-      text: 'Are you sure that you want to mark all the unflagged videos as viewed?',
+      title: `Mark unflagged videos as seen (${videos.length})`,
+      text: 'Are you sure that you want to mark all the unflagged videos as seen?',
       onClose: (confirmed) => {
         if (confirmed) {
           dispatch(
             setVideosFlag({
               videos,
-              flag: 'viewed',
+              flag: 'seen',
             }),
           );
         }
@@ -111,11 +111,11 @@ function RecentViewOptions(props: RecentViewOptionsProps) {
         transformOrigin={{ horizontal: 'right', vertical: 'top' }}
         anchorOrigin={{ horizontal: 'right', vertical: 'bottom' }}
       >
-        <MenuItem onClick={handleMarkVideosAsViewed}>
+        <MenuItem onClick={handleMarkVideosAsSeen}>
           <ListItemIcon>
             <VisibilityIcon />
           </ListItemIcon>
-          <ListItemText>Mark unflagged videos as viewed</ListItemText>
+          <ListItemText>Mark unflagged videos as seen</ListItemText>
         </MenuItem>
         <MenuItem onClick={handleMarkVideosAsIgnored}>
           <ListItemIcon>

diff --git a/src/ui/components/pages/Home/TabActions/WatchLaterViewActions/WatchLaterViewFilters.tsx b/src/ui/components/pages/Home/TabActions/WatchLaterViewActions/WatchLaterViewFilters.tsx
@@ -12,8 +12,8 @@ const options: {
   value: keyof Filters;
 }[] = [
   {
-    label: 'Viewed',
-    value: 'viewed',
+    label: 'Seen',
+    value: 'seen',
   },
   {
     label: 'Archived',

diff --git a/src/ui/components/pages/Home/TabActions/WatchLaterViewActions/WatchLaterViewOptions.tsx b/src/ui/components/pages/Home/TabActions/WatchLaterViewActions/WatchLaterViewOptions.tsx
@@ -22,7 +22,7 @@ import {
 } from 'store/reducers/videos';
 import {
   selectWatchLaterVideos,
-  selectViewedWatchLaterVideosCount,
+  selectSeenWatchLaterVideosCount,
 } from 'store/selectors/videos';
 import { Nullable } from 'types';
 import { downloadFile } from 'helpers/file';
@@ -34,7 +34,7 @@ interface WatchLaterViewOptionsProps {
 function WatchLaterViewOptions(props: WatchLaterViewOptionsProps) {
   const { videosCount } = props;
   const watchLaterVideos = useAppSelector(selectWatchLaterVideos());
-  const viewedCount = useAppSelector(selectViewedWatchLaterVideosCount);
+  const seenCount = useAppSelector(selectSeenWatchLaterVideosCount);
   const dispatch = useAppDispatch();
   const [anchorEl, setAnchorEl] = useState<Nullable<HTMLElement>>(null);
   const open = Boolean(anchorEl);
@@ -90,14 +90,14 @@ function WatchLaterViewOptions(props: WatchLaterViewOptionsProps) {
     handleClose();
   };
 
-  const handleRemoveViewed = () => {
+  const handleRemoveSeen = () => {
     setConfirmationDialogProps({
       open: true,
-      title: `Remove viewed videos (${viewedCount})`,
-      text: 'Are you sure that you want to remove all viewed videos from the watch later list?',
+      title: `Remove seen videos (${seenCount})`,
+      text: 'Are you sure that you want to remove all seen videos from the watch later list?',
       onClose: (confirmed) => {
         if (confirmed) {
-          dispatch(clearWatchLaterList({ viewedOnly: true }));
+          dispatch(clearWatchLaterList({ seenOnly: true }));
         }
         setConfirmationDialogProps((state) => ({
           ...state,
@@ -155,12 +155,12 @@ function WatchLaterViewOptions(props: WatchLaterViewOptionsProps) {
           </ListItemIcon>
           <ListItemText>Remove all videos</ListItemText>
         </MenuItem>
-        {viewedCount > 0 ? (
-          <MenuItem onClick={handleRemoveViewed}>
+        {seenCount > 0 ? (
+          <MenuItem onClick={handleRemoveSeen}>
             <ListItemIcon>
               <VisibilityOffIcon />
             </ListItemIcon>
-            <ListItemText>Remove viewed videos</ListItemText>
+            <ListItemText>Remove seen videos</ListItemText>
           </MenuItem>
         ) : null}
         <MenuItem onClick={handleExport}>

diff --git a/src/ui/components/webext/Background/ChannelChecker.tsx b/src/ui/components/webext/Background/ChannelChecker.tsx
@@ -57,7 +57,7 @@ export default function ChannelChecker(props: ChannelCheckerProps) {
         const checkedVideosIds = cachedVideos
           .filter(
             ({ flags }) =>
-              flags.viewed ||
+              flags.seen ||
               flags.toWatchLater ||
               flags.notified ||
               flags.recent,