Fixed the bug and deleted the redundant codes

packages/app/src/server/models/activity.ts

@@ -96,17 +96,8 @@ activitySchema.post('save', function() {
 activitySchema.methods.getNotificationTargetUsers = async function() {
   const User = getModelSafely('User') || require('~/server/models/user')();
   const { user: actionUser, target } = this;
-
-  const [subscribeUsers, unsubscribeUsers] = await Promise.all([
-    Subscription.getSubscription(target as unknown as Ref<IPage>),
-    Subscription.getUnsubscription(target as unknown as Ref<IPage>),
-  ]);
-  const unique = array => Object.values(array.reduce((objects, object) => ({ ...objects, [object.toString()]: object }), {}));
-  const filter = (array, pull) => {
-    const ids = pull.map(object => object.toString());
-    return array.filter(object => !ids.includes(object.toString()));
-  };
-  const notificationUsers = filter(unique([...subscribeUsers]), [...unsubscribeUsers, actionUser]);
+  const subscribedUsers = await Subscription.getSubscription(target as unknown as Ref<IPage>);
+  const notificationUsers = subscribedUsers.filter(item => (item.toString() !== actionUser._id.toString()));
   const activeNotificationUsers = await User.find({
     _id: { $in: notificationUsers },
     status: User.STATUS_ACTIVE,

packages/app/src/server/service/page.ts

@@ -363,6 +363,8 @@ class PageService {
       endpoint: activityParameters.endpoint,
       action: page.descendantCount > 0 ? SupportedAction.ACTION_PAGE_RECURSIVELY_RENAME : SupportedAction.ACTION_PAGE_RENAME,
       user,
+      targetModel: 'Page',
+      target: page,
       snapshot: {
         username: user.username,
       },
@@ -431,7 +433,7 @@ class PageService {
 
       throw err;
     }
-    if (!options.isRecursively) {
+    if (page.descendantCount < 1) {
       this.activityEvent.emit('updated', activity, page);
     }
     return renamedPage;