Merge pull request #6597 from RocketChat/improvements/real-names-in-m…

…emory Add `fname` to subscriptions in memory
RocketChat · Apr 6, 2017 · 9323473 · 9323473
2 parents b3dcf1a + b152621
commit 9323473
Show file tree

Hide file tree

Showing 25 changed files with 120 additions and 71 deletions.
diff --git a/client/notifications/UsersNameChanged.js b/client/notifications/UsersNameChanged.js
@@ -0,0 +1,22 @@
+Meteor.startup(function() {
+	RocketChat.Notifications.onLogged('Users:NameChanged', function({_id, name, username}) {
+		RocketChat.models.Messages.update({
+			'u._id': _id
+		}, {
+			$set: {
+				'u.name': name
+			}
+		}, {
+			multi: true
+		});
+
+		RocketChat.models.Subscriptions.update({
+			name: username,
+			t: 'd'
+		}, {
+			$set: {
+				fname: name
+			}
+		});
+	});
+});
diff --git a/packages/rocketchat-lib/client/methods/sendMessage.coffee b/packages/rocketchat-lib/client/methods/sendMessage.coffee
@@ -9,9 +9,13 @@ Meteor.methods
 			else
 				message.ts = new Date(Date.now() + TimeSync.serverOffset())
 
+			user = Meteor.user()
 			message.u =
 				_id: Meteor.userId()
-				username: Meteor.user().username
+				username: user.username
+
+			if RocketChat.settings.get('UI_Use_Real_Name')
+				message.u.name = user.name
 
 			message.temp = true
 

diff --git a/packages/rocketchat-lib/server/functions/addUserToRoom.js b/packages/rocketchat-lib/server/functions/addUserToRoom.js
@@ -27,8 +27,7 @@ RocketChat.addUserToRoom = function(rid, user, inviter, silenced) {
 				ts: now,
 				u: {
 					_id: inviter._id,
-					username: inviter.username,
-					name: inviter.name
+					username: inviter.username
 				}
 			});
 		} else {

diff --git a/packages/rocketchat-lib/server/functions/sendMessage.coffee b/packages/rocketchat-lib/server/functions/sendMessage.coffee
@@ -5,7 +5,7 @@ RocketChat.sendMessage = (user, message, room, upsert = false) ->
 	unless message.ts?
 		message.ts = new Date()
 
-	message.u = _.pick user, ['_id','username', 'name']
+	message.u = _.pick user, ['_id','username']
 
 	if not Match.test(message.msg, String)
 		message.msg = ''

diff --git a/packages/rocketchat-lib/server/functions/setRealName.js b/packages/rocketchat-lib/server/functions/setRealName.js
@@ -11,16 +11,18 @@ RocketChat._setRealName = function(userId, name) {
 		return user;
 	}
 
-	const previousName = user.name;
-
-	if (previousName) {
-		RocketChat.models.Messages.updateAllNamesByUserId(user._id, name);
-		RocketChat.models.Subscriptions.setRealNameForDirectRoomsWithUsername(user.username, name);
-	}
-
 	// Set new name
 	RocketChat.models.Users.setName(user._id, name);
 	user.name = name;
+
+	if (RocketChat.settings.get('UI_Use_Real_Name') === true) {
+		RocketChat.Notifications.notifyLogged('Users:NameChanged', {
+			_id: user._id,
+			name: user.name,
+			username: user.username
+		});
+	}
+
 	return user;
 };
 

diff --git a/packages/rocketchat-lib/server/methods/getChannelHistory.js b/packages/rocketchat-lib/server/methods/getChannelHistory.js
@@ -49,8 +49,14 @@ Meteor.methods({
 			records = RocketChat.models.Messages.findVisibleByRoomIdBetweenTimestamps(rid, oldest, latest, options).fetch();
 		}
 
+		const UI_Use_Real_Name = RocketChat.settings.get('UI_Use_Real_Name') === true;
+
 		const messages = _.map(records, (message) => {
 			message.starred = _.findWhere(message.starred, { _id: fromUserId });
+			if (message.u && message.u._id && UI_Use_Real_Name) {
+				const user = RocketChat.models.Users.findOneById(message.u._id);
+				message.u.name = user && user.name;
+			}
 			return message;
 		});
 

diff --git a/packages/rocketchat-lib/server/methods/setRealName.js b/packages/rocketchat-lib/server/methods/setRealName.js
@@ -7,16 +7,6 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'setRealName' });
 		}
 
-		const user = Meteor.user();
-
-		if (user.name === name) {
-			return name;
-		}
-
-		if (_.trim(name)) {
-			name = _.trim(name);
-		}
-
 		if (!RocketChat.setRealName(Meteor.userId(), name)) {
 			throw new Meteor.Error('error-could-not-change-name', 'Could not change name', { method: 'setRealName' });
 		}

diff --git a/packages/rocketchat-lib/server/models/Messages.coffee b/packages/rocketchat-lib/server/models/Messages.coffee
@@ -320,16 +320,6 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base
 
 		return @update query, update
 
-	updateAllNamesByUserId: (userId, name) ->
-		query =
-			'u._id': userId
-
-		update =
-			$set:
-				"u.name": name
-
-		return @update query, update, { multi: true }
-
 	updateUserStarById: (_id, userId, starred) ->
 		query =
 			_id: _id
@@ -390,7 +380,6 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base
 			u:
 				_id: user._id
 				username: user.username
-				name: user.name
 			groupable: false
 
 		_.extend record, extraData

diff --git a/packages/rocketchat-lib/server/models/Subscriptions.coffee b/packages/rocketchat-lib/server/models/Subscriptions.coffee
@@ -21,6 +21,7 @@ class ModelSubscriptions extends RocketChat.models._Base
 
 		this.cache.ensureIndex('rid', 'array')
 		this.cache.ensureIndex('u._id', 'array')
+		this.cache.ensureIndex('name', 'array')
 		this.cache.ensureIndex(['rid', 'u._id'], 'unique')
 		this.cache.ensureIndex(['name', 'u._id'], 'unique')
 
@@ -242,17 +243,6 @@ class ModelSubscriptions extends RocketChat.models._Base
 
 		return @update query, update, { multi: true }
 
-	setRealNameForDirectRoomsWithUsername: (username, name) ->
-		query =
-			name: username
-			t: "d"
-
-		update =
-			$set:
-				fname: name
-
-		return @update query, update, { multi: true }
-
 	setNameForDirectRoomsWithOldName: (oldName, name) ->
 		query =
 			name: oldName

diff --git a/packages/rocketchat-lib/server/models/Users.coffee b/packages/rocketchat-lib/server/models/Users.coffee
@@ -10,6 +10,8 @@ class ModelUsers extends RocketChat.models._Base
 		@tryEnsureIndex { 'statusConnection': 1 }, { sparse: 1 }
 		@tryEnsureIndex { 'type': 1 }
 
+		this.cache.ensureIndex('username', 'unique')
+
 	findOneByImportId: (_id, options) ->
 		return @findOne { importIds: _id }, options
 

diff --git a/packages/rocketchat-lib/server/models/_BaseCache.js b/packages/rocketchat-lib/server/models/_BaseCache.js
@@ -230,18 +230,24 @@ class ModelsBaseCache extends EventEmitter {
 				localRecord[field] = [];
 			}
 
+			if (typeof link.where === 'function' && link.where(localRecord, record) === false) {
+				continue;
+			}
+
+			let mutableRecord = record;
+
 			if (typeof link.transform === 'function') {
-				record = link.transform(localRecord, record);
+				mutableRecord = link.transform(localRecord, mutableRecord);
 			}
 
 			if (multi === true) {
-				localRecord[field].push(record);
+				localRecord[field].push(mutableRecord);
 			} else {
-				localRecord[field] = record;
+				localRecord[field] = mutableRecord;
 			}
 
-			this.emit(`join:${ field }:inserted`, localRecord, record);
-			this.emit(`join:${ field }:changed`, 'inserted', localRecord, record);
+			this.emit(`join:${ field }:inserted`, localRecord, mutableRecord);
+			this.emit(`join:${ field }:changed`, 'inserted', localRecord, mutableRecord);
 		}
 	}
 
@@ -255,6 +261,10 @@ class ModelsBaseCache extends EventEmitter {
 		for (let i = 0; i < records.length; i++) {
 			let record = records[i];
 
+			if (typeof link.where === 'function' && link.where(localRecord, record) === false) {
+				continue;
+			}
+
 			if (typeof link.transform === 'function') {
 				record = link.transform(localRecord, record);
 			}

diff --git a/packages/rocketchat-lib/server/startup/cache/CacheLoad.js b/packages/rocketchat-lib/server/startup/cache/CacheLoad.js
@@ -32,6 +32,28 @@ RocketChat.models.Subscriptions.cache.hasOne('Users', {
 	}
 });
 
+RocketChat.models.Subscriptions.cache.hasOne('Users', {
+	field: 'fname',
+	link: {
+		local: 'name',
+		remote: 'username',
+		where(subscription/*, user*/) {
+			return subscription.t === 'd';
+		},
+		transform(subscription, user) {
+			if (user == null || subscription == null) {
+				return undefined;
+			}
+			// Prevent client cache for old subscriptions with new names
+			// Cuz when a user change his name, the subscription's _updateAt
+			// will not change
+			if (subscription._updatedAt < user._updatedAt) {
+				subscription._updatedAt = user._updatedAt;
+			}
+			return user.name;
+		}
+	}
+});
 
 RocketChat.models.Users.cache.load();
 RocketChat.models.Rooms.cache.load();

diff --git a/server/methods/addRoomModerator.js b/server/methods/addRoomModerator.js
@@ -44,8 +44,7 @@ Meteor.methods({
 		RocketChat.models.Messages.createSubscriptionRoleAddedWithRoomIdAndUser(rid, user, {
 			u: {
 				_id: fromUser._id,
-				username: fromUser.username,
-				name: fromUser.name
+				username: fromUser.username
 			},
 			role: 'moderator'
 		});

diff --git a/server/methods/addRoomOwner.js b/server/methods/addRoomOwner.js
@@ -44,8 +44,7 @@ Meteor.methods({
 		RocketChat.models.Messages.createSubscriptionRoleAddedWithRoomIdAndUser(rid, user, {
 			u: {
 				_id: fromUser._id,
-				username: fromUser.username,
-				name: fromUser.name
+				username: fromUser.username
 			},
 			role: 'owner'
 		});
@@ -56,7 +55,8 @@ Meteor.methods({
 				_id: 'owner',
 				u: {
 					_id: user._id,
-					username: user.username
+					username: user.username,
+					name: user.name
 				},
 				scope: rid
 			});

diff --git a/server/methods/createDirectMessage.js b/server/methods/createDirectMessage.js
@@ -63,7 +63,6 @@ Meteor.methods({
 			},
 			$setOnInsert: {
 				name: to.username,
-				fname: to.name,
 				t: 'd',
 				alert: false,
 				unread: 0,
@@ -89,7 +88,6 @@ Meteor.methods({
 		}, {
 			$setOnInsert: {
 				name: me.username,
-				fname: me.name,
 				t: 'd',
 				open: false,
 				alert: false,

diff --git a/server/methods/loadHistory.js b/server/methods/loadHistory.js
@@ -58,10 +58,16 @@ Meteor.methods({
 			records = RocketChat.models.Messages.findVisibleByRoomIdNotContainingTypes(rid, hideMessagesOfType, options).fetch();
 		}
 
+		const UI_Use_Real_Name = RocketChat.settings.get('UI_Use_Real_Name') === true;
+
 		const messages = records.map((message) => {
 			message.starred = _.findWhere(message.starred, {
 				_id: fromId
 			});
+			if (message.u && message.u._id && UI_Use_Real_Name) {
+				const user = RocketChat.models.Users.findOneById(message.u._id);
+				message.u.name = user && user.name;
+			}
 			return message;
 		});
 

diff --git a/server/methods/muteUserInRoom.js b/server/methods/muteUserInRoom.js
@@ -49,8 +49,7 @@ Meteor.methods({
 		RocketChat.models.Messages.createUserMutedWithRoomIdAndUser(data.rid, mutedUser, {
 			u: {
 				_id: fromUser._id,
-				username: fromUser.username,
-				name: fromUser.name
+				username: fromUser.username
 			}
 		});
 

diff --git a/server/methods/removeRoomModerator.js b/server/methods/removeRoomModerator.js
@@ -44,8 +44,7 @@ Meteor.methods({
 		RocketChat.models.Messages.createSubscriptionRoleRemovedWithRoomIdAndUser(rid, user, {
 			u: {
 				_id: fromUser._id,
-				username: fromUser.username,
-				name: fromUser.name
+				username: fromUser.username
 			},
 			role: 'moderator'
 		});
@@ -56,7 +55,8 @@ Meteor.methods({
 				_id: 'moderator',
 				u: {
 					_id: user._id,
-					username: user.username
+					username: user.username,
+					name: user.name
 				},
 				scope: rid
 			});

diff --git a/server/methods/removeRoomOwner.js b/server/methods/removeRoomOwner.js
@@ -51,8 +51,7 @@ Meteor.methods({
 		RocketChat.models.Messages.createSubscriptionRoleRemovedWithRoomIdAndUser(rid, user, {
 			u: {
 				_id: fromUser._id,
-				username: fromUser.username,
-				name: fromUser.name
+				username: fromUser.username
 			},
 			role: 'owner'
 		});
@@ -63,7 +62,8 @@ Meteor.methods({
 				_id: 'owner',
 				u: {
 					_id: user._id,
-					username: user.username
+					username: user.username,
+					name: user.name
 				},
 				scope: rid
 			});

diff --git a/server/methods/removeUserFromRoom.js b/server/methods/removeUserFromRoom.js
@@ -58,8 +58,7 @@ Meteor.methods({
 		RocketChat.models.Messages.createUserRemovedWithRoomIdAndUser(data.rid, removedUser, {
 			u: {
 				_id: fromUser._id,
-				username: fromUser.username,
-				name: fromUser.name
+				username: fromUser.username
 			}
 		});
 

diff --git a/server/methods/saveUserProfile.js b/server/methods/saveUserProfile.js
@@ -44,7 +44,7 @@ Meteor.methods({
 		}
 
 		if (settings.realname) {
-			Meteor.call('setRealName', settings.realname);
+			RocketChat.setRealName(Meteor.userId(), settings.realname);
 		}
 
 		if (settings.username) {

diff --git a/server/methods/unmuteUserInRoom.js b/server/methods/unmuteUserInRoom.js
@@ -43,8 +43,7 @@ Meteor.methods({
 		RocketChat.models.Messages.createUserUnmutedWithRoomIdAndUser(data.rid, unmutedUser, {
 			u: {
 				_id: fromUser._id,
-				username: fromUser.username,
-				name: fromUser.name
+				username: fromUser.username
 			}
 		});