refactor: enhance legacy typing

AXeL-dev · Oct 15, 2022 · 25264b0 · 25264b0
1 parent e823934
commit 25264b0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/store/utils/preload.ts b/src/store/utils/preload.ts
@@ -12,6 +12,7 @@ import {
   VideosSeniority,
   HomeView,
   LegacySettings,
+  LegacyVideoFlags,
 } from 'types';
 import { log } from 'helpers/logger';
 
@@ -96,8 +97,7 @@ const replaceLegacySettings = (
 
 const replaceViewedFlagWithSeen = (videos: VideoCache[]) => {
   return videos.map((video) => {
-    const { viewed, ...flags } =
-      (video.flags as typeof video.flags & { viewed: boolean }) || {};
+    const { viewed, ...flags } = (video.flags as LegacyVideoFlags) || {};
     return {
       ...video,
       flags: viewed

diff --git a/src/types/legacy.ts b/src/types/legacy.ts
@@ -6,6 +6,7 @@ import {
   ViewSorting,
   WatchLaterViewFilters,
 } from './Settings';
+import { VideoFlags } from './Video';
 
 export interface LegacySettings extends Omit<Settings, 'viewOptions'> {
   recentVideosSeniority: VideosSeniority;
@@ -17,3 +18,7 @@ export interface LegacySettings extends Omit<Settings, 'viewOptions'> {
   watchLaterViewSorting: ViewSorting;
   bookmarksViewSorting: ViewSorting;
 }
+
+export type LegacyVideoFlags = VideoFlags & {
+  viewed: boolean;
+};