fix: do not duplicate action extensions

standardnotes · Aug 13, 2021 · 8697fee · 8697fee
1 parent ae4a205
commit 8697fee
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/packages/snjs/lib/models/app/extension.ts b/packages/snjs/lib/models/app/extension.ts
@@ -1,3 +1,5 @@
+import { ConflictStrategy } from './../../protocol/payloads/deltas/strategies';
+import { HistoryEntry } from './../../services/history/entries/history_entry';
 import { PurePayload } from './../../protocol/payloads/pure_payload';
 import { ItemMutator, SNItem } from '@Models/core/item';
 import { Action } from './action';
@@ -34,6 +36,18 @@ export class SNActionsExtension extends SNItem {
       return action.context === item.content_type || action.context === 'Item';
     });
   }
+
+  /** Do not duplicate. Always keep original */
+  strategyWhenConflictingWithItem(
+    item: SNItem,
+    previousRevision?: HistoryEntry
+  ): ConflictStrategy {
+    if (this.errorDecrypting) {
+      return super.strategyWhenConflictingWithItem(item, previousRevision);
+    }
+
+    return ConflictStrategy.KeepLeft;
+  }
 }
 
 export class ActionsExtensionMutator extends ItemMutator {

diff --git a/packages/snjs/package.json b/packages/snjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/snjs",
-  "version": "2.7.22",
+  "version": "2.7.23",
   "engines": {
     "node": ">=14.0.0 <16.0.0"
   },