From f3fa7fe744ec9bccef81c411386bc3b5f0078626 Mon Sep 17 00:00:00 2001
From: Abdullah Atta <abdullahatta@streetwriters.co>
Date: Wed, 12 Oct 2022 20:33:37 +0500
Subject: [PATCH] core: update core version to 5.8

---
 packages/core/api/sync/merger.js   |  9 +--------
 packages/core/common.js            |  2 +-
 packages/core/database/migrator.js |  6 +-----
 packages/core/migrations.js        | 17 ++++++++++++++++-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/core/api/sync/merger.js b/packages/core/api/sync/merger.js
index ee912f65a..c09e58396 100644
--- a/packages/core/api/sync/merger.js
+++ b/packages/core/api/sync/merger.js
@@ -128,14 +128,7 @@ class Merger {
     // it is a locked note, bail out.
     if (deserialized.alg && deserialized.cipher) return deserialized;
 
-    let type = deserialized.type;
-    // temporary fix for streetwriters/notesnook#751
-    if (type === "content") {
-      type = "tiptap";
-      deserialized.type = type;
-    }
-
-    return migrateItem(deserialized, version, type, this._db);
+    return migrateItem(deserialized, version, deserialized.type, this._db);
   }
 
   async _deserialize(item, migrate = true) {
diff --git a/packages/core/common.js b/packages/core/common.js
index 74afd45fc..fe5a21a97 100644
--- a/packages/core/common.js
+++ b/packages/core/common.js
@@ -83,4 +83,4 @@ export const EVENTS = {
   systemTimeInvalid: "system:invalidTime"
 };
 
-export const CURRENT_DATABASE_VERSION = 5.7;
+export const CURRENT_DATABASE_VERSION = 5.8;
diff --git a/packages/core/database/migrator.js b/packages/core/database/migrator.js
index f55157cae..724e2f553 100644
--- a/packages/core/database/migrator.js
+++ b/packages/core/database/migrator.js
@@ -30,16 +30,12 @@ class Migrator {
           continue;
         }
 
+        // check if item is permanently deleted or just a soft delete
         if (item.deleted && !item.type) {
           await collection.dbCollection?._collection?.addItem(item);
           continue;
         }
 
-        // temporary fix for streetwriters/notesnook#751
-        if (item.type === "content") {
-          item.type = "tiptap";
-        }
-
         item = await migrateItem(
           item,
           version,
diff --git a/packages/core/migrations.js b/packages/core/migrations.js
index 4c5e8b9c2..04d8ffad2 100644
--- a/packages/core/migrations.js
+++ b/packages/core/migrations.js
@@ -98,7 +98,22 @@ const migrations = [
       }
     }
   },
-  { version: 5.7, types: {} }
+  {
+    version: 5.7,
+    types: {
+      tiny: (item) => {
+        if (!item.data || item.data.iv) return item;
+        item.type = "tiptap";
+        return item;
+      },
+      content: (item) => {
+        if (!item.data || item.data.iv) return item;
+        item.type = "tiptap";
+        return item;
+      }
+    }
+  },
+  { version: 5.8, types: {} }
 ];
 
 export async function migrateItem(item, version, type, database) {