merging

1 files changed, 9 insertions, 7 deletions

diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index 56b6cb8a9..1ba6cff6d 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -1,6 +1,4 @@
 import { Doc, DocListCast, Opt } from "../../fields/Doc";
-import { List } from "../../fields/List";
-import { listSpec } from "../../fields/Schema";
 import { Cast, StrCast } from "../../fields/Types";
 import { SharingManager } from "./SharingManager";
 import { computedFn } from "mobx-utils";
@@ -36,17 +34,21 @@ export class LinkManager {
 
 
     public getAllLinks(): Doc[] {
-        const lset = new Set<Doc>(DocListCast(Doc.UserDoc().myLinkDatabase));
-        SharingManager.Instance.users.forEach(user => DocListCast(user.sharingDoc.myLinkDatabase).map(lset.add));
+        const lset = new Set<Doc>(DocListCast(Doc.LinkDBDoc().data));
+        SharingManager.Instance.users.forEach(user => {
+            DocListCast(user.linkDatabase?.data).map(doc => {
+                lset.add(doc);
+            });
+        });
         return Array.from(lset);
     }
 
     public addLink(linkDoc: Doc): boolean {
-        return Doc.AddDocToList(Doc.UserDoc(), "myLinkDatabase", linkDoc);
+        return Doc.AddDocToList(Doc.LinkDBDoc(), "data", linkDoc);
     }
 
     public deleteLink(linkDoc: Doc): boolean {
-        return Doc.RemoveDocFromList(Doc.UserDoc(), "myLinkDatabase", linkDoc);
+        return Doc.RemoveDocFromList(Doc.LinkDBDoc(), "data", linkDoc);
     }
 
     // finds all links that contain the given anchor
@@ -67,7 +69,7 @@ export class LinkManager {
             related.push(...LinkManager.Instance.getAllRelatedLinks(anno));
         });
         return related;
-    }.bind(this));
+    }.bind(this), true);
 
     // finds all links that contain the given anchor
     public getAllRelatedLinks(anchor: Doc): Doc[] {