From 9ab7f85005f8ff8592ed35511d43087106c3991e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 16:06:32 -0300
Subject: [PATCH 01/26] Change ChatSubscription to reference user as object

---
 client/lib/RoomManager.coffee                 |  2 +-
 client/startup/startup.coffee                 |  2 +-
 client/views/app/chatWindowDashboard.coffee   |  2 +-
 client/views/app/sideNav/channels.coffee      |  4 +--
 .../views/app/sideNav/directMessages.coffee   |  4 +--
 client/views/app/sideNav/privateGroups.coffee |  4 +--
 client/views/app/sideNav/starredRooms.coffee  |  4 +--
 server/lib/accounts.coffee                    | 21 ---------------
 server/methods/canAccessRoom.coffee           |  2 +-
 server/methods/createDirectRoom.coffee        |  4 +--
 server/methods/forwardRoom.coffee             |  2 +-
 server/methods/hideRoom.coffee                |  2 +-
 server/methods/sendMessage.coffee             |  2 +-
 server/methods/setUsername.coffee             | 27 ++++++++++++++++++-
 server/methods/toogleFavorite.coffee          |  2 +-
 server/publications.coffee                    | 14 +---------
 16 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/client/lib/RoomManager.coffee b/client/lib/RoomManager.coffee
index 67b7a68753410..9ff08ad9ff9d5 100644
--- a/client/lib/RoomManager.coffee
+++ b/client/lib/RoomManager.coffee
@@ -51,7 +51,7 @@
 				ready: false
 
 		if myRoomActivity.ready()
-			if ChatSubscription.findOne { rid: roomId, uid: Meteor.userId() }, { reactive: false }
+			if ChatSubscription.findOne { rid: roomId, 'u._id': Meteor.userId() }, { reactive: false }
 				openedRooms[roomId].active = true
 				setRoomExpireExcept roomId
 				computation.invalidate()
diff --git a/client/startup/startup.coffee b/client/startup/startup.coffee
index 703ec147faf33..083a88a33d32e 100644
--- a/client/startup/startup.coffee
+++ b/client/startup/startup.coffee
@@ -61,7 +61,7 @@ Meteor.startup ->
 
 	Tracker.autorun ->
 		rooms = []
-		ChatSubscription.find({ uid: Meteor.userId() }, { fields: { rid: 1 } }).forEach (sub) ->
+		ChatSubscription.find({ 'u._id': Meteor.userId() }, { fields: { rid: 1 } }).forEach (sub) ->
 			rooms.push sub.rid
 
 		ChatRoom.find({ _id: $in: rooms }).observe
diff --git a/client/views/app/chatWindowDashboard.coffee b/client/views/app/chatWindowDashboard.coffee
index e6577083f54e6..35765785cf3bc 100644
--- a/client/views/app/chatWindowDashboard.coffee
+++ b/client/views/app/chatWindowDashboard.coffee
@@ -6,7 +6,7 @@ Template.chatWindowDashboard.helpers
 		return t('chatWindowDashboard.Quick_Search')
 	favorite: ->
 		console.log 'chatWindowDashboard.favorite' if window.rocketDebug
-		sub = ChatSubscription.findOne { rid: this._id, uid: Meteor.userId() }
+		sub = ChatSubscription.findOne { rid: this._id, 'u._id': Meteor.userId() }
 		return 'icon-star favorite-room' if sub?.f? and sub.f
 
 		return 'icon-star-empty'
diff --git a/client/views/app/sideNav/channels.coffee b/client/views/app/sideNav/channels.coffee
index 1e445ba0a50f4..982dc1392cde2 100644
--- a/client/views/app/sideNav/channels.coffee
+++ b/client/views/app/sideNav/channels.coffee
@@ -3,10 +3,10 @@ Template.channels.helpers
 		return t('chatRooms.Members_placeholder')
 
 	rooms: ->
-		return ChatSubscription.find { uid: Meteor.userId(), t: { $in: ['c']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }
+		return ChatSubscription.find { 'u._id': Meteor.userId(), t: { $in: ['c']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }
 
 	total: ->
-		return ChatSubscription.find({ uid: Meteor.userId(), t: { $in: ['c']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }).fetch().length
+		return ChatSubscription.find({ 'u._id': Meteor.userId(), t: { $in: ['c']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }).count()
 
 Template.channels.events
 	'click .add-room': (e, instance) ->
diff --git a/client/views/app/sideNav/directMessages.coffee b/client/views/app/sideNav/directMessages.coffee
index 415e04051d4de..20c419f423c9b 100644
--- a/client/views/app/sideNav/directMessages.coffee
+++ b/client/views/app/sideNav/directMessages.coffee
@@ -1,5 +1,5 @@
 Template.directMessages.helpers
 	rooms: ->
-		return ChatSubscription.find { uid: Meteor.userId(), t: { $in: ['d']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }
+		return ChatSubscription.find { 'u._id': Meteor.userId(), t: { $in: ['d']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }
 	total: ->
-		return ChatSubscription.find({ uid: Meteor.userId(), t: { $in: ['d']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }).fetch().length
+		return ChatSubscription.find({ 'u._id': Meteor.userId(), t: { $in: ['d']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }).fetch().length
diff --git a/client/views/app/sideNav/privateGroups.coffee b/client/views/app/sideNav/privateGroups.coffee
index 5ba59860e380a..3a1a517001fa9 100644
--- a/client/views/app/sideNav/privateGroups.coffee
+++ b/client/views/app/sideNav/privateGroups.coffee
@@ -2,9 +2,9 @@ Template.privateGroups.helpers
 	tRoomMembers: ->
 		return t('chatRooms.Members_placeholder')
 	rooms: ->
-		return ChatSubscription.find { uid: Meteor.userId(), t: { $in: ['p']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }
+		return ChatSubscription.find { 'u._id': Meteor.userId(), t: { $in: ['p']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }
 	total: ->
-		return ChatSubscription.find({ uid: Meteor.userId(), t: { $in: ['p']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }).fetch().length
+		return ChatSubscription.find({ 'u._id': Meteor.userId(), t: { $in: ['p']}, f: { $ne: true } }, { sort: 't': 1, 'rn': 1 }).fetch().length
 
 Template.privateGroups.events
 	'click .add-room': (e, instance) ->
diff --git a/client/views/app/sideNav/starredRooms.coffee b/client/views/app/sideNav/starredRooms.coffee
index 22137ca040b87..5aa7be9d4d23a 100644
--- a/client/views/app/sideNav/starredRooms.coffee
+++ b/client/views/app/sideNav/starredRooms.coffee
@@ -1,5 +1,5 @@
 Template.starredRooms.helpers
 	rooms: ->
-		return ChatSubscription.find { uid: Meteor.userId(), f: true }, { sort: 't': 1, 'rn': 1 }
+		return ChatSubscription.find { 'u._id': Meteor.userId(), f: true }, { sort: 't': 1, 'rn': 1 }
 	total: ->
-		return ChatSubscription.find({ uid: Meteor.userId(), f: true }, { sort: 't': 1, 'rn': 1 }).fetch().length
\ No newline at end of file
+		return ChatSubscription.find({ 'u._id': Meteor.userId(), f: true }, { sort: 't': 1, 'rn': 1 }).fetch().length
\ No newline at end of file
diff --git a/server/lib/accounts.coffee b/server/lib/accounts.coffee
index ded92edf3dcf8..59f2643c671e0 100644
--- a/server/lib/accounts.coffee
+++ b/server/lib/accounts.coffee
@@ -57,27 +57,6 @@ Accounts.validateLoginAttempt (login) ->
 			throw new Meteor.Error 'no-valid-email'
 			return false
 
-	if not login.user.lastLogin?
-		# put user in general channel
-		ChatRoom.update('57om6EQCcFami9wuT', { $addToSet: { uids: login.user._id }})
-		if not ChatSubscription.findOne(rid: '57om6EQCcFami9wuT', uid: login.user._id)?
-			ChatSubscription.insert
-				rid: '57om6EQCcFami9wuT'
-				uid: login.user._id
-				ls: (new Date())
-				rn: 'general'
-				t: 'c'
-				f: true
-				ts: new Date()
-				unread: 0
-
-			if login.user.name?
-				ChatMessage.insert
-					rid: '57om6EQCcFami9wuT'
-					ts: new Date()
-					t: 'wm'
-					msg: login.user.name
-
 	Meteor.users.update {_id: login.user._id}, {$set: {lastLogin: new Date}}
 
 	return true
diff --git a/server/methods/canAccessRoom.coffee b/server/methods/canAccessRoom.coffee
index 6a4a7c8a28088..6a1e6f237d11b 100644
--- a/server/methods/canAccessRoom.coffee
+++ b/server/methods/canAccessRoom.coffee
@@ -23,7 +23,7 @@ Meteor.methods
 			throw new Meteor.Error 'without-permission', "[methods] canAccessRoom -> User doesn't have enough permissions"
 
 		# create room subscription
-		ChatSubscription.upsert { rid: roomId, uid: Meteor.userId() },
+		ChatSubscription.upsert { rid: roomId, 'u._id': Meteor.userId() },
 			$setOnInsert:
 				rn: room.name
 				t: room.t
diff --git a/server/methods/createDirectRoom.coffee b/server/methods/createDirectRoom.coffee
index 49b0c942bb91a..9e7d70e31d751 100644
--- a/server/methods/createDirectRoom.coffee
+++ b/server/methods/createDirectRoom.coffee
@@ -24,7 +24,7 @@ Meteor.methods
 				msgs: 0
 				ts: now
 
-		ChatSubscription.upsert { uid: Meteor.userId(), rid: roomId },
+		ChatSubscription.upsert { 'u._id': Meteor.userId(), rid: roomId },
 			$set:
 				ts: now
 				ls: now
@@ -33,7 +33,7 @@ Meteor.methods
 				t: 'd'
 				unread: 0
 
-		ChatSubscription.upsert { uid: userTo._id, rid: roomId },
+		ChatSubscription.upsert { 'u._id': userTo._id, rid: roomId },
 			$set:
 				rn: me.name
 			$setOnInsert:
diff --git a/server/methods/forwardRoom.coffee b/server/methods/forwardRoom.coffee
index a1b6aac4dca3d..c8a7c95b15b68 100644
--- a/server/methods/forwardRoom.coffee
+++ b/server/methods/forwardRoom.coffee
@@ -19,7 +19,7 @@ Meteor.methods
 			# $pull:
 			# 	uids: Meteor.userId()
 
-		ChatSubscription.upsert { rid: forward.rid, uid: forward.to },
+		ChatSubscription.upsert { rid: forward.rid, 'u._id': forward.to },
 			$setOnInsert:
 				rn: room.name
 				t: 'v'
diff --git a/server/methods/hideRoom.coffee b/server/methods/hideRoom.coffee
index a9dedc1c2d6b2..844055289c8a8 100644
--- a/server/methods/hideRoom.coffee
+++ b/server/methods/hideRoom.coffee
@@ -6,4 +6,4 @@ Meteor.methods
 		unless Meteor.userId()?
 			throw new Meteor.Error 300, 'Usuário não logado'
 
-		ChatSubscription.update({ rid: roomId, uid: Meteor.userId() }, { $unset: { ts: 1, f: 1 } })
+		ChatSubscription.update({ rid: roomId, 'u._id': Meteor.userId() }, { $unset: { ts: 1, f: 1 } })
diff --git a/server/methods/sendMessage.coffee b/server/methods/sendMessage.coffee
index 12d73c2ed72cb..d1e6dec11449a 100644
--- a/server/methods/sendMessage.coffee
+++ b/server/methods/sendMessage.coffee
@@ -26,7 +26,7 @@ Meteor.methods
 
 		if Meteor.userId()?
 			messageFilter = { rid: rid, uid: Meteor.userId(), t: 't' }
-			activityFilter = { rid: rid, uid: { $ne: Meteor.userId() } }
+			activityFilter = { rid: rid, 'u._id': { $ne: Meteor.userId() } }
 
 		mentions = []
 		msg.message.replace /(?:^|\s|\n)(?:@)([A-Za-z0-9-_.]+)/g, (match, mention) ->
diff --git a/server/methods/setUsername.coffee b/server/methods/setUsername.coffee
index 2cacbaf402cee..6d695621c66f1 100644
--- a/server/methods/setUsername.coffee
+++ b/server/methods/setUsername.coffee
@@ -24,6 +24,31 @@ Meteor.methods
 		if not /^[0-9a-z-_.]+$/.test username
 			throw new Meteor.Error 'username-invalid'
 
-		Meteor.users.update({_id: user._id},  {$set: {username: username}})
+		if not user.username?
+			# put user in general channel
+			ChatRoom.update '57om6EQCcFami9wuT',
+				$addToSet:
+					username: username
+
+			if not ChatSubscription.findOne(rid: '57om6EQCcFami9wuT', 'u._id': user._id)?
+				ChatSubscription.insert
+					rid: '57om6EQCcFami9wuT'
+					u:
+						_id: user._id
+						username: username
+					ls: new Date()
+					rn: 'general'
+					t: 'c'
+					f: true
+					ts: new Date()
+					unread: 0
+
+				ChatMessage.insert
+					rid: '57om6EQCcFami9wuT'
+					ts: new Date()
+					t: 'wm'
+					msg: "#{user.name} - #{username}"
+
+		Meteor.users.update({_id: user._id}, {$set: {username: username}})
 
 		return username
diff --git a/server/methods/toogleFavorite.coffee b/server/methods/toogleFavorite.coffee
index 1a46f1f0b8578..95b576c0811ab 100644
--- a/server/methods/toogleFavorite.coffee
+++ b/server/methods/toogleFavorite.coffee
@@ -6,4 +6,4 @@ Meteor.methods
 		fromId = Meteor.userId()
 		# console.log '[methods] toogleFavorite -> '.green, 'fromId:', fromId, 'roomId:', roomId, 'fav:', fav
 
-		ChatSubscription.update { rid: roomId, uid: Meteor.userId() }, { $set: { f: fav } }
+		ChatSubscription.update { rid: roomId, 'u._id': Meteor.userId() }, { $set: { f: fav } }
diff --git a/server/publications.coffee b/server/publications.coffee
index 0bbf5a4c5e190..5cb63e6d7f866 100644
--- a/server/publications.coffee
+++ b/server/publications.coffee
@@ -13,10 +13,6 @@ Meteor.publish 'userData', ->
 			statusDefault: 1
 			statusConnection: 1
 			avatarOrigin: 1
-			emails: 1
-			'services.facebook.id': 1
-			'services.google.picture': 1
-			'services.github.username': 1
 
 Meteor.publish 'myRoomActivity', ->
 	unless this.userId
@@ -29,7 +25,7 @@ Meteor.publish 'myRoomActivity', ->
 	return Meteor.publishWithRelations
 		handle: this
 		collection: ChatSubscription
-		filter: { uid: this.userId, $or: [ { ts: { $gte: moment().subtract(1, 'days').startOf('day').toDate() } }, { f: true } ] }
+		filter: { 'u._id': this.userId, $or: [ { ts: { $gte: moment().subtract(1, 'days').startOf('day').toDate() } }, { f: true } ] }
 		mappings: [
 			key: 'rid'
 			reverse: false
@@ -73,10 +69,6 @@ Meteor.publish 'allUsers', ->
 		name: 1
 		username: 1
 		status: 1
-		emails: 1
-		'services.facebook.id': 1
-		'services.google.picture': 1
-		'services.github.username': 1
 	}}
 
 Meteor.publish 'selectiveUsers', (userIds) ->
@@ -94,10 +86,6 @@ Meteor.publish 'selectiveUsers', (userIds) ->
 			name: 1
 			username: 1
 			status: 1
-			emails: 1
-			'services.facebook.id': 1
-			'services.google.picture': 1
-			'services.github.username': 1
 
 	cursor = Meteor.users.find query, options
 

From 110e7ef76e4da165ad554fdc8a61d175b72e6263 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 17:06:29 -0300
Subject: [PATCH 02/26] Typing, sendMessage and sidebar profile fixed

---
 client/methods/sendMessage.coffee            |  5 +++--
 client/methods/typingStatus.coffee           |  4 +++-
 client/startup/startup.coffee                |  9 ---------
 client/views/app/chatMessageDashboard.coffee |  3 +--
 client/views/app/chatWindowDashboard.coffee  | 20 ++++++++++----------
 client/views/app/chatWindowDashboard.html    |  4 ++--
 client/views/app/sideNav/chatRoomItem.coffee |  2 +-
 client/views/app/sideNav/userStatus.coffee   |  1 +
 client/views/app/sideNav/userStatus.html     |  4 ++--
 server/methods/canAccessRoom.coffee          |  5 +++--
 server/methods/createDirectRoom.coffee       |  6 ++++--
 server/methods/forwardRoom.coffee            |  3 ++-
 server/methods/sendMessage.coffee            | 10 ++++++----
 server/methods/setUsername.coffee            |  3 +++
 server/methods/typingStatus.coffee           |  4 +++-
 server/startup/generalRoom.coffee            |  2 +-
 16 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/client/methods/sendMessage.coffee b/client/methods/sendMessage.coffee
index 4cee976d5d004..958ffaf165553 100644
--- a/client/methods/sendMessage.coffee
+++ b/client/methods/sendMessage.coffee
@@ -3,10 +3,11 @@ Meteor.methods
 		Tracker.nonreactive ->
 			now = new Date(Date.now() + TimeSync.serverOffset())
 
-			ChatMessage.upsert { rid: msg.rid, uid: Meteor.userId(), t: 't' },
+			ChatMessage.upsert { rid: msg.rid, t: 't' },
 				$set:
 					ts: now
 					msg: msg.message
+					'u.username': Meteor.user().username
 				$unset:
 					t: 1
 					expireAt: 1
@@ -15,7 +16,7 @@ Meteor.methods
 		Tracker.nonreactive ->
 			now = new Date(Date.now() + TimeSync.serverOffset())
 
-			ChatMessage.update { _id: msg.id, uid: Meteor.userId() },
+			ChatMessage.update { _id: msg.id, 'u._id': Meteor.userId() },
 				$set:
 					ets: now
 					msg: msg.message
diff --git a/client/methods/typingStatus.coffee b/client/methods/typingStatus.coffee
index 8d2536819f5e1..fdff0694957bb 100644
--- a/client/methods/typingStatus.coffee
+++ b/client/methods/typingStatus.coffee
@@ -6,7 +6,7 @@ Meteor.methods
 		filter =
 			t: 't'
 			rid: typingData.rid
-			uid: Meteor.userId()
+			$and: [{'u._id': Meteor.userId()}]
 
 		if start
 			msgData =
@@ -14,6 +14,8 @@ Meteor.methods
 					expireAt: moment().add(30, 'seconds').toDate()
 				'$setOnInsert':
 					msg: '...'
+					'u._id': Meteor.userId()
+					'u.username': Meteor.user().username
 					ts: moment().add(1, 'years').toDate()
 
 			ChatMessage.upsert(filter, msgData)
diff --git a/client/startup/startup.coffee b/client/startup/startup.coffee
index 083a88a33d32e..1ec645e9af334 100644
--- a/client/startup/startup.coffee
+++ b/client/startup/startup.coffee
@@ -28,24 +28,15 @@ Meteor.startup ->
 
 	Meteor.users.find({}, { fields: { name: 1, pictures: 1, status: 1, emails: 1, phone: 1, services: 1 } }).observe
 		added: (user) ->
-			Session.set('user_' + user._id + '_name', user.name)
 			Session.set('user_' + user._id + '_status', user.status)
-			Session.set('user_' + user._id + '_emails', user.emails)
-			Session.set('user_' + user._id + '_phone', user.phone)
 
 			UserAndRoom.insert({ type: 'u', uid: user._id, name: user.name})
 		changed: (user) ->
-			Session.set('user_' + user._id + '_name', user.name)
 			Session.set('user_' + user._id + '_status', user.status)
-			Session.set('user_' + user._id + '_emails', user.emails)
-			Session.set('user_' + user._id + '_phone', user.phone)
 
 			UserAndRoom.update({ uid: user._id }, { $set: { name: user.name } })
 		removed: (user) ->
-			Session.set('user_' + user._id + '_name', null)
 			Session.set('user_' + user._id + '_status', null)
-			Session.set('user_' + user._id + '_emails', null)
-			Session.set('user_' + user._id + '_phone', null)
 
 			UserAndRoom.remove({ uid: user._id })
 
diff --git a/client/views/app/chatMessageDashboard.coffee b/client/views/app/chatMessageDashboard.coffee
index 698df19f780f4..bb0b66c397c85 100644
--- a/client/views/app/chatMessageDashboard.coffee
+++ b/client/views/app/chatMessageDashboard.coffee
@@ -3,8 +3,7 @@ Template.chatMessageDashboard.helpers
 		return 'own' if this.data.uid is Meteor.userId()
 
 	username: ->
-		if this.uid?
-			return Session.get('user_' + this.uid + '_name')
+		return this.u.username
 
 	isSystemMessage: ->
 		return this.t in ['s', 'p', 'f', 'r', 'au', 'ru', 'ul', 'nu', 'wm']
diff --git a/client/views/app/chatWindowDashboard.coffee b/client/views/app/chatWindowDashboard.coffee
index 35765785cf3bc..3e54e90a5df04 100644
--- a/client/views/app/chatWindowDashboard.coffee
+++ b/client/views/app/chatWindowDashboard.coffee
@@ -37,7 +37,7 @@ Template.chatWindowDashboard.helpers
 
 	typing: ->
 		console.log 'chatWindowDashboard.typing' if window.rocketDebug
-		return this.uid isnt Meteor.userId()
+		return this.u._id isnt Meteor.userId()
 
 	usersTyping: ->
 		messages = ChatMessage.find { rid: this._id }, { sort: { ts: 1 } }
@@ -45,10 +45,10 @@ Template.chatWindowDashboard.helpers
 		selfTyping = false
 		messages.forEach (message) ->
 			if message.t is 't'
-				if message.uid is Meteor.userId()
+				if message.u._id is Meteor.userId()
 					selfTyping = true
 				else
-					username = Session.get('user_' + message.uid + '_name')
+					username = message.u.username
 					if username?
 						usernames.push username
 
@@ -142,14 +142,14 @@ Template.chatWindowDashboard.helpers
 		return {} unless roomData
 
 		if roomData.t is 'd'
-			uid = _.without roomData.uids, Meteor.userId()
-			UserManager.addUser uid
+			username = _.without roomData.usernames, Meteor.user().username
+			UserManager.addUser username
 
 			userData = {
-				name: Session.get('user_' + uid + '_name')
-				emails: Session.get('user_' + uid + '_emails') || []
-				phone: Session.get('user_' + uid + '_phone')
-				uid: String(uid)
+				name: Session.get('user_' + username + '_name')
+				emails: Session.get('user_' + username + '_emails') || []
+				phone: Session.get('user_' + username + '_phone')
+				username: String(username)
 			}
 			return userData
 
@@ -241,7 +241,7 @@ Template.chatWindowDashboard.helpers
 		room = ChatRoom.findOne(this._id, { reactive: false })
 		ret =
 			_id: this._id
-			total: room?.uids.length
+			total: room?.usernames.length
 			totalOnline: 0
 			users: []
 
diff --git a/client/views/app/chatWindowDashboard.html b/client/views/app/chatWindowDashboard.html
index 86bf6735a2a03..078170d698c9c 100644
--- a/client/views/app/chatWindowDashboard.html
+++ b/client/views/app/chatWindowDashboard.html
@@ -128,7 +128,7 @@ <h2>{{_ "chatWindowDashboard.Members_List"}}</h2>
 								{{> avatar userId=uid}}
 							</div>
 							<div class="info">
-								<h3>{{name}}</h3>
+								<h3>{{username}}</h3>
 								{{#if contactCode}}
 									<div class="contact-code">{{_ "general.Contact"}} {{contactCode}}</div>
 								{{/if}}
@@ -156,7 +156,7 @@ <h3>{{name}}</h3>
 								{{> avatar userId=uid}}
 							</div>
 							<div class="info">
-								<h3>{{name}}</h3>
+								<h3>{{username}}</h3>
 								{{#if contactCode}}
 									<div class="contact-code">{{_ "general.contact"}} {{contactCode}}</div>
 								{{/if}}
diff --git a/client/views/app/sideNav/chatRoomItem.coffee b/client/views/app/sideNav/chatRoomItem.coffee
index f327b2ba53b89..19931e993529e 100644
--- a/client/views/app/sideNav/chatRoomItem.coffee
+++ b/client/views/app/sideNav/chatRoomItem.coffee
@@ -32,7 +32,7 @@ Template.chatRoomItem.helpers
 
 		return false unless roomData
 
-		if (roomData.cl? and not roomData.cl) or roomData.t is 'd' or (roomData.uids.indexOf(Meteor.userId()) isnt -1 and roomData.uids.length is 1)
+		if (roomData.cl? and not roomData.cl) or roomData.t is 'd' or (roomData.usernames.indexOf(Meteor.user().username) isnt -1 and roomData.uids.length is 1)
 			return false
 		else
 			return true
diff --git a/client/views/app/sideNav/userStatus.coffee b/client/views/app/sideNav/userStatus.coffee
index 2d2649337eba7..c5fcec5692fd5 100644
--- a/client/views/app/sideNav/userStatus.coffee
+++ b/client/views/app/sideNav/userStatus.coffee
@@ -13,6 +13,7 @@ Template.userStatus.helpers
 			status: Session.get('user_' + Meteor.userId() + '_status')
 			visualStatus: visualStatus
 			_id: Meteor.userId()
+			username: Meteor.user().username
 		}
 
 Template.userStatus.events
diff --git a/client/views/app/sideNav/userStatus.html b/client/views/app/sideNav/userStatus.html
index 336a9866b92a8..436a8a2d8f335 100644
--- a/client/views/app/sideNav/userStatus.html
+++ b/client/views/app/sideNav/userStatus.html
@@ -2,13 +2,13 @@
 	<div class="account-box">
 		{{#with myUserInfo}}
 			<div class="info status-{{status}}">
-				{{#if name}}
+				{{#if username}}
 					<div class="thumb" data-status='{{visualStatus}}'>
 						{{> avatar userId=_id}}
 					</div>
 					<div class="data">
 						<div class="wrp">
-							<h4>{{name}}</h4>
+							<h4>{{username}}</h4>
 							<span class="arrow"></span>
 						</div>
 					</div>
diff --git a/server/methods/canAccessRoom.coffee b/server/methods/canAccessRoom.coffee
index 6a1e6f237d11b..5a5bc86752815 100644
--- a/server/methods/canAccessRoom.coffee
+++ b/server/methods/canAccessRoom.coffee
@@ -16,15 +16,16 @@ Meteor.methods
 
 		if room.t is 'c'
 			canAccess = true
-		else if room.uids.indexOf(Meteor.userId()) isnt -1
+		else if room.usernames.indexOf(Meteor.user().username) isnt -1
 			canAccess = true
 
 		if canAccess isnt true
 			throw new Meteor.Error 'without-permission', "[methods] canAccessRoom -> User doesn't have enough permissions"
 
 		# create room subscription
-		ChatSubscription.upsert { rid: roomId, 'u._id': Meteor.userId() },
+		ChatSubscription.upsert { rid: roomId, $and: [{'u._id': Meteor.userId()}] },
 			$setOnInsert:
+				'u._id': Meteor.userId()
 				rn: room.name
 				t: room.t
 				unread: 0
diff --git a/server/methods/createDirectRoom.coffee b/server/methods/createDirectRoom.coffee
index 9e7d70e31d751..d9c0eba53ad39 100644
--- a/server/methods/createDirectRoom.coffee
+++ b/server/methods/createDirectRoom.coffee
@@ -24,7 +24,7 @@ Meteor.methods
 				msgs: 0
 				ts: now
 
-		ChatSubscription.upsert { 'u._id': Meteor.userId(), rid: roomId },
+		ChatSubscription.upsert { $and: [{'u._id': Meteor.userId()}], rid: roomId },
 			$set:
 				ts: now
 				ls: now
@@ -32,13 +32,15 @@ Meteor.methods
 			$setOnInsert:
 				t: 'd'
 				unread: 0
+				'u._id': userTo._id
 
-		ChatSubscription.upsert { 'u._id': userTo._id, rid: roomId },
+		ChatSubscription.upsert { $and: [{'u._id': userTo._id}], rid: roomId },
 			$set:
 				rn: me.name
 			$setOnInsert:
 				t: 'd'
 				unread: 0
+				'u._id': userTo._id
 
 		return {
 			rid: roomId
diff --git a/server/methods/forwardRoom.coffee b/server/methods/forwardRoom.coffee
index c8a7c95b15b68..01ac844806453 100644
--- a/server/methods/forwardRoom.coffee
+++ b/server/methods/forwardRoom.coffee
@@ -19,8 +19,9 @@ Meteor.methods
 			# $pull:
 			# 	uids: Meteor.userId()
 
-		ChatSubscription.upsert { rid: forward.rid, 'u._id': forward.to },
+		ChatSubscription.upsert { rid: forward.rid, $and: [{'u._id': forward.to}] },
 			$setOnInsert:
+				'u._id': forward.to
 				rn: room.name
 				t: 'v'
 				unread: 0
diff --git a/server/methods/sendMessage.coffee b/server/methods/sendMessage.coffee
index d1e6dec11449a..fc19ffb626d53 100644
--- a/server/methods/sendMessage.coffee
+++ b/server/methods/sendMessage.coffee
@@ -19,13 +19,13 @@ Meteor.methods
 
 		roomUpdate = { $set: { lm: now }, $inc: { msgs: 1 } }
 
-		if Meteor.userId() and roomData.uids.indexOf(Meteor.userId()) is -1
-			roomUpdate.$push = { uids: Meteor.userId() }
+		if Meteor.userId() and not Meteor.user().username in roomData.usernames
+			roomUpdate.$push = { usernames: Meteor.user().username }
 
 		ChatRoom.update rid, roomUpdate
 
 		if Meteor.userId()?
-			messageFilter = { rid: rid, uid: Meteor.userId(), t: 't' }
+			messageFilter = { rid: rid, $and: [{ 'u._id': Meteor.userId() }], t: 't' }
 			activityFilter = { rid: rid, 'u._id': { $ne: Meteor.userId() } }
 
 		mentions = []
@@ -47,6 +47,8 @@ Meteor.methods
 
 		ChatMessage.upsert messageFilter,
 			$set:
+				'u._id': Meteor.userId()
+				'u.username': Meteor.user().username
 				ts: now
 				msg: msg.message
 				mentions: mentions
@@ -68,7 +70,7 @@ Meteor.methods
 
 		now = new Date()
 
-		messageFilter = { _id: msg.id, uid: Meteor.userId() }
+		messageFilter = { _id: msg.id, 'u._id': Meteor.userId() }
 
 		ChatMessage.update messageFilter,
 			$set:
diff --git a/server/methods/setUsername.coffee b/server/methods/setUsername.coffee
index 6d695621c66f1..a896a4b34df90 100644
--- a/server/methods/setUsername.coffee
+++ b/server/methods/setUsername.coffee
@@ -44,6 +44,9 @@ Meteor.methods
 					unread: 0
 
 				ChatMessage.insert
+					u:
+						_id: user._id
+						username: username
 					rid: '57om6EQCcFami9wuT'
 					ts: new Date()
 					t: 'wm'
diff --git a/server/methods/typingStatus.coffee b/server/methods/typingStatus.coffee
index c10c89d3e2a18..472c03ecadad3 100644
--- a/server/methods/typingStatus.coffee
+++ b/server/methods/typingStatus.coffee
@@ -9,7 +9,7 @@ Meteor.methods
 		filter =
 			t: 't'
 			rid: typingData.rid
-			uid: Meteor.userId()
+			$and: [{'u._id': Meteor.userId()}]
 
 		if start
 			msgData =
@@ -18,6 +18,8 @@ Meteor.methods
 				'$setOnInsert':
 					msg: '...'
 					ts: moment().add(1, 'years').toDate()
+					'u._id': Meteor.userId()
+					'u.username': Meteor.user().username
 
 			ChatMessage.upsert(filter, msgData)
 		else
diff --git a/server/startup/generalRoom.coffee b/server/startup/generalRoom.coffee
index cdd4247005cdf..d598d2ceb1d30 100644
--- a/server/startup/generalRoom.coffee
+++ b/server/startup/generalRoom.coffee
@@ -3,7 +3,7 @@ Meteor.startup ->
 		if ChatRoom.find('57om6EQCcFami9wuT').count() is 0
 			ChatRoom.insert
 				_id: '57om6EQCcFami9wuT'
-				uids: []
+				usernames: []
 				ts: new Date()
 				t: 'c'
 				name: 'general'

From d35ae42a52608361e490f07f04a57a5d4b1d8dc9 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 17:41:33 -0300
Subject: [PATCH 03/26] Create channels working

---
 client/methods/leaveRoom.coffee               |  4 ++--
 client/views/app/sideNav/chatRoomItem.coffee  |  2 +-
 .../app/sideNav/createChannelFlex.coffee      |  6 +++---
 server/methods/createChannel.coffee           | 20 +++++++++++++------
 server/methods/leaveRoom.coffee               |  8 ++++----
 server/publications.coffee                    |  4 ++--
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/client/methods/leaveRoom.coffee b/client/methods/leaveRoom.coffee
index 728bb75b3d217..fe1d6676affb0 100644
--- a/client/methods/leaveRoom.coffee
+++ b/client/methods/leaveRoom.coffee
@@ -4,8 +4,8 @@ Meteor.methods
 
 		update =
 			$pull:
-				uids: Meteor.userId()
+				usernames: Meteor.user().username
 
-		ChatSubscription.remove { rid: roomId, uid: Meteor.userId() }
+		ChatSubscription.remove { rid: roomId, 'u._id': Meteor.userId() }
 
 		ChatRoom.update roomId, update
diff --git a/client/views/app/sideNav/chatRoomItem.coffee b/client/views/app/sideNav/chatRoomItem.coffee
index 19931e993529e..2b13cd184e3b9 100644
--- a/client/views/app/sideNav/chatRoomItem.coffee
+++ b/client/views/app/sideNav/chatRoomItem.coffee
@@ -32,7 +32,7 @@ Template.chatRoomItem.helpers
 
 		return false unless roomData
 
-		if (roomData.cl? and not roomData.cl) or roomData.t is 'd' or (roomData.usernames.indexOf(Meteor.user().username) isnt -1 and roomData.uids.length is 1)
+		if (roomData.cl? and not roomData.cl) or roomData.t is 'd' or (roomData.usernames.indexOf(Meteor.user().username) isnt -1 and roomData.usernames.length is 1)
 			return false
 		else
 			return true
diff --git a/client/views/app/sideNav/createChannelFlex.coffee b/client/views/app/sideNav/createChannelFlex.coffee
index f0ddd5dca61e6..b993fd72a6f20 100644
--- a/client/views/app/sideNav/createChannelFlex.coffee
+++ b/client/views/app/sideNav/createChannelFlex.coffee
@@ -25,7 +25,7 @@ Template.createChannelFlex.helpers
 						type: 'u'
 						$and: [
 							{ _id: { $ne: Meteor.userId() } }
-							{ _id: { $nin: Template.instance().selectedUsers.get() } }
+							{ username: { $nin: Template.instance().selectedUsers.get() } }
 						]
 					sort: 'name'
 				}
@@ -34,9 +34,9 @@ Template.createChannelFlex.helpers
 
 Template.createChannelFlex.events
 	'autocompleteselect #channel-members': (event, instance, doc) ->
-		instance.selectedUsers.set instance.selectedUsers.get().concat doc._id
+		instance.selectedUsers.set instance.selectedUsers.get().concat doc.username
 
-		instance.selectedUserNames[doc._id] = doc.name
+		instance.selectedUserNames[doc.username] = doc.name
 
 		event.currentTarget.value = ''
 		event.currentTarget.focus()
diff --git a/server/methods/createChannel.coffee b/server/methods/createChannel.coffee
index b5f7e4170c408..38a50ae7287f9 100644
--- a/server/methods/createChannel.coffee
+++ b/server/methods/createChannel.coffee
@@ -5,29 +5,37 @@ Meteor.methods
 
 		now = new Date()
 
-		members.push Meteor.userId()
+		members.push Meteor.user().username
 
 		name = s.slugify name
 
 		# create new room
 		roomId = ChatRoom.insert
-			uids: members
+			usernames: members
 			ts: now
 			t: 'c'
-			uid: Meteor.userId()
+			u:
+				_id: Meteor.userId()
+				username: Meteor.user().username
 			name: name
 			msgs: 0
 
-		for user in members
+		for username in members
+			member = Meteor.users.findOne({username: username})
+			if not member?
+				continue
+
 			sub =
-				uid: user
+				u: 
+					_id: member._id
+					username: username
 				rid: roomId
 				ts: now
 				rn: name
 				t: 'c'
 				unread: 0
 
-			if user is Meteor.userId()
+			if username is Meteor.user().username
 				sub.ls = now
 
 			ChatSubscription.insert sub
diff --git a/server/methods/leaveRoom.coffee b/server/methods/leaveRoom.coffee
index 19499ef2aab47..6c95be09dae8e 100644
--- a/server/methods/leaveRoom.coffee
+++ b/server/methods/leaveRoom.coffee
@@ -10,7 +10,7 @@ Meteor.methods
 
 		update =
 			$pull:
-				uids: Meteor.userId()
+				usernames: Meteor.user().username
 
 		ChatSubscription.update { rid: roomId },
 			$set:
@@ -18,8 +18,8 @@ Meteor.methods
 		,
 			multi: true
 
-		if room.t isnt 'c' and room.uids.indexOf(Meteor.userId()) isnt -1
-			removedUser = Meteor.users.findOne Meteor.userId()
+		if room.t isnt 'c' and room.usernames.indexOf(Meteor.user().username) isnt -1
+			removedUser = Meteor.user()
 
 			ChatMessage.insert
 				rid: roomId
@@ -34,6 +34,6 @@ Meteor.methods
 
 			update.$set.uid = _.without(room.uids, Meteor.userId())[0]
 
-		ChatSubscription.remove { rid: roomId, uid: Meteor.userId() }
+		ChatSubscription.remove { rid: roomId, 'u._id': Meteor.userId() }
 
 		ChatRoom.update roomId, update
diff --git a/server/publications.coffee b/server/publications.coffee
index 5cb63e6d7f866..b106d4e96b5ee 100644
--- a/server/publications.coffee
+++ b/server/publications.coffee
@@ -127,9 +127,9 @@ Meteor.publish 'roomSearch', (selector, options, collName) ->
 		delete selector.type
 
 	if not searchType? or searchType is 'u'
-		subHandleUsers = Meteor.users.find(selector, { limit: 10, fields: { name: 1, status: 1 } }).observeChanges
+		subHandleUsers = Meteor.users.find(selector, { limit: 10, fields: { name: 1, username: 1, status: 1 } }).observeChanges
 			added: (id, fields) ->
-				data = { type: 'u', uid: id, name: fields.name, status: fields.status }
+				data = { type: 'u', uid: id, name: fields.name, username: fields.username, status: fields.status }
 				self.added("autocompleteRecords", id, data)
 			changed: (id, fields) ->
 				self.changed("autocompleteRecords", id, fields)

From 80bcfafa6cb3b66d24a3464037e863ec41cdbb43 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 17:41:39 -0300
Subject: [PATCH 04/26] Fix indexes

---
 server/startup/indexes.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/startup/indexes.coffee b/server/startup/indexes.coffee
index eeec7a2346121..bae065df2d56c 100644
--- a/server/startup/indexes.coffee
+++ b/server/startup/indexes.coffee
@@ -3,6 +3,6 @@ Meteor.startup ->
 		ChatMessage._ensureIndex({ 'expireAt': 1 }, { expireAfterSeconds: 0 })
 		ChatMessage._ensureIndex({ 'rid': 1 })
 		ChatMessage._ensureIndex({ 'rid': 1, 'ts': 1 })
-		ChatSubscription._ensureIndex({ 'uid': 1 })
+		ChatSubscription._ensureIndex({ 'u._id': 1 })
 		ChatSubscription._ensureIndex({ 'ts': 1 })
-		ChatSubscription._ensureIndex({ 'rid': 1, 'uid': 1 }, {unique: true})
+		ChatSubscription._ensureIndex({ 'rid': 1, 'u._id': 1 }, {unique: true})

From 3f931f48a01f2183747281fcc05c8e40f78b8804 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 17:45:57 -0300
Subject: [PATCH 05/26] Create groups working

---
 .../views/app/sideNav/privateGroupsFlex.coffee   |  6 +++---
 server/methods/createPrivateGroup.coffee         | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/client/views/app/sideNav/privateGroupsFlex.coffee b/client/views/app/sideNav/privateGroupsFlex.coffee
index 4303c2a236285..0fce8645697ee 100644
--- a/client/views/app/sideNav/privateGroupsFlex.coffee
+++ b/client/views/app/sideNav/privateGroupsFlex.coffee
@@ -25,7 +25,7 @@ Template.privateGroupsFlex.helpers
 						type: 'u'
 						$and: [
 							{ _id: { $ne: Meteor.userId() } }
-							{ _id: { $nin: Template.instance().selectedUsers.get() } }
+							{ username: { $nin: Template.instance().selectedUsers.get() } }
 						]
 					sort: 'name'
 				}
@@ -34,9 +34,9 @@ Template.privateGroupsFlex.helpers
 
 Template.privateGroupsFlex.events
 	'autocompleteselect #pvt-group-members': (event, instance, doc) ->
-		instance.selectedUsers.set instance.selectedUsers.get().concat doc._id
+		instance.selectedUsers.set instance.selectedUsers.get().concat doc.username
 
-		instance.selectedUserNames[doc._id] = doc.name
+		instance.selectedUserNames[doc.username] = doc.name
 
 		event.currentTarget.value = ''
 		event.currentTarget.focus()
diff --git a/server/methods/createPrivateGroup.coffee b/server/methods/createPrivateGroup.coffee
index cb44bd192c197..77e9bf80cf881 100644
--- a/server/methods/createPrivateGroup.coffee
+++ b/server/methods/createPrivateGroup.coffee
@@ -5,29 +5,35 @@ Meteor.methods
 
 		now = new Date()
 
-		members.push Meteor.userId()
+		members.push Meteor.user().username
 
 		name = s.slugify name
 
 		# create new room
 		roomId = ChatRoom.insert
-			uids: members
+			usernames: members
 			ts: now
 			t: 'p'
 			uid: Meteor.userId()
 			name: name
 			msgs: 0
 
-		for user in members
+		for username in members
+			member = Meteor.users.findOne({username: username})
+			if not member?
+				continue
+
 			sub =
-				uid: user
+				u: 
+					_id: member._id
+					username: username
 				rid: roomId
 				ts: now
 				rn: name
 				t: 'p'
 				unread: 0
 
-			if user is Meteor.userId()
+			if username is Meteor.user().username
 				sub.ls = now
 
 			ChatSubscription.insert sub

From 5d1e28773095f13c1fc1b407ba1d0719c89d7f45 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 17:54:10 -0300
Subject: [PATCH 06/26] View user info when click in user name or mention
 working

---
 client/views/app/chatMessageDashboard.coffee |  7 +++----
 client/views/app/chatMessageDashboard.html   |  6 +++---
 client/views/app/chatWindowDashboard.coffee  | 18 +++++++++---------
 client/views/app/chatWindowDashboard.html    |  2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/client/views/app/chatMessageDashboard.coffee b/client/views/app/chatMessageDashboard.coffee
index bb0b66c397c85..59c4b92592643 100644
--- a/client/views/app/chatMessageDashboard.coffee
+++ b/client/views/app/chatMessageDashboard.coffee
@@ -75,10 +75,9 @@ Template.chatMessageDashboard.events
 			Meteor.defer ->
 				$('.input-message-editing').select()
 
-	# TODO open flextab with user info
-	# 'click .mention-link': ->
-	# 	Session.set('flexOpened', true)
-	# 	Session.set('showUserInfo', $(e.currentTarget).data('username'))
+	'click .mention-link': (e) ->
+		Session.set('flexOpened', true)
+		Session.set('showUserInfo', $(e.currentTarget).data('username'))
 
 Template.chatMessageDashboard.onRendered ->
 	chatMessages = $('.messages-box .wrapper')
diff --git a/client/views/app/chatMessageDashboard.html b/client/views/app/chatMessageDashboard.html
index 1d4e3ea90ff52..ed85d434fbf11 100644
--- a/client/views/app/chatMessageDashboard.html
+++ b/client/views/app/chatMessageDashboard.html
@@ -4,10 +4,10 @@
 			{{#if isSystemMessage}}
 				<p class="system">{{{message}}}</p>
 			{{else}}
-				<a class="thumb user-card-message" href="#" data-userid="{{uid}}" tabindex="1">
-					{{> avatar userId=uid}}
+				<a class="thumb user-card-message" href="#" data-username="{{username}}" tabindex="1">
+					{{> avatar username=username}}
 				</a>
-				<a class="user user-card-message" href="#" data-userid="{{uid}}" tabindex="1">{{username}}</a>
+				<a class="user user-card-message" href="#" data-username="{{username}}" tabindex="1">{{username}}</a>
 				<span class="time">
 					{{time}}
 					{{#if ets}}
diff --git a/client/views/app/chatWindowDashboard.coffee b/client/views/app/chatWindowDashboard.coffee
index 3e54e90a5df04..1cd42cce44778 100644
--- a/client/views/app/chatWindowDashboard.coffee
+++ b/client/views/app/chatWindowDashboard.coffee
@@ -264,16 +264,16 @@ Template.chatWindowDashboard.helpers
 		return ret
 
 	flexUserInfo: ->
-		uid = Session.get('showUserInfo')
+		username = Session.get('showUserInfo')
 
 		userData = {
-			name: Session.get('user_' + uid + '_name')
-			emails: Session.get('user_' + uid + '_emails')
-			uid: String(uid)
+			# name: Session.get('user_' + uid + '_name')
+			# emails: Session.get('user_' + uid + '_emails')
+			username: String(username)
 		}
-		phone = Session.get('user_' + uid + '_phone')
-		if phone? and phone[0]?.phoneNumber
-			userData.phone = phone[0]?.phoneNumber
+		# phone = Session.get('user_' + uid + '_phone')
+		# if phone? and phone[0]?.phoneNumber
+		# 	userData.phone = phone[0]?.phoneNumber
 
 		return userData
 
@@ -363,13 +363,13 @@ Template.chatWindowDashboard.events
 
 	"click .flex-tab .user-image > a" : (e) ->
 		Session.set('flexOpened', true)
-		Session.set('showUserInfo', $(e.currentTarget).data('userid'))
+		Session.set('showUserInfo', $(e.currentTarget).data('username'))
 
 	'click .user-card-message': (e) ->
 		roomData = Session.get('roomData' + this.rid)
 		if roomData.t in ['c', 'p']
 			Session.set('flexOpened', true)
-			Session.set('showUserInfo', $(e.currentTarget).data('userid'))
+			Session.set('showUserInfo', $(e.currentTarget).data('username'))
 		else
 			Session.set('flexOpened', true)
 
diff --git a/client/views/app/chatWindowDashboard.html b/client/views/app/chatWindowDashboard.html
index 078170d698c9c..bbc518bf20000 100644
--- a/client/views/app/chatWindowDashboard.html
+++ b/client/views/app/chatWindowDashboard.html
@@ -125,7 +125,7 @@ <h2>{{_ "chatWindowDashboard.Members_List"}}</h2>
 					{{#with flexUserInfo}}
 						<div class="about cf_">
 							<div class="thumb">
-								{{> avatar userId=uid}}
+								{{> avatar username=username}}
 							</div>
 							<div class="info">
 								<h3>{{username}}</h3>

From 639aa76dd61d25e638f1e808ba5a3d9b707d7d68 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 18:50:27 -0300
Subject: [PATCH 07/26] Direct messages working

---
 client/views/app/chatWindowDashboard.html |  2 +-
 server/methods/createDirectRoom.coffee    | 10 +++++-----
 server/startup/initialData.coffee         |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/views/app/chatWindowDashboard.html b/client/views/app/chatWindowDashboard.html
index bbc518bf20000..bce70e9be6758 100644
--- a/client/views/app/chatWindowDashboard.html
+++ b/client/views/app/chatWindowDashboard.html
@@ -153,7 +153,7 @@ <h3>{{username}}</h3>
 					{{#with userData}}
 						<div class="about cf_">
 							<div class="thumb">
-								{{> avatar userId=uid}}
+								{{> avatar username=username}}
 							</div>
 							<div class="info">
 								<h3>{{username}}</h3>
diff --git a/server/methods/createDirectRoom.coffee b/server/methods/createDirectRoom.coffee
index d9c0eba53ad39..6add84d413332 100644
--- a/server/methods/createDirectRoom.coffee
+++ b/server/methods/createDirectRoom.coffee
@@ -1,14 +1,14 @@
 Meteor.methods
-	createDirectRoom: (toUserId) ->
+	createDirectRoom: (toUsername) ->
 		fromId = Meteor.userId()
 		# console.log '[methods] createDirectRoom -> '.green, 'fromId:', fromId, 'toUserId:', toUserId
 
-		if Meteor.userId() is toUserId
+		if Meteor.user().username is toUsername
 			return
 
-		roomId = [Meteor.userId(), toUserId].sort().join('')
+		roomId = [Meteor.userId().username, toUsername].sort().join('')
 
-		userTo = Meteor.users.findOne { _id: toUserId }
+		userTo = Meteor.users.findOne { username: toUsername }
 
 		me = Meteor.user()
 
@@ -17,7 +17,7 @@ Meteor.methods
 		# create new room
 		ChatRoom.upsert { _id: roomId },
 			$set:
-				uids: [Meteor.userId(),toUserId]
+				usernames: [Meteor.user().username, toUsername]
 			$setOnInsert:
 				t: 'd'
 				name: "#{me.name}|#{userTo.name}"
diff --git a/server/startup/initialData.coffee b/server/startup/initialData.coffee
index 4289a40576043..6b0e959fdd76a 100644
--- a/server/startup/initialData.coffee
+++ b/server/startup/initialData.coffee
@@ -13,5 +13,6 @@ Meteor.startup ->
 				verified: true
 			],
 			name: 'Admin'
+			avatarOrigin: 'none'
 
 		Accounts.setPassword id, 'admin'

From a2065dcb6b5be373cb9ec0e5fc9af15b42169d62 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 18:52:42 -0300
Subject: [PATCH 08/26] Read messages working

---
 server/methods/readMessages.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/methods/readMessages.coffee b/server/methods/readMessages.coffee
index b0c861d42cb64..b1d3cf5838722 100644
--- a/server/methods/readMessages.coffee
+++ b/server/methods/readMessages.coffee
@@ -4,7 +4,7 @@ Meteor.methods
 		# console.log '[methods] readMessages -> '.green, 'fromId:', fromId, 'room:', room
 
 		if Meteor.userId()
-			filter = { rid: room, uid: Meteor.userId() }
+			filter = { rid: room, 'u._id': Meteor.userId() }
 		else
 			throw new Meteor.Error 203, '[methods] readMessages -> Invalid user'
 

From 75419258ce37a208927c3fb08e3be7fd2826a4f2 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 18:55:42 -0300
Subject: [PATCH 09/26] Fix list of users in room

---
 client/views/app/chatWindowDashboard.coffee | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/views/app/chatWindowDashboard.coffee b/client/views/app/chatWindowDashboard.coffee
index 1cd42cce44778..eb65958764cb4 100644
--- a/client/views/app/chatWindowDashboard.coffee
+++ b/client/views/app/chatWindowDashboard.coffee
@@ -245,12 +245,12 @@ Template.chatWindowDashboard.helpers
 			totalOnline: 0
 			users: []
 
-		if room?.uids
+		if room?.usernames
 			# UserManager.addUser room.uids
 
 			filter =
-				_id:
-					$in: room?.uids
+				username:
+					$in: room.usernames
 
 			# unless Template.instance().showUsersOffline.get()
 			# 	filter.status = { $ne: 'offline' }

From 650dfcc773c6bbdd51837c70ae5e1528145ae8e0 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 19:26:52 -0300
Subject: [PATCH 10/26] Fixes #131

---
 client/stylesheets/base.less              | 2 +-
 client/views/app/chatWindowDashboard.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index 9fc6449340cff..792daebefc6d0 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -269,7 +269,7 @@ input.search {
 	}
 }
 
-form.search-form {
+.search-form {
 	position: relative;
 }
 
diff --git a/client/views/app/chatWindowDashboard.html b/client/views/app/chatWindowDashboard.html
index bce70e9be6758..5bed187c4a201 100644
--- a/client/views/app/chatWindowDashboard.html
+++ b/client/views/app/chatWindowDashboard.html
@@ -86,12 +86,12 @@ <h2>
 		<div class="control">
 			<button class="more"><span class="arrow {{arrowPosition}}"></span></button>
 			{{#if canAddUser}}
-				<form class="search-form" role="form">
+				<div class="search-form">
 					<div class="input-line search">
 						{{> inputAutocomplete settings=autocompleteSettingsAddUser id="user-add-search" class="search" placeholder=tAddUsers}}
 						<i class="icon-plus"></i>
 					</div>
-				</form>
+				</div>
 			{{else}}
 				{{#if isChannel}}
 					<form class="search-form" role="form">

From e6bbd5a2f9b0435ef77af119a5a9c184eb98d050 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 19:27:46 -0300
Subject: [PATCH 11/26] Add user to room working

---
 client/views/app/chatWindowDashboard.coffee | 11 +++++------
 server/methods/addUserToRoom.coffee         | 12 +++++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/client/views/app/chatWindowDashboard.coffee b/client/views/app/chatWindowDashboard.coffee
index eb65958764cb4..e648650010c1a 100644
--- a/client/views/app/chatWindowDashboard.coffee
+++ b/client/views/app/chatWindowDashboard.coffee
@@ -391,21 +391,20 @@ Template.chatWindowDashboard.events
 		roomData = Session.get('roomData' + Session.get('openedRoom'))
 
 		if roomData.t is 'd'
-			Meteor.call 'createGroupRoom', roomData.uids, doc.uid, (error, result) ->
+			Meteor.call 'createGroupRoom', roomData.usernames, doc.username, (error, result) ->
 				if error
 					return Errors.throw error.reason
 
 				if result?.rid?
-					Router.go('room', { _id: result.rid })
+					# Router.go('room', { _id: result.rid })
 					$('#user-add-search').val('')
 		else if roomData.t in ['c', 'p']
-			Meteor.call 'addUserToRoom', { rid: roomData._id, uid: doc.uid }, (error, result) ->
+			Meteor.call 'addUserToRoom', { rid: roomData._id, username: doc.username }, (error, result) ->
 				if error
 					return Errors.throw error.reason
 
-				if result
-					$('#user-add-search').val('')
-					toggleAddUser()
+				$('#user-add-search').val('')
+				toggleAddUser()
 
 	'autocompleteselect #room-search': (event, template, doc) ->
 		if doc.type is 'u'
diff --git a/server/methods/addUserToRoom.coffee b/server/methods/addUserToRoom.coffee
index 7417ef8e3d279..69f9862a5f8c1 100644
--- a/server/methods/addUserToRoom.coffee
+++ b/server/methods/addUserToRoom.coffee
@@ -5,23 +5,25 @@ Meteor.methods
 
 		room = ChatRoom.findOne data.rid
 
-		if room.uid isnt Meteor.userId() and room.t is 'c'
+		if room.username isnt Meteor.user().username and room.t is 'c'
 			throw new Meteor.Error 403, '[methods] addUserToRoom -> Not allowed'
 
 		# verify if user is already in room
-		if room.uids.indexOf(data.uid) isnt -1
+		if room.usernames.indexOf(data.username) isnt -1
 			return
 
 		update =
 			$addToSet:
-				uids: data.uid
+				usernames: data.username
 
-		newUser = Meteor.users.findOne data.uid
+		newUser = Meteor.users.findOne username: data.username
 
 		ChatRoom.update data.rid, update
 
 		ChatSubscription.insert
-			uid: data.uid
+			u:
+				_id: newUser._id
+				username: data.username
 			rid: data.rid
 			ts: (new Date())
 			rn: room.name

From 4d2db614b77bf4342682f8f0095d888fae00c746 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 19:39:48 -0300
Subject: [PATCH 12/26] More adjustments

---
 client/views/app/userCard.coffee         | 11 +++++------
 server/methods/leaveRoom.coffee          | 14 ++++++++++----
 server/methods/removeUserFromRoom.coffee |  8 ++++----
 server/publications.coffee               |  4 ++--
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/client/views/app/userCard.coffee b/client/views/app/userCard.coffee
index 0d918572c87c0..e09efb34e4ade 100644
--- a/client/views/app/userCard.coffee
+++ b/client/views/app/userCard.coffee
@@ -14,14 +14,13 @@ Template.userCard.helpers
 		return userData
 
 	canManageRoom: ->
-		Tracker.nonreactive ->
-			return false unless Router.current().params._id?
+		return false unless Router.current().params._id?
 
-			roomData = Session.get('roomData' + Router.current().params._id)
+		roomData = Session.get('roomData' + Router.current().params._id)
 
-			return false unless roomData?
+		return false unless roomData?
 
-			return roomData.uid is Meteor.userId() and not Session.equals('userProfileActive', Meteor.userId())
+		return roomData.u?._id is Meteor.userId() and not Session.equals('userProfileActive', Meteor.user().username)
 
 Template.userCard.events
 	'click .private-chat': (event) ->
@@ -33,6 +32,6 @@ Template.userCard.events
 				Router.go('room', { _id: result.rid })
 
 	'click .remove-user': (event) ->
-		Meteor.call 'removeUserFromRoom', { rid: Router.current().params._id, uid: Session.get('userProfileActive') }, (error, result) ->
+		Meteor.call 'removeUserFromRoom', { rid: Router.current().params._id, username: Session.get('userProfileActive') }, (error, result) ->
 			if error
 				return Errors.throw error.reason
diff --git a/server/methods/leaveRoom.coffee b/server/methods/leaveRoom.coffee
index 6c95be09dae8e..d144ba1b49e58 100644
--- a/server/methods/leaveRoom.coffee
+++ b/server/methods/leaveRoom.coffee
@@ -28,11 +28,17 @@ Meteor.methods
 				msg: removedUser.name
 				by: Meteor.userId()
 
-		if room.uid is Meteor.userId()
-			if not update.$set?
-				update.$set = {}
+		if room.u._id is Meteor.userId()
+			newOwner = _.without(room.usernames, Meteor.user().username)[0]
+			if newOwner?
+				newOwner = Meteor.users.findOne username: newOwner
 
-			update.$set.uid = _.without(room.uids, Meteor.userId())[0]
+				if newOwner?
+					if not update.$set?
+						update.$set = {}
+
+					update.$set['u._id'] = newOwner._id
+					update.$set['u.username'] = newOwner.username
 
 		ChatSubscription.remove { rid: roomId, 'u._id': Meteor.userId() }
 
diff --git a/server/methods/removeUserFromRoom.coffee b/server/methods/removeUserFromRoom.coffee
index 81bf367ba53c2..62bba8cc1fcce 100644
--- a/server/methods/removeUserFromRoom.coffee
+++ b/server/methods/removeUserFromRoom.coffee
@@ -5,18 +5,18 @@ Meteor.methods
 
 		room = ChatRoom.findOne data.rid
 
-		if room.uid isnt Meteor.userId() and room.t is 'c'
+		if room.u?._id isnt Meteor.userId() and room.t is 'c'
 			throw new Meteor.Error 403, 'Not allowed'
 
 		update =
 			$pull:
-				uids: data.uid
+				usernames: data.username
 
-		removedUser = Meteor.users.findOne data.uid
+		removedUser = Meteor.users.findOne username: data.username
 
 		ChatRoom.update data.rid, update
 
-		ChatSubscription.remove { uid: data.uid, rid: data.rid }
+		ChatSubscription.remove { 'u._id': data.username, rid: data.rid }
 
 		ChatMessage.insert
 			rid: data.rid
diff --git a/server/publications.coffee b/server/publications.coffee
index b106d4e96b5ee..b5c3e81f6b0db 100644
--- a/server/publications.coffee
+++ b/server/publications.coffee
@@ -110,7 +110,7 @@ Meteor.publish 'privateHistoryRooms', ->
 
 	# console.log '[publish] privateHistoryRooms'.green
 
-	return ChatRoom.find { uids: this.userId, t: { $in: ['d', 'c'] } }, { fields: { t: 1, name: 1, msgs: 1, ts: 1, lm: 1, cl: 1 } }
+	return ChatRoom.find { usernames: this.user().username, t: { $in: ['d', 'c'] } }, { fields: { t: 1, name: 1, msgs: 1, ts: 1, lm: 1, cl: 1 } }
 
 Meteor.publish 'roomSearch', (selector, options, collName) ->
 	unless this.userId
@@ -139,7 +139,7 @@ Meteor.publish 'roomSearch', (selector, options, collName) ->
 	subHandleRooms = null
 
 	# @TODO buscar apenas salas de grupo permitidas
-	roomSelector = _.extend { t: { $in: ['c'] }, uids: this.userId }, selector
+	roomSelector = _.extend { t: { $in: ['c'] }, usernames: this.user().username }, selector
 
 	if not searchType? or searchType is 'r'
 		subHandleRooms = ChatRoom.find(roomSelector, { limit: 10, fields: { t: 1, name: 1 } }).observeChanges

From 1e6631192eca4442eca3974f1db024425abd13cc Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 20:00:05 -0300
Subject: [PATCH 13/26] Fix direct message creation

---
 server/methods/createDirectRoom.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/methods/createDirectRoom.coffee b/server/methods/createDirectRoom.coffee
index 6add84d413332..bea955eb0225b 100644
--- a/server/methods/createDirectRoom.coffee
+++ b/server/methods/createDirectRoom.coffee
@@ -6,7 +6,7 @@ Meteor.methods
 		if Meteor.user().username is toUsername
 			return
 
-		roomId = [Meteor.userId().username, toUsername].sort().join('')
+		roomId = [Meteor.user().username, toUsername].sort().join('')
 
 		userTo = Meteor.users.findOne { username: toUsername }
 

From 45c2884d8e8d822e64711005cbc6de8a3d5c0cff Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 20:07:09 -0300
Subject: [PATCH 14/26] Fix users status

---
 client/lib/UserManager.coffee                | 12 +++++-----
 client/startup/startup.coffee                |  8 +++----
 client/views/app/chatMessageDashboard.coffee |  4 ++--
 client/views/app/chatWindowDashboard.coffee  | 24 ++++++++++----------
 client/views/app/sideNav/chatRoomItem.coffee |  9 ++++----
 client/views/app/sideNav/userStatus.coffee   |  9 ++++----
 client/views/app/userImageProfile.coffee     |  5 +---
 client/views/app/userImageProfile.html       |  6 ++---
 server/publications.coffee                   | 11 +++++----
 9 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/client/lib/UserManager.coffee b/client/lib/UserManager.coffee
index be3dcfd4a8377..784a889f2589f 100644
--- a/client/lib/UserManager.coffee
+++ b/client/lib/UserManager.coffee
@@ -3,12 +3,12 @@
 
 	dep = new Tracker.Dependency
 
-	addUser = (userIds) ->
-		# console.log 'addUser', userIds if window.rocketUserDebug
-		userIds = [].concat userIds
-		for userId in userIds
-			unless users[userId]
-				users[userId] = 1
+	addUser = (usernames) ->
+		# console.log 'addUser', usernames if window.rocketUserDebug
+		usernames = [].concat usernames
+		for username in usernames
+			unless users[username]
+				users[username] = 1
 				dep.changed()
 
 	subscribeFn = ->
diff --git a/client/startup/startup.coffee b/client/startup/startup.coffee
index 1ec645e9af334..902789d12657b 100644
--- a/client/startup/startup.coffee
+++ b/client/startup/startup.coffee
@@ -26,17 +26,17 @@ Meteor.startup ->
 	TAPi18n.setLanguage(userLanguage)
 	moment.locale(userLanguage)
 
-	Meteor.users.find({}, { fields: { name: 1, pictures: 1, status: 1, emails: 1, phone: 1, services: 1 } }).observe
+	Meteor.users.find({}, { fields: { name: 1, username: 1, pictures: 1, status: 1, emails: 1, phone: 1, services: 1 } }).observe
 		added: (user) ->
-			Session.set('user_' + user._id + '_status', user.status)
+			Session.set('user_' + user.username + '_status', user.status)
 
 			UserAndRoom.insert({ type: 'u', uid: user._id, name: user.name})
 		changed: (user) ->
-			Session.set('user_' + user._id + '_status', user.status)
+			Session.set('user_' + user.username + '_status', user.status)
 
 			UserAndRoom.update({ uid: user._id }, { $set: { name: user.name } })
 		removed: (user) ->
-			Session.set('user_' + user._id + '_status', null)
+			Session.set('user_' + user.username + '_status', null)
 
 			UserAndRoom.remove({ uid: user._id })
 
diff --git a/client/views/app/chatMessageDashboard.coffee b/client/views/app/chatMessageDashboard.coffee
index 59c4b92592643..160111956f1bd 100644
--- a/client/views/app/chatMessageDashboard.coffee
+++ b/client/views/app/chatMessageDashboard.coffee
@@ -29,8 +29,8 @@ Template.chatMessageDashboard.helpers
 	message: ->
 		if this.by
 			UserManager.addUser(this.by)
-		else if this.uid
-			UserManager.addUser(this.uid)
+		else if this.u?.username
+			UserManager.addUser this.u.username
 		switch this.t
 			when 'p' then "<i class='icon-link-ext'></i><a href=\"#{this.url}\" target=\"_blank\">#{this.msg}</a>"
 			when 'r' then t('chatMessageDashboard.Room_name_changed', { room_name: this.msg, user_by: Session.get('user_' + this.by + '_name') }) + '.'
diff --git a/client/views/app/chatWindowDashboard.coffee b/client/views/app/chatWindowDashboard.coffee
index e648650010c1a..609352a5be739 100644
--- a/client/views/app/chatWindowDashboard.coffee
+++ b/client/views/app/chatWindowDashboard.coffee
@@ -243,23 +243,23 @@ Template.chatWindowDashboard.helpers
 			_id: this._id
 			total: room?.usernames.length
 			totalOnline: 0
-			users: []
+			users: room.usernames
 
-		if room?.usernames
-			# UserManager.addUser room.uids
+		# if room?.usernames
+		# 	# UserManager.addUser room.uids
 
-			filter =
-				username:
-					$in: room.usernames
+		# 	filter =
+		# 		username:
+		# 			$in: room.usernames
 
-			# unless Template.instance().showUsersOffline.get()
-			# 	filter.status = { $ne: 'offline' }
+		# 	# unless Template.instance().showUsersOffline.get()
+		# 	# 	filter.status = { $ne: 'offline' }
 
-			filter.$and = [{ status: {$exists: true} }, { status: {$ne: 'offline'} }]
+		# 	filter.$and = [{ status: {$exists: true} }, { status: {$ne: 'offline'} }]
 
-			users = Meteor.users.find(filter, { sort: { name: 1 } } ).fetch()
-			ret.totalOnline = users.length
-			ret.users = users
+		# 	users = Meteor.users.find(filter, { sort: { name: 1 } } ).fetch()
+		# 	ret.totalOnline = users.length
+		# 	ret.users = users
 
 		return ret
 
diff --git a/client/views/app/sideNav/chatRoomItem.coffee b/client/views/app/sideNav/chatRoomItem.coffee
index 2b13cd184e3b9..d87326a7e9e32 100644
--- a/client/views/app/sideNav/chatRoomItem.coffee
+++ b/client/views/app/sideNav/chatRoomItem.coffee
@@ -11,8 +11,9 @@ Template.chatRoomItem.helpers
 	userStatus: ->
 		switch this.t
 			when 'd'
-				uid = this.rid.replace Meteor.userId(), ''
-				return 'status-' + Session.get('user_' + uid + '_status')
+				username = this.rid.replace Meteor.user().username, ''
+				UserManager.addUser username
+				return 'status-' + Session.get('user_' + username + '_status')
 			else return ''
 
 	name: ->
@@ -39,8 +40,8 @@ Template.chatRoomItem.helpers
 
 Template.chatRoomItem.rendered = ->
 	if @data.t is 'd'
-		uid = @data.rid.replace Meteor.userId(), ''
-		UserManager.addUser uid
+		username = @data.rid.replace Meteor.user().username, ''
+		UserManager.addUser username
 
 	if not (Router.current().params._id? and Router.current().params._id is this.data.rid) and (not this.data.ls? or moment(this.data.ls).add(1, 'days').startOf('day') < moment(this.data.ts).startOf('day'))
 		KonchatNotification.newRoom(this.data.rid)
diff --git a/client/views/app/sideNav/userStatus.coffee b/client/views/app/sideNav/userStatus.coffee
index c5fcec5692fd5..76a834477d387 100644
--- a/client/views/app/sideNav/userStatus.coffee
+++ b/client/views/app/sideNav/userStatus.coffee
@@ -1,7 +1,8 @@
 Template.userStatus.helpers
 	myUserInfo: ->
 		visualStatus = "online"
-		switch Session.get('user_' + Meteor.userId() + '_status')
+		username = Meteor.user().username
+		switch Session.get('user_' + username + '_status')
 			when "away"
 				visualStatus = t("userStatus.away")
 			when "busy"
@@ -9,11 +10,11 @@ Template.userStatus.helpers
 			when "offline"
 				visualStatus = t("userStatus.invisible")
 		return {
-			name: Session.get('user_' + Meteor.userId() + '_name')
-			status: Session.get('user_' + Meteor.userId() + '_status')
+			name: Session.get('user_' + username + '_name')
+			status: Session.get('user_' + username + '_status')
 			visualStatus: visualStatus
 			_id: Meteor.userId()
-			username: Meteor.user().username
+			username: username
 		}
 
 Template.userStatus.events
diff --git a/client/views/app/userImageProfile.coffee b/client/views/app/userImageProfile.coffee
index 4ba8babfb23f8..472123e45845c 100644
--- a/client/views/app/userImageProfile.coffee
+++ b/client/views/app/userImageProfile.coffee
@@ -1,6 +1,3 @@
 Template.userImageProfile.helpers
-	userName: ->
-		return Session.get('user_' + this._id + '_name')
-
 	userStatus: ->
-		return 'status-' + Session.get('user_' + this._id + '_status')
+		return 'status-' + Session.get('user_' + this + '_status')
diff --git a/client/views/app/userImageProfile.html b/client/views/app/userImageProfile.html
index 54ae10149696f..28d30b3c15675 100644
--- a/client/views/app/userImageProfile.html
+++ b/client/views/app/userImageProfile.html
@@ -1,8 +1,8 @@
 <template name="userImageProfile">
 	<li class='user-image user-card-room {{userStatus}}'>
-		<a data-userid="{{this._id}}" tabindex="0" title="{{userName}}">
-			{{> avatar userId=_id}}
-			<p>{{userName}}</p>
+		<a data-username="{{.}}" tabindex="0" title="{{.}}">
+			{{> avatar username=.}}
+			<p>{{.}}</p>
 		</a>
 	</li>
 </template>
diff --git a/server/publications.coffee b/server/publications.coffee
index b5c3e81f6b0db..213740245115a 100644
--- a/server/publications.coffee
+++ b/server/publications.coffee
@@ -71,7 +71,7 @@ Meteor.publish 'allUsers', ->
 		status: 1
 	}}
 
-Meteor.publish 'selectiveUsers', (userIds) ->
+Meteor.publish 'selectiveUsers', (usernames) ->
 	unless @userId
 		return @ready()
 
@@ -79,7 +79,8 @@ Meteor.publish 'selectiveUsers', (userIds) ->
 
 	self = @
 
-	query = {}
+	query =
+		username: $exists: true
 
 	options =
 		fields:
@@ -91,13 +92,13 @@ Meteor.publish 'selectiveUsers', (userIds) ->
 
 	observer = cursor.observeChanges
 		added: (id, record) ->
-			if userIds[id]?
+			if usernames[record.username]?
 				self.added 'users', id, record
 		changed: (id, record) ->
-			if userIds[id]?
+			if usernames[record.username]?
 				self.changed 'users', id, record
 		removed: (id) ->
-			if userIds[id]?
+			if usernames[record.username]?
 				self.removed 'users', id
 
 	@ready()

From c7f4d075fe6e407c4a106d128c68f0c51869559c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 20:10:03 -0300
Subject: [PATCH 15/26] Prevent errors

---
 client/views/app/sideNav/userStatus.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/views/app/sideNav/userStatus.coffee b/client/views/app/sideNav/userStatus.coffee
index 76a834477d387..ef385a51154c9 100644
--- a/client/views/app/sideNav/userStatus.coffee
+++ b/client/views/app/sideNav/userStatus.coffee
@@ -1,7 +1,7 @@
 Template.userStatus.helpers
 	myUserInfo: ->
 		visualStatus = "online"
-		username = Meteor.user().username
+		username = Meteor.user()?.username
 		switch Session.get('user_' + username + '_status')
 			when "away"
 				visualStatus = t("userStatus.away")

From c86bb45622a44f946c1dab86a8ac5f65088215ae Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 20:12:20 -0300
Subject: [PATCH 16/26] Prevent error

---
 client/views/app/chatWindowDashboard.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/views/app/chatWindowDashboard.coffee b/client/views/app/chatWindowDashboard.coffee
index 609352a5be739..ed452bb4e6e53 100644
--- a/client/views/app/chatWindowDashboard.coffee
+++ b/client/views/app/chatWindowDashboard.coffee
@@ -381,7 +381,7 @@ Template.chatWindowDashboard.events
 			if error
 				return Errors.throw error.reason
 
-			if result.rid?
+			if result?.rid?
 				Router.go('room', { _id: result.rid })
 
 	'click button.load-more': (e) ->

From 109e74763a74b29e3da0fb50f76b534717209375 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 20:12:37 -0300
Subject: [PATCH 17/26] Fix auto adition of new users in general room

---
 server/methods/setUsername.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/methods/setUsername.coffee b/server/methods/setUsername.coffee
index a896a4b34df90..acfbb36112a42 100644
--- a/server/methods/setUsername.coffee
+++ b/server/methods/setUsername.coffee
@@ -28,7 +28,7 @@ Meteor.methods
 			# put user in general channel
 			ChatRoom.update '57om6EQCcFami9wuT',
 				$addToSet:
-					username: username
+					usernames: username
 
 			if not ChatSubscription.findOne(rid: '57om6EQCcFami9wuT', 'u._id': user._id)?
 				ChatSubscription.insert

From 08dbb02104f2fc8af4e1212b00abc2b5de87e264 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 20:14:26 -0300
Subject: [PATCH 18/26] Edit last message working

---
 client/lib/chatMessages.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/lib/chatMessages.coffee b/client/lib/chatMessages.coffee
index 99d59037324da..cbd9dbc0a9853 100644
--- a/client/lib/chatMessages.coffee
+++ b/client/lib/chatMessages.coffee
@@ -61,7 +61,7 @@
 		self.typingTimeout = null
 
 	startEditingLastMessage = (rid, imput) ->
-		lastMessage = ChatMessage.findOne { rid: rid, t: {$exists: false}, uid: Meteor.userId() }, { sort: { ts: -1 } }
+		lastMessage = ChatMessage.findOne { rid: rid, t: {$exists: false}, 'u._id': Meteor.userId() }, { sort: { ts: -1 } }
 		if not lastMessage?
 			return
 

From 92bc7bd098ba6fe4b7f0e7323601f897a7b316cf Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 20:21:07 -0300
Subject: [PATCH 19/26] Fix room rename

---
 client/startup/startup.coffee                | 4 ++--
 client/views/app/chatMessageDashboard.coffee | 2 +-
 client/views/app/chatWindowDashboard.coffee  | 4 ++--
 server/methods/saveRoomName.coffee           | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/startup/startup.coffee b/client/startup/startup.coffee
index 902789d12657b..5d90626eb775d 100644
--- a/client/startup/startup.coffee
+++ b/client/startup/startup.coffee
@@ -30,11 +30,11 @@ Meteor.startup ->
 		added: (user) ->
 			Session.set('user_' + user.username + '_status', user.status)
 
-			UserAndRoom.insert({ type: 'u', uid: user._id, name: user.name})
+			UserAndRoom.insert({ type: 'u', uid: user._id, username: user.username, name: user.name})
 		changed: (user) ->
 			Session.set('user_' + user.username + '_status', user.status)
 
-			UserAndRoom.update({ uid: user._id }, { $set: { name: user.name } })
+			UserAndRoom.update({ uid: user._id }, { $set: { username: user.username, name: user.name } })
 		removed: (user) ->
 			Session.set('user_' + user.username + '_status', null)
 
diff --git a/client/views/app/chatMessageDashboard.coffee b/client/views/app/chatMessageDashboard.coffee
index 160111956f1bd..94b7fe40566b9 100644
--- a/client/views/app/chatMessageDashboard.coffee
+++ b/client/views/app/chatMessageDashboard.coffee
@@ -1,6 +1,6 @@
 Template.chatMessageDashboard.helpers
 	own: ->
-		return 'own' if this.data.uid is Meteor.userId()
+		return 'own' if this.data.u?._id is Meteor.userId()
 
 	username: ->
 		return this.u.username
diff --git a/client/views/app/chatWindowDashboard.coffee b/client/views/app/chatWindowDashboard.coffee
index ed452bb4e6e53..71b3b59bb0322 100644
--- a/client/views/app/chatWindowDashboard.coffee
+++ b/client/views/app/chatWindowDashboard.coffee
@@ -201,14 +201,14 @@ Template.chatWindowDashboard.helpers
 
 		return '' unless roomData
 
-		return roomData.t in ['p', 'c'] and roomData.uid is Meteor.userId()
+		return roomData.t in ['p', 'c'] and roomData.u?._id is Meteor.userId()
 
 	canEditName: ->
 		roomData = Session.get('roomData' + this._id)
 
 		return '' unless roomData
 
-		return roomData.uid is Meteor.userId() and roomData.t in ['c', 'p']
+		return roomData.u?._id is Meteor.userId() and roomData.t in ['c', 'p']
 
 	roomNameEdit: ->
 		return Session.get('roomData' + this._id)?.name
diff --git a/server/methods/saveRoomName.coffee b/server/methods/saveRoomName.coffee
index aa35440784fc6..8b28dd7496210 100644
--- a/server/methods/saveRoomName.coffee
+++ b/server/methods/saveRoomName.coffee
@@ -5,7 +5,7 @@ Meteor.methods
 
 		room = ChatRoom.findOne data.rid
 
-		if room.uid isnt Meteor.userId() or room.t not in ['c', 'p']
+		if room.u._id isnt Meteor.userId() or room.t not in ['c', 'p']
 			throw new Meteor.Error 403, 'Not allowed'
 
 		newName = _.slugify data.name
@@ -29,6 +29,6 @@ Meteor.methods
 			ts: (new Date)
 			t: 'r'
 			msg: newName
-			by: Meteor.userId()
+			by: Meteor.user().username
 
 		return true

From 5356a331382a8c5deff416fc00203ad933a59418 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 20:24:40 -0300
Subject: [PATCH 20/26] Little fixes

---
 client/views/app/userCard.coffee         | 14 +++++++-------
 client/views/app/userCard.html           |  2 +-
 server/methods/createPrivateGroup.coffee |  4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/client/views/app/userCard.coffee b/client/views/app/userCard.coffee
index e09efb34e4ade..fd92d9039d50a 100644
--- a/client/views/app/userCard.coffee
+++ b/client/views/app/userCard.coffee
@@ -1,15 +1,15 @@
 Template.userCard.helpers
 	userData: ->
-		uid = Session.get('userProfileActive')
+		username = Session.get('userProfileActive')
 
 		userData = {
-			name: Session.get('user_' + uid + '_name')
-			emails: Session.get('user_' + uid + '_emails')
-			uid: uid
+			# name: Session.get('user_' + username + '_name')
+			# emails: Session.get('user_' + username + '_emails')
+			username: username
 		}
-		phone = Session.get('user_' + uid + '_phone')
-		if phone? and phone[0]?.phoneNumber
-			userData.phone = phone[0]?.phoneNumber
+		# phone = Session.get('user_' + username + '_phone')
+		# if phone? and phone[0]?.phoneNumber
+		# 	userData.phone = phone[0]?.phoneNumber
 
 		return userData
 
diff --git a/client/views/app/userCard.html b/client/views/app/userCard.html
index 38c2c60c1b6e8..304d43c203309 100644
--- a/client/views/app/userCard.html
+++ b/client/views/app/userCard.html
@@ -3,7 +3,7 @@
 		<span class="-close"><i title="{{_ "general.close"}}" class="icon-cancel"></i></span>
 		{{#with userData}}
 			<div class="thumb">
-				{{> avatar userId=uid}}
+				{{> avatar username=username}}
 			</div>
 			<div class="info">
 				<h3>{{name}}</h3>
diff --git a/server/methods/createPrivateGroup.coffee b/server/methods/createPrivateGroup.coffee
index 77e9bf80cf881..19ea205ada1f9 100644
--- a/server/methods/createPrivateGroup.coffee
+++ b/server/methods/createPrivateGroup.coffee
@@ -14,7 +14,9 @@ Meteor.methods
 			usernames: members
 			ts: now
 			t: 'p'
-			uid: Meteor.userId()
+			u:
+				_id: Meteor.userId()
+				username: Meteor.user().username
 			name: name
 			msgs: 0
 

From fde2ab80222c94673f24c3864b3c8b3210bf68b6 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 22:32:56 -0300
Subject: [PATCH 21/26] Create migration 3

---
 server/startup/migrations/v0.1.1.coffee |  2 +-
 server/startup/migrations/v0.1.2.coffee |  2 +-
 server/startup/migrations/v3.coffee     | 73 +++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 server/startup/migrations/v3.coffee

diff --git a/server/startup/migrations/v0.1.1.coffee b/server/startup/migrations/v0.1.1.coffee
index 9deb09db0d2bc..be91de3ade8f5 100644
--- a/server/startup/migrations/v0.1.1.coffee
+++ b/server/startup/migrations/v0.1.1.coffee
@@ -1,6 +1,6 @@
 Meteor.startup ->
 	Migrations.add
-		version: new Date("2015-05-30T22:51:26.759Z").getTime()
+		version: 1
 		up: ->
 			Meteor.users.find({username: {$exists: false}, lastLogin: {$exists: true}}).forEach (user) ->
 				username = generateSuggestion(user)
diff --git a/server/startup/migrations/v0.1.2.coffee b/server/startup/migrations/v0.1.2.coffee
index 2110dc60f6dfa..eb1f378ef7414 100644
--- a/server/startup/migrations/v0.1.2.coffee
+++ b/server/startup/migrations/v0.1.2.coffee
@@ -1,6 +1,6 @@
 Meteor.startup ->
 	Migrations.add
-		version: new Date("2015-06-03T00:49:41.269Z").getTime()
+		version: 2
 		up: ->
 			Meteor.users.find({avatarOrigin: {$exists: false}, username: {$exists: true}}).forEach (user) ->
 				avatars = getAvatarSuggestionForUser user
diff --git a/server/startup/migrations/v3.coffee b/server/startup/migrations/v3.coffee
new file mode 100644
index 0000000000000..49d65801a9e4b
--- /dev/null
+++ b/server/startup/migrations/v3.coffee
@@ -0,0 +1,73 @@
+Meteor.startup ->
+	Migrations.add
+		version: 3
+		up: ->
+
+			try
+				ChatSubscription._dropIndex 'uid_1'
+			try
+				ChatSubscription._dropIndex 'rid_1_uid_1'
+
+
+			console.log 'Fixing ChatSubscription uid'
+			ChatSubscription.find({uid: {$exists: true}}, {nonreactive: true}).forEach (sub) ->
+				update = {}
+				user = Meteor.users.findOne(sub.uid, {fields: {username: 1}})
+				if user?
+					update.$set ?= {}
+					update.$unset ?= {}
+					update.$set['u._id'] = user._id
+					update.$set['u.username'] = user.username
+					update.$unset.uid = 1
+
+				if Object.keys(update).length > 0
+					ChatSubscription.update(sub._id, update)
+
+
+			console.log 'Fixing ChatRoom uids'
+			ChatRoom.find({'uids.0': {$exists: true}}, {nonreactive: true}).forEach (room) ->
+				update = {}
+				users = Meteor.users.find {_id: {$in: room.uids}, username: {$exists: true}}, {fields: {username: 1}}
+				usernames = users.map (user) ->
+					return user.username
+
+				update.$set ?= {}
+				update.$unset ?= {}
+				update.$set.usernames = usernames
+				update.$unset.uids = 1
+
+				user = Meteor.users.findOne(room.uid, {fields: {username: 1}})
+				if user?
+					update.$set['u._id'] = user._id
+					update.$set['u.username'] = user.username
+					update.$unset.uid = 1
+
+				if room.t is 'd' and usernames.length is 2
+					for k, v of update.$set
+						room[k] = v
+					for k, v of update.$unset
+						delete room[k]
+
+					oldId = room._id
+					room._id = usernames.sort().join('')
+					ChatRoom.insert(room)
+					ChatRoom.remove({_id: oldId})
+				else
+					ChatRoom.update(room._id, update)
+
+
+			console.log 'Fixing ChatMessage uid'
+			ChatMessage.find({uid: {$exists: true}}, {nonreactive: true}).forEach (message) ->
+				update = {}
+				user = Meteor.users.findOne(message.uid, {fields: {username: 1}})
+				if user?
+					update.$set ?= {}
+					update.$unset ?= {}
+					update.$set['u._id'] = user._id
+					update.$set['u.username'] = user.username
+					update.$unset.uid = 1
+
+				if Object.keys(update).length > 0
+					ChatMessage.update(message._id, update)
+
+			console.log 'End'

From 717a1e532264cabc2c94d5d46f59a37946f4a3d2 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 22:33:21 -0300
Subject: [PATCH 22/26] Comment transform of ChatRoom

---
 lib/collections.coffee | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/collections.coffee b/lib/collections.coffee
index aa36ff6c4820d..9ff5af0b11b0e 100644
--- a/lib/collections.coffee
+++ b/lib/collections.coffee
@@ -1,16 +1,17 @@
 @UserFullName = {}
 
 @ChatMessage = new Meteor.Collection 'data.ChatMessage'
-@ChatRoom = new Meteor.Collection 'data.ChatRoom',
-	transform: (room) ->
-		if room.t is 'd' and Meteor.userId()?
-			if not UserFullName[Meteor.userId()]?
-				user = Meteor.users.findOne Meteor.userId()
-				UserFullName[Meteor.userId()] = user.name
+@ChatRoom = new Meteor.Collection 'data.ChatRoom'
+# ,
+# 	transform: (room) ->
+# 		if room.t is 'd' and Meteor.userId()?
+# 			if not UserFullName[Meteor.userId()]?
+# 				user = Meteor.users.findOne Meteor.userId()
+# 				UserFullName[Meteor.userId()] = user.name
 
-			regex = new RegExp('\\|?' + UserFullName[Meteor.userId()] + '\\|?')
-			room.name = room.name.replace(regex, '')
+# 			regex = new RegExp('\\|?' + UserFullName[Meteor.userId()] + '\\|?')
+# 			room.name = room.name.replace(regex, '')
 
-		return room
+# 		return room
 
 @ChatSubscription = new Meteor.Collection 'data.ChatSubscription'

From 46617d4fe34e96698b0d4c0fd73aed6491f3a595 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 3 Jun 2015 22:33:29 -0300
Subject: [PATCH 23/26] Improve performance

---
 client/stylesheets/base.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index 792daebefc6d0..c1c176a540c94 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -2146,7 +2146,7 @@ a.github-fork {
 		a{
 			.cf_;
 			padding: 5px 0;
-			height: auto;
+			// height: auto;
 			background-color: transparent;
 			display: block;
 			> div{

From 9925613845a4e8407d65ba815ef2ec703b75e487 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 4 Jun 2015 00:40:14 -0300
Subject: [PATCH 24/26] Performance improvements

---
 client/lib/UserManager.coffee               |  2 +-
 client/startup/startup.coffee               | 24 ++++++++++-----------
 client/stylesheets/base.less                |  8 +++----
 client/views/app/chatWindowDashboard.coffee | 24 ++++++---------------
 client/views/app/chatWindowDashboard.html   |  9 +++++++-
 client/views/app/userImageProfile.coffee    |  3 ---
 client/views/app/userImageProfile.html      |  8 -------
 client/views/avatar/avatar.coffee           |  1 +
 client/views/avatar/avatar.html             |  4 ++--
 server/publications.coffee                  |  7 +++---
 10 files changed, 38 insertions(+), 52 deletions(-)
 delete mode 100644 client/views/app/userImageProfile.coffee
 delete mode 100644 client/views/app/userImageProfile.html

diff --git a/client/lib/UserManager.coffee b/client/lib/UserManager.coffee
index 784a889f2589f..463d29257bf29 100644
--- a/client/lib/UserManager.coffee
+++ b/client/lib/UserManager.coffee
@@ -21,7 +21,7 @@
 			dep.depend()
 			subscribe.run()
 
-	init()
+	# init()
 
 	addUser: addUser
 	users: users
diff --git a/client/startup/startup.coffee b/client/startup/startup.coffee
index 5d90626eb775d..1b33ff9eed877 100644
--- a/client/startup/startup.coffee
+++ b/client/startup/startup.coffee
@@ -2,7 +2,7 @@ Meteor.startup ->
 	UserPresence.awayTime = 300000
 	UserPresence.start()
 
-	Session.setDefault('AvatarRandom', Date.now())
+	Session.setDefault('AvatarRandom', 0)
 
 	window.lastMessageWindow = {}
 	window.lastMessageWindowHistory = {}
@@ -30,25 +30,25 @@ Meteor.startup ->
 		added: (user) ->
 			Session.set('user_' + user.username + '_status', user.status)
 
-			UserAndRoom.insert({ type: 'u', uid: user._id, username: user.username, name: user.name})
+			# UserAndRoom.insert({ type: 'u', uid: user._id, username: user.username, name: user.name})
 		changed: (user) ->
 			Session.set('user_' + user.username + '_status', user.status)
 
-			UserAndRoom.update({ uid: user._id }, { $set: { username: user.username, name: user.name } })
+			# UserAndRoom.update({ uid: user._id }, { $set: { username: user.username, name: user.name } })
 		removed: (user) ->
 			Session.set('user_' + user.username + '_status', null)
 
-			UserAndRoom.remove({ uid: user._id })
+			# UserAndRoom.remove({ uid: user._id })
 
-	ChatRoom.find({ t: { $ne: 'd' } }, { fields: { t: 1, name: 1 } }).observe
-		added: (room) ->
-			roomData = { type: 'r', t: room.t, rid: room._id, name: room.name }
+	# ChatRoom.find({ t: { $ne: 'd' } }, { fields: { t: 1, name: 1 } }).observe
+	# 	added: (room) ->
+	# 		roomData = { type: 'r', t: room.t, rid: room._id, name: room.name }
 
-			UserAndRoom.insert(roomData)
-		changed: (room) ->
-			UserAndRoom.update({ rid: room._id }, { $set: { t: room.t, name: room.name } })
-		removed: (room) ->
-			UserAndRoom.remove({ rid: room._id })
+	# 		UserAndRoom.insert(roomData)
+	# 	changed: (room) ->
+	# 		UserAndRoom.update({ rid: room._id }, { $set: { t: room.t, name: room.name } })
+	# 	removed: (room) ->
+	# 		UserAndRoom.remove({ rid: room._id })
 
 	Tracker.autorun ->
 		rooms = []
diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index c1c176a540c94..d1bef9a8d128f 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -668,8 +668,8 @@ a.github-fork {
 	.avatar-image {
 		height: 100%;
 		width: 100%;
-		min-height: 40px;
-		min-width: 40px;
+		min-height: 20px;
+		min-width: 20px;
 		display: block;
 		background-color: transparent;
 		background-size: cover;
@@ -2069,7 +2069,7 @@ a.github-fork {
 	}
 }
 
-@user-image-square: 40px;
+@user-image-square: 20px;
 .user-image {
 	margin: 4px;
 	height: @user-image-square;
@@ -2146,7 +2146,7 @@ a.github-fork {
 		a{
 			.cf_;
 			padding: 5px 0;
-			// height: auto;
+			height: 30px;
 			background-color: transparent;
 			display: block;
 			> div{
diff --git a/client/views/app/chatWindowDashboard.coffee b/client/views/app/chatWindowDashboard.coffee
index 71b3b59bb0322..87d196462ee22 100644
--- a/client/views/app/chatWindowDashboard.coffee
+++ b/client/views/app/chatWindowDashboard.coffee
@@ -237,6 +237,12 @@ Template.chatWindowDashboard.helpers
 		room = ChatRoom.findOne(this._id, { reactive: false })
 		return room?.t in ['c', 'p']
 
+	userActiveByUsername: (username) ->
+		status = Session.get 'user_' + username + '_status'
+		if status in ['online', 'away', 'busy']
+			return {username: username, status: status}
+		return 
+
 	roomUsers: ->
 		room = ChatRoom.findOne(this._id, { reactive: false })
 		ret =
@@ -245,22 +251,6 @@ Template.chatWindowDashboard.helpers
 			totalOnline: 0
 			users: room.usernames
 
-		# if room?.usernames
-		# 	# UserManager.addUser room.uids
-
-		# 	filter =
-		# 		username:
-		# 			$in: room.usernames
-
-		# 	# unless Template.instance().showUsersOffline.get()
-		# 	# 	filter.status = { $ne: 'offline' }
-
-		# 	filter.$and = [{ status: {$exists: true} }, { status: {$ne: 'offline'} }]
-
-		# 	users = Meteor.users.find(filter, { sort: { name: 1 } } ).fetch()
-		# 	ret.totalOnline = users.length
-		# 	ret.users = users
-
 		return ret
 
 	flexUserInfo: ->
@@ -437,7 +427,7 @@ Template.chatWindowDashboard.onCreated ->
 	this.scrollOnBottom = true
 	this.showUsersOffline = new ReactiveVar false
 
-	# this.subscribe("allUsers")
+	this.subscribe("allUsers")
 
 Template.chatWindowDashboard.onRendered ->
 	FlexTab.check()
diff --git a/client/views/app/chatWindowDashboard.html b/client/views/app/chatWindowDashboard.html
index 5bed187c4a201..854846a4e6e07 100644
--- a/client/views/app/chatWindowDashboard.html
+++ b/client/views/app/chatWindowDashboard.html
@@ -116,7 +116,14 @@ <h2>{{_ "chatWindowDashboard.Members_List"}}</h2>
 						</div>
 						<ul class='list cf_ lines'>
 							{{#each users}}
-								{{> userImageProfile}}
+								{{#with userActiveByUsername .}}
+								<li class='user-image user-card-room status-{{status}}'>
+									<a data-username="{{username}}" tabindex="0" title="{{username}}">
+										{{> avatar username=username}}
+										<p>{{username}}</p>
+									</a>
+								</li>
+								{{/with}}
 							{{/each}}
 						</ul>
 					{{/with}}
diff --git a/client/views/app/userImageProfile.coffee b/client/views/app/userImageProfile.coffee
deleted file mode 100644
index 472123e45845c..0000000000000
--- a/client/views/app/userImageProfile.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-Template.userImageProfile.helpers
-	userStatus: ->
-		return 'status-' + Session.get('user_' + this + '_status')
diff --git a/client/views/app/userImageProfile.html b/client/views/app/userImageProfile.html
deleted file mode 100644
index 28d30b3c15675..0000000000000
--- a/client/views/app/userImageProfile.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<template name="userImageProfile">
-	<li class='user-image user-card-room {{userStatus}}'>
-		<a data-username="{{.}}" tabindex="0" title="{{.}}">
-			{{> avatar username=.}}
-			<p>{{.}}</p>
-		</a>
-	</li>
-</template>
diff --git a/client/views/avatar/avatar.coffee b/client/views/avatar/avatar.coffee
index b6492dd9c987b..216a36355d015 100644
--- a/client/views/avatar/avatar.coffee
+++ b/client/views/avatar/avatar.coffee
@@ -11,4 +11,5 @@ Template.avatar.helpers
 		if not username? and this.userId?
 			username = Meteor.users.findOne(this.userId)?.username
 		url = "#{Meteor.absoluteUrl()}avatar/#{username}.jpg?_dc=#{random}"
+		url = "http://rocket.chat/avatar/#{username}.jpg?_dc=#{random}"
 		return url
\ No newline at end of file
diff --git a/client/views/avatar/avatar.html b/client/views/avatar/avatar.html
index cd1e1da0f2c37..f75cd71a0092f 100644
--- a/client/views/avatar/avatar.html
+++ b/client/views/avatar/avatar.html
@@ -1,6 +1,6 @@
 <template name="avatar">
 	<div class="avatar">
-		<img class="avatar-image" src="/images/pixel.png" style="background-image:url({{imageUrl}});" alt="avatar" />
-		<span class="avatar-initials" style="{{initialsCss}}">{{initialsText}}</span>
+		<div class="avatar-image" style="background-image:url({{imageUrl}});">
+		</div>
 	</div>
 </template>
\ No newline at end of file
diff --git a/server/publications.coffee b/server/publications.coffee
index 213740245115a..c2cc42622fe62 100644
--- a/server/publications.coffee
+++ b/server/publications.coffee
@@ -65,8 +65,7 @@ Meteor.publish 'allUsers', ->
 
 	# console.log '[publish] allUsers'.green
 
-	return Meteor.users.find {}, { 'fields': {
-		name: 1
+	return Meteor.users.find {username: {$exists: true}}, { 'fields': {
 		username: 1
 		status: 1
 	}}
@@ -111,7 +110,7 @@ Meteor.publish 'privateHistoryRooms', ->
 
 	# console.log '[publish] privateHistoryRooms'.green
 
-	return ChatRoom.find { usernames: this.user().username, t: { $in: ['d', 'c'] } }, { fields: { t: 1, name: 1, msgs: 1, ts: 1, lm: 1, cl: 1 } }
+	return ChatRoom.find { usernames: Meteor.users.findOne(this.userId).username, t: { $in: ['d', 'c'] } }, { fields: { t: 1, name: 1, msgs: 1, ts: 1, lm: 1, cl: 1 } }
 
 Meteor.publish 'roomSearch', (selector, options, collName) ->
 	unless this.userId
@@ -140,7 +139,7 @@ Meteor.publish 'roomSearch', (selector, options, collName) ->
 	subHandleRooms = null
 
 	# @TODO buscar apenas salas de grupo permitidas
-	roomSelector = _.extend { t: { $in: ['c'] }, usernames: this.user().username }, selector
+	roomSelector = _.extend { t: { $in: ['c'] }, usernames: Meteor.users.findOne(this.userId).username }, selector
 
 	if not searchType? or searchType is 'r'
 		subHandleRooms = ChatRoom.find(roomSelector, { limit: 10, fields: { t: 1, name: 1 } }).observeChanges

From 6015441bd2d90a7e262bc0ea6d7830bd85d240ac Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 4 Jun 2015 00:44:18 -0300
Subject: [PATCH 25/26] Back avatar url to correct path

---
 client/views/avatar/avatar.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/views/avatar/avatar.coffee b/client/views/avatar/avatar.coffee
index 216a36355d015..b6492dd9c987b 100644
--- a/client/views/avatar/avatar.coffee
+++ b/client/views/avatar/avatar.coffee
@@ -11,5 +11,4 @@ Template.avatar.helpers
 		if not username? and this.userId?
 			username = Meteor.users.findOne(this.userId)?.username
 		url = "#{Meteor.absoluteUrl()}avatar/#{username}.jpg?_dc=#{random}"
-		url = "http://rocket.chat/avatar/#{username}.jpg?_dc=#{random}"
 		return url
\ No newline at end of file

From 49655aaa2e19d5e179367b92a44955ff1cc2fe61 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 4 Jun 2015 00:44:25 -0300
Subject: [PATCH 26/26] Change avatar to 30px

---
 client/stylesheets/base.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index d1bef9a8d128f..332d436dbf9d0 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -2069,7 +2069,7 @@ a.github-fork {
 	}
 }
 
-@user-image-square: 20px;
+@user-image-square: 30px;
 .user-image {
 	margin: 4px;
 	height: @user-image-square;