From 7caf817c8132b42a6c719e7638af93f5aa925686 Mon Sep 17 00:00:00 2001
From: Martin Filser <github-wekan@linux-email.de>
Date: Sun, 12 Mar 2023 18:27:27 +0100
Subject: [PATCH] Move every Activities.find(idOrFirstObjectSelector, options)
 to the ReactiveCache (directory server/)

---
 server/publications/activities.js    | 11 +++++++----
 server/publications/notifications.js | 12 ++++++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/server/publications/activities.js b/server/publications/activities.js
index 87ca003ea..8e1f90aec 100644
--- a/server/publications/activities.js
+++ b/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;
 });
diff --git a/server/publications/notifications.js b/server/publications/notifications.js
index 93614691e..94337369d 100644
--- a/server/publications/notifications.js
+++ b/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;
 }