Use real name instead of username for messages and direct messages list

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -292,6 +292,7 @@
   "Custom_Fields" : "Custom Fields",
   "Custom_oauth_helper" : "When setting up your OAuth Provider, you'll have to inform a Callback URL. Use <pre>%s</pre> .",
   "Custom_oauth_unique_name" : "Custom oauth unique name",
+  "Custom_Scripts" : "Custom Scripts",
   "Custom_Script_Logged_In" : "Custom Script for logged in users",
   "Custom_Script_Logged_Out" : "Custom Script for logged out users",
   "Custom_Translations" : "Custom Translations",
@@ -1240,6 +1241,7 @@
   "Type_your_new_password" : "Type your new password",
   "UI_DisplayRoles" : "Display Roles",
   "UI_Merge_Channels_Groups" : "Merge private groups with channels",
+  "UI_Use_Real_Name" : "Use Real Name",
   "Unarchive" : "Unarchive",
   "Unmute_someone_in_room" : "Unmute someone in the room",
   "Unmute_user" : "Unmute user",
@@ -1276,6 +1278,7 @@
   "User_has_been_muted_in_s" : "User has been muted in %s",
   "User_has_been_removed_from_s" : "User has been removed from %s",
   "User_Info" : "User Info",
+  "User_Interface" : "User Interface",
   "User_is_no_longer_an_admin" : "User is no longer an admin",
   "User_is_now_an_admin" : "User is now an admin",
   "User_joined_channel" : "Has joined the channel.",

packages/rocketchat-importer-hipchat/server.coffee

@@ -219,7 +219,7 @@ Importer.HipChat = class Importer.HipChat extends Importer.Base
 
 	getRocketUser: (hipchatId) =>
 		for user in @users.users when user.user_id is hipchatId
-			return RocketChat.models.Users.findOneById user.rocketId, { fields: { username: 1 }}
+			return RocketChat.models.Users.findOneById user.rocketId, { fields: { username: 1, name: 1 }}
 
 	convertHipChatMessageToRocketChat: (message) =>
 		if message?

packages/rocketchat-importer-slack/server.coffee

@@ -312,7 +312,7 @@ Importer.Slack = class Importer.Slack extends Importer.Base
 
 	getRocketUser: (slackId) =>
 		for user in @users.users when user.id is slackId
-			return RocketChat.models.Users.findOneById user.rocketId, { fields: { username: 1 }}
+			return RocketChat.models.Users.findOneById user.rocketId, { fields: { username: 1, name: 1 }}
 
 	convertSlackMessageToRocketChat: (message) =>
 		if message?

packages/rocketchat-lib/package.js

@@ -75,6 +75,7 @@ Package.onUse(function(api) {
 	api.addFiles('server/functions/settings.coffee', 'server');
 	api.addFiles('server/functions/setUserAvatar.js', 'server');
 	api.addFiles('server/functions/setUsername.coffee', 'server');
+	api.addFiles('server/functions/setRealName.coffee', 'server');
 	api.addFiles('server/functions/setEmail.js', 'server');
 	api.addFiles('server/functions/unarchiveRoom.js', 'server');
 	api.addFiles('server/functions/updateMessage.js', 'server');

packages/rocketchat-lib/server/functions/addUserToRoom.js

@@ -27,7 +27,8 @@ RocketChat.addUserToRoom = function(rid, user, inviter, silenced) {
 				ts: now,
 				u: {
 					_id: inviter._id,
-					username: inviter.username
+					username: inviter.username,
+					name: inviter.name
 				}
 			});
 		} else {

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']
+	message.u = _.pick user, ['_id','username', 'name']
 
 	message.rid = room._id
 

packages/rocketchat-lib/server/functions/setRealName.coffee

@@ -0,0 +1,24 @@
+RocketChat._setRealName = (userId, name) ->
+	name = s.trim name
+	if not userId or not name
+		return false
+
+	user = RocketChat.models.Users.findOneById userId
+
+	# User already has desired name, return
+	if user.name is name
+		return user
+
+	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
+	return user
+
+RocketChat.setRealName = RocketChat.RateLimiter.limitFunction RocketChat._setRealName, 1, 60000,
+	0: () -> return not Meteor.userId() or not RocketChat.authz.hasPermission(Meteor.userId(), 'edit-other-user-info') # Administrators have permission to change others names, so don't limit those

packages/rocketchat-lib/server/methods/addUserToRoom.coffee

@@ -23,6 +23,7 @@ Meteor.methods
 
 
 		newUser = RocketChat.models.Users.findOneByUsername data.username
+
 		RocketChat.addUserToRoom(data.rid, newUser, Meteor.user());
 
 		return true

packages/rocketchat-lib/server/methods/setRealName.coffee

@@ -14,7 +14,11 @@ Meteor.methods
 		if _.trim name
 			name = _.trim name
 
-		unless RocketChat.models.Users.setName Meteor.userId(), name
+		#unless RocketChat.models.Users.setName Meteor.userId(), name
+		unless RocketChat.setRealName user._id, name
 			throw new Meteor.Error 'error-could-not-change-name', "Could not change name", { method: 'setRealName' }
 
 		return name
+
+RocketChat.RateLimiter.limitMethod 'setRealName', 1, 1000,
+	userId: (userId) -> return true

packages/rocketchat-lib/server/models/Messages.coffee

@@ -224,6 +224,16 @@ 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
@@ -273,6 +283,7 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base
 			u:
 				_id: user._id
 				username: user.username
+				name: user.name
 			groupable: false
 
 		_.extend record, extraData

packages/rocketchat-lib/server/models/Subscriptions.coffee

@@ -203,6 +203,17 @@ RocketChat.models.Subscriptions = new class 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

packages/rocketchat-lib/server/startup/settings.coffee

@@ -228,13 +228,14 @@ RocketChat.settings.addGroup 'Layout', ->
 		@add 'Layout_Privacy_Policy', 'Privacy Policy <br> Go to APP SETTINGS -> Layout to customize this page.', { type: 'code', code: 'text/html', multiline: true, public: true }
 		@add 'Layout_Sidenav_Footer', '<img style="left: 10px; position: absolute;" src="/assets/logo.png" />', { type: 'code', code: 'text/html', public: true, i18nDescription: 'Layout_Sidenav_Footer_description' }
 
-	@section 'Custom Scripts', ->
+	@section 'Custom_Scripts', ->
 		@add 'Custom_Script_Logged_Out', '//Add your script', { type: 'code', multiline: true, public: true }
 		@add 'Custom_Script_Logged_In', '//Add your script', { type: 'code', multiline: true, public: true }
 
-	@section 'User Interface', ->
+	@section 'User_Interface', ->
 		@add 'UI_DisplayRoles', true, { type: 'boolean', public: true }
 		@add 'UI_Merge_Channels_Groups', true, { type: 'boolean', public: true }
+		@add 'UI_Use_Real_Name', true, { type: 'boolean', public: true }
 
 
 RocketChat.settings.addGroup 'Logs', ->

packages/rocketchat-lib/startup/defaultRoomTypes.coffee

@@ -41,7 +41,7 @@ RocketChat.roomTypes.add 'd', 20,
 				$all: [identifier, user.username]
 		return ChatRoom.findOne(query)
 	roomName: (roomData) ->
-		return ChatSubscription.findOne({ rid: roomData._id }, { fields: { name: 1 } })?.name
+		return ChatSubscription.findOne({ rid: roomData._id }, { fields: { name: 1, fname: 1 } })
 	condition: ->
 		return RocketChat.authz.hasAtLeastOnePermission ['view-d-room', 'view-joined-room']
 

packages/rocketchat-theme/assets/stylesheets/base.less

@@ -2279,6 +2279,10 @@ label.required:after {
 			display: inline-block;
 		}
 	}
+	.secondary-name {
+		color: #666;
+		font-size: 15px;
+	}
 }
 
 .message-popup-items {

packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html

@@ -11,8 +11,8 @@
 					{{> avatar username=username}}
 				</div>
 				<div class="info">
-					<h3 title="{{username}}"><i class="status-{{status}}"></i> {{username}}</h3>
-					<p>{{name}}</p>
+					<h3 title="{{name}}"><i class="status-{{status}}"></i> {{name}}</h3>
+					<p>@{{username}}</p>
 					<p>
 						{{#each roleTags}}
 							<span class="role-tag" data-role="{{description}}">{{description}}</span>

packages/rocketchat-ui-message/message/message.html

@@ -27,7 +27,7 @@
 		{{#if alias}}
 			<button type="button" class="user user-card-message" data-username="{{u.username}}" tabindex="1">{{alias}} <span class="message-alias">@{{u.username}}</span></button>
 		{{else}}
-			<button type="button" class="user user-card-message" data-username="{{u.username}}" tabindex="1">{{u.username}}</button>
+			<button type="button" class="user user-card-message" data-username="{{u.username}}" tabindex="1">{{u.name}}</button>
 		{{/if}}
 		<span class="info">
 			{{#each roleTags}}

packages/rocketchat-ui-message/message/popup/messagePopupConfig.coffee

@@ -8,14 +8,15 @@ Meteor.startup ->
 			return
 
 		filteredUsersMemory.remove({})
-		messageUsers = RocketChat.models.Messages.find({rid: Session.get('openedRoom'), 'u.username': {$ne: Meteor.user().username}}, {fields: {'u.username': 1, ts: 1}, sort: {ts: -1}}).fetch()
+		messageUsers = RocketChat.models.Messages.find({rid: Session.get('openedRoom'), 'u.username': {$ne: Meteor.user().username}}, {fields: {'u.username': 1, 'u.name': 1, ts: 1}, sort: {ts: -1}}).fetch()
 		uniqueMessageUsersControl = {}
 		messageUsers.forEach (messageUser) ->
 			if not uniqueMessageUsersControl[messageUser.u.username]?
 				uniqueMessageUsersControl[messageUser.u.username] = true
 				filteredUsersMemory.upsert messageUser.u.username,
 					_id: messageUser.u.username
 					username: messageUser.u.username
+					name: messageUser.u.name
 					status: Session.get('user_' + messageUser.u.username + '_status') or 'offline'
 					ts: messageUser.ts
 
@@ -43,6 +44,7 @@ Template.messagePopupConfig.helpers
 						items.push
 							_id: item.username
 							username: item.username
+							name: item.name
 							status: item.status
 
 				# Get users of room

packages/rocketchat-ui-sidenav/side-nav/accountBox.coffee

@@ -2,6 +2,7 @@ Template.accountBox.helpers
 	myUserInfo: ->
 		visualStatus = "online"
 		username = Meteor.user()?.username
+		name = Meteor.user()?.name
 		switch Session.get('user_' + username + '_status')
 			when "away"
 				visualStatus = t("away")
@@ -15,6 +16,7 @@ Template.accountBox.helpers
 			visualStatus: visualStatus
 			_id: Meteor.userId()
 			username: username
+			fname: name
 		}
 
 	showAdminOption: ->

packages/rocketchat-ui-sidenav/side-nav/accountBox.html

@@ -7,7 +7,7 @@
 						{{> avatar username=username}}
 					</div>
 					<div class="data">
-						<h4>{{username}}</h4>
+						<h4>{{fname}}</h4>
 					</div>
 				{{/if}}
 			</div>

packages/rocketchat-ui-sidenav/side-nav/chatRoomItem.coffee

@@ -12,7 +12,10 @@ Template.chatRoomItem.helpers
 		return 'status-' + (Session.get('user_' + this.name + '_status') or 'offline')
 
 	name: ->
-		return this.name
+		if RocketChat.settings.get('UI_Use_Real_Name') and this.fname
+			return this.fname
+		else
+			return this.name
 
 	roomIcon: ->
 		return RocketChat.roomTypes.getIcon this.t

packages/rocketchat-ui-sidenav/side-nav/listDirectMessagesFlex.html

@@ -29,7 +29,7 @@ <h4>{{_ "List_of_Direct_Messages"}}</h4>
 				<li>
 					<a href="{{pathFor 'direct' username=name}}" class="channel-link">
 						<i class="icon-at {{userStatus}}"></i>
-						{{name}}
+						{{fname}}
 						<span class='opt fixed'>
 							{{#if hidden}}
 							<i class="icon-eye-off" title="{{_ "Hidden"}}" aria-label="{{_ "Hidden"}}"></i>

packages/rocketchat-ui-sidenav/side-nav/listDirectMessagesFlex.js

@@ -67,7 +67,7 @@ Template.listDirectMessagesFlex.onCreated(function() {
 	this.roomsList = new ReactiveVar([]);
 	this.autorun(() => {
 		this.hasMore.set(true);
-		let options = { fields: { name: 1 } };
+		let options = { fields: { name: 1, fname: 1 } };
 		if (_.isNumber(this.limit.get())) {
 			options.limit = this.limit.get();
 		}
@@ -83,7 +83,11 @@ Template.listDirectMessagesFlex.onCreated(function() {
 		}
 		let query = { t: 'd' };
 		if (s.trim(this.nameFilter.get())) {
-			query.name = new RegExp(s.trim(s.escapeRegExp(this.nameFilter.get())), 'i');
+			let filter = new RegExp(s.trim(s.escapeRegExp(this.nameFilter.get())), 'i');
+			query.$or = [
+				{ name: filter },
+				{ fname: filter }
+			];
 		}
 
 		this.roomsList.set(RocketChat.models.Subscriptions.find(query, options).fetch());

packages/rocketchat-ui/views/app/room.coffee

@@ -46,7 +46,20 @@ Template.room.helpers
 		roomData = Session.get('roomData' + this._id)
 		return '' unless roomData
 
-		return RocketChat.roomTypes.getRoomName roomData?.t, roomData
+		room = RocketChat.roomTypes.getRoomName roomData?.t, roomData
+		if typeof room is 'object'
+			return if RocketChat.settings.get('UI_Use_Real_Name') then room.fname or room.name else room.name
+		else
+			return room
+
+	secondaryName: ->
+		if not RocketChat.settings.get('UI_Use_Real_Name')
+			return false
+		roomData = Session.get('roomData' + this._id)
+		return '' unless roomData
+
+		room = RocketChat.roomTypes.getRoomName roomData?.t, roomData
+		return if typeof room is 'object' then room.name
 
 	roomTopic: ->
 		roomData = Session.get('roomData' + this._id)

packages/rocketchat-ui/views/app/room.html

@@ -14,6 +14,9 @@ <h2>
 					{{/if}}
 					<i class="{{roomIcon}} status-{{userStatus}}"></i>
 					<span class="room-title">{{roomName}}</span>
+					{{#if secondaryName}}
+						<span class="secondary-name">@{{secondaryName}}</span>
+					{{/if}}
 					<span class="room-topic">{{{RocketChatMarkdown roomTopic}}}</span>
 				</h2>
 			</header>

packages/rocketchat-ui/views/app/spotlight/spotlightTemplate.js

@@ -8,5 +8,13 @@ Template.spotlightTemplate.helpers({
 			return 'status-' + (Session.get(`user_${this.name}_status`) || 'offline');
 		}
 		return 'status-offline';
+	},
+
+	name() {
+		if (RocketChat.settings.get('UI_Use_Real_Name') && this.fname) {
+			return this.fname;
+		} else {
+			return this.name;
+		}
 	}
 });

server/methods/addRoomModerator.coffee

@@ -22,6 +22,7 @@ Meteor.methods
 			u:
 				_id: fromUser._id
 				username: fromUser.username
+				name: fromUser.name
 			role: 'moderator'
 
 		if RocketChat.settings.get('UI_DisplayRoles')

server/methods/addRoomOwner.coffee

@@ -22,6 +22,7 @@ Meteor.methods
 			u:
 				_id: fromUser._id
 				username: fromUser.username
+				name: fromUser.name
 			role: 'owner'
 
 		if RocketChat.settings.get('UI_DisplayRoles')

server/methods/createDirectMessage.coffee

@@ -45,6 +45,7 @@ Meteor.methods
 				open: true
 			$setOnInsert:
 				name: to.username
+				fname: to.name
 				t: 'd'
 				alert: false
 				unread: 0
@@ -67,6 +68,7 @@ Meteor.methods
 		,
 			$setOnInsert:
 				name: me.username
+				fname: me.name
 				t: 'd'
 				open: false
 				alert: false

server/methods/muteUserInRoom.coffee

@@ -30,5 +30,6 @@ Meteor.methods
 			u:
 				_id: fromUser._id
 				username: fromUser.username
+				name: fromUser.name
 
 		return true