diff options
author | floatinghotpot <rjfun.mobile@gmail.com> | 2016-01-06 16:59:25 +0800 |
---|---|---|
committer | floatinghotpot <rjfun.mobile@gmail.com> | 2016-01-06 16:59:25 +0800 |
commit | 39e1cc02374b3a379de87bdcb95a7a343b698a05 (patch) | |
tree | 0f64c3428e1ee8a05060330c6c2e4fba01293788 /models | |
parent | 9bbdacc79a89667e0d6f1ed30c415e5350ad468b (diff) | |
download | wekan-39e1cc02374b3a379de87bdcb95a7a343b698a05.tar.gz wekan-39e1cc02374b3a379de87bdcb95a7a343b698a05.tar.bz2 wekan-39e1cc02374b3a379de87bdcb95a7a343b698a05.zip |
Improve PR, adding more comments
Diffstat (limited to 'models')
-rw-r--r-- | models/activities.js | 20 | ||||
-rw-r--r-- | models/users.js | 14 |
2 files changed, 17 insertions, 17 deletions
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) => { diff --git a/models/users.js b/models/users.js index 3bb7324f..89220a11 100644 --- a/models/users.js +++ b/models/users.js @@ -57,9 +57,9 @@ Users.helpers({ return _.contains(notifications, activityId); }, - getEmailCache() { - const {emailCache = []} = this.profile; - return emailCache; + getEmailBuffer() { + const {emailBuffer = []} = this.profile; + return emailBuffer; }, getInitials() { @@ -153,18 +153,18 @@ Users.mutations({ }; }, - addEmailCache(text) { + addEmailBuffer(text) { return { $addToSet: { - 'profile.emailCache': text, + 'profile.emailBuffer': text, }, }; }, - clearEmailCache() { + clearEmailBuffer() { return { $set: { - 'profile.emailCache': [], + 'profile.emailBuffer': [], }, }; }, |