Do not set user’s name on messages or subscriptions

pull/6597/head
Rodrigo Nascimento 9 years ago
parent 03c04e6af7
commit fc0933345a
  1. 7
      packages/rocketchat-lib/server/functions/setRealName.js
  2. 10
      packages/rocketchat-lib/server/methods/setRealName.js
  3. 11
      packages/rocketchat-lib/server/models/Messages.coffee
  4. 11
      packages/rocketchat-lib/server/models/Subscriptions.coffee
  5. 2
      server/methods/saveUserProfile.js
  6. 2
      server/startup/migrations/v091.js

@ -11,13 +11,6 @@ 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;

@ -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' });
}

@ -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

@ -243,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

@ -44,7 +44,7 @@ Meteor.methods({
}
if (settings.realname) {
Meteor.call('setRealName', settings.realname);
RocketChat.setRealName(Meteor.userId(), settings.realname);
}
if (settings.username) {

@ -18,8 +18,6 @@ RocketChat.Migrations.add({
const name = `${ user.services.linkedin.firstName } ${ user.services.linkedin.lastName }`;
RocketChat.models.Users.setName(user._id, name);
RocketChat.models.Messages.updateAllNamesByUserId(user._id, name);
RocketChat.models.Subscriptions.setRealNameForDirectRoomsWithUsername(user.username, name);
});
}
});

Loading…
Cancel
Save