浏览代码

Move every Activities.find(idOrFirstObjectSelector, options) to the ReactiveCache (directory server/)

Martin Filser 2 年之前
父节点
当前提交
7caf817c81
共有 2 个文件被更改,包括 15 次插入8 次删除
  1. 7 4
      server/publications/activities.js
  2. 8 4
      server/publications/notifications.js

+ 7 - 4
server/publications/activities.js

@@ -33,9 +33,12 @@ Meteor.publish('activities', (kind, id, limit, hideSystem) => {
   const selector = hideSystem
     ? { $and: [{ activityType: 'addComment' }, { [`${kind}Id`]: { $in: linkedElmtId } }] }
     : { [`${kind}Id`]: { $in: linkedElmtId } };
-  const ret = Activities.find(selector, {
-    limit,
-    sort: { createdAt: -1 },
-  });
+  const ret = ReactiveCache.getActivities(selector,
+    {
+      limit,
+      sort: { createdAt: -1 },
+    },
+    true,
+  );
   return ret;
 });

+ 8 - 4
server/publications/notifications.js

@@ -132,9 +132,13 @@ function activities() {
   const activityIds = ReactiveCache.getCurrentUser()?.profile?.notifications?.map(v => v.activity) || [];
   let ret = [];
   if (activityIds.length > 0) {
-    ret = Activities.find({
-      _id: { $in: activityIds },
-    });
-  return ret;
+    ret = ReactiveCache.getActivities(
+      {
+        _id: { $in: activityIds },
+      },
+      {},
+      true,
+    );
   }
+  return ret;
 }