several performance improvements

client/lib/RoomManager.coffee

@@ -9,23 +9,23 @@
 		subscription = Meteor.subscribe('subscription')
 		return subscription
 
-	expireRoom = (roomId) ->
-		if openedRooms[roomId]
-			if openedRooms[roomId].sub?
-				for sub in openedRooms[roomId].sub
+	expireRoom = (rid) ->
+		if openedRooms[rid]
+			if openedRooms[rid].sub?
+				for sub in openedRooms[rid].sub
 					sub.stop()
 
-			openedRooms[roomId].ready = false
-			openedRooms[roomId].active = false
-			delete openedRooms[roomId].timeout
+			openedRooms[rid].ready = false
+			openedRooms[rid].active = false
+			delete openedRooms[rid].timeout
 
-			ChatMessageHistory.remove rid: roomId
+			ChatMessageHistory.remove rid: rid
 
 	computation = Tracker.autorun ->
-		for roomId, record of openedRooms when record.active is true
+		for rid, record of openedRooms when record.active is true
 			record.sub = [
-				Meteor.subscribe 'room', roomId
-				Meteor.subscribe 'messages', roomId
+				Meteor.subscribe 'room', rid
+				Meteor.subscribe 'messages', rid
 			]
 
 			record.ready = record.sub[0].ready() and record.sub[1].ready()
@@ -38,26 +38,27 @@
 			clearTimeout openedRooms[except].timeout
 			delete openedRooms[except].timeout
 
-		for roomId of openedRooms
-			if roomId isnt except and not openedRooms[roomId].timeout?
-				openedRooms[roomId].timeout = setTimeout expireRoom, defaultTime, roomId
+		for rid of openedRooms
+			if rid isnt except and not openedRooms[rid].timeout?
+				openedRooms[rid].timeout = setTimeout expireRoom, defaultTime, rid
 
-	open = (roomId) ->
-		if not openedRooms[roomId]?
-			openedRooms[roomId] =
+	open = (rid) ->
+		if not openedRooms[rid]?
+			openedRooms[rid] =
 				active: false
 				ready: false
 
 		if subscription.ready()
-			if ChatSubscription.findOne { rid: roomId }, { reactive: false }
-				openedRooms[roomId].active = true
-				setRoomExpireExcept roomId
+			# if ChatSubscription.findOne { rid: rid }, { reactive: false }
+			if openedRooms[rid].active isnt true
+				openedRooms[rid].active = true
+				setRoomExpireExcept rid
 				computation.invalidate()
 
 		return {
 			ready: ->
 				Dep.depend()
-				return openedRooms[roomId].ready
+				return openedRooms[rid].ready
 		}
 
 	open: open

client/views/app/chatWindowDashboard.coffee

@@ -95,7 +95,11 @@ Template.chatWindowDashboard.helpers
 		console.log 'chatWindowDashboard.roomName' if window.rocketDebug
 		roomData = Session.get('roomData' + this._id)
 		return '' unless roomData
-		return roomData.name
+
+		if roomData.t is 'd'
+			return ChatSubscription.findOne({ rid: this._id }, { fields: { name: 1 } }).name
+		else
+			return roomData.name
 
 	roomTypeIcon: ->
 		console.log 'chatWindowDashboard.roomType' if window.rocketDebug

server/methods/addUserToRoom.coffee

@@ -12,6 +12,8 @@ Meteor.methods
 		if room.usernames.indexOf(data.username) isnt -1
 			return
 
+		now = new Date()
+
 		update =
 			$push:
 				usernames:
@@ -24,17 +26,19 @@ Meteor.methods
 
 		ChatSubscription.insert
 			rid: data.rid
-			ts: (new Date())
+			ts: now
 			name: room.name
 			t: room.t
-			unread: 0
+			open: true
+			alert: true
+			unread: 1
 			u:
 				_id: newUser._id
 				username: data.username
 
 		ChatMessage.insert
 			rid: data.rid
-			ts: (new Date)
+			ts: now
 			t: 'au'
 			msg: newUser.name
 			u:

server/methods/canAccessRoom.coffee

@@ -19,7 +19,6 @@ Meteor.methods
 			canAccess = true
 
 		if canAccess isnt true
-			throw new Meteor.Error 'without-permission', "[methods] canAccessRoom -> User doesn't have enough permissions"
 			return false
 		else
 			return room

server/methods/createPrivateGroup.coffee

@@ -7,7 +7,9 @@ Meteor.methods
 
 		now = new Date()
 
-		members.push Meteor.user().username
+		me = Meteor.user()
+
+		members.push me.username
 
 		name = s.slugify name
 
@@ -17,30 +19,32 @@ Meteor.methods
 			ts: now
 			t: 'p'
 			u:
-				_id: Meteor.userId()
-				username: Meteor.user().username
+				_id: me._id
+				username: me.username
 			name: name
 			msgs: 0
 
 		for username in members
-			member = Meteor.users.findOne({username: username})
+			member = Meteor.users.findOne({ username: username },{ fields: { username: 1 }})
 			if not member?
 				continue
 
-			sub =
-				u:
-					_id: member._id
-					username: username
+			subscription =
 				rid: rid
 				ts: now
 				name: name
 				t: 'p'
-				unread: 0
+				open: true
+				u:
+					_id: member._id
+					username: member.username
 
-			if username is Meteor.user().username
-				sub.ls = now
+			if username is me.username
+				subscription.ls = now
+			else
+				subscription.alert = true
 
-			ChatSubscription.insert sub
+			ChatSubscription.insert subscription
 
 		return {
 			rid: rid

server/methods/sendMessage.coffee

@@ -105,9 +105,9 @@ Meteor.methods
 		Save the message. If there was already a typing record, update it.
 		###
 		ChatMessage.upsert
-				rid: message.rid
-				t: 't'
-				$and: [{ 'u._id': message.u._id }]
+			rid: message.rid
+			t: 't'
+			$and: [{ 'u._id': message.u._id }]
 		,
 			$set: message
 			$unset:

server/publications/room.coffee

@@ -2,7 +2,7 @@ Meteor.publish 'room', (rid) ->
 	unless this.userId
 		return this.ready()
 
-	console.log '[publish] room ->'.green, 'rid:'
+	console.log '[publish] room ->'.green, 'arguments:', arguments
 
 	if typeof rid isnt 'string'
 		return this.ready()