Merge branch 'dev' into QOL-fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "movie-web",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "private": true,
   "homepage": "https://movie.squeezebox.dev",
   "dependencies": {
@@ -85,4 +85,4 @@
     "vite-plugin-checker": "^0.5.6",
     "vite-plugin-package-version": "^1.0.2"
   }
-}
+}

src/setup/constants.ts

@@ -1,3 +1,3 @@
 export const DISCORD_LINK = "https://discord.gg/Jhqt4Xzpfb";
 export const GITHUB_LINK = "https://github.com/movie-web/movie-web";
-export const APP_VERSION = "3.0.1";
+export const APP_VERSION = "3.0.2";

src/views/other/v2Migration.tsx

@@ -11,6 +11,52 @@ function fromBinary(str: string): Uint8Array {
   return result;
 }
 
+export function importV2Data({ data, time }: { data: any; time: Date }) {
+  const savedTime = localStorage.getItem("mw-migration-date");
+  if (savedTime) {
+    if (new Date(savedTime) >= time) {
+      // has already migrated this or something newer, skip
+      return false;
+    }
+  }
+
+  // restore migration data
+  if (data.bookmarks)
+    localStorage.setItem("mw-bookmarks", JSON.stringify(data.bookmarks));
+  if (data.videoProgress)
+    localStorage.setItem("video-progress", JSON.stringify(data.videoProgress));
+
+  localStorage.setItem("mw-migration-date", time.toISOString());
+
+  return true;
+}
+
+export function EmbedMigration() {
+  let hasReceivedMigrationData = false;
+
+  const onMessage = (e: any) => {
+    const data = e.data;
+    if (data && data.isMigrationData && !hasReceivedMigrationData) {
+      hasReceivedMigrationData = true;
+      const didImport = importV2Data({
+        data: data.data,
+        time: data.date,
+      });
+      if (didImport) window.location.reload();
+    }
+  };
+
+  useEffect(() => {
+    window.addEventListener("message", onMessage);
+
+    return () => {
+      window.removeEventListener("message", onMessage);
+    };
+  });
+
+  return <iframe src="https://movie.squeezebox.dev" hidden />;
+}
+
 export function V2MigrationView() {
   const [done, setDone] = useState(false);
   useEffect(() => {
@@ -28,24 +74,10 @@ export function V2MigrationView() {
     );
     const timeOfMigration = new Date(params.get("m-time") as string);
 
-    const savedTime = localStorage.getItem("mw-migration-date");
-    if (savedTime) {
-      if (new Date(savedTime) >= timeOfMigration) {
-        // has already migrated this or something newer, skip
-        setDone(true);
-        return;
-      }
-    }
-
-    // restore migration data
-    if (data.bookmarks)
-      localStorage.setItem("mw-bookmarks", JSON.stringify(data.bookmarks));
-    if (data.videoProgress)
-      localStorage.setItem(
-        "video-progress",
-        JSON.stringify(data.videoProgress)
-      );
-    localStorage.setItem("mw-migration-date", timeOfMigration.toISOString());
+    importV2Data({
+      data,
+      time: timeOfMigration,
+    });
 
     // finished
     setDone(true);

src/views/search/HomeView.tsx

@@ -14,6 +14,7 @@ import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { useHistory } from "react-router-dom";
 import { Modal, ModalCard } from "@/components/layout/Modal";
 import { Button } from "@/components/Button";
+import { EmbedMigration } from "../other/v2Migration";
 
 function Bookmarks() {
   const { t } = useTranslation();
@@ -172,6 +173,7 @@ function NewDomainModal() {
 export function HomeView() {
   return (
     <div className="mb-16">
+      <EmbedMigration />
       <NewDomainModal />
       <Bookmarks />
       <Watched />