From 39e1cc02374b3a379de87bdcb95a7a343b698a05 Mon Sep 17 00:00:00 2001
From: floatinghotpot <rjfun.mobile@gmail.com>
Date: Wed, 6 Jan 2016 16:59:25 +0800
Subject: Improve PR, adding more comments

---
 models/activities.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'models/activities.js')

diff --git a/models/activities.js b/models/activities.js
index 0aa4fa54..ad920149 100644
--- a/models/activities.js
+++ b/models/activities.js
@@ -50,10 +50,10 @@ if (Meteor.isServer) {
   });
 
   Activities.after.insert((userId, doc) => {
-    const activity = Activities.findOne(doc._id);
+    const activity = Activities._transform(doc);
     let participants = [];
     let watchers = [];
-    let title = 'Wekan Notification';
+    let title = 'act-activity-notify';
     let board = null;
     const description = `act-${activity.activityType}`;
     const params = {
@@ -101,20 +101,20 @@ if (Meteor.isServer) {
       params.attachment = attachment._id;
     }
     if (board) {
-      const boardWatching = _.pluck(_.where(board.watchers, {level: 'watching'}), 'userId');
-      const boardTracking = _.pluck(_.where(board.watchers, {level: 'tracking'}), 'userId');
-      const boardMuted = _.pluck(_.where(board.watchers, {level: 'muted'}), 'userId');
+      const watchingUsers = _.pluck(_.where(board.watchers, {level: 'watching'}), 'userId');
+      const trackingUsers = _.pluck(_.where(board.watchers, {level: 'tracking'}), 'userId');
+      const mutedUsers = _.pluck(_.where(board.watchers, {level: 'muted'}), 'userId');
       switch(board.getWatchDefault()) {
       case 'muted':
-        participants = _.intersection(participants, boardTracking);
-        watchers = _.intersection(watchers, boardTracking);
+        participants = _.intersection(participants, trackingUsers);
+        watchers = _.intersection(watchers, trackingUsers);
         break;
       case 'tracking':
-        participants = _.difference(participants, boardMuted);
-        watchers = _.difference(watchers, boardMuted);
+        participants = _.difference(participants, mutedUsers);
+        watchers = _.difference(watchers, mutedUsers);
         break;
       }
-      watchers = _.union(watchers, boardWatching || []);
+      watchers = _.union(watchers, watchingUsers || []);
     }
 
     Notifications.getUsers(participants, watchers).forEach((user) => {
-- 
cgit v1.2.3-1-g7c22