diff --git a/packages/rocketchat-lib/server/methods/joinRoom.js b/packages/rocketchat-lib/server/methods/joinRoom.js index b3d44f41561..c95d5a2df30 100644 --- a/packages/rocketchat-lib/server/methods/joinRoom.js +++ b/packages/rocketchat-lib/server/methods/joinRoom.js @@ -9,7 +9,7 @@ Meteor.methods({ const room = RocketChat.models.Rooms.findOneById(rid); - if (room == null) { + if (!room) { throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'joinRoom' }); } diff --git a/packages/rocketchat-lib/server/methods/setRealName.js b/packages/rocketchat-lib/server/methods/setRealName.js index a3268e12ffa..16f7068f9ea 100644 --- a/packages/rocketchat-lib/server/methods/setRealName.js +++ b/packages/rocketchat-lib/server/methods/setRealName.js @@ -7,7 +7,7 @@ Meteor.methods({ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'setRealName' }); } - let user = Meteor.user(); + const user = Meteor.user(); if (user.name === name) { return name; diff --git a/packages/rocketchat-lib/server/methods/setUsername.js b/packages/rocketchat-lib/server/methods/setUsername.js index b8b011e37b1..c61b74f16d4 100644 --- a/packages/rocketchat-lib/server/methods/setUsername.js +++ b/packages/rocketchat-lib/server/methods/setUsername.js @@ -9,7 +9,7 @@ Meteor.methods({ const user = Meteor.user(); - if ((user.username != null) && !RocketChat.settings.get('Accounts_AllowUsernameChange')) { + if (user.username && !RocketChat.settings.get('Accounts_AllowUsernameChange')) { throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setUsername' }); } @@ -42,7 +42,7 @@ Meteor.methods({ throw new Meteor.Error('error-could-not-change-username', 'Could not change username', { method: 'setUsername' }); } - if (user.username == null) { + if (!user.username) { Meteor.runAsUser(user._id, () => Meteor.call('joinDefaultChannels', joinDefaultChannelsSilenced)); }