Merge pull request #302 from haosdent/master

Fix minor bugs in irc plugin.

packages/rocketchat-irc/irc.server.coffee

@@ -19,6 +19,7 @@ async = (f, args...) ->
 class IrcClient
 	constructor: (@loginReq) ->
 		@user = @loginReq.user
+		@user.username = @user.name
 		ircClientMap[@user._id] = this
 		@ircPort = IRC_PORT
 		@ircHost = IRC_HOST
@@ -157,8 +158,7 @@ class IrcClient
 			ircSendMessageCache.set cacheKey, timestamp
 
 		console.log '[irc] onReceiveMessage -> '.yellow, 'source:', source, 'target:', target, 'content:', content
-		@createUserWhenNotExist source
-		source = Meteor.users.findOne {name: source}
+		source = @createUserWhenNotExist source
 		if target[0] == '#'
 			room = ChatRoom.findOne {name: target.substring 1}
 		else
@@ -188,9 +188,6 @@ class IrcClient
 
 		for member in appendMembers
 			@createUserWhenNotExist member
-			Meteor.users.update {name: member},
-				$set:
-					status: 'online'
 
 		update =
 			$pull:
@@ -248,7 +245,7 @@ class IrcClient
 			@joinRoom(room)
 
 	joinRoom: (room) ->
-		if room.t isnt 'c'
+		if room.t isnt 'c' or room.name == 'general'
 			return
 
 		if @isJoiningRoom
@@ -304,15 +301,23 @@ class IrcClient
 				status: 'offline'
 
 	createUserWhenNotExist: (name) ->
-		user = Meteor.users.findOne {name: name}, fields: name: 1
+		user = Meteor.users.findOne {name: name}
 		unless user
 			console.log '[irc] createNotExistUser ->'.yellow, 'userName:', name
 			Meteor.call 'registerUser',
-				email: "#{name}@rocketchat.org",
-				pass: 'rocketchat',
+				email: "#{name}@rocketchat.org"
+				pass: 'rocketchat'
 				name: name
+			Meteor.users.update {name: name},
+				$set:
+					status: 'online'
+					username: name
+			user = Meteor.users.findOne {name: name}
+		return user
+
 
 	createDirectRoomWhenNotExist: (source, target) ->
+		console.log '[irc] createDirectRoomWhenNotExist -> '.yellow, 'source:', source, 'target:', target
 		rid = [source._id, target._id].sort().join('')
 		now = new Date()
 		ChatRoom.upsert
@@ -346,9 +351,12 @@ IrcClient.getByUid = (uid) ->
 	return ircClientMap[uid]
 
 IrcClient.create = (login) ->
+	unless login.user?
+		return login
 	unless login.user._id of ircClientMap
 		ircClient = new IrcClient login
 		return async ircClient.connect
+
 	return login
 
 

server/methods/createChannel.coffee

@@ -9,8 +9,9 @@ Meteor.methods
 		console.log '[methods] createChannel -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
 
 		now = new Date()
+		user = Meteor.user()
 
-		members.push Meteor.user().username
+		members.push user.username
 
 		# name = s.slugify name
 
@@ -22,9 +23,9 @@ Meteor.methods
 			msgs: 0
 			u:
 				_id: Meteor.userId()
-				username: Meteor.user().username
+				username: user.username
 
-		RocketChat.callbacks.run 'beforeCreateChannel', Meteor.user(), room
+		RocketChat.callbacks.run 'beforeCreateChannel', user, room
 
 		# create new room
 		rid = ChatRoom.insert room
@@ -44,14 +45,14 @@ Meteor.methods
 					_id: member._id
 					username: username
 
-			if username is Meteor.user().username
+			if username is user.username
 				sub.ls = now
 
 			ChatSubscription.insert sub
 
 		Meteor.defer ->
 
-			RocketChat.callbacks.run 'afterCreateChannel', Meteor.user(), room
+			RocketChat.callbacks.run 'afterCreateChannel', user, room
 
 		return {
 			rid: rid

server/methods/joinRoom.coffee

@@ -45,6 +45,8 @@ Meteor.methods
 				_id: user._id
 				username: user.username
 
-		RocketChat.callbacks.run 'afterJoinRoom', user, room
+		Meteor.defer ->
+
+			RocketChat.callbacks.run 'afterJoinRoom', user, room
 
 		return true

server/methods/leaveRoom.coffee

@@ -7,21 +7,22 @@ Meteor.methods
 			throw new Meteor.Error 300, 'Usuário não logado'
 
 		room = ChatRoom.findOne rid
+		user = Meteor.user()
 
-		RocketChat.callbacks.run 'beforeLeaveRoom', Meteor.user(), room
+		RocketChat.callbacks.run 'beforeLeaveRoom', user, room
 
 		update =
 			$pull:
-				usernames: Meteor.user().username
+				usernames: user.username
 
 		ChatSubscription.update { rid: rid },
 			$set:
 				name: room.name
 		,
 			multi: true
 
-		if room.t isnt 'c' and room.usernames.indexOf(Meteor.user().username) isnt -1
-			removedUser = Meteor.user()
+		if room.t isnt 'c' and room.usernames.indexOf(user.username) isnt -1
+			removedUser = user
 
 			ChatMessage.insert
 				rid: rid
@@ -33,7 +34,7 @@ Meteor.methods
 					username: removedUser.username
 
 		if room.u? and room.u._id is Meteor.userId()
-			newOwner = _.without(room.usernames, Meteor.user().username)[0]
+			newOwner = _.without(room.usernames, user.username)[0]
 			if newOwner?
 				newOwner = Meteor.users.findOne username: newOwner
 
@@ -48,4 +49,6 @@ Meteor.methods
 
 		ChatRoom.update rid, update
 
-		RocketChat.callbacks.run 'afterLeaveRoom', Meteor.user(), room
+		Meteor.defer ->
+
+			RocketChat.callbacks.run 'afterLeaveRoom', user, room