fix(migration): not restoring Boorus

Rule-34 · Jan 18, 2024 · b3eacc8 · b3eacc8
1 parent 041f2d7
commit b3eacc8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/assets/js/BackupHelper.ts b/assets/js/BackupHelper.ts
@@ -188,7 +188,7 @@ export async function migrateBrowserOldVersionState(): Promise<void> {
   const userSettings = useUserSettings()
   const { booruList } = useBooruList()
 
-  if (!localStorage.getItem('vuex-user')) {
+  if (!doesBrowserHaveOldVersionState()) {
     return
   }
 
@@ -209,7 +209,7 @@ export async function migrateBrowserOldVersionState(): Promise<void> {
   }
 
   // === Migrate Boorus
-  if (!vuexUser.user.custom.boorus?.length) {
+  if (vuexUser.user.custom.boorus?.length) {
     const vuexUserBoorusMigrated = vuexUser.user.custom.boorus.map((booru) => {
       return {
         domain: booru.domain,
@@ -223,9 +223,11 @@ export async function migrateBrowserOldVersionState(): Promise<void> {
       }
     }) as Domain[]
 
-    booruList.value = unionWith(booruList.value, vuexUserBoorusMigrated, (obj1, obj2) => {
+    const uniqueBoorus = unionWith(booruList.value, vuexUserBoorusMigrated, (obj1, obj2) => {
       return obj1.domain === obj2.domain
     })
+
+    booruList.value = uniqueBoorus
   }
 
   // === Migrate saved posts

diff --git a/pages/premium/migrate-old-data.vue b/pages/premium/migrate-old-data.vue
@@ -17,15 +17,15 @@
 
     toast.success('Old data migrated successfully!')
 
-    navigateTo('/premium')
+    navigateTo('/premium/dashboard')
   }
 
   function removeOldData() {
     removeBrowserOldVersionState()
 
     toast.success('Old data removed successfully!')
 
-    navigateTo('/premium')
+    navigateTo('/premium/dashboard')
   }
 
   useSeoMeta({