Merge pull request #856 from RocketChat/joinroom-mod

joinRoom returns if room is already added

server/methods/joinRoom.coffee

@@ -3,15 +3,21 @@ Meteor.methods
 
 		room = RocketChat.models.Rooms.findOneById rid
 
+		console.log '[methods] joinRoom -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
+
+		if not room?
+			throw new Meteor.Error 500, 'No channel with this id'
+
 		if room.t isnt 'c'
 			throw new Meteor.Error 403, '[methods] joinRoom -> Not allowed'
 
-		# verify if user is already in room
-		# if room.usernames.indexOf(user.username) is -1
-		console.log '[methods] joinRoom -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
-
 		now = new Date()
 
+		# Check if user is already in room
+		subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId rid, Meteor.userId()
+		if subscription?
+			return
+
 		user = RocketChat.models.Users.findOneById Meteor.userId()
 
 		RocketChat.callbacks.run 'beforeJoinRoom', user, room