diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-09-17 01:34:55 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-17 01:34:55 +0300 |
commit | ddd00a27a97b047ca854ece80d8bc60021784f3f (patch) | |
tree | 2a4ff94450b82910acfc12d4699e8bea6a3706f6 /models | |
parent | 6e6e7ded82d589fe290cbf7b8b9aac0892fd30da (diff) | |
parent | b31c42acc44e94f41907e6e50fdcc05b9b6886ac (diff) | |
download | wekan-ddd00a27a97b047ca854ece80d8bc60021784f3f.tar.gz wekan-ddd00a27a97b047ca854ece80d8bc60021784f3f.tar.bz2 wekan-ddd00a27a97b047ca854ece80d8bc60021784f3f.zip |
Merge pull request #2715 from whowillcare/master
fix some issues found
Diffstat (limited to 'models')
-rw-r--r-- | models/activities.js | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/models/activities.js b/models/activities.js index a864e5e4..dcabfbc2 100644 --- a/models/activities.js +++ b/models/activities.js @@ -180,7 +180,7 @@ if (Meteor.isServer) { const comment = activity.comment(); params.comment = comment.text; if (board) { - const atUser = /(?:^|>|\b|\s)@(\S+)(?:\s|$|<|\b)/g; + const atUser = /(?:^|>|\b|\s)@(\S+?)(?:\s|$|<|\b)/g; const comment = params.comment; if (comment.match(atUser)) { const commenter = params.user; @@ -192,12 +192,14 @@ if (Meteor.isServer) { } const atUser = Users.findOne(username) || Users.findOne({ username }); - const uid = atUser && atUser._id; - params.atUsername = username; - params.atEmails = atUser.emails; - if (board.hasMember(uid)) { - title = 'act-atUserComment'; - watchers = _.union(watchers, [uid]); + if (atUser && atUser._id) { + const uid = atUser._id; + params.atUsername = username; + params.atEmails = atUser.emails; + if (board.hasMember(uid)) { + title = 'act-atUserComment'; + watchers = _.union(watchers, [uid]); + } } } } |