Skip to content

Join room via mention #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rodrigok merged 2 commits into from
Aug 28, 2015
Merged

Join room via mention #600

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18f070b
Join user in room via mention
rodrigok Aug 27, 2015
54420b5
Some fixes
rodrigok Aug 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/rocketchat-lib/server/sendMessage.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@ RocketChat.sendMessage = (user, message, room, options) ->
mentionIds.push mention._id

if mentionIds.length > 0
usersOfMention = Meteor.users.find({_id: {$in: mentionIds}}, {fields: {_id: 1, username: 1}}).fetch()

if mentionIds.indexOf('all') is -1
for usersOfMentionItem in usersOfMention
if room.usernames.indexOf(usersOfMentionItem.username) is -1
Meteor.runAsUser usersOfMentionItem._id, ->
Meteor.call 'joinRoom', room._id

###
Update all other subscriptions of mentioned users to alert their owners and incrementing
the unread counter for mentions and direct messages
Expand Down Expand Up @@ -141,7 +149,6 @@ RocketChat.sendMessage = (user, message, room, options) ->
query._id =
$in: mentionIds

usersOfMention = Meteor.users.find(query, {fields: {_id: 1}}).fetch()
usersOfMentionIds = _.pluck(usersOfMention, '_id');
if usersOfMentionIds.length > 0
Push.send
Expand Down