diff --git a/.eslintrc b/.eslintrc index 15b904eb3ab..e216b836fcd 100644 --- a/.eslintrc +++ b/.eslintrc @@ -78,7 +78,8 @@ "linebreak-style": [2, "unix"], "quotes": [2, "single"], "semi": [2, "always"], - "prefer-const": 2 + "prefer-const": 2, + "object-shorthand": 2 }, "globals": { "_" : false, diff --git a/client/methods/hideRoom.js b/client/methods/hideRoom.js index 801f464e420..ba3f2c2dcb1 100644 --- a/client/methods/hideRoom.js +++ b/client/methods/hideRoom.js @@ -5,7 +5,7 @@ Meteor.methods({ } ChatSubscription.update({ - rid: rid, + rid, 'u._id': Meteor.userId() }, { $set: { diff --git a/client/methods/leaveRoom.js b/client/methods/leaveRoom.js index 8de1d369484..8a5d1817f3a 100644 --- a/client/methods/leaveRoom.js +++ b/client/methods/leaveRoom.js @@ -5,7 +5,7 @@ Meteor.methods({ } ChatSubscription.remove({ - rid: rid, + rid, 'u._id': Meteor.userId() }); diff --git a/client/methods/openRoom.js b/client/methods/openRoom.js index 9aa659e937b..bb8ae962442 100644 --- a/client/methods/openRoom.js +++ b/client/methods/openRoom.js @@ -5,7 +5,7 @@ Meteor.methods({ } ChatSubscription.update({ - rid: rid, + rid, 'u._id': Meteor.userId() }, { $set: { diff --git a/client/methods/setUserActiveStatus.js b/client/methods/setUserActiveStatus.js index d61598877df..c164fcd8fa4 100644 --- a/client/methods/setUserActiveStatus.js +++ b/client/methods/setUserActiveStatus.js @@ -1,6 +1,6 @@ Meteor.methods({ setUserActiveStatus(userId, active) { - Meteor.users.update(userId, { $set: { active: active } }); + Meteor.users.update(userId, { $set: { active } }); return true; } }); diff --git a/client/methods/toggleFavorite.js b/client/methods/toggleFavorite.js index e58b8eb71c0..1579b6223a5 100644 --- a/client/methods/toggleFavorite.js +++ b/client/methods/toggleFavorite.js @@ -5,11 +5,11 @@ Meteor.methods({ } ChatSubscription.update({ - rid: rid, + rid, 'u._id': Meteor.userId() }, { $set: { - f: f + f } }); } diff --git a/client/notifications/notification.js b/client/notifications/notification.js index a9045cdb2b1..85364e99dc4 100644 --- a/client/notifications/notification.js +++ b/client/notifications/notification.js @@ -19,9 +19,9 @@ Meteor.startup(function() { const messageIsInOpenedRoom = openedRoomId === notification.payload.rid; fireGlobalEvent('notification', { - notification: notification, + notification, fromOpenedRoom: messageIsInOpenedRoom, - hasFocus: hasFocus + hasFocus }); if (RocketChat.Layout.isEmbedded()) { diff --git a/client/routes/router.js b/client/routes/router.js index 308d9b50e0c..fb7882344f0 100644 --- a/client/routes/router.js +++ b/client/routes/router.js @@ -60,7 +60,7 @@ FlowRouter.route('/home', { saml: true, credentialToken: queryParams.saml_idp_credentialToken }], - userCallback: function() { BlazeLayout.render('main', {center: 'home'}); } + userCallback() { BlazeLayout.render('main', {center: 'home'}); } }); } else { BlazeLayout.render('main', {center: 'home'}); diff --git a/client/startup/startup.js b/client/startup/startup.js index af6a3fe604a..8ea9aee30c7 100644 --- a/client/startup/startup.js +++ b/client/startup/startup.js @@ -69,7 +69,7 @@ Meteor.startup(function() { language = language.toLowerCase(); if (language !== 'en') { Meteor.call('loadLocale', language, (err, localeFn) => { - Function(localeFn).call({moment: moment}); + Function(localeFn).call({moment}); moment.locale(language); }); } diff --git a/packages/meteor-accounts-saml/saml_client.js b/packages/meteor-accounts-saml/saml_client.js index c24b5b16c57..fef7b34d691 100644 --- a/packages/meteor-accounts-saml/saml_client.js +++ b/packages/meteor-accounts-saml/saml_client.js @@ -21,7 +21,7 @@ Meteor.logout = function() { const provider = samlService.clientConfig && samlService.clientConfig.provider; if (provider) { if (samlService.idpSLORedirectURL) { - return Meteor.logoutWithSaml({ provider: provider }); + return Meteor.logoutWithSaml({ provider }); } } } @@ -108,7 +108,7 @@ Meteor.loginWithSaml = function(options, callback) { Accounts.callLoginMethod({ methodArguments: [{ saml: true, - credentialToken: credentialToken + credentialToken }], userCallback: callback }); diff --git a/packages/meteor-accounts-saml/saml_rocketchat.js b/packages/meteor-accounts-saml/saml_rocketchat.js index 0fe772f2720..19132b755a0 100644 --- a/packages/meteor-accounts-saml/saml_rocketchat.js +++ b/packages/meteor-accounts-saml/saml_rocketchat.js @@ -136,8 +136,8 @@ const configureSamlService = function(samlConfigs) { idpSLORedirectURL: samlConfigs.idpSLORedirectURL, issuer: samlConfigs.issuer, cert: samlConfigs.secret.cert, - privateCert: privateCert, - privateKey: privateKey + privateCert, + privateKey }; }; diff --git a/packages/meteor-accounts-saml/saml_server.js b/packages/meteor-accounts-saml/saml_server.js index 5dc464e7c1f..b56aff3379f 100644 --- a/packages/meteor-accounts-saml/saml_server.js +++ b/packages/meteor-accounts-saml/saml_server.js @@ -31,7 +31,7 @@ function getSamlProviderConfig(provider) { } Meteor.methods({ - samlLogout: function(provider) { + samlLogout(provider) { // Make sure the user is logged in before initiate SAML SLO if (!Meteor.userId()) { throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'samlLogout' }); @@ -58,8 +58,8 @@ Meteor.methods({ const _saml = new SAML(providerConfig); const request = _saml.generateLogoutRequest({ - nameID: nameID, - sessionIndex: sessionIndex + nameID, + sessionIndex }); // request.request: actual XML SAML Request @@ -335,7 +335,7 @@ const middleware = function(req, res, next) { // No credentialToken in IdP-initiated SSO const saml_idp_credentialToken = Random.id(); Accounts.saml._loginResultForCredentialToken[saml_idp_credentialToken] = { - profile: profile + profile }; const url = Meteor.absoluteUrl('home') + '?saml_idp_credentialToken='+saml_idp_credentialToken; res.writeHead(302, { @@ -344,7 +344,7 @@ const middleware = function(req, res, next) { res.end(); } else { Accounts.saml._loginResultForCredentialToken[credentialToken] = { - profile: profile + profile }; closePopup(res); } diff --git a/packages/meteor-accounts-saml/saml_utils.js b/packages/meteor-accounts-saml/saml_utils.js index e37e18efbd1..51d17d7afb6 100644 --- a/packages/meteor-accounts-saml/saml_utils.js +++ b/packages/meteor-accounts-saml/saml_utils.js @@ -136,8 +136,8 @@ SAML.prototype.generateLogoutRequest = function(options) { console.log(request); } return { - request: request, - id: id + request, + id }; }; @@ -236,10 +236,10 @@ SAML.prototype.validateSignature = function(xml, cert) { const sig = new xmlCrypto.SignedXml(); sig.keyInfoProvider = { - getKeyInfo: function(/*key*/) { + getKeyInfo(/*key*/) { return ''; }, - getKey: function(/*keyInfo*/) { + getKey(/*keyInfo*/) { return self.certToPEM(cert); } }; diff --git a/packages/rocketchat-action-links/both/lib/actionLinks.js b/packages/rocketchat-action-links/both/lib/actionLinks.js index 90b4020e6f2..edf0d0e4b25 100644 --- a/packages/rocketchat-action-links/both/lib/actionLinks.js +++ b/packages/rocketchat-action-links/both/lib/actionLinks.js @@ -1,10 +1,10 @@ //Action Links namespace creation. RocketChat.actionLinks = { actions: {}, - register: function(name, funct) { + register(name, funct) { RocketChat.actionLinks.actions[name] = funct; }, - getMessage: function(name, messageId) { + getMessage(name, messageId) { if (!Meteor.userId()) { throw new Meteor.Error('error-invalid-user', 'Invalid user', { function: 'actionLinks.getMessage' }); } diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js index c490700eae0..10e5b561999 100644 --- a/packages/rocketchat-api/server/api.js +++ b/packages/rocketchat-api/server/api.js @@ -131,7 +131,7 @@ const getUserAuth = function _getUserAuth() { const invalidResults = [undefined, null, false]; return { token: 'services.resume.loginTokens.hashedToken', - user: function() { + user() { if (this.bodyParams && this.bodyParams.payload) { this.bodyParams = JSON.parse(this.bodyParams.payload); } diff --git a/packages/rocketchat-api/server/default/info.js b/packages/rocketchat-api/server/default/info.js index 7093793ab9b..82695fb064e 100644 --- a/packages/rocketchat-api/server/default/info.js +++ b/packages/rocketchat-api/server/default/info.js @@ -1,5 +1,5 @@ RocketChat.API.default.addRoute('info', { authRequired: false }, { - get: function() { + get() { const user = this.getLoggedInUser(); if (user && RocketChat.authz.hasRole(user._id, 'admin')) { diff --git a/packages/rocketchat-api/server/default/metrics.js b/packages/rocketchat-api/server/default/metrics.js index bae94b3f3f0..89b761c199a 100644 --- a/packages/rocketchat-api/server/default/metrics.js +++ b/packages/rocketchat-api/server/default/metrics.js @@ -1,5 +1,5 @@ RocketChat.API.default.addRoute('metrics', { authRequired: false }, { - get: function() { + get() { return { headers: { 'Content-Type': 'text/plain' }, body: RocketChat.promclient.register.metrics() diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js index 4b92c9add3d..bb820176ecb 100644 --- a/packages/rocketchat-api/server/v1/channels.js +++ b/packages/rocketchat-api/server/v1/channels.js @@ -18,7 +18,7 @@ function findChannelById({ roomId, checkedArchived = true }) { } RocketChat.API.v1.addRoute('channels.addAll', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId }); Meteor.runAsUser(this.userId, () => { @@ -32,7 +32,7 @@ RocketChat.API.v1.addRoute('channels.addAll', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.addModerator', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId }); const user = this.getUserFromParams(); @@ -46,7 +46,7 @@ RocketChat.API.v1.addRoute('channels.addModerator', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.addOwner', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId }); const user = this.getUserFromParams(); @@ -60,7 +60,7 @@ RocketChat.API.v1.addRoute('channels.addOwner', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.archive', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId }); Meteor.runAsUser(this.userId, () => { @@ -72,7 +72,7 @@ RocketChat.API.v1.addRoute('channels.archive', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.cleanHistory', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId }); if (!this.bodyParams.latest) { @@ -100,7 +100,7 @@ RocketChat.API.v1.addRoute('channels.cleanHistory', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.close', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId, checkedArchived: false }); const sub = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(findResult._id, this.userId); @@ -122,7 +122,7 @@ RocketChat.API.v1.addRoute('channels.close', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.create', { authRequired: true }, { - post: function() { + post() { if (!RocketChat.authz.hasPermission(this.userId, 'create-p')) { return RocketChat.API.v1.unauthorized(); } @@ -156,7 +156,7 @@ RocketChat.API.v1.addRoute('channels.create', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.delete', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId, checkedArchived: false }); //The find method returns either with the group or the failur @@ -172,7 +172,7 @@ RocketChat.API.v1.addRoute('channels.delete', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.getIntegrations', { authRequired: true }, { - get: function() { + get() { if (!RocketChat.authz.hasPermission(this.userId, 'manage-integrations')) { return RocketChat.API.v1.unauthorized(); } @@ -216,7 +216,7 @@ RocketChat.API.v1.addRoute('channels.getIntegrations', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.history', { authRequired: true }, { - get: function() { + get() { const findResult = findChannelById({ roomId: this.queryParams.roomId, checkedArchived: false }); let latestDate = new Date(); @@ -256,7 +256,7 @@ RocketChat.API.v1.addRoute('channels.history', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.info', { authRequired: true }, { - get: function() { + get() { const findResult = findChannelById({ roomId: this.queryParams.roomId, checkedArchived: false }); return RocketChat.API.v1.success({ @@ -266,7 +266,7 @@ RocketChat.API.v1.addRoute('channels.info', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.invite', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId }); const user = this.getUserFromParams(); @@ -282,7 +282,7 @@ RocketChat.API.v1.addRoute('channels.invite', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.join', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId }); Meteor.runAsUser(this.userId, () => { @@ -296,7 +296,7 @@ RocketChat.API.v1.addRoute('channels.join', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.kick', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId }); const user = this.getUserFromParams(); @@ -312,7 +312,7 @@ RocketChat.API.v1.addRoute('channels.kick', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.leave', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId }); Meteor.runAsUser(this.userId, () => { @@ -328,7 +328,7 @@ RocketChat.API.v1.addRoute('channels.leave', { authRequired: true }, { RocketChat.API.v1.addRoute('channels.list', { authRequired: true }, { get: { //This is like this only to provide an example of how we routes can be defined :X - action: function() { + action() { const { offset, count } = this.getPaginationItems(); const { sort, fields, query } = this.parseJsonQuery(); @@ -352,7 +352,7 @@ RocketChat.API.v1.addRoute('channels.list', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.list.joined', { authRequired: true }, { - get: function() { + get() { const { offset, count } = this.getPaginationItems(); const { sort, fields } = this.parseJsonQuery(); let rooms = _.pluck(RocketChat.models.Subscriptions.findByTypeAndUserId('c', this.userId).fetch(), '_room'); @@ -375,7 +375,7 @@ RocketChat.API.v1.addRoute('channels.list.joined', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.online', { authRequired: true }, { - get: function() { + get() { const { query } = this.parseJsonQuery(); const ourQuery = Object.assign({}, query, { t: 'c' }); @@ -408,7 +408,7 @@ RocketChat.API.v1.addRoute('channels.online', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.open', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId, checkedArchived: false }); const sub = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(findResult._id, this.userId); @@ -430,7 +430,7 @@ RocketChat.API.v1.addRoute('channels.open', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.removeModerator', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId }); const user = this.getUserFromParams(); @@ -444,7 +444,7 @@ RocketChat.API.v1.addRoute('channels.removeModerator', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.removeOwner', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId }); const user = this.getUserFromParams(); @@ -458,7 +458,7 @@ RocketChat.API.v1.addRoute('channels.removeOwner', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.rename', { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.name || !this.bodyParams.name.trim()) { return RocketChat.API.v1.failure('The bodyParam "name" is required'); } @@ -480,7 +480,7 @@ RocketChat.API.v1.addRoute('channels.rename', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.setDescription', { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.description || !this.bodyParams.description.trim()) { return RocketChat.API.v1.failure('The bodyParam "description" is required'); } @@ -502,7 +502,7 @@ RocketChat.API.v1.addRoute('channels.setDescription', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.setJoinCode', { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.joinCode || !this.bodyParams.joinCode.trim()) { return RocketChat.API.v1.failure('The bodyParam "joinCode" is required'); } @@ -520,7 +520,7 @@ RocketChat.API.v1.addRoute('channels.setJoinCode', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.setPurpose', { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.purpose || !this.bodyParams.purpose.trim()) { return RocketChat.API.v1.failure('The bodyParam "purpose" is required'); } @@ -542,7 +542,7 @@ RocketChat.API.v1.addRoute('channels.setPurpose', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.setReadOnly', { authRequired: true }, { - post: function() { + post() { if (typeof this.bodyParams.readOnly === 'undefined') { return RocketChat.API.v1.failure('The bodyParam "readOnly" is required'); } @@ -564,7 +564,7 @@ RocketChat.API.v1.addRoute('channels.setReadOnly', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.setTopic', { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.topic || !this.bodyParams.topic.trim()) { return RocketChat.API.v1.failure('The bodyParam "topic" is required'); } @@ -586,7 +586,7 @@ RocketChat.API.v1.addRoute('channels.setTopic', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.setType', { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.type || !this.bodyParams.type.trim()) { return RocketChat.API.v1.failure('The bodyParam "type" is required'); } @@ -608,7 +608,7 @@ RocketChat.API.v1.addRoute('channels.setType', { authRequired: true }, { }); RocketChat.API.v1.addRoute('channels.unarchive', { authRequired: true }, { - post: function() { + post() { const findResult = findChannelById({ roomId: this.bodyParams.roomId, checkedArchived: false }); if (!findResult.archived) { diff --git a/packages/rocketchat-api/server/v1/chat.js b/packages/rocketchat-api/server/v1/chat.js index 90569eda694..384ee2602ec 100644 --- a/packages/rocketchat-api/server/v1/chat.js +++ b/packages/rocketchat-api/server/v1/chat.js @@ -1,6 +1,6 @@ /* global processWebhookMessage */ RocketChat.API.v1.addRoute('chat.delete', { authRequired: true }, { - post: function() { + post() { check(this.bodyParams, Match.ObjectIncluding({ msgId: String, roomId: String, @@ -29,7 +29,7 @@ RocketChat.API.v1.addRoute('chat.delete', { authRequired: true }, { }); RocketChat.API.v1.addRoute('chat.postMessage', { authRequired: true }, { - post: function() { + post() { const messageReturn = processWebhookMessage(this.bodyParams, this.user)[0]; if (!messageReturn) { @@ -45,7 +45,7 @@ RocketChat.API.v1.addRoute('chat.postMessage', { authRequired: true }, { }); RocketChat.API.v1.addRoute('chat.update', { authRequired: true }, { - post: function() { + post() { check(this.bodyParams, Match.ObjectIncluding({ roomId: String, msgId: String, diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js index 94e63a24d1e..a976d1bdfa5 100644 --- a/packages/rocketchat-api/server/v1/groups.js +++ b/packages/rocketchat-api/server/v1/groups.js @@ -23,7 +23,7 @@ function findPrivateGroupByIdOrName({ roomId, roomName, userId, checkedArchived } RocketChat.API.v1.addRoute('groups.addModerator', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId }); const user = this.getUserFromParams(); @@ -37,7 +37,7 @@ RocketChat.API.v1.addRoute('groups.addModerator', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.addOwner', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId }); const user = this.getUserFromParams(); @@ -52,7 +52,7 @@ RocketChat.API.v1.addRoute('groups.addOwner', { authRequired: true }, { //Archives a private group only if it wasn't RocketChat.API.v1.addRoute('groups.archive', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId }); Meteor.runAsUser(this.userId, () => { @@ -64,7 +64,7 @@ RocketChat.API.v1.addRoute('groups.archive', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.close', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId, checkedArchived: false }); if (!findResult.open) { @@ -81,7 +81,7 @@ RocketChat.API.v1.addRoute('groups.close', { authRequired: true }, { //Create Private Group RocketChat.API.v1.addRoute('groups.create', { authRequired: true }, { - post: function() { + post() { if (!RocketChat.authz.hasPermission(this.userId, 'create-p')) { return RocketChat.API.v1.unauthorized(); } @@ -115,7 +115,7 @@ RocketChat.API.v1.addRoute('groups.create', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.delete', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId, checkedArchived: false }); Meteor.runAsUser(this.userId, () => { @@ -129,7 +129,7 @@ RocketChat.API.v1.addRoute('groups.delete', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.getIntegrations', { authRequired: true }, { - get: function() { + get() { if (!RocketChat.authz.hasPermission(this.userId, 'manage-integrations')) { return RocketChat.API.v1.unauthorized(); } @@ -167,7 +167,7 @@ RocketChat.API.v1.addRoute('groups.getIntegrations', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.history', { authRequired: true }, { - get: function() { + get() { const findResult = findPrivateGroupByIdOrName({ roomId: this.queryParams.roomId, userId: this.userId, checkedArchived: false }); let latestDate = new Date(); @@ -207,7 +207,7 @@ RocketChat.API.v1.addRoute('groups.history', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.info', { authRequired: true }, { - get: function() { + get() { const findResult = findPrivateGroupByIdOrName({ roomId: this.queryParams.roomId, roomName: this.queryParams.roomName, userId: this.userId, checkedArchived: false }); return RocketChat.API.v1.success({ @@ -217,7 +217,7 @@ RocketChat.API.v1.addRoute('groups.info', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.invite', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId }); const user = this.getUserFromParams(); @@ -233,7 +233,7 @@ RocketChat.API.v1.addRoute('groups.invite', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.kick', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId }); const user = this.getUserFromParams(); @@ -247,7 +247,7 @@ RocketChat.API.v1.addRoute('groups.kick', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.leave', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId }); Meteor.runAsUser(this.userId, () => { @@ -260,7 +260,7 @@ RocketChat.API.v1.addRoute('groups.leave', { authRequired: true }, { //List Private Groups a user has access to RocketChat.API.v1.addRoute('groups.list', { authRequired: true }, { - get: function() { + get() { const { offset, count } = this.getPaginationItems(); const { sort, fields } = this.parseJsonQuery(); let rooms = _.pluck(RocketChat.models.Subscriptions.findByTypeAndUserId('p', this.userId).fetch(), '_room'); @@ -283,7 +283,7 @@ RocketChat.API.v1.addRoute('groups.list', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.online', { authRequired: true }, { - get: function() { + get() { const { query } = this.parseJsonQuery(); const ourQuery = Object.assign({}, query, { t: 'p' }); @@ -316,7 +316,7 @@ RocketChat.API.v1.addRoute('groups.online', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.open', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId, checkedArchived: false }); if (findResult.open) { @@ -332,7 +332,7 @@ RocketChat.API.v1.addRoute('groups.open', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.removeModerator', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId }); const user = this.getUserFromParams(); @@ -346,7 +346,7 @@ RocketChat.API.v1.addRoute('groups.removeModerator', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.removeOwner', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId }); const user = this.getUserFromParams(); @@ -360,7 +360,7 @@ RocketChat.API.v1.addRoute('groups.removeOwner', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.rename', { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.name || !this.bodyParams.name.trim()) { return RocketChat.API.v1.failure('The bodyParam "name" is required'); } @@ -378,7 +378,7 @@ RocketChat.API.v1.addRoute('groups.rename', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.setDescription', { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.description || !this.bodyParams.description.trim()) { return RocketChat.API.v1.failure('The bodyParam "description" is required'); } @@ -396,7 +396,7 @@ RocketChat.API.v1.addRoute('groups.setDescription', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.setPurpose', { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.purpose || !this.bodyParams.purpose.trim()) { return RocketChat.API.v1.failure('The bodyParam "purpose" is required'); } @@ -414,7 +414,7 @@ RocketChat.API.v1.addRoute('groups.setPurpose', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.setReadOnly', { authRequired: true }, { - post: function() { + post() { if (typeof this.bodyParams.readOnly === 'undefined') { return RocketChat.API.v1.failure('The bodyParam "readOnly" is required'); } @@ -436,7 +436,7 @@ RocketChat.API.v1.addRoute('groups.setReadOnly', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.setTopic', { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.topic || !this.bodyParams.topic.trim()) { return RocketChat.API.v1.failure('The bodyParam "topic" is required'); } @@ -454,7 +454,7 @@ RocketChat.API.v1.addRoute('groups.setTopic', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.setType', { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.type || !this.bodyParams.type.trim()) { return RocketChat.API.v1.failure('The bodyParam "type" is required'); } @@ -476,7 +476,7 @@ RocketChat.API.v1.addRoute('groups.setType', { authRequired: true }, { }); RocketChat.API.v1.addRoute('groups.unarchive', { authRequired: true }, { - post: function() { + post() { const findResult = findPrivateGroupByIdOrName({ roomId: this.bodyParams.roomId, userId: this.userId, checkedArchived: false }); Meteor.runAsUser(this.userId, () => { diff --git a/packages/rocketchat-api/server/v1/im.js b/packages/rocketchat-api/server/v1/im.js index f184d6d8e18..ead2beed8eb 100644 --- a/packages/rocketchat-api/server/v1/im.js +++ b/packages/rocketchat-api/server/v1/im.js @@ -13,7 +13,7 @@ function findDirectMessageRoomById(roomId, userId) { } RocketChat.API.v1.addRoute(['dm.close', 'im.close'], { authRequired: true }, { - post: function() { + post() { const findResult = findDirectMessageRoomById(this.bodyParams.roomId, this.userId); //The find method returns either with the dm or the failure @@ -34,7 +34,7 @@ RocketChat.API.v1.addRoute(['dm.close', 'im.close'], { authRequired: true }, { }); RocketChat.API.v1.addRoute(['dm.history', 'im.history'], { authRequired: true }, { - get: function() { + get() { const findResult = findDirectMessageRoomById(this.queryParams.roomId, this.userId); //The find method returns either with the group or the failure @@ -79,7 +79,7 @@ RocketChat.API.v1.addRoute(['dm.history', 'im.history'], { authRequired: true }, }); RocketChat.API.v1.addRoute(['dm.messages.others', 'im.messages.others'], { authRequired: true }, { - get: function() { + get() { if (RocketChat.settings.get('API_Enable_Direct_Message_History_EndPoint') !== true) { throw new Meteor.Error('error-endpoint-disabled', 'This endpoint is disabled', { route: '/api/v1/im.messages.others' }); } @@ -119,7 +119,7 @@ RocketChat.API.v1.addRoute(['dm.messages.others', 'im.messages.others'], { authR }); RocketChat.API.v1.addRoute(['dm.list', 'im.list'], { authRequired: true }, { - get: function() { + get() { const { offset, count } = this.getPaginationItems(); const { sort, fields } = this.parseJsonQuery(); let rooms = _.pluck(RocketChat.models.Subscriptions.findByTypeAndUserId('d', this.userId).fetch(), '_room'); @@ -142,7 +142,7 @@ RocketChat.API.v1.addRoute(['dm.list', 'im.list'], { authRequired: true }, { }); RocketChat.API.v1.addRoute(['dm.list.everyone', 'im.list.everyone'], { authRequired: true }, { - get: function() { + get() { if (!RocketChat.authz.hasPermission(this.userId, 'view-room-administration')) { return RocketChat.API.v1.unauthorized(); } @@ -169,7 +169,7 @@ RocketChat.API.v1.addRoute(['dm.list.everyone', 'im.list.everyone'], { authRequi }); RocketChat.API.v1.addRoute(['dm.open', 'im.open'], { authRequired: true }, { - post: function() { + post() { const findResult = findDirectMessageRoomById(this.bodyParams.roomId, this.userId); //The find method returns either with the group or the failure @@ -190,7 +190,7 @@ RocketChat.API.v1.addRoute(['dm.open', 'im.open'], { authRequired: true }, { }); RocketChat.API.v1.addRoute(['dm.setTopic', 'im.setTopic'], { authRequired: true }, { - post: function() { + post() { if (!this.bodyParams.topic || !this.bodyParams.topic.trim()) { return RocketChat.API.v1.failure('The bodyParam "topic" is required'); } diff --git a/packages/rocketchat-api/server/v1/integrations.js b/packages/rocketchat-api/server/v1/integrations.js index d07c9ec1fa1..de848737ba8 100644 --- a/packages/rocketchat-api/server/v1/integrations.js +++ b/packages/rocketchat-api/server/v1/integrations.js @@ -1,5 +1,5 @@ RocketChat.API.v1.addRoute('integrations.create', { authRequired: true }, { - post: function() { + post() { check(this.bodyParams, Match.ObjectIncluding({ type: String, name: String, @@ -35,7 +35,7 @@ RocketChat.API.v1.addRoute('integrations.create', { authRequired: true }, { }); RocketChat.API.v1.addRoute('integrations.history', { authRequired: true }, { - get: function() { + get() { if (!RocketChat.authz.hasPermission(this.userId, 'manage-integrations')) { return RocketChat.API.v1.unauthorized(); } @@ -66,7 +66,7 @@ RocketChat.API.v1.addRoute('integrations.history', { authRequired: true }, { }); RocketChat.API.v1.addRoute('integrations.list', { authRequired: true }, { - get: function() { + get() { if (!RocketChat.authz.hasPermission(this.userId, 'manage-integrations')) { return RocketChat.API.v1.unauthorized(); } @@ -83,7 +83,7 @@ RocketChat.API.v1.addRoute('integrations.list', { authRequired: true }, { }).fetch(); return RocketChat.API.v1.success({ - integrations: integrations, + integrations, offset, items: integrations.length, total: RocketChat.models.Integrations.find(ourQuery).count() @@ -92,7 +92,7 @@ RocketChat.API.v1.addRoute('integrations.list', { authRequired: true }, { }); RocketChat.API.v1.addRoute('integrations.remove', { authRequired: true }, { - post: function() { + post() { check(this.bodyParams, Match.ObjectIncluding({ type: String, target_url: Match.Maybe(String), @@ -122,7 +122,7 @@ RocketChat.API.v1.addRoute('integrations.remove', { authRequired: true }, { }); return RocketChat.API.v1.success({ - integration: integration + integration }); default: return RocketChat.API.v1.failure('Invalid integration type.'); diff --git a/packages/rocketchat-api/server/v1/misc.js b/packages/rocketchat-api/server/v1/misc.js index cc2cba7cea6..38176417f88 100644 --- a/packages/rocketchat-api/server/v1/misc.js +++ b/packages/rocketchat-api/server/v1/misc.js @@ -1,5 +1,5 @@ RocketChat.API.v1.addRoute('info', { authRequired: false }, { - get: function() { + get() { const user = this.getLoggedInUser(); if (user && RocketChat.authz.hasRole(user._id, 'admin')) { @@ -17,7 +17,7 @@ RocketChat.API.v1.addRoute('info', { authRequired: false }, { }); RocketChat.API.v1.addRoute('me', { authRequired: true }, { - get: function() { + get() { return RocketChat.API.v1.success(_.pick(this.user, [ '_id', 'name', diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js index 1a4c54b5463..6892a54d1f2 100644 --- a/packages/rocketchat-api/server/v1/users.js +++ b/packages/rocketchat-api/server/v1/users.js @@ -1,5 +1,5 @@ RocketChat.API.v1.addRoute('users.create', { authRequired: true }, { - post: function() { + post() { check(this.bodyParams, { email: String, name: String, @@ -36,7 +36,7 @@ RocketChat.API.v1.addRoute('users.create', { authRequired: true }, { }); RocketChat.API.v1.addRoute('users.delete', { authRequired: true }, { - post: function() { + post() { if (!RocketChat.authz.hasPermission(this.userId, 'delete-user')) { return RocketChat.API.v1.unauthorized(); } @@ -52,7 +52,7 @@ RocketChat.API.v1.addRoute('users.delete', { authRequired: true }, { }); RocketChat.API.v1.addRoute('users.getAvatar', { authRequired: false }, { - get: function() { + get() { const user = this.getUserFromParams(); const url = RocketChat.getURL(`/avatar/${user.username}`, { cdn: false, full: true }); @@ -66,7 +66,7 @@ RocketChat.API.v1.addRoute('users.getAvatar', { authRequired: false }, { }); RocketChat.API.v1.addRoute('users.getPresence', { authRequired: true }, { - get: function() { + get() { //BLAHHHHHHHHHH :'( if ((this.queryParams.userId && this.userId !== this.queryParams.userId) || (this.queryParams.username && this.user.username !== this.queryParams.username) || (this.queryParams.user && this.user.username !== this.queryParams.user)) { const user = this.getUserFromParams(); @@ -86,7 +86,7 @@ RocketChat.API.v1.addRoute('users.getPresence', { authRequired: true }, { }); RocketChat.API.v1.addRoute('users.info', { authRequired: true }, { - get: function() { + get() { const user = this.getUserFromParams(); let result; @@ -105,7 +105,7 @@ RocketChat.API.v1.addRoute('users.info', { authRequired: true }, { }); RocketChat.API.v1.addRoute('users.list', { authRequired: true }, { - get: function() { + get() { const { offset, count } = this.getPaginationItems(); const { sort, fields, query } = this.parseJsonQuery(); @@ -148,7 +148,7 @@ RocketChat.API.v1.addRoute('users.list', { authRequired: true }, { }); RocketChat.API.v1.addRoute('users.register', { authRequired: false }, { - post: function() { + post() { if (this.userId) { return RocketChat.API.v1.failure('Logged in users can not register again.'); } @@ -171,7 +171,7 @@ RocketChat.API.v1.addRoute('users.register', { authRequired: false }, { //TODO: Make this route work with support for usernames RocketChat.API.v1.addRoute('users.setAvatar', { authRequired: true }, { - post: function() { + post() { check(this.bodyParams, { avatarUrl: Match.Maybe(String), userId: Match.Maybe(String) }); if (typeof this.bodyParams.userId !== 'undefined' && this.userId !== this.bodyParams.userId && !RocketChat.authz.hasPermission(this.userId, 'edit-other-user-info')) { @@ -212,7 +212,7 @@ RocketChat.API.v1.addRoute('users.setAvatar', { authRequired: true }, { }); RocketChat.API.v1.addRoute('users.update', { authRequired: true }, { - post: function() { + post() { check(this.bodyParams, { userId: String, data: Match.ObjectIncluding({ diff --git a/packages/rocketchat-assets/server/assets.js b/packages/rocketchat-assets/server/assets.js index f1814c968b2..d55848474d1 100644 --- a/packages/rocketchat-assets/server/assets.js +++ b/packages/rocketchat-assets/server/assets.js @@ -268,12 +268,12 @@ RocketChat.Assets = new (class { where: 'client', type: 'asset', content: file.buffer, - extension: extension, + extension, url: `/assets/${assetKey}.${extension}?${hash}`, size: file.length, uploadDate: file.uploadDate, contentType: file.contentType, - hash: hash + hash }; } }); diff --git a/packages/rocketchat-authorization/client/startup.js b/packages/rocketchat-authorization/client/startup.js index d939db392ec..c4ef2b2deaf 100644 --- a/packages/rocketchat-authorization/client/startup.js +++ b/packages/rocketchat-authorization/client/startup.js @@ -3,7 +3,7 @@ Meteor.subscribe('roles'); RocketChat.AdminBox.addOption({ href: 'admin-permissions', i18nLabel: 'Permissions', - permissionGranted: function() { + permissionGranted() { return RocketChat.authz.hasAllPermission('access-permissions'); } }); diff --git a/packages/rocketchat-authorization/client/views/permissionsRole.js b/packages/rocketchat-authorization/client/views/permissionsRole.js index 59ec9552958..be70ede7d00 100644 --- a/packages/rocketchat-authorization/client/views/permissionsRole.js +++ b/packages/rocketchat-authorization/client/views/permissionsRole.js @@ -65,7 +65,7 @@ Template.permissionsRole.helpers({ noMatchTemplate: Template.roomSearchEmpty, matchAll: true, sort: 'name', - selector: function(match) { + selector(match) { return { name: match }; @@ -90,7 +90,7 @@ Template.permissionsRole.helpers({ filter: { exceptions: instance.usersInRole.get() && instance.usersInRole.get().fetch() }, - selector: function(match) { + selector(match) { return { term: match }; diff --git a/packages/rocketchat-authorization/server/methods/addUserToRole.js b/packages/rocketchat-authorization/server/methods/addUserToRole.js index 9f45c061670..e5dd7f2f57d 100644 --- a/packages/rocketchat-authorization/server/methods/addUserToRole.js +++ b/packages/rocketchat-authorization/server/methods/addUserToRole.js @@ -40,9 +40,9 @@ Meteor.methods({ _id: roleName, u: { _id: user._id, - username: username + username }, - scope: scope + scope }); } diff --git a/packages/rocketchat-authorization/server/methods/removeUserFromRole.js b/packages/rocketchat-authorization/server/methods/removeUserFromRole.js index 6e56f518307..cd62bf1b1c6 100644 --- a/packages/rocketchat-authorization/server/methods/removeUserFromRole.js +++ b/packages/rocketchat-authorization/server/methods/removeUserFromRole.js @@ -14,7 +14,7 @@ Meteor.methods({ } const user = Meteor.users.findOne({ - username: username + username }, { fields: { _id: 1, @@ -52,9 +52,9 @@ Meteor.methods({ _id: roleName, u: { _id: user._id, - username: username + username }, - scope: scope + scope }); } diff --git a/packages/rocketchat-authorization/server/models/Base.js b/packages/rocketchat-authorization/server/models/Base.js index 2f41acdc394..b5abf1c0a8c 100644 --- a/packages/rocketchat-authorization/server/models/Base.js +++ b/packages/rocketchat-authorization/server/models/Base.js @@ -34,7 +34,7 @@ RocketChat.models._Base.prototype.removeRolesByUserId = function(userId, roles, const query = this.roleBaseQuery(userId, scope); const update = { $pullAll: { - roles: roles + roles } }; return this.update(query, update); diff --git a/packages/rocketchat-authorization/server/models/Permissions.js b/packages/rocketchat-authorization/server/models/Permissions.js index 077c9b5f418..a82e0411fca 100644 --- a/packages/rocketchat-authorization/server/models/Permissions.js +++ b/packages/rocketchat-authorization/server/models/Permissions.js @@ -17,7 +17,7 @@ class ModelPermissions extends RocketChat.models._Base { } createOrUpdate(name, roles) { - this.upsert({ _id: name }, { $set: { roles: roles } }); + this.upsert({ _id: name }, { $set: { roles } }); } addRole(permission, role) { diff --git a/packages/rocketchat-authorization/server/publications/usersInRole.js b/packages/rocketchat-authorization/server/publications/usersInRole.js index a8a02da5ba7..20937986617 100644 --- a/packages/rocketchat-authorization/server/publications/usersInRole.js +++ b/packages/rocketchat-authorization/server/publications/usersInRole.js @@ -10,7 +10,7 @@ Meteor.publish('usersInRole', function(roleName, scope, limit = 50) { } const options = { - limit: limit, + limit, sort: { name: 1 } diff --git a/packages/rocketchat-autotranslate/client/lib/autotranslate.js b/packages/rocketchat-autotranslate/client/lib/autotranslate.js index 1301993914f..20458baebcb 100644 --- a/packages/rocketchat-autotranslate/client/lib/autotranslate.js +++ b/packages/rocketchat-autotranslate/client/lib/autotranslate.js @@ -5,7 +5,7 @@ RocketChat.AutoTranslate = { getLanguage(rid) { let subscription = {}; if (rid) { - subscription = RocketChat.models.Subscriptions.findOne({ rid: rid }, { fields: { autoTranslateLanguage: 1 } }); + subscription = RocketChat.models.Subscriptions.findOne({ rid }, { fields: { autoTranslateLanguage: 1 } }); } const language = subscription && subscription.autoTranslateLanguage || Meteor.user().language || window.defaultUserLanguage(); if (language.indexOf('-') !== -1) { diff --git a/packages/rocketchat-autotranslate/server/autotranslate.js b/packages/rocketchat-autotranslate/server/autotranslate.js index 81be619f140..c61c7544456 100644 --- a/packages/rocketchat-autotranslate/server/autotranslate.js +++ b/packages/rocketchat-autotranslate/server/autotranslate.js @@ -30,7 +30,7 @@ class AutoTranslate { message.msg = message.msg.replace(/:[+\w\d]+:/g, function(match) { const token = `{${count++}}`; message.tokens.push({ - token: token, + token, text: match }); return token; @@ -120,7 +120,7 @@ class AutoTranslate { message.msg = message.msg.replace(new RegExp(`(@${mention.username})`, 'gm'), match => { const token = `{${count++}}`; message.tokens.push({ - token: token, + token, text: match }); return token; @@ -133,7 +133,7 @@ class AutoTranslate { message.msg = message.msg.replace(new RegExp(`(#${channel.name})`, 'gm'), match => { const token = `{${count++}}`; message.tokens.push({ - token: token, + token, text: match }); return token; @@ -180,7 +180,7 @@ class AutoTranslate { } let result; try { - result = HTTP.get('https://translation.googleapis.com/language/translate/v2', { params: { key: this.apiKey, target: language }, query: query }); + result = HTTP.get('https://translation.googleapis.com/language/translate/v2', { params: { key: this.apiKey, target: language }, query }); } catch (e) { console.log('Error translating message', e); return message; @@ -209,7 +209,7 @@ class AutoTranslate { if (language.indexOf('-') !== -1 && !_.findWhere(supportedLanguages, { language })) { language = language.substr(0, 2); } - const result = HTTP.get('https://translation.googleapis.com/language/translate/v2', { params: { key: this.apiKey, target: language }, query: query }); + const result = HTTP.get('https://translation.googleapis.com/language/translate/v2', { params: { key: this.apiKey, target: language }, query }); if (result.statusCode === 200 && result.data && result.data.data && result.data.data.translations && Array.isArray(result.data.data.translations) && result.data.data.translations.length > 0) { const txt = result.data.data.translations.map(translation => translation.translatedText).join('\n'); translations[language] = txt; @@ -240,13 +240,13 @@ class AutoTranslate { } try { - result = HTTP.get('https://translation.googleapis.com/language/translate/v2/languages', { params: params }); + result = HTTP.get('https://translation.googleapis.com/language/translate/v2/languages', { params }); } catch (e) { if (e.response && e.response.statusCode === 400 && e.response.data && e.response.data.error && e.response.data.error.status === 'INVALID_ARGUMENT') { params.target = 'en'; target = 'en'; if (!this.supportedLanguages[target]) { - result = HTTP.get('https://translation.googleapis.com/language/translate/v2/languages', { params: params }); + result = HTTP.get('https://translation.googleapis.com/language/translate/v2/languages', { params }); } } } finally { diff --git a/packages/rocketchat-autotranslate/server/methods/saveSettings.js b/packages/rocketchat-autotranslate/server/methods/saveSettings.js index 142c9beeda0..1030436bcdd 100644 --- a/packages/rocketchat-autotranslate/server/methods/saveSettings.js +++ b/packages/rocketchat-autotranslate/server/methods/saveSettings.js @@ -1,5 +1,5 @@ Meteor.methods({ - 'autoTranslate.saveSettings': function(rid, field, value, options) { + 'autoTranslate.saveSettings'(rid, field, value, options) { if (!Meteor.userId()) { throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'saveAutoTranslateSettings' }); } diff --git a/packages/rocketchat-autotranslate/server/models/Subscriptions.js b/packages/rocketchat-autotranslate/server/models/Subscriptions.js index 7af441dff90..85482e6173c 100644 --- a/packages/rocketchat-autotranslate/server/models/Subscriptions.js +++ b/packages/rocketchat-autotranslate/server/models/Subscriptions.js @@ -1,13 +1,13 @@ RocketChat.models.Subscriptions.updateAutoTranslateById = function(_id, autoTranslate) { const query = { - _id: _id + _id }; let update; if (autoTranslate) { update = { $set: { - autoTranslate: autoTranslate + autoTranslate } }; } else { @@ -23,12 +23,12 @@ RocketChat.models.Subscriptions.updateAutoTranslateById = function(_id, autoTran RocketChat.models.Subscriptions.updateAutoTranslateLanguageById = function(_id, autoTranslateLanguage) { const query = { - _id: _id + _id }; const update = { $set: { - autoTranslateLanguage: autoTranslateLanguage + autoTranslateLanguage } }; @@ -39,7 +39,7 @@ RocketChat.models.Subscriptions.getAutoTranslateLanguagesByRoomAndNotUser = func const subscriptionsRaw = RocketChat.models.Subscriptions.model.rawCollection(); const distinct = Meteor.wrapAsync(subscriptionsRaw.distinct, subscriptionsRaw); const query = { - rid: rid, + rid, 'u._id': { $ne: userId }, autoTranslate: true }; diff --git a/packages/rocketchat-cas/cas_client.js b/packages/rocketchat-cas/cas_client.js index 72e1df32eea..9b3468f56df 100644 --- a/packages/rocketchat-cas/cas_client.js +++ b/packages/rocketchat-cas/cas_client.js @@ -52,7 +52,7 @@ Meteor.loginWithCas = function(options, callback) { popup.addEventListener('exit', function() { // check auth on server. Accounts.callLoginMethod({ - methodArguments: [{ cas: { credentialToken: credentialToken } }], + methodArguments: [{ cas: { credentialToken } }], userCallback: callback }); }); @@ -77,7 +77,7 @@ Meteor.loginWithCas = function(options, callback) { // check auth on server. Accounts.callLoginMethod({ - methodArguments: [{ cas: { credentialToken: credentialToken } }], + methodArguments: [{ cas: { credentialToken } }], userCallback: callback }); } diff --git a/packages/rocketchat-cas/cas_server.js b/packages/rocketchat-cas/cas_server.js index 9d1b148916b..a78a280d533 100644 --- a/packages/rocketchat-cas/cas_server.js +++ b/packages/rocketchat-cas/cas_server.js @@ -42,7 +42,7 @@ const casTicket = function(req, token, callback) { logger.error('error when trying to validate: ' + err.message); } else if (status) { logger.info('Validated user: ' + username); - const user_info = { username: username }; + const user_info = { username }; // CAS 2.0 attributes handling if (details && details.attributes) { diff --git a/packages/rocketchat-crowd/client/loginHelper.js b/packages/rocketchat-crowd/client/loginHelper.js index cb0de911015..e337b07edc6 100644 --- a/packages/rocketchat-crowd/client/loginHelper.js +++ b/packages/rocketchat-crowd/client/loginHelper.js @@ -9,12 +9,12 @@ Meteor.loginWithCrowd = function(username, password, callback) { password = args.shift(); const loginRequest = { crowd: true, - username: username, + username, crowdPassword: password }; Accounts.callLoginMethod({ methodArguments: [loginRequest], - userCallback: function(error) { + userCallback(error) { if (error) { if (callback) { callback(error); diff --git a/packages/rocketchat-crowd/server/crowd.js b/packages/rocketchat-crowd/server/crowd.js index 364b7b32c29..0ca60d4548a 100644 --- a/packages/rocketchat-crowd/server/crowd.js +++ b/packages/rocketchat-crowd/server/crowd.js @@ -5,7 +5,7 @@ const logger = new Logger('CROWD', {}); function fallbackDefaultAccountSystem(bind, username, password) { if (typeof username === 'string') { if (username.indexOf('@') === -1) { - username = {username: username}; + username = {username}; } else { username = {email: username}; } @@ -76,7 +76,7 @@ const CROWD = class CROWD { displayname: userResponse['display-name'], username: userResponse.name, email: userResponse.email, - password: password, + password, active: userResponse.active }; @@ -222,7 +222,7 @@ RocketChat.settings.get('CROWD_Sync_User_Data', function(key, value) { }); Meteor.methods({ - crowd_test_connection:function() { + crowd_test_connection() { const user = Meteor.user(); if (!user) { throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'crowd_test_connection' }); diff --git a/packages/rocketchat-crowd/server/settings.js b/packages/rocketchat-crowd/server/settings.js index 418fddff926..6a83a6abac8 100644 --- a/packages/rocketchat-crowd/server/settings.js +++ b/packages/rocketchat-crowd/server/settings.js @@ -2,11 +2,11 @@ Meteor.startup(function() { RocketChat.settings.addGroup('AtlassianCrowd', function() { const enableQuery = {_id: 'CROWD_Enable', value: true}; this.add('CROWD_Enable', false, { type: 'boolean', public: true, i18nLabel: 'Enabled' }); - this.add('CROWD_URL', '', { type: 'string', enableQuery: enableQuery, i18nLabel: 'URL' }); - this.add('CROWD_Reject_Unauthorized', true, { type: 'boolean', enableQuery: enableQuery }); - this.add('CROWD_APP_USERNAME', '', { type: 'string', enableQuery: enableQuery, i18nLabel: 'Username' }); - this.add('CROWD_APP_PASSWORD', '', { type: 'password', enableQuery: enableQuery, i18nLabel: 'Password' }); - this.add('CROWD_Sync_User_Data', false, { type: 'boolean', enableQuery: enableQuery, i18nLabel: 'Sync_Users' }); + this.add('CROWD_URL', '', { type: 'string', enableQuery, i18nLabel: 'URL' }); + this.add('CROWD_Reject_Unauthorized', true, { type: 'boolean', enableQuery }); + this.add('CROWD_APP_USERNAME', '', { type: 'string', enableQuery, i18nLabel: 'Username' }); + this.add('CROWD_APP_PASSWORD', '', { type: 'password', enableQuery, i18nLabel: 'Password' }); + this.add('CROWD_Sync_User_Data', false, { type: 'boolean', enableQuery, i18nLabel: 'Sync_Users' }); this.add('CROWD_Test_Connection', 'crowd_test_connection', { type: 'action', actionText: 'Test_Connection', i18nLabel: 'Test_Connection' }); }); }); diff --git a/packages/rocketchat-custom-oauth/custom_oauth_client.js b/packages/rocketchat-custom-oauth/custom_oauth_client.js index b3c88e9955d..6c3ed5084e4 100644 --- a/packages/rocketchat-custom-oauth/custom_oauth_client.js +++ b/packages/rocketchat-custom-oauth/custom_oauth_client.js @@ -87,10 +87,10 @@ export class CustomOAuth { OAuth.launchLogin({ loginService: this.name, - loginStyle: loginStyle, - loginUrl: loginUrl, - credentialRequestCompleteCallback: credentialRequestCompleteCallback, - credentialToken: credentialToken, + loginStyle, + loginUrl, + credentialRequestCompleteCallback, + credentialToken, popupOptions: { width: 900, height: 450 diff --git a/packages/rocketchat-custom-oauth/custom_oauth_server.js b/packages/rocketchat-custom-oauth/custom_oauth_server.js index 6517b3891e4..4a938be3517 100644 --- a/packages/rocketchat-custom-oauth/custom_oauth_server.js +++ b/packages/rocketchat-custom-oauth/custom_oauth_server.js @@ -119,8 +119,8 @@ export class CustomOAuth { try { const response = HTTP.get(this.identityPath, { - headers: headers, - params: params + headers, + params }); let data; @@ -199,13 +199,13 @@ export class CustomOAuth { const serviceData = { _OAuthCustom: true, - accessToken: accessToken + accessToken }; _.extend(serviceData, identity); const data = { - serviceData: serviceData, + serviceData, options: { profile: { name: identity.name || identity.username || identity.nickname || identity.CharacterName || identity.userName || identity.preferred_username || (identity.user && identity.user.name) diff --git a/packages/rocketchat-custom-sounds/admin/adminSounds.js b/packages/rocketchat-custom-sounds/admin/adminSounds.js index 62386d22f6a..7dc22fa0973 100644 --- a/packages/rocketchat-custom-sounds/admin/adminSounds.js +++ b/packages/rocketchat-custom-sounds/admin/adminSounds.js @@ -82,7 +82,7 @@ Template.adminSounds.onCreated(function() { const limit = (instance.limit != null) ? instance.limit.get() : 0; - return RocketChat.models.CustomSounds.find(query, { limit: limit, sort: { name: 1 }}).fetch(); + return RocketChat.models.CustomSounds.find(query, { limit, sort: { name: 1 }}).fetch(); }; }); diff --git a/packages/rocketchat-emoji-custom/admin/adminEmoji.js b/packages/rocketchat-emoji-custom/admin/adminEmoji.js index a1ddce4c9c5..568015eddcd 100644 --- a/packages/rocketchat-emoji-custom/admin/adminEmoji.js +++ b/packages/rocketchat-emoji-custom/admin/adminEmoji.js @@ -78,7 +78,7 @@ Template.adminEmoji.onCreated(function() { const limit = (instance.limit != null) ? instance.limit.get() : 0; - return RocketChat.models.EmojiCustom.find(query, { limit: limit, sort: { name: 1 }}).fetch(); + return RocketChat.models.EmojiCustom.find(query, { limit, sort: { name: 1 }}).fetch(); }; }); diff --git a/packages/rocketchat-emoji-custom/client/lib/emojiCustom.js b/packages/rocketchat-emoji-custom/client/lib/emojiCustom.js index 469aa014fb5..2927f89f4db 100644 --- a/packages/rocketchat-emoji-custom/client/lib/emojiCustom.js +++ b/packages/rocketchat-emoji-custom/client/lib/emojiCustom.js @@ -4,7 +4,7 @@ RocketChat.emoji.packages.emojiCustom = { toneList: {}, list: [], - render: function(html) { + render(html) { const regShortNames = new RegExp(']*>.*?<\/object>|]*>.*?<\/span>|<(?:object|embed|svg|img|div|span|p|a)[^>]*>|(' + RocketChat.emoji.packages.emojiCustom.list.join('|') + ')', 'gi'); // replace regular shortnames first diff --git a/packages/rocketchat-emoji/emojiPicker.js b/packages/rocketchat-emoji/emojiPicker.js index 41611d0321e..2d0d7dcd45b 100644 --- a/packages/rocketchat-emoji/emojiPicker.js +++ b/packages/rocketchat-emoji/emojiPicker.js @@ -150,7 +150,7 @@ Template.emojiPicker.helpers({ activeCategory(category) { return Template.instance().currentCategory.get() === category ? 'active' : ''; }, - categoryName: categoryName, + categoryName, /** * Returns currently active emoji category hash * diff --git a/packages/rocketchat-emoji/lib/EmojiPicker.js b/packages/rocketchat-emoji/lib/EmojiPicker.js index 376231f5999..4543cae0521 100644 --- a/packages/rocketchat-emoji/lib/EmojiPicker.js +++ b/packages/rocketchat-emoji/lib/EmojiPicker.js @@ -56,8 +56,8 @@ RocketChat.EmojiPicker = { const left = sourcePos.left; const top = (sourcePos.top - this.height - 5); const cssProperties = { - top: top, - left: left + top, + left }; if (top < 0) { diff --git a/packages/rocketchat-file-upload/globalFileRestrictions.js b/packages/rocketchat-file-upload/globalFileRestrictions.js index 04ec78b760f..0568c018d8f 100644 --- a/packages/rocketchat-file-upload/globalFileRestrictions.js +++ b/packages/rocketchat-file-upload/globalFileRestrictions.js @@ -3,7 +3,7 @@ import filesize from 'filesize'; const slingShotConfig = { - authorize: function(file/*, metaContext*/) { + authorize(file/*, metaContext*/) { //Deny uploads if user is not logged in. if (!this.userId) { throw new Meteor.Error('login-required', 'Please login before posting files'); diff --git a/packages/rocketchat-file-upload/lib/FileUploadBase.js b/packages/rocketchat-file-upload/lib/FileUploadBase.js index 9aedd73197a..62263dd0c6d 100644 --- a/packages/rocketchat-file-upload/lib/FileUploadBase.js +++ b/packages/rocketchat-file-upload/lib/FileUploadBase.js @@ -2,13 +2,13 @@ /* exported FileUploadBase */ UploadFS.config.defaultStorePermissions = new UploadFS.StorePermissions({ - insert: function(userId/*, doc*/) { + insert(userId/*, doc*/) { return userId; }, - update: function(userId, doc) { + update(userId, doc) { return RocketChat.authz.hasPermission(Meteor.userId(), 'delete-message', doc.rid) || (RocketChat.settings.get('Message_AllowDeleting') && userId === doc.userId); }, - remove: function(userId, doc) { + remove(userId, doc) { return RocketChat.authz.hasPermission(Meteor.userId(), 'delete-message', doc.rid) || (RocketChat.settings.get('Message_AllowDeleting') && userId === doc.userId); } }); diff --git a/packages/rocketchat-file-upload/server/config/configFileUploadAmazonS3.js b/packages/rocketchat-file-upload/server/config/configFileUploadAmazonS3.js index cdbee5a1240..09a901c24e0 100644 --- a/packages/rocketchat-file-upload/server/config/configFileUploadAmazonS3.js +++ b/packages/rocketchat-file-upload/server/config/configFileUploadAmazonS3.js @@ -58,10 +58,10 @@ const createS3Directive = _.debounce(() => { delete Slingshot._directives[directiveName]; } const config = { - bucket: bucket, + bucket, AWSAccessKeyId: accessKey, AWSSecretAccessKey: secretKey, - key: function(file, metaContext) { + key(file, metaContext) { const path = RocketChat.hostname + '/' + metaContext.rid + '/' + this.userId + '/'; const upload = { s3: { diff --git a/packages/rocketchat-file-upload/server/config/configFileUploadFileSystem.js b/packages/rocketchat-file-upload/server/config/configFileUploadFileSystem.js index aacb97542a4..8cdb9d9655d 100644 --- a/packages/rocketchat-file-upload/server/config/configFileUploadFileSystem.js +++ b/packages/rocketchat-file-upload/server/config/configFileUploadFileSystem.js @@ -16,7 +16,7 @@ const createFileSystemStore = _.debounce(function() { filter: new UploadFS.Filter({ onCheck: FileUpload.validateFileUpload }), - transformWrite: function(readStream, writeStream, fileId, file) { + transformWrite(readStream, writeStream, fileId, file) { if (RocketChatFile.enabled === false || !/^image\/((x-windows-)?bmp|p?jpeg|png)$/.test(file.type)) { return readStream.pipe(writeStream); } diff --git a/packages/rocketchat-github-enterprise/startup.js b/packages/rocketchat-github-enterprise/startup.js index e0ace3bf5bf..71ded8631fd 100644 --- a/packages/rocketchat-github-enterprise/startup.js +++ b/packages/rocketchat-github-enterprise/startup.js @@ -6,9 +6,9 @@ RocketChat.settings.addGroup('OAuth', function() { }; this.add('Accounts_OAuth_GitHub_Enterprise', false, { type: 'boolean' }); - this.add('API_GitHub_Enterprise_URL', '', { type: 'string', public: true, enableQuery: enableQuery, i18nDescription: 'API_GitHub_Enterprise_URL_Description' }); - this.add('Accounts_OAuth_GitHub_Enterprise_id', '', { type: 'string', enableQuery: enableQuery }); - this.add('Accounts_OAuth_GitHub_Enterprise_secret', '', { type: 'string', enableQuery: enableQuery }); - this.add('Accounts_OAuth_GitHub_Enterprise_callback_url', '_oauth/github_enterprise', { type: 'relativeUrl', readonly: true, force: true, enableQuery: enableQuery }); + this.add('API_GitHub_Enterprise_URL', '', { type: 'string', public: true, enableQuery, i18nDescription: 'API_GitHub_Enterprise_URL_Description' }); + this.add('Accounts_OAuth_GitHub_Enterprise_id', '', { type: 'string', enableQuery }); + this.add('Accounts_OAuth_GitHub_Enterprise_secret', '', { type: 'string', enableQuery }); + this.add('Accounts_OAuth_GitHub_Enterprise_callback_url', '_oauth/github_enterprise', { type: 'relativeUrl', readonly: true, force: true, enableQuery }); }); }); diff --git a/packages/rocketchat-gitlab/startup.js b/packages/rocketchat-gitlab/startup.js index 29eb8d3acee..f854c79fd7c 100644 --- a/packages/rocketchat-gitlab/startup.js +++ b/packages/rocketchat-gitlab/startup.js @@ -6,9 +6,9 @@ RocketChat.settings.addGroup('OAuth', function() { }; this.add('Accounts_OAuth_Gitlab', false, { type: 'boolean', public: true }); - this.add('API_Gitlab_URL', '', { type: 'string', enableQuery: enableQuery, public: true }); - this.add('Accounts_OAuth_Gitlab_id', '', { type: 'string', enableQuery: enableQuery }); - this.add('Accounts_OAuth_Gitlab_secret', '', { type: 'string', enableQuery: enableQuery }); - this.add('Accounts_OAuth_Gitlab_callback_url', '_oauth/gitlab', { type: 'relativeUrl', readonly: true, force: true, enableQuery: enableQuery }); + this.add('API_Gitlab_URL', '', { type: 'string', enableQuery, public: true }); + this.add('Accounts_OAuth_Gitlab_id', '', { type: 'string', enableQuery }); + this.add('Accounts_OAuth_Gitlab_secret', '', { type: 'string', enableQuery }); + this.add('Accounts_OAuth_Gitlab_callback_url', '_oauth/gitlab', { type: 'relativeUrl', readonly: true, force: true, enableQuery }); }); }); diff --git a/packages/rocketchat-iframe-login/iframe_client.js b/packages/rocketchat-iframe-login/iframe_client.js index 76c845ca92b..6b5b1692ccd 100644 --- a/packages/rocketchat-iframe-login/iframe_client.js +++ b/packages/rocketchat-iframe-login/iframe_client.js @@ -89,7 +89,7 @@ class IframeLogin { if (Match.test(token, String)) { token = { - token: token + token }; } @@ -166,7 +166,7 @@ window.addEventListener('message', (e) => { console.log('facebook-login-success', response); e.source.postMessage({ event: 'facebook-login-success', - response: response + response // authResponse: Object // accessToken: "a7s6d8a76s8d7..." // expiresIn: "5172793" @@ -182,8 +182,8 @@ window.addEventListener('message', (e) => { console.log('facebook-login-error', error, response); e.source.postMessage({ event: 'facebook-login-error', - error: error, - response: response + error, + response }, e.origin); }; @@ -196,7 +196,7 @@ window.addEventListener('message', (e) => { authResponse: { accessToken: serviceData.accessToken, expiresIn: serviceData.expiresAt, - secret: secret + secret }, userID: serviceData.id }); @@ -223,7 +223,7 @@ window.addEventListener('message', (e) => { console.log('twitter-login-success', response); e.source.postMessage({ event: 'twitter-login-success', - response: response + response // { // "userName": "orodrigok", // "userId": 293123, @@ -237,7 +237,7 @@ window.addEventListener('message', (e) => { console.log('twitter-login-error', error); e.source.postMessage({ event: 'twitter-login-error', - error: error + error }, e.origin); }; @@ -269,7 +269,7 @@ window.addEventListener('message', (e) => { console.log('google-login-success', response); e.source.postMessage({ event: 'google-login-success', - response: response + response // { // "email": "rodrigoknascimento@gmail.com", // "userId": "1082039180239", @@ -288,7 +288,7 @@ window.addEventListener('message', (e) => { console.log('google-login-error', error); e.source.postMessage({ event: 'google-login-error', - error: error + error }, e.origin); }; diff --git a/packages/rocketchat-integrations/client/views/integrationsIncoming.js b/packages/rocketchat-integrations/client/views/integrationsIncoming.js index 9b0a7c663bc..2548e5dcb0a 100644 --- a/packages/rocketchat-integrations/client/views/integrationsIncoming.js +++ b/packages/rocketchat-integrations/client/views/integrationsIncoming.js @@ -221,7 +221,7 @@ Template.integrationsIncoming.events({ const integration = { enabled: enabled === '1', - channel: channel, + channel, alias: alias !== '' ? alias : undefined, emoji: emoji !== '' ? emoji : undefined, avatar: avatar !== '' ? avatar : undefined, diff --git a/packages/rocketchat-integrations/client/views/integrationsOutgoing.js b/packages/rocketchat-integrations/client/views/integrationsOutgoing.js index 6d02ffeb99b..ee6ff6aa044 100644 --- a/packages/rocketchat-integrations/client/views/integrationsOutgoing.js +++ b/packages/rocketchat-integrations/client/views/integrationsOutgoing.js @@ -322,7 +322,7 @@ Template.integrationsOutgoing.events({ const integration = { event: event !== '' ? event : undefined, enabled: enabled === '1', - username: username, + username, channel: channel !== '' ? channel : undefined, targetRoom: targetRoom !== '' ? targetRoom : undefined, alias: alias !== '' ? alias : undefined, diff --git a/packages/rocketchat-integrations/server/processWebhookMessage.js b/packages/rocketchat-integrations/server/processWebhookMessage.js index aa81be89adb..a1d04d43bd0 100644 --- a/packages/rocketchat-integrations/server/processWebhookMessage.js +++ b/packages/rocketchat-integrations/server/processWebhookMessage.js @@ -69,7 +69,7 @@ this.processWebhookMessage = function(messageObj, user, defaultValues = { channe } const messageReturn = RocketChat.sendMessage(user, message, room); - sentData.push({ channel: channel, message: messageReturn }); + sentData.push({ channel, message: messageReturn }); } return sentData; diff --git a/packages/rocketchat-ldap/client/loginHelper.js b/packages/rocketchat-ldap/client/loginHelper.js index 021ee942dbd..9c1dbc6008d 100644 --- a/packages/rocketchat-ldap/client/loginHelper.js +++ b/packages/rocketchat-ldap/client/loginHelper.js @@ -30,7 +30,7 @@ Meteor.loginWithLDAP = function(username, password, customLdapOptions, callback) // Set up loginRequest object const loginRequest = { ldap: true, - username: username, + username, ldapPass: password, ldapOptions: customLdapOptions }; @@ -39,7 +39,7 @@ Meteor.loginWithLDAP = function(username, password, customLdapOptions, callback) // Call login method with ldap = true // This will hook into our login handler for ldap methodArguments: [loginRequest], - userCallback: function(error/*, result*/) { + userCallback(error/*, result*/) { if (error) { if (callback) { callback(error); diff --git a/packages/rocketchat-ldap/server/ldap.js b/packages/rocketchat-ldap/server/ldap.js index d98b92cf761..15e497e4e24 100644 --- a/packages/rocketchat-ldap/server/ldap.js +++ b/packages/rocketchat-ldap/server/ldap.js @@ -250,7 +250,7 @@ LDAP = class LDAP { if (attribute) { filter = new self.ldapjs.filters.EqualityFilter({ - attribute: attribute, + attribute, value: new Buffer(id, 'hex') }); } else { @@ -262,11 +262,11 @@ LDAP = class LDAP { })); }); - filter = new self.ldapjs.filters.OrFilter({filters: filters}); + filter = new self.ldapjs.filters.OrFilter({filters}); } const searchOptions = { - filter: filter, + filter, scope: 'sub' }; diff --git a/packages/rocketchat-ldap/server/loginHandler.js b/packages/rocketchat-ldap/server/loginHandler.js index 388f08075f1..67fc2ab8d4b 100644 --- a/packages/rocketchat-ldap/server/loginHandler.js +++ b/packages/rocketchat-ldap/server/loginHandler.js @@ -6,7 +6,7 @@ const logger = new Logger('LDAPHandler', {}); function fallbackDefaultAccountSystem(bind, username, password) { if (typeof username === 'string') { if (username.indexOf('@') === -1) { - username = {username: username}; + username = {username}; } else { username = {email: username}; } @@ -99,7 +99,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) { if (!user) { userQuery = { - username: username + username }; logger.debug('userQuery', userQuery); diff --git a/packages/rocketchat-ldap/server/settings.js b/packages/rocketchat-ldap/server/settings.js index 6d42dcc8ec5..71c8b7a271f 100644 --- a/packages/rocketchat-ldap/server/settings.js +++ b/packages/rocketchat-ldap/server/settings.js @@ -23,21 +23,21 @@ Meteor.startup(function() { ]; this.add('LDAP_Enable', false, { type: 'boolean', public: true }); - this.add('LDAP_Login_Fallback', true, { type: 'boolean', enableQuery: enableQuery }); - this.add('LDAP_Host', '', { type: 'string', enableQuery: enableQuery }); - this.add('LDAP_Port', '389', { type: 'string', enableQuery: enableQuery }); - this.add('LDAP_Connect_Timeout', 600000, {type: 'int', enableQuery: enableQuery}); - this.add('LDAP_Idle_Timeout', 600000, {type: 'int', enableQuery: enableQuery}); - this.add('LDAP_Encryption', 'plain', { type: 'select', values: [ { key: 'plain', i18nLabel: 'No_Encryption' }, { key: 'tls', i18nLabel: 'StartTLS' }, { key: 'ssl', i18nLabel: 'SSL/LDAPS' } ], enableQuery: enableQuery }); + this.add('LDAP_Login_Fallback', true, { type: 'boolean', enableQuery }); + this.add('LDAP_Host', '', { type: 'string', enableQuery }); + this.add('LDAP_Port', '389', { type: 'string', enableQuery }); + this.add('LDAP_Connect_Timeout', 600000, {type: 'int', enableQuery}); + this.add('LDAP_Idle_Timeout', 600000, {type: 'int', enableQuery}); + this.add('LDAP_Encryption', 'plain', { type: 'select', values: [ { key: 'plain', i18nLabel: 'No_Encryption' }, { key: 'tls', i18nLabel: 'StartTLS' }, { key: 'ssl', i18nLabel: 'SSL/LDAPS' } ], enableQuery }); this.add('LDAP_CA_Cert', '', { type: 'string', multiline: true, enableQuery: enableTLSQuery }); this.add('LDAP_Reject_Unauthorized', true, { type: 'boolean', enableQuery: enableTLSQuery }); - this.add('LDAP_Domain_Base', '', { type: 'string', enableQuery: enableQuery }); - this.add('LDAP_Use_Custom_Domain_Search', false, { type: 'boolean', enableQuery: enableQuery }); + this.add('LDAP_Domain_Base', '', { type: 'string', enableQuery }); + this.add('LDAP_Use_Custom_Domain_Search', false, { type: 'boolean', enableQuery }); this.add('LDAP_Custom_Domain_Search', '', { type: 'string', enableQuery: customBindSearchEnabledQuery }); this.add('LDAP_Domain_Search_User', '', { type: 'string', enableQuery: customBindSearchDisabledQuery }); this.add('LDAP_Domain_Search_Password', '', { type: 'password', enableQuery: customBindSearchDisabledQuery }); this.add('LDAP_Domain_Search_Filter', '', { type: 'string', enableQuery: customBindSearchDisabledQuery }); - this.add('LDAP_Group_Filter_Enable', false, { type: 'boolean', enableQuery: enableQuery }); + this.add('LDAP_Group_Filter_Enable', false, { type: 'boolean', enableQuery }); this.add('LDAP_Group_Filter_ObjectClass', 'groupOfUniqueNames', { type: 'string', enableQuery: groupFilterQuery }); this.add('LDAP_Group_Filter_Group_Id_Attribute', 'cn', { type: 'string', enableQuery: groupFilterQuery }); this.add('LDAP_Group_Filter_Group_Member_Attribute', 'uniqueMember', { type: 'string', enableQuery: groupFilterQuery }); @@ -46,13 +46,13 @@ Meteor.startup(function() { this.add('LDAP_Domain_Search_User_ID', 'sAMAccountName', { type: 'string', enableQuery: customBindSearchDisabledQuery }); this.add('LDAP_Domain_Search_Object_Class', 'user', { type: 'string', enableQuery: customBindSearchDisabledQuery }); this.add('LDAP_Domain_Search_Object_Category', 'person', { type: 'string', enableQuery: customBindSearchDisabledQuery }); - this.add('LDAP_Username_Field', 'sAMAccountName', { type: 'string', enableQuery: enableQuery }); - this.add('LDAP_Unique_Identifier_Field', 'objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber', { type: 'string', enableQuery: enableQuery }); - this.add('LDAP_Sync_User_Data', false, { type: 'boolean', enableQuery: enableQuery }); + this.add('LDAP_Username_Field', 'sAMAccountName', { type: 'string', enableQuery }); + this.add('LDAP_Unique_Identifier_Field', 'objectGUID,ibm-entryUUID,GUID,dominoUNID,nsuniqueId,uidNumber', { type: 'string', enableQuery }); + this.add('LDAP_Sync_User_Data', false, { type: 'boolean', enableQuery }); this.add('LDAP_Sync_User_Avatar', true, { type: 'boolean', enableQuery: syncDataQuery }); this.add('LDAP_Sync_User_Data_FieldMap', '{"cn":"name", "mail":"email"}', { type: 'string', enableQuery: syncDataQuery }); - this.add('LDAP_Default_Domain', '', { type: 'string', enableQuery: enableQuery }); - this.add('LDAP_Merge_Existing_Users', false, { type: 'boolean', enableQuery: enableQuery }); + this.add('LDAP_Default_Domain', '', { type: 'string', enableQuery }); + this.add('LDAP_Merge_Existing_Users', false, { type: 'boolean', enableQuery }); this.add('LDAP_Import_Users', false, { type: 'boolean', enableQuery: syncDataQuery }); this.add('LDAP_Test_Connection', 'ldap_test_connection', { type: 'action', actionText: 'Test_Connection' }); this.add('LDAP_Sync_Users', 'ldap_sync_users', { type: 'action', actionText: 'Sync_Users' }); diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js index 7837d7f8049..506fab17947 100644 --- a/packages/rocketchat-ldap/server/sync.js +++ b/packages/rocketchat-ldap/server/sync.js @@ -155,7 +155,7 @@ syncUserData = function syncUserData(user, ldapUser) { addLdapUser = function addLdapUser(ldapUser, username, password) { const userObject = { - username: username + username }; const userData = getDataToSyncUserData(ldapUser, {}); @@ -210,7 +210,7 @@ sync = function sync() { const username = slug(getLdapUsername(ldapUser)); // Look to see if user already exists const userQuery = { - username: username + username }; logger.debug('userQuery', userQuery); diff --git a/packages/rocketchat-ldap/server/syncUsers.js b/packages/rocketchat-ldap/server/syncUsers.js index c8d05a3e3ac..2c26f2cf095 100644 --- a/packages/rocketchat-ldap/server/syncUsers.js +++ b/packages/rocketchat-ldap/server/syncUsers.js @@ -1,7 +1,7 @@ /* globals sync */ Meteor.methods({ - ldap_sync_users: function() { + ldap_sync_users() { const user = Meteor.user(); if (!user) { throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'ldap_sync_users' }); diff --git a/packages/rocketchat-ldap/server/testConnection.js b/packages/rocketchat-ldap/server/testConnection.js index 64dee7f5666..679d934af56 100644 --- a/packages/rocketchat-ldap/server/testConnection.js +++ b/packages/rocketchat-ldap/server/testConnection.js @@ -1,7 +1,7 @@ /* globals LDAP */ Meteor.methods({ - ldap_test_connection: function() { + ldap_test_connection() { const user = Meteor.user(); if (!user) { throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'ldap_test_connection' }); diff --git a/packages/rocketchat-lib/server/functions/createRoom.js b/packages/rocketchat-lib/server/functions/createRoom.js index 3e6512ea016..76682f03368 100644 --- a/packages/rocketchat-lib/server/functions/createRoom.js +++ b/packages/rocketchat-lib/server/functions/createRoom.js @@ -42,7 +42,7 @@ RocketChat.createRoom = function(type, name, owner, members, readOnly, extraData if (type === 'c') { RocketChat.callbacks.run('beforeCreateChannel', owner, { t: 'c', - name: name, + name, ts: now, ro: readOnly === true, sysMes: readOnly !== true, diff --git a/packages/rocketchat-lib/server/functions/getFullUserData.js b/packages/rocketchat-lib/server/functions/getFullUserData.js index 7e77af13e36..0b5290b3b3e 100644 --- a/packages/rocketchat-lib/server/functions/getFullUserData.js +++ b/packages/rocketchat-lib/server/functions/getFullUserData.js @@ -33,8 +33,8 @@ RocketChat.getFullUserData = function({userId, filter, limit}) { } const options = { - fields: fields, - limit: limit, + fields, + limit, sort: { username: 1 } }; diff --git a/packages/rocketchat-lib/server/functions/saveUser.js b/packages/rocketchat-lib/server/functions/saveUser.js index a10edf183d3..fb0783d48a2 100644 --- a/packages/rocketchat-lib/server/functions/saveUser.js +++ b/packages/rocketchat-lib/server/functions/saveUser.js @@ -81,7 +81,7 @@ RocketChat.saveUser = function(userId, userData) { updateUser.$set['emails.0.verified'] = true; } - Meteor.users.update({ _id: _id }, updateUser); + Meteor.users.update({ _id }, updateUser); if (userData.sendWelcomeEmail) { const header = RocketChat.placeholders.replace(RocketChat.settings.get('Email_Header') || ''); @@ -108,7 +108,7 @@ RocketChat.saveUser = function(userId, userData) { const email = { to: userData.email, from: RocketChat.settings.get('From_Email'), - subject: subject, + subject, html: header + html + footer }; diff --git a/packages/rocketchat-lib/server/functions/setEmail.js b/packages/rocketchat-lib/server/functions/setEmail.js index 2a60737ff6b..f20482710c4 100644 --- a/packages/rocketchat-lib/server/functions/setEmail.js +++ b/packages/rocketchat-lib/server/functions/setEmail.js @@ -29,5 +29,5 @@ RocketChat._setEmail = function(userId, email) { }; RocketChat.setEmail = RocketChat.RateLimiter.limitFunction(RocketChat._setEmail, 1, 60000, { - 0: function(userId) { return !userId || !RocketChat.authz.hasPermission(userId, 'edit-other-user-info'); } // Administrators have permission to change others emails, so don't limit those + 0(userId) { return !userId || !RocketChat.authz.hasPermission(userId, 'edit-other-user-info'); } // Administrators have permission to change others emails, so don't limit those }); diff --git a/packages/rocketchat-lib/server/functions/updateMessage.js b/packages/rocketchat-lib/server/functions/updateMessage.js index d0a56507afa..252e169f5b9 100644 --- a/packages/rocketchat-lib/server/functions/updateMessage.js +++ b/packages/rocketchat-lib/server/functions/updateMessage.js @@ -12,7 +12,7 @@ RocketChat.updateMessage = function(message, user) { const urls = message.msg.match(/([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\w]*)?\??([-\+=&!:;%@\/\.\,\w]+)?(?:#([^\s\)]+))?)?/g); if (urls) { - message.urls = urls.map((url) => { return { url: url }; }); + message.urls = urls.map((url) => { return { url }; }); } message = RocketChat.callbacks.run('beforeSaveMessage', message); diff --git a/packages/rocketchat-lib/server/lib/PushNotification.js b/packages/rocketchat-lib/server/lib/PushNotification.js index f4b3e98c68c..05c576189d2 100644 --- a/packages/rocketchat-lib/server/lib/PushNotification.js +++ b/packages/rocketchat-lib/server/lib/PushNotification.js @@ -29,7 +29,7 @@ class PushNotification { from: 'push', badge: 1, sound: 'default', - title: title, + title, text: message, payload, query: usersTo, diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js index 8c5d7edbf07..3acf3f44fff 100644 --- a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js +++ b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js @@ -278,7 +278,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) { title += ' @ #' + room.name; } RocketChat.Notifications.notifyUser(usersOfMentionId, 'notification', { - title: title, + title, text: message.msg, duration: settings.desktopNotificationDurations[usersOfMentionId], payload: { diff --git a/packages/rocketchat-lib/server/lib/validateEmailDomain.js b/packages/rocketchat-lib/server/lib/validateEmailDomain.js index 620d226ea50..8b366505a88 100644 --- a/packages/rocketchat-lib/server/lib/validateEmailDomain.js +++ b/packages/rocketchat-lib/server/lib/validateEmailDomain.js @@ -21,7 +21,7 @@ RocketChat.settings.get('Accounts_UseDNSDomainCheck', function(key, value) { RocketChat.validateEmailDomain = function(email) { const emailValidation = /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/; if (!emailValidation.test(email)) { - throw new Meteor.Error('error-invalid-email', 'Invalid email ' + email, { function: 'RocketChat.validateEmailDomain', email: email }); + throw new Meteor.Error('error-invalid-email', 'Invalid email ' + email, { function: 'RocketChat.validateEmailDomain', email }); } const emailDomain = email.substr(email.lastIndexOf('@') + 1); diff --git a/packages/rocketchat-lib/server/methods/addUserToRoom.js b/packages/rocketchat-lib/server/methods/addUserToRoom.js index 5fdeb64a178..3b1871a49a5 100644 --- a/packages/rocketchat-lib/server/methods/addUserToRoom.js +++ b/packages/rocketchat-lib/server/methods/addUserToRoom.js @@ -1,5 +1,5 @@ Meteor.methods({ - addUserToRoom: function(data) { + addUserToRoom(data) { return Meteor.call('addUsersToRoom', { rid: data.rid, users: [ data.username ] diff --git a/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js b/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js index ed7f361c4d3..5d75a8bdc3e 100644 --- a/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js +++ b/packages/rocketchat-lib/server/methods/deleteUserOwnAccount.js @@ -1,5 +1,5 @@ Meteor.methods({ - deleteUserOwnAccount: function(password) { + deleteUserOwnAccount(password) { check(password, String); diff --git a/packages/rocketchat-lib/server/methods/saveSetting.js b/packages/rocketchat-lib/server/methods/saveSetting.js index f9380922607..2c0402317bf 100644 --- a/packages/rocketchat-lib/server/methods/saveSetting.js +++ b/packages/rocketchat-lib/server/methods/saveSetting.js @@ -1,5 +1,5 @@ Meteor.methods({ - saveSetting: function(_id, value, editor) { + saveSetting(_id, value, editor) { if (Meteor.userId() === null) { throw new Meteor.Error('error-action-not-allowed', 'Editing settings is not allowed', { method: 'saveSetting' diff --git a/packages/rocketchat-lib/server/methods/setEmail.js b/packages/rocketchat-lib/server/methods/setEmail.js index e71db53808d..4e5d39681a4 100644 --- a/packages/rocketchat-lib/server/methods/setEmail.js +++ b/packages/rocketchat-lib/server/methods/setEmail.js @@ -1,5 +1,5 @@ Meteor.methods({ - setEmail: function(email) { + setEmail(email) { check (email, String); @@ -26,5 +26,5 @@ Meteor.methods({ }); RocketChat.RateLimiter.limitMethod('setEmail', 1, 1000, { - userId: function(/*userId*/) { return true; } + userId(/*userId*/) { return true; } }); diff --git a/packages/rocketchat-lib/server/models/_BaseCache.js b/packages/rocketchat-lib/server/models/_BaseCache.js index 3ff56e08712..6ca56b82b83 100644 --- a/packages/rocketchat-lib/server/models/_BaseCache.js +++ b/packages/rocketchat-lib/server/models/_BaseCache.js @@ -173,27 +173,27 @@ class ModelsBaseCache extends EventEmitter { } RocketChat.models[join].cache.on('inserted', (record) => { - this.processRemoteJoinInserted({join, field, link, multi, record: record}); + this.processRemoteJoinInserted({join, field, link, multi, record}); }); RocketChat.models[join].cache.on('beforeupdate', (record, diff) => { if (diff[link.remote]) { - this.processRemoteJoinRemoved({join, field, link, multi, record: record}); + this.processRemoteJoinRemoved({join, field, link, multi, record}); } }); RocketChat.models[join].cache.on('updated', (record, diff) => { if (diff[link.remote]) { - this.processRemoteJoinInserted({join, field, link, multi, record: record}); + this.processRemoteJoinInserted({join, field, link, multi, record}); } }); RocketChat.models[join].cache.on('removed', (record) => { - this.processRemoteJoinRemoved({join, field, link, multi, record: record}); + this.processRemoteJoinRemoved({join, field, link, multi, record}); }); this.on('inserted', (localRecord) => { - this.processLocalJoinInserted({join, field, link, multi, localRecord: localRecord}); + this.processLocalJoinInserted({join, field, link, multi, localRecord}); }); this.on('beforeupdate', (localRecord, diff) => { @@ -208,7 +208,7 @@ class ModelsBaseCache extends EventEmitter { this.on('updated', (localRecord, diff) => { if (diff[link.local]) { - this.processLocalJoinInserted({join, field, link, multi, localRecord: localRecord}); + this.processLocalJoinInserted({join, field, link, multi, localRecord}); } }); } @@ -307,8 +307,8 @@ class ModelsBaseCache extends EventEmitter { } this.indexes[fields.join(',')] = { - type: type, - fields: fields, + type, + fields, data: {} }; } diff --git a/packages/rocketchat-lib/server/models/_BaseDb.js b/packages/rocketchat-lib/server/models/_BaseDb.js index 256c975b1c6..42f2dfb173d 100644 --- a/packages/rocketchat-lib/server/models/_BaseDb.js +++ b/packages/rocketchat-lib/server/models/_BaseDb.js @@ -317,9 +317,9 @@ class ModelsBaseDb extends EventEmitter { action: 'update:query', id: undefined, data: { - query: query, - update: update, - options: options + query, + update, + options }, oplog: false }); @@ -370,7 +370,7 @@ class ModelsBaseDb extends EventEmitter { const _id = args[0]._id; delete args[0]._id; args.unshift({ - _id: _id + _id }); this.upsert(...args); diff --git a/packages/rocketchat-lib/server/oauth/google.js b/packages/rocketchat-lib/server/oauth/google.js index b1e3cb87d74..b65a2519909 100644 --- a/packages/rocketchat-lib/server/oauth/google.js +++ b/packages/rocketchat-lib/server/oauth/google.js @@ -50,7 +50,7 @@ RocketChat.registerAccessTokenService('google', function(options) { } return { - serviceData: serviceData, + serviceData, options: { profile: { name: identity.name diff --git a/packages/rocketchat-lib/server/oauth/oauth.js b/packages/rocketchat-lib/server/oauth/oauth.js index df041e5aa81..9cf20c61f58 100644 --- a/packages/rocketchat-lib/server/oauth/oauth.js +++ b/packages/rocketchat-lib/server/oauth/oauth.js @@ -2,8 +2,8 @@ const AccessTokenServices = {}; RocketChat.registerAccessTokenService = function(serviceName, handleAccessTokenRequest) { AccessTokenServices[serviceName] = { - serviceName: serviceName, - handleAccessTokenRequest: handleAccessTokenRequest + serviceName, + handleAccessTokenRequest }; }; diff --git a/packages/rocketchat-livechat/app/client/lib/CustomFields.js b/packages/rocketchat-livechat/app/client/lib/CustomFields.js index 1a03fabdc1f..4f984139c7d 100644 --- a/packages/rocketchat-livechat/app/client/lib/CustomFields.js +++ b/packages/rocketchat-livechat/app/client/lib/CustomFields.js @@ -26,7 +26,7 @@ this.CustomFields = (function() { }; return { - init: init, - setCustomField: setCustomField + init, + setCustomField }; }()); diff --git a/packages/rocketchat-livechat/app/client/lib/commands.js b/packages/rocketchat-livechat/app/client/lib/commands.js index cce25960024..f215fdad0c9 100644 --- a/packages/rocketchat-livechat/app/client/lib/commands.js +++ b/packages/rocketchat-livechat/app/client/lib/commands.js @@ -1,17 +1,17 @@ /* globals LivechatVideoCall, Livechat */ // Functions to call on messages of type 'command' this.Commands = { - survey: function() { + survey() { if (!($('body #survey').length)) { Blaze.render(Template.survey, $('body').get(0)); } }, - endCall: function() { + endCall() { LivechatVideoCall.finish(); }, - promptTranscript: function() { + promptTranscript() { if (Livechat.transcript) { const user = Meteor.user(); const email = user.visitorEmails && user.visitorEmails.length > 0 ? user.visitorEmails[0].address : ''; @@ -62,7 +62,7 @@ this.Commands = { } }, - connected: function() { + connected() { Livechat.connecting = false; } }; diff --git a/packages/rocketchat-livechat/app/client/lib/hooks.js b/packages/rocketchat-livechat/app/client/lib/hooks.js index a127b51b833..eb7a2e34c56 100644 --- a/packages/rocketchat-livechat/app/client/lib/hooks.js +++ b/packages/rocketchat-livechat/app/client/lib/hooks.js @@ -1,6 +1,6 @@ /* globals CustomFields, Livechat */ const api = { - pageVisited: function(info) { + pageVisited(info) { if (info.change === 'url') { Triggers.processRequest(info); } @@ -8,11 +8,11 @@ const api = { Meteor.call('livechat:pageVisited', visitor.getToken(), info); }, - setCustomField: function(key, value, overwrite = true) { + setCustomField(key, value, overwrite = true) { CustomFields.setCustomField(visitor.getToken(), key, value, overwrite); }, - setTheme: function(theme) { + setTheme(theme) { if (theme.color) { Livechat.customColor = theme.color; } @@ -21,19 +21,19 @@ const api = { } }, - setDepartment: function(department) { + setDepartment(department) { Livechat.department = department; }, - clearDepartment: function() { + clearDepartment() { Livechat.department = null; }, - widgetOpened: function() { + widgetOpened() { Livechat.setWidgetOpened(); }, - widgetClosed: function() { + widgetClosed() { Livechat.setWidgetClosed(); } }; diff --git a/packages/rocketchat-livechat/app/client/lib/triggers.js b/packages/rocketchat-livechat/app/client/lib/triggers.js index a86df396d1e..e303ef11093 100644 --- a/packages/rocketchat-livechat/app/client/lib/triggers.js +++ b/packages/rocketchat-livechat/app/client/lib/triggers.js @@ -88,10 +88,10 @@ this.Triggers = (function() { }; return { - init: init, - processRequest: processRequest, - setTriggers: setTriggers, - setDisabled: setDisabled, - setEnabled: setEnabled + init, + processRequest, + setTriggers, + setDisabled, + setEnabled }; }()); diff --git a/packages/rocketchat-livechat/app/client/views/messages.js b/packages/rocketchat-livechat/app/client/views/messages.js index 2076526953a..3bd088b3129 100644 --- a/packages/rocketchat-livechat/app/client/views/messages.js +++ b/packages/rocketchat-livechat/app/client/views/messages.js @@ -86,14 +86,14 @@ Template.messages.helpers({ }); Template.messages.events({ - 'keyup .input-message': function(event, instance) { + 'keyup .input-message'(event, instance) { instance.chatMessages.keyup(visitor.getRoom(), event, instance); instance.updateMessageInputHeight(event.currentTarget); }, - 'keydown .input-message': function(event, instance) { + 'keydown .input-message'(event, instance) { return instance.chatMessages.keydown(visitor.getRoom(), event, instance); }, - 'click .send-button': function(event, instance) { + 'click .send-button'(event, instance) { const input = instance.find('.input-message'); const sent = instance.chatMessages.send(visitor.getRoom(), input); input.focus(); @@ -101,17 +101,17 @@ Template.messages.events({ return sent; }, - 'click .new-message': function(event, instance) { + 'click .new-message'(event, instance) { instance.atBottom = true; return instance.find('.input-message').focus(); }, - 'click .error': function(event) { + 'click .error'(event) { return $(event.currentTarget).removeClass('show'); }, - 'click .toggle-options': function(event, instance) { + 'click .toggle-options'(event, instance) { instance.showOptions.set(!instance.showOptions.get()); }, - 'click .video-button': function(event) { + 'click .video-button'(event) { event.preventDefault(); if (!Meteor.userId()) { diff --git a/packages/rocketchat-livechat/app/client/views/survey.js b/packages/rocketchat-livechat/app/client/views/survey.js index 2a51aad82c6..51d3928cd66 100644 --- a/packages/rocketchat-livechat/app/client/views/survey.js +++ b/packages/rocketchat-livechat/app/client/views/survey.js @@ -1,9 +1,9 @@ Template.survey.events({ - 'click button.skip': function(e, instance) { + 'click button.skip'(e, instance) { instance.$('#survey').remove(); }, - 'click button.send': function(e, instance) { + 'click button.send'(e, instance) { const formData = instance.$('form').serializeArray(); Meteor.call('livechat:saveSurveyFeedback', visitor.getToken(), visitor.getRoom(), formData, function(/*err, results*/) { instance.$('#survey').remove(); diff --git a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js b/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js index d4de61a8cc3..919246034b0 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js +++ b/packages/rocketchat-livechat/client/views/app/livechatCustomFieldForm.js @@ -28,8 +28,8 @@ Template.livechatCustomFieldForm.events({ $btn.html(t('Saving')); const customFieldData = { - field: field, - label: label, + field, + label, scope: scope.trim(), visibility: visibility.trim() }; diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js index 918e6ff488a..a2e425c444b 100644 --- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js +++ b/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js @@ -50,7 +50,7 @@ Template.visitorInfo.helpers({ if (livechatData.hasOwnProperty(_id)) { const customFields = Template.instance().customFields.get(); if (customFields) { - const field = _.findWhere(customFields, { _id: _id }); + const field = _.findWhere(customFields, { _id }); if (field && field.visibility !== 'hidden') { fields.push({ label: field.label, value: livechatData[_id] }); } diff --git a/packages/rocketchat-livechat/imports/server/rest/departments.js b/packages/rocketchat-livechat/imports/server/rest/departments.js index 103ca4c9383..810d3a1c6c6 100644 --- a/packages/rocketchat-livechat/imports/server/rest/departments.js +++ b/packages/rocketchat-livechat/imports/server/rest/departments.js @@ -23,7 +23,7 @@ RocketChat.API.v1.addRoute('livechat/department', { authRequired: true }, { if (department) { return RocketChat.API.v1.success({ - department: department, + department, agents: RocketChat.models.LivechatDepartmentAgents.find({ departmentId: department._id }).fetch() }); } diff --git a/packages/rocketchat-livechat/server/lib/Livechat.js b/packages/rocketchat-livechat/server/lib/Livechat.js index 20fb4f1a1b0..2bd223f4a40 100644 --- a/packages/rocketchat-livechat/server/lib/Livechat.js +++ b/packages/rocketchat-livechat/server/lib/Livechat.js @@ -74,7 +74,7 @@ RocketChat.Livechat = { } // return messages; - return _.extend(RocketChat.sendMessage(guest, message, room), { newRoom: newRoom, showConnecting: this.showConnecting() }); + return _.extend(RocketChat.sendMessage(guest, message, room), { newRoom, showConnecting: this.showConnecting() }); }, registerGuest({ token, name, email, department, phone, loginToken, username } = {}) { check(token, String); @@ -84,7 +84,7 @@ RocketChat.Livechat = { $set: { profile: { guest: true, - token: token + token } } }; @@ -119,9 +119,9 @@ RocketChat.Livechat = { updateUser.$set.name = name; const userData = { - username: username, + username, globalRoles: ['livechat-guest'], - department: department, + department, type: 'visitor', joinDefaultChannels: false }; @@ -165,7 +165,7 @@ RocketChat.Livechat = { const updateUser = { $set: { - department: department + department } }; diff --git a/packages/rocketchat-livechat/server/lib/QueueMethods.js b/packages/rocketchat-livechat/server/lib/QueueMethods.js index 6b9349b7e56..c1e8d887a6a 100644 --- a/packages/rocketchat-livechat/server/lib/QueueMethods.js +++ b/packages/rocketchat-livechat/server/lib/QueueMethods.js @@ -4,7 +4,7 @@ RocketChat.QueueMethods = { * default method where the agent with the least number * of open chats is paired with the incoming livechat */ - 'Least_Amount' : function(guest, message, roomInfo) { + 'Least_Amount'(guest, message, roomInfo) { const agent = RocketChat.Livechat.getNextAgent(guest.department); if (!agent) { throw new Meteor.Error('no-agent-online', 'Sorry, no online agents'); @@ -70,7 +70,7 @@ RocketChat.QueueMethods = { * A room is still created with the initial message, but it is occupied by * only the client until paired with an agent */ - 'Guest_Pool' : function(guest, message, roomInfo) { + 'Guest_Pool'(guest, message, roomInfo) { let agents = RocketChat.Livechat.getOnlineAgents(guest.department); if (agents.count() === 0 && RocketChat.settings.get('Livechat_guest_pool_with_no_agents')) { diff --git a/packages/rocketchat-livechat/server/methods/closeByVisitor.js b/packages/rocketchat-livechat/server/methods/closeByVisitor.js index 7d3c9486f2a..4aa20f1a1c8 100644 --- a/packages/rocketchat-livechat/server/methods/closeByVisitor.js +++ b/packages/rocketchat-livechat/server/methods/closeByVisitor.js @@ -15,8 +15,8 @@ Meteor.methods({ const language = (user && user.language) || RocketChat.settings.get('language') || 'en'; return RocketChat.Livechat.closeRoom({ - user: user, - room: room, + user, + room, comment: TAPi18n.__('Closed_by_visitor', { lng: language }) }); } diff --git a/packages/rocketchat-livechat/server/methods/closeRoom.js b/packages/rocketchat-livechat/server/methods/closeRoom.js index ec45f9aabde..19e6b9c1cab 100644 --- a/packages/rocketchat-livechat/server/methods/closeRoom.js +++ b/packages/rocketchat-livechat/server/methods/closeRoom.js @@ -13,9 +13,9 @@ Meteor.methods({ } return RocketChat.Livechat.closeRoom({ - user: user, - room: room, - comment: comment + user, + room, + comment }); } }); diff --git a/packages/rocketchat-livechat/server/methods/registerGuest.js b/packages/rocketchat-livechat/server/methods/registerGuest.js index 3a1653970f3..9dcc0b9082c 100644 --- a/packages/rocketchat-livechat/server/methods/registerGuest.js +++ b/packages/rocketchat-livechat/server/methods/registerGuest.js @@ -1,13 +1,13 @@ Meteor.methods({ - 'livechat:registerGuest': function({ token, name, email, department } = {}) { + 'livechat:registerGuest'({ token, name, email, department } = {}) { const stampedToken = Accounts._generateStampedLoginToken(); const hashStampedToken = Accounts._hashStampedToken(stampedToken); const userId = RocketChat.Livechat.registerGuest.call(this, { - token: token, - name: name, - email: email, - department: department, + token, + name, + email, + department, loginToken: hashStampedToken }); @@ -15,7 +15,7 @@ Meteor.methods({ RocketChat.models.LivechatPageVisited.keepHistoryForToken(token); return { - userId: userId, + userId, token: stampedToken.token }; } diff --git a/packages/rocketchat-livechat/server/methods/returnAsInquiry.js b/packages/rocketchat-livechat/server/methods/returnAsInquiry.js index 4d4cfbc0766..91abafb0444 100644 --- a/packages/rocketchat-livechat/server/methods/returnAsInquiry.js +++ b/packages/rocketchat-livechat/server/methods/returnAsInquiry.js @@ -13,7 +13,7 @@ Meteor.methods({ RocketChat.models.Rooms.removeUsernameById(rid, username); // find inquiry corresponding to room - const inquiry = RocketChat.models.LivechatInquiry.findOne({rid: rid}); + const inquiry = RocketChat.models.LivechatInquiry.findOne({rid}); // mark inquiry as open return RocketChat.models.LivechatInquiry.openInquiry(inquiry._id); diff --git a/packages/rocketchat-livechat/server/methods/saveInfo.js b/packages/rocketchat-livechat/server/methods/saveInfo.js index ae4d1a2323d..7d4484ecbc5 100644 --- a/packages/rocketchat-livechat/server/methods/saveInfo.js +++ b/packages/rocketchat-livechat/server/methods/saveInfo.js @@ -1,7 +1,7 @@ /* eslint new-cap: [2, {"capIsNewExceptions": ["Match.ObjectIncluding", "Match.Optional"]}] */ Meteor.methods({ - 'livechat:saveInfo': function(guestData, roomData) { + 'livechat:saveInfo'(guestData, roomData) { if (!Meteor.userId() || !RocketChat.authz.hasPermission(Meteor.userId(), 'view-l-room')) { throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveInfo' }); } diff --git a/packages/rocketchat-livechat/server/methods/sendMessageLivechat.js b/packages/rocketchat-livechat/server/methods/sendMessageLivechat.js index 314dd93bf22..b34c80019d9 100644 --- a/packages/rocketchat-livechat/server/methods/sendMessageLivechat.js +++ b/packages/rocketchat-livechat/server/methods/sendMessageLivechat.js @@ -1,5 +1,5 @@ Meteor.methods({ - sendMessageLivechat: function(message) { + sendMessageLivechat(message) { check(message.rid, String); check(message.token, String); @@ -11,6 +11,6 @@ Meteor.methods({ } }); - return RocketChat.Livechat.sendMessage({ guest: guest, message: message }); + return RocketChat.Livechat.sendMessage({ guest, message }); } }); diff --git a/packages/rocketchat-livechat/server/methods/setDepartmentForVisitor.js b/packages/rocketchat-livechat/server/methods/setDepartmentForVisitor.js index 5b06da24414..da77d2c2305 100644 --- a/packages/rocketchat-livechat/server/methods/setDepartmentForVisitor.js +++ b/packages/rocketchat-livechat/server/methods/setDepartmentForVisitor.js @@ -1,8 +1,8 @@ Meteor.methods({ - 'livechat:setDepartmentForVisitor': function({ token, department } = {}) { + 'livechat:setDepartmentForVisitor'({ token, department } = {}) { RocketChat.Livechat.setDepartmentForGuest.call(this, { - token: token, - department: department + token, + department }); // update visited page history to not expire diff --git a/packages/rocketchat-livechat/server/models/LivechatCustomField.js b/packages/rocketchat-livechat/server/models/LivechatCustomField.js index fc824200a4d..a9b41b10136 100644 --- a/packages/rocketchat-livechat/server/models/LivechatCustomField.js +++ b/packages/rocketchat-livechat/server/models/LivechatCustomField.js @@ -8,22 +8,22 @@ class LivechatCustomField extends RocketChat.models._Base { // FIND findOneById(_id, options) { - const query = { _id: _id }; + const query = { _id }; return this.findOne(query, options); } createOrUpdateCustomField(_id, field, label, scope, visibility, extraData) { const record = { - label: label, - scope: scope, - visibility: visibility + label, + scope, + visibility }; _.extend(record, extraData); if (_id) { - this.update({ _id: _id }, { $set: record }); + this.update({ _id }, { $set: record }); } else { record._id = field; _id = this.insert(record); @@ -34,7 +34,7 @@ class LivechatCustomField extends RocketChat.models._Base { // REMOVE removeById(_id) { - const query = { _id: _id }; + const query = { _id }; return this.remove(query); } diff --git a/packages/rocketchat-livechat/server/models/LivechatDepartment.js b/packages/rocketchat-livechat/server/models/LivechatDepartment.js index 3038c9005a7..1da6e23c1a5 100644 --- a/packages/rocketchat-livechat/server/models/LivechatDepartment.js +++ b/packages/rocketchat-livechat/server/models/LivechatDepartment.js @@ -13,13 +13,13 @@ class LivechatDepartment extends RocketChat.models._Base { // FIND findOneById(_id, options) { - const query = { _id: _id }; + const query = { _id }; return this.findOne(query, options); } findByDepartmentId(_id, options) { - const query = { _id: _id }; + const query = { _id }; return this.find(query, options); } @@ -28,15 +28,15 @@ class LivechatDepartment extends RocketChat.models._Base { agents = [].concat(agents); const record = { - enabled: enabled, - name: name, - description: description, + enabled, + name, + description, numAgents: agents.length, - showOnRegistration: showOnRegistration + showOnRegistration }; if (_id) { - this.update({ _id: _id }, { $set: record }); + this.update({ _id }, { $set: record }); } else { _id = this.insert(record); } @@ -59,12 +59,12 @@ class LivechatDepartment extends RocketChat.models._Base { }); }); - return _.extend(record, { _id: _id }); + return _.extend(record, { _id }); } // REMOVE removeById(_id) { - const query = { _id: _id }; + const query = { _id }; return this.remove(query); } diff --git a/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js b/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js index bba08339f02..2be64d52060 100644 --- a/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js +++ b/packages/rocketchat-livechat/server/models/LivechatDepartmentAgents.js @@ -7,7 +7,7 @@ class LivechatDepartmentAgents extends RocketChat.models._Base { } findByDepartmentId(departmentId) { - return this.find({ departmentId: departmentId }); + return this.find({ departmentId }); } saveAgent(agent) { @@ -24,7 +24,7 @@ class LivechatDepartmentAgents extends RocketChat.models._Base { } removeByDepartmentIdAndAgentId(departmentId, agentId) { - this.remove({ departmentId: departmentId, agentId: agentId }); + this.remove({ departmentId, agentId }); } getNextAgentForDepartment(departmentId) { @@ -39,7 +39,7 @@ class LivechatDepartmentAgents extends RocketChat.models._Base { const onlineUsernames = _.pluck(onlineUsers.fetch(), 'username'); const query = { - departmentId: departmentId, + departmentId, username: { $in: onlineUsernames } @@ -82,7 +82,7 @@ class LivechatDepartmentAgents extends RocketChat.models._Base { const onlineUsernames = _.pluck(onlineUsers.fetch(), 'username'); const query = { - departmentId: departmentId, + departmentId, username: { $in: onlineUsernames } diff --git a/packages/rocketchat-livechat/server/models/LivechatExternalMessage.js b/packages/rocketchat-livechat/server/models/LivechatExternalMessage.js index 0a74f7d7338..08dcf12781e 100644 --- a/packages/rocketchat-livechat/server/models/LivechatExternalMessage.js +++ b/packages/rocketchat-livechat/server/models/LivechatExternalMessage.js @@ -11,7 +11,7 @@ class LivechatExternalMessage extends RocketChat.models._Base { findByRoomId(roomId, sort = { ts: -1 }) { const query = { rid: roomId }; - return this.find(query, { sort: sort }); + return this.find(query, { sort }); } } diff --git a/packages/rocketchat-livechat/server/models/LivechatOfficeHour.js b/packages/rocketchat-livechat/server/models/LivechatOfficeHour.js index d4744e65f55..d5d15bc24d1 100644 --- a/packages/rocketchat-livechat/server/models/LivechatOfficeHour.js +++ b/packages/rocketchat-livechat/server/models/LivechatOfficeHour.js @@ -26,7 +26,7 @@ class LivechatOfficeHour extends RocketChat.models._Base { */ updateHours(day, newStart, newFinish, newOpen) { this.update({ - 'day': day + day }, { $set: { start: newStart, diff --git a/packages/rocketchat-livechat/server/models/LivechatPageVisited.js b/packages/rocketchat-livechat/server/models/LivechatPageVisited.js index dc1bfe06e8a..b18bf54805e 100644 --- a/packages/rocketchat-livechat/server/models/LivechatPageVisited.js +++ b/packages/rocketchat-livechat/server/models/LivechatPageVisited.js @@ -17,7 +17,7 @@ class LivechatPageVisited extends RocketChat.models._Base { const keepHistoryMiliseconds = 2592000000; return this.insert({ - token: token, + token, page: pageInfo, ts: new Date(), expireAt: new Date().getTime() + keepHistoryMiliseconds @@ -25,12 +25,12 @@ class LivechatPageVisited extends RocketChat.models._Base { } findByToken(token) { - return this.find({ token: token }, { sort : { ts: -1 }, limit: 20 }); + return this.find({ token }, { sort : { ts: -1 }, limit: 20 }); } keepHistoryForToken(token) { return this.update({ - token: token, + token, expireAt: { $exists: true } diff --git a/packages/rocketchat-livechat/server/models/Rooms.js b/packages/rocketchat-livechat/server/models/Rooms.js index e237737b4e1..9a57fb5e62f 100644 --- a/packages/rocketchat-livechat/server/models/Rooms.js +++ b/packages/rocketchat-livechat/server/models/Rooms.js @@ -4,12 +4,12 @@ */ RocketChat.models.Rooms.updateSurveyFeedbackById = function(_id, surveyFeedback) { const query = { - _id: _id + _id }; const update = { $set: { - surveyFeedback: surveyFeedback + surveyFeedback } }; @@ -43,7 +43,7 @@ RocketChat.models.Rooms.findLivechat = function(filter = {}, offset = 0, limit = t: 'l' }); - return this.find(query, { sort: { ts: - 1 }, offset: offset, limit: limit }); + return this.find(query, { sort: { ts: - 1 }, offset, limit }); }; RocketChat.models.Rooms.findLivechatByCode = function(code, fields) { @@ -61,7 +61,7 @@ RocketChat.models.Rooms.findLivechatByCode = function(code, fields) { const query = { t: 'l', - code: code + code }; return this.findOne(query, options); @@ -162,7 +162,7 @@ RocketChat.models.Rooms.closeByRoomId = function(roomId, closeInfo) { }; RocketChat.models.Rooms.setLabelByRoomId = function(roomId, label) { - return this.update({ _id: roomId }, { $set: { label: label } }); + return this.update({ _id: roomId }, { $set: { label } }); }; RocketChat.models.Rooms.findOpenByAgent = function(userId) { diff --git a/packages/rocketchat-livechat/server/models/Users.js b/packages/rocketchat-livechat/server/models/Users.js index 97b8358f3f2..02202960476 100644 --- a/packages/rocketchat-livechat/server/models/Users.js +++ b/packages/rocketchat-livechat/server/models/Users.js @@ -6,7 +6,7 @@ RocketChat.models.Users.setOperator = function(_id, operator) { const update = { $set: { - operator: operator + operator } }; diff --git a/packages/rocketchat-livechat/server/publications/customFields.js b/packages/rocketchat-livechat/server/publications/customFields.js index ff10c778d38..60adffdeaf6 100644 --- a/packages/rocketchat-livechat/server/publications/customFields.js +++ b/packages/rocketchat-livechat/server/publications/customFields.js @@ -8,7 +8,7 @@ Meteor.publish('livechat:customFields', function(_id) { } if (s.trim(_id)) { - return RocketChat.models.LivechatCustomField.find({ _id: _id }); + return RocketChat.models.LivechatCustomField.find({ _id }); } return RocketChat.models.LivechatCustomField.find(); diff --git a/packages/rocketchat-livechat/server/publications/departmentAgents.js b/packages/rocketchat-livechat/server/publications/departmentAgents.js index 141dd52ad2c..47d30df37e1 100644 --- a/packages/rocketchat-livechat/server/publications/departmentAgents.js +++ b/packages/rocketchat-livechat/server/publications/departmentAgents.js @@ -7,5 +7,5 @@ Meteor.publish('livechat:departmentAgents', function(departmentId) { return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:departmentAgents' })); } - return RocketChat.models.LivechatDepartmentAgents.find({ departmentId: departmentId }); + return RocketChat.models.LivechatDepartmentAgents.find({ departmentId }); }); diff --git a/packages/rocketchat-livechat/server/rest/departments.js b/packages/rocketchat-livechat/server/rest/departments.js index 103ca4c9383..810d3a1c6c6 100644 --- a/packages/rocketchat-livechat/server/rest/departments.js +++ b/packages/rocketchat-livechat/server/rest/departments.js @@ -23,7 +23,7 @@ RocketChat.API.v1.addRoute('livechat/department', { authRequired: true }, { if (department) { return RocketChat.API.v1.success({ - department: department, + department, agents: RocketChat.models.LivechatDepartmentAgents.find({ departmentId: department._id }).fetch() }); } diff --git a/packages/rocketchat-message-snippet/client/actionButton.js b/packages/rocketchat-message-snippet/client/actionButton.js index 0a184f264ab..0ba1eb676a0 100644 --- a/packages/rocketchat-message-snippet/client/actionButton.js +++ b/packages/rocketchat-message-snippet/client/actionButton.js @@ -8,7 +8,7 @@ Meteor.startup(function() { 'message', 'message-mobile' ], - action: function() { + action() { const message = this._arguments[1]; swal({ @@ -37,7 +37,7 @@ Meteor.startup(function() { }); }, - validation: function(message) { + validation(message) { if (RocketChat.models.Subscriptions.findOne({ rid: message.rid, 'u._id': Meteor.userId() }) === undefined) { return false; } diff --git a/packages/rocketchat-message-snippet/client/messageType.js b/packages/rocketchat-message-snippet/client/messageType.js index 96cdcc7a64d..f7fe37c7f30 100644 --- a/packages/rocketchat-message-snippet/client/messageType.js +++ b/packages/rocketchat-message-snippet/client/messageType.js @@ -3,9 +3,9 @@ Meteor.startup(function() { id: 'message_snippeted', system: true, message: 'Snippeted_a_message', - data: function(message) { + data(message) { const snippetLink = `${message.snippetName}`; - return { snippetLink: snippetLink }; + return { snippetLink }; } }); }); diff --git a/packages/rocketchat-message-snippet/client/page/snippetPage.js b/packages/rocketchat-message-snippet/client/page/snippetPage.js index 17d4e319911..7e1351cc2d2 100644 --- a/packages/rocketchat-message-snippet/client/page/snippetPage.js +++ b/packages/rocketchat-message-snippet/client/page/snippetPage.js @@ -2,10 +2,10 @@ import moment from 'moment'; Template.snippetPage.helpers({ - snippet: function() { + snippet() { return SnippetedMessages.findOne({ _id: FlowRouter.getParam('snippetId') }); }, - snippetContent: function() { + snippetContent() { const message = SnippetedMessages.findOne({ _id: FlowRouter.getParam('snippetId') }); if (message === undefined) { return null; diff --git a/packages/rocketchat-message-snippet/client/router.js b/packages/rocketchat-message-snippet/client/router.js index edf2efbdf61..a2f58dda935 100644 --- a/packages/rocketchat-message-snippet/client/router.js +++ b/packages/rocketchat-message-snippet/client/router.js @@ -1,7 +1,7 @@ /* global FlowRouter, BlazeLayout */ FlowRouter.route('/snippet/:snippetId/:snippetName', { name: 'snippetView', - action: function() { + action() { BlazeLayout.render('main', {center: 'snippetPage', flexTabBar: null }); }, triggersEnter: [ function() { diff --git a/packages/rocketchat-message-snippet/client/snippetMessage.js b/packages/rocketchat-message-snippet/client/snippetMessage.js index 2b75f3e321c..75392c94686 100644 --- a/packages/rocketchat-message-snippet/client/snippetMessage.js +++ b/packages/rocketchat-message-snippet/client/snippetMessage.js @@ -1,5 +1,5 @@ Meteor.methods({ - snippetMessage: function(message) { + snippetMessage(message) { if (typeof Meteor.userId() === 'undefined' || Meteor.userId() === null) { return false; } diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js b/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js index f561900d87b..b5bceb98c9f 100644 --- a/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js +++ b/packages/rocketchat-message-snippet/client/tabBar/views/snippetMessage.js @@ -1,18 +1,18 @@ import moment from 'moment'; Template.snippetMessage.helpers({ - time: function() { + time() { return moment(this.ts).format(RocketChat.settings.get('Message_TimeFormat')); }, - date: function() { + date() { return moment(this.ts).format(RocketChat.settings.get('Message_DateFormat')); }, - own: function() { + own() { if (this.u !== undefined && this.u && this.u._id === Meteor.userId()) { return 'own'; } }, - body: function() { + body() { return `${this.snippetName}`; } }); diff --git a/packages/rocketchat-message-snippet/server/methods/snippetMessage.js b/packages/rocketchat-message-snippet/server/methods/snippetMessage.js index 98e6140e021..6299c81d0b9 100644 --- a/packages/rocketchat-message-snippet/server/methods/snippetMessage.js +++ b/packages/rocketchat-message-snippet/server/methods/snippetMessage.js @@ -1,5 +1,5 @@ Meteor.methods({ - snippetMessage: function(message, filename) { + snippetMessage(message, filename) { if ((typeof Meteor.userId() === 'undefined') || (Meteor.userId() === null)) { //noinspection JSUnresolvedFunction throw new Meteor.Error('error-invalid-user', 'Invalid user', diff --git a/packages/rocketchat-message-snippet/server/publications/snippetedMessage.js b/packages/rocketchat-message-snippet/server/publications/snippetedMessage.js index 60f32b80b64..a6e4205baf2 100644 --- a/packages/rocketchat-message-snippet/server/publications/snippetedMessage.js +++ b/packages/rocketchat-message-snippet/server/publications/snippetedMessage.js @@ -3,7 +3,7 @@ Meteor.publish('snippetedMessage', function(_id) { return this.ready(); } - const snippet = RocketChat.models.Messages.findOne({'_id': _id, snippeted: true}); + const snippet = RocketChat.models.Messages.findOne({_id, snippeted: true}); const user = RocketChat.models.Users.findOneById(this.userId); const roomSnippetQuery = { '_id': snippet.rid, @@ -26,15 +26,15 @@ Meteor.publish('snippetedMessage', function(_id) { } const cursor = RocketChat.models.Messages.find( - { '_id': _id } + { _id } ).observeChanges({ - added: function(_id, record) { + added(_id, record) { publication.added('rocketchat_snippeted_message', _id, record); }, - changed: function(_id, record) { + changed(_id, record) { publication.changed('rocketchat_snippeted_message', _id, record); }, - removed: function(_id) { + removed(_id) { publication.removed('rocketchat_snippeted_message', _id); } }); diff --git a/packages/rocketchat-message-snippet/server/publications/snippetedMessagesByRoom.js b/packages/rocketchat-message-snippet/server/publications/snippetedMessagesByRoom.js index 0bd5abfba23..7c53f02c1e5 100644 --- a/packages/rocketchat-message-snippet/server/publications/snippetedMessagesByRoom.js +++ b/packages/rocketchat-message-snippet/server/publications/snippetedMessagesByRoom.js @@ -15,16 +15,16 @@ Meteor.publish('snippetedMessages', function(rid, limit=50) { rid, { sort: {ts: -1}, - limit: limit + limit } ).observeChanges({ - added: function(_id, record) { + added(_id, record) { publication.added('rocketchat_snippeted_message', _id, record); }, - changed: function(_id, record) { + changed(_id, record) { publication.changed('rocketchat_snippeted_message', _id, record); }, - removed: function(_id) { + removed(_id) { publication.removed('rocketchat_snippeted_message', _id); } }); diff --git a/packages/rocketchat-otr/client/rocketchat.otr.room.js b/packages/rocketchat-otr/client/rocketchat.otr.room.js index de84c33896e..81786a388ad 100644 --- a/packages/rocketchat-otr/client/rocketchat.otr.room.js +++ b/packages/rocketchat-otr/client/rocketchat.otr.room.js @@ -20,7 +20,7 @@ RocketChat.OTR.Room = class { this.establishing.set(true); this.firstPeer = true; this.generateKeyPair().then(() => { - RocketChat.Notifications.notifyUser(this.peerId, 'otr', 'handshake', { roomId: this.roomId, userId: this.userId, publicKey: EJSON.stringify(this.exportedPublicKey), refresh: refresh }); + RocketChat.Notifications.notifyUser(this.peerId, 'otr', 'handshake', { roomId: this.roomId, userId: this.userId, publicKey: EJSON.stringify(this.exportedPublicKey), refresh }); }); } @@ -122,7 +122,7 @@ RocketChat.OTR.Room = class { return RocketChat.OTR.crypto.encrypt({ name: 'AES-GCM', - iv: iv + iv }, this.sessionKey, data).then((cipherText) => { cipherText = new Uint8Array(cipherText); const output = new Uint8Array(iv.length + cipherText.length); @@ -147,7 +147,7 @@ RocketChat.OTR.Room = class { text: message.msg, userId: this.userId, ack: Random.id((Random.fraction()+1)*20), - ts: ts + ts })); const enc = this.encryptText(data); return enc; @@ -160,7 +160,7 @@ RocketChat.OTR.Room = class { return RocketChat.OTR.crypto.decrypt({ name: 'AES-GCM', - iv: iv + iv }, this.sessionKey, cipherText) .then((data) => { data = EJSON.parse(new TextDecoder('UTF-8').decode(new Uint8Array(data))); diff --git a/packages/rocketchat-otr/client/views/otrFlexTab.js b/packages/rocketchat-otr/client/views/otrFlexTab.js index 2a8a1ed4a7c..50c813b380e 100644 --- a/packages/rocketchat-otr/client/views/otrFlexTab.js +++ b/packages/rocketchat-otr/client/views/otrFlexTab.js @@ -28,7 +28,7 @@ Template.otrFlexTab.helpers({ }); Template.otrFlexTab.events({ - 'click button.start': function(e, t) { + 'click button.start'(e, t) { e.preventDefault(); const otr = RocketChat.OTR.getInstanceByRoomId(this.rid); if (otr) { @@ -39,7 +39,7 @@ Template.otrFlexTab.events({ }, 10000); } }, - 'click button.refresh': function(e, t) { + 'click button.refresh'(e, t) { e.preventDefault(); const otr = RocketChat.OTR.getInstanceByRoomId(this.rid); if (otr) { @@ -51,7 +51,7 @@ Template.otrFlexTab.events({ }, 10000); } }, - 'click button.end': function(e/*, t*/) { + 'click button.end'(e/*, t*/) { e.preventDefault(); const otr = RocketChat.OTR.getInstanceByRoomId(this.rid); if (otr) { diff --git a/packages/rocketchat-otr/server/methods/deleteOldOTRMessages.js b/packages/rocketchat-otr/server/methods/deleteOldOTRMessages.js index 6e8f7010755..84d9b33b34b 100644 --- a/packages/rocketchat-otr/server/methods/deleteOldOTRMessages.js +++ b/packages/rocketchat-otr/server/methods/deleteOldOTRMessages.js @@ -1,5 +1,5 @@ Meteor.methods({ - deleteOldOTRMessages: function(roomId) { + deleteOldOTRMessages(roomId) { if (!Meteor.userId()) { throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'deleteOldOTRMessages' }); } diff --git a/packages/rocketchat-otr/server/methods/updateOTRAck.js b/packages/rocketchat-otr/server/methods/updateOTRAck.js index 14c5a7fd95f..f798365a54c 100644 --- a/packages/rocketchat-otr/server/methods/updateOTRAck.js +++ b/packages/rocketchat-otr/server/methods/updateOTRAck.js @@ -1,5 +1,5 @@ Meteor.methods({ - updateOTRAck: function(_id, ack) { + updateOTRAck(_id, ack) { if (!Meteor.userId()) { throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'updateOTRAck' }); } diff --git a/packages/rocketchat-otr/server/models/Messages.js b/packages/rocketchat-otr/server/models/Messages.js index 901a63b06ea..7a5b3457004 100644 --- a/packages/rocketchat-otr/server/models/Messages.js +++ b/packages/rocketchat-otr/server/models/Messages.js @@ -4,7 +4,7 @@ RocketChat.models.Messages.deleteOldOTRMessages = function(roomId, ts) { }; RocketChat.models.Messages.updateOTRAck = function(_id, otrAck) { - const query = { _id: _id }; - const update = { $set: { otrAck: otrAck } }; + const query = { _id }; + const update = { $set: { otrAck } }; return this.update(query, update); }; diff --git a/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js b/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js index 15473db7c09..528a55e5d05 100644 --- a/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js +++ b/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js @@ -1,5 +1,5 @@ Meteor.methods({ - saveNotificationSettings: function(rid, field, value) { + saveNotificationSettings(rid, field, value) { if (!Meteor.userId()) { throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'saveNotificationSettings' }); } @@ -42,7 +42,7 @@ Meteor.methods({ return true; }, - saveDesktopNotificationDuration: function(rid, value) { + saveDesktopNotificationDuration(rid, value) { const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(rid, Meteor.userId()); if (!subscription) { throw new Meteor.Error('error-invalid-subscription', 'Invalid subscription', { method: 'saveDesktopNotificationDuration' }); diff --git a/packages/rocketchat-push-notifications/server/models/Subscriptions.js b/packages/rocketchat-push-notifications/server/models/Subscriptions.js index 7a005a51a6e..d495f607f7f 100644 --- a/packages/rocketchat-push-notifications/server/models/Subscriptions.js +++ b/packages/rocketchat-push-notifications/server/models/Subscriptions.js @@ -1,11 +1,11 @@ RocketChat.models.Subscriptions.updateAudioNotificationById = function(_id, audioNotification) { const query = { - _id: _id + _id }; const update = { $set: { - audioNotification: audioNotification + audioNotification } }; @@ -14,12 +14,12 @@ RocketChat.models.Subscriptions.updateAudioNotificationById = function(_id, audi RocketChat.models.Subscriptions.updateDesktopNotificationsById = function(_id, desktopNotifications) { const query = { - _id: _id + _id }; const update = { $set: { - desktopNotifications: desktopNotifications + desktopNotifications } }; @@ -28,7 +28,7 @@ RocketChat.models.Subscriptions.updateDesktopNotificationsById = function(_id, d RocketChat.models.Subscriptions.updateDesktopNotificationDurationById = function(_id, value) { const query = { - _id: _id + _id }; const update = { @@ -42,12 +42,12 @@ RocketChat.models.Subscriptions.updateDesktopNotificationDurationById = function RocketChat.models.Subscriptions.updateMobilePushNotificationsById = function(_id, mobilePushNotifications) { const query = { - _id: _id + _id }; const update = { $set: { - mobilePushNotifications: mobilePushNotifications + mobilePushNotifications } }; @@ -56,12 +56,12 @@ RocketChat.models.Subscriptions.updateMobilePushNotificationsById = function(_id RocketChat.models.Subscriptions.updateEmailNotificationsById = function(_id, emailNotifications) { const query = { - _id: _id + _id }; const update = { $set: { - emailNotifications: emailNotifications + emailNotifications } }; @@ -70,7 +70,7 @@ RocketChat.models.Subscriptions.updateEmailNotificationsById = function(_id, ema RocketChat.models.Subscriptions.updateUnreadAlertById = function(_id, unreadAlert) { const query = { - _id: _id + _id }; const update = { diff --git a/packages/rocketchat-reactions/server/models/Messages.js b/packages/rocketchat-reactions/server/models/Messages.js index 6227c5b55f7..ae2cf6d256d 100644 --- a/packages/rocketchat-reactions/server/models/Messages.js +++ b/packages/rocketchat-reactions/server/models/Messages.js @@ -1,5 +1,5 @@ RocketChat.models.Messages.setReactions = function(messageId, reactions) { - return this.update({ _id: messageId }, { $set: { reactions: reactions }}); + return this.update({ _id: messageId }, { $set: { reactions }}); }; RocketChat.models.Messages.unsetReactions = function(messageId) { diff --git a/packages/rocketchat-sandstorm/client/powerboxListener.js b/packages/rocketchat-sandstorm/client/powerboxListener.js index c51fdcc7ea4..1f836a25430 100644 --- a/packages/rocketchat-sandstorm/client/powerboxListener.js +++ b/packages/rocketchat-sandstorm/client/powerboxListener.js @@ -21,7 +21,7 @@ if (Meteor.settings.public.sandstorm) { const rpcId = Math.random().toString(); callbackMap[rpcId] = cb; window.parent.postMessage({ powerboxRequest: { - rpcId: rpcId, + rpcId, query: [interfaces[interfaceName]] }}, '*'); }; diff --git a/packages/rocketchat-sandstorm/server/powerbox.js b/packages/rocketchat-sandstorm/server/powerbox.js index 87269cc18ca..68f6d9513e8 100644 --- a/packages/rocketchat-sandstorm/server/powerbox.js +++ b/packages/rocketchat-sandstorm/server/powerbox.js @@ -19,7 +19,7 @@ if (process.env.SANDSTORM === '1') { }; Meteor.methods({ - sandstormClaimRequest: function(token, serializedDescriptor) { + sandstormClaimRequest(token, serializedDescriptor) { const descriptor = Capnp.parsePacked(Powerbox.PowerboxDescriptor, new Buffer(serializedDescriptor, 'base64')); const grainTitle = Capnp.parse(Grain.UiView.PowerboxTag, descriptor.tags[0].value).title; const sessionId = this.connection.sandstormSessionId(); @@ -34,13 +34,13 @@ if (process.env.SANDSTORM === '1') { const appIconUrl = asset.protocol + '://' + asset.hostPath; return { token: newToken, - appTitle: appTitle, - appIconUrl: appIconUrl, - grainTitle: grainTitle, + appTitle, + appIconUrl, + grainTitle, descriptor: descriptor.tags[0].value.toString('base64') }; }, - sandstormOffer: function(token, serializedDescriptor) { + sandstormOffer(token, serializedDescriptor) { RocketChat.Sandstorm.offerUiView(token, serializedDescriptor, this.connection.sandstormSessionId()); } diff --git a/packages/rocketchat-slackbridge/slackbridge.js b/packages/rocketchat-slackbridge/slackbridge.js index a728403b46b..21fa5a898f3 100644 --- a/packages/rocketchat-slackbridge/slackbridge.js +++ b/packages/rocketchat-slackbridge/slackbridge.js @@ -985,7 +985,7 @@ class SlackBridge { if (pin.message) { const user = this.findRocketUser(pin.message.user); const msgObj = { - rid: rid, + rid, t: 'message_pinned', msg: '', u: { diff --git a/packages/rocketchat-slashcommands-inviteall/server.js b/packages/rocketchat-slashcommands-inviteall/server.js index 2b5ccbd6786..4d32c55697a 100644 --- a/packages/rocketchat-slashcommands-inviteall/server.js +++ b/packages/rocketchat-slashcommands-inviteall/server.js @@ -56,7 +56,7 @@ function inviteAll(type) { } else { Meteor.call('addUsersToRoom', { rid: targetChannel._id, - users: users + users }); } return RocketChat.Notifications.notifyUser(Meteor.userId(), 'message', { diff --git a/packages/rocketchat-smarsh-connector/server/functions/sendEmail.js b/packages/rocketchat-smarsh-connector/server/functions/sendEmail.js index d2a8c5fd4c7..f90fa5d38aa 100644 --- a/packages/rocketchat-smarsh-connector/server/functions/sendEmail.js +++ b/packages/rocketchat-smarsh-connector/server/functions/sendEmail.js @@ -27,6 +27,6 @@ RocketChat.smarsh.sendEmail = (data) => { from: RocketChat.settings.get('From_Email'), subject: data.subject, html: data.body, - attachments: attachments + attachments }); }; diff --git a/packages/rocketchat-spotify/lib/spotify.js b/packages/rocketchat-spotify/lib/spotify.js index 560de988493..0e6b633da29 100644 --- a/packages/rocketchat-spotify/lib/spotify.js +++ b/packages/rocketchat-spotify/lib/spotify.js @@ -38,7 +38,7 @@ class Spotify { const data = _.filter(match.slice(1), value => value != null); const path = _.map(data, value => _.escape(value)).join('/'); const url = `https://open.spotify.com/${path}`; - urls.push({'url': url, 'source': `spotify:${data.join(':')}`}); + urls.push({url, 'source': `spotify:${data.join(':')}`}); changed = true; } diff --git a/packages/rocketchat-token-login/client/login_token_client.js b/packages/rocketchat-token-login/client/login_token_client.js index eef799befe8..266618a986b 100644 --- a/packages/rocketchat-token-login/client/login_token_client.js +++ b/packages/rocketchat-token-login/client/login_token_client.js @@ -3,7 +3,7 @@ Meteor.loginWithLoginToken = function(token) { methodArguments: [{ loginToken: token }], - userCallback: function(error) { + userCallback(error) { if (!error) { FlowRouter.go('/'); } @@ -13,7 +13,7 @@ Meteor.loginWithLoginToken = function(token) { FlowRouter.route('/login-token/:token', { name: 'tokenLogin', - action: function() { + action() { BlazeLayout.render('loginLayout'); Meteor.loginWithLoginToken(this.getParam('token')); } diff --git a/packages/rocketchat-ui-admin/publications/adminRooms.js b/packages/rocketchat-ui-admin/publications/adminRooms.js index 52dbd78c500..33701504f87 100644 --- a/packages/rocketchat-ui-admin/publications/adminRooms.js +++ b/packages/rocketchat-ui-admin/publications/adminRooms.js @@ -23,7 +23,7 @@ Meteor.publish('adminRooms', function(filter, types, limit) { msgs: 1, archived: 1 }, - limit: limit, + limit, sort: { default: -1, name: 1 diff --git a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js index 6e474524eda..00a5f0b4210 100644 --- a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js +++ b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js @@ -15,15 +15,15 @@ Template.resetPassword.helpers({ }); Template.resetPassword.events({ - 'focus .input-text input': function(event) { + 'focus .input-text input'(event) { $(event.currentTarget).parents('.input-text').addClass('focus'); }, - 'blur .input-text input': function(event) { + 'blur .input-text input'(event) { if (event.currentTarget.value === '') { $(event.currentTarget).parents('.input-text').removeClass('focus'); } }, - 'submit #login-card': function(event, instance) { + 'submit #login-card'(event, instance) { event.preventDefault(); const button = instance.$('button.resetpass'); diff --git a/packages/rocketchat-ui-login/client/routes.js b/packages/rocketchat-ui-login/client/routes.js index a6ac9f5b22f..d7f6fa692e7 100644 --- a/packages/rocketchat-ui-login/client/routes.js +++ b/packages/rocketchat-ui-login/client/routes.js @@ -1,6 +1,6 @@ FlowRouter.route('/reset-password/:token', { name: 'resetPassword', - action: function() { + action() { BlazeLayout.render('loginLayout', {center: 'resetPassword'}); } }); diff --git a/packages/rocketchat-ui-sidenav/client/accountBox.js b/packages/rocketchat-ui-sidenav/client/accountBox.js index c7ae30bcd58..0e9ed0a96aa 100644 --- a/packages/rocketchat-ui-sidenav/client/accountBox.js +++ b/packages/rocketchat-ui-sidenav/client/accountBox.js @@ -16,9 +16,9 @@ Template.accountBox.helpers({ return { name: Session.get('user_' + username + '_name'), status: Session.get('user_' + username + '_status'), - visualStatus: visualStatus, + visualStatus, _id: Meteor.userId(), - username: username + username }; }, diff --git a/packages/rocketchat-ui-sidenav/client/toolbar.js b/packages/rocketchat-ui-sidenav/client/toolbar.js index fc4dbd788b9..163a25d2928 100644 --- a/packages/rocketchat-ui-sidenav/client/toolbar.js +++ b/packages/rocketchat-ui-sidenav/client/toolbar.js @@ -119,9 +119,9 @@ Template.toolbar.helpers({ cleanOnEnter: true, closeOnEsc: false, blurOnSelectItem: true, - isLoading: isLoading, - open: open, - getFilter: function(collection, filter, cb) { + isLoading, + open, + getFilter(collection, filter, cb) { filterText = filter; const type = { @@ -168,8 +168,8 @@ Template.toolbar.helpers({ } }, - getValue: function(_id, collection, records) { - const doc = _.findWhere(records, {_id: _id}); + getValue(_id, collection, records) { + const doc = _.findWhere(records, {_id}); RocketChat.roomTypes.openRouteLink(doc.t, doc, FlowRouter.current().queryParams); menu.close(); diff --git a/packages/rocketchat-ui/client/lib/fireEvent.js b/packages/rocketchat-ui/client/lib/fireEvent.js index c81ce337541..4238ca12b39 100644 --- a/packages/rocketchat-ui/client/lib/fireEvent.js +++ b/packages/rocketchat-ui/client/lib/fireEvent.js @@ -3,7 +3,7 @@ window.fireGlobalEvent = (eventName, params) => { if (RocketChat.settings.get('Iframe_Integration_send_enable') === true) { parent.postMessage({ - eventName: eventName, + eventName, data: params }, RocketChat.settings.get('Iframe_Integration_send_target_origin')); } diff --git a/packages/rocketchat-ui/client/lib/iframeCommands.js b/packages/rocketchat-ui/client/lib/iframeCommands.js index 0a4d63b99a6..896f8b64abb 100644 --- a/packages/rocketchat-ui/client/lib/iframeCommands.js +++ b/packages/rocketchat-ui/client/lib/iframeCommands.js @@ -15,7 +15,7 @@ const commands = { const customOAuthCallback = (response) => { event.source.postMessage({ event: 'custom-oauth-callback', - response: response + response }, event.origin); }; diff --git a/packages/rocketchat-videobridge/server/models/Rooms.js b/packages/rocketchat-videobridge/server/models/Rooms.js index e943e1c111a..8c138009bc9 100644 --- a/packages/rocketchat-videobridge/server/models/Rooms.js +++ b/packages/rocketchat-videobridge/server/models/Rooms.js @@ -5,7 +5,7 @@ */ RocketChat.models.Rooms.setJitsiTimeout = function(_id, time) { const query = { - _id: _id + _id }; const update = { diff --git a/server/lib/accounts.js b/server/lib/accounts.js index 5dad2be2517..495c1c359f8 100644 --- a/server/lib/accounts.js +++ b/server/lib/accounts.js @@ -109,7 +109,7 @@ Accounts.insertUserDoc = _.wrap(Accounts.insertUserDoc, function(insertUserDoc, const _id = insertUserDoc.call(Accounts, options, user); user = Meteor.users.findOne({ - _id: _id + _id }); if (user.username && options.joinDefaultChannels !== false && user.joinDefaultChannels !== false) { diff --git a/server/lib/cordova.js b/server/lib/cordova.js index 54bd6c41909..d2f53080d9d 100644 --- a/server/lib/cordova.js +++ b/server/lib/cordova.js @@ -73,8 +73,8 @@ Meteor.methods({ function sendPush(service, token, options, tries = 0) { const data = { data: { - token: token, - options: options + token, + options } }; @@ -117,7 +117,7 @@ function configurePush() { if (RocketChat.settings.get('Push_enable') === true) { Push.allow({ - send: function(userId/*, notification*/) { + send(userId/*, notification*/) { return RocketChat.authz.hasRole(userId, 'admin'); } }); @@ -156,8 +156,8 @@ function configurePush() { } Push.Configure({ - apn: apn, - gcm: gcm, + apn, + gcm, production: RocketChat.settings.get('Push_production'), sendInterval: 1000, sendBatchSize: 10 diff --git a/server/methods/OEmbedCacheCleanup.js b/server/methods/OEmbedCacheCleanup.js index c7b7c4c2d20..3ca8139ad00 100644 --- a/server/methods/OEmbedCacheCleanup.js +++ b/server/methods/OEmbedCacheCleanup.js @@ -1,5 +1,5 @@ Meteor.methods({ - OEmbedCacheCleanup: function() { + OEmbedCacheCleanup() { if (Meteor.userId() && !RocketChat.authz.hasRole(Meteor.userId(), 'admin')) { throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'OEmbedCacheCleanup' diff --git a/server/methods/addAllUserToRoom.js b/server/methods/addAllUserToRoom.js index ec614a2e48a..c52a76268f1 100644 --- a/server/methods/addAllUserToRoom.js +++ b/server/methods/addAllUserToRoom.js @@ -1,5 +1,5 @@ Meteor.methods({ - addAllUserToRoom: function(rid) { + addAllUserToRoom(rid) { check (rid, String); diff --git a/server/methods/createDirectMessage.js b/server/methods/createDirectMessage.js index fd216d68842..ea60ca95dd5 100644 --- a/server/methods/createDirectMessage.js +++ b/server/methods/createDirectMessage.js @@ -78,12 +78,12 @@ Meteor.methods({ } RocketChat.models.Subscriptions.upsert({ - rid: rid, + rid, $and: [{'u._id': me._id}] // work around to solve problems with upsert and dot }, upsertSubscription); RocketChat.models.Subscriptions.upsert({ - rid: rid, + rid, $and: [{'u._id': to._id}] // work around to solve problems with upsert and dot }, { $setOnInsert: { @@ -100,7 +100,7 @@ Meteor.methods({ }); return { - rid: rid + rid }; } }); diff --git a/server/methods/deleteFileMessage.js b/server/methods/deleteFileMessage.js index 55590f5702b..ce10e596c45 100644 --- a/server/methods/deleteFileMessage.js +++ b/server/methods/deleteFileMessage.js @@ -1,6 +1,6 @@ /* global FileUpload */ Meteor.methods({ - deleteFileMessage: function(fileID) { + deleteFileMessage(fileID) { check(fileID, String); const msg = RocketChat.models.Messages.getMessageByFileId(fileID); diff --git a/server/methods/groupsList.js b/server/methods/groupsList.js index 208111fc73c..09e4e8e272f 100644 --- a/server/methods/groupsList.js +++ b/server/methods/groupsList.js @@ -1,5 +1,5 @@ Meteor.methods({ - groupsList: function(nameFilter, limit, sort) { + groupsList(nameFilter, limit, sort) { check(nameFilter, Match.Optional(String)); check(limit, Match.Optional(Number)); diff --git a/server/methods/loadHistory.js b/server/methods/loadHistory.js index 299ec022061..c55727eb81b 100644 --- a/server/methods/loadHistory.js +++ b/server/methods/loadHistory.js @@ -42,7 +42,7 @@ Meteor.methods({ sort: { ts: -1 }, - limit: limit + limit }; if (!RocketChat.settings.get('Message_ShowEditedStatus')) { @@ -87,9 +87,9 @@ Meteor.methods({ } return { - messages: messages, - firstUnread: firstUnread, - unreadNotLoaded: unreadNotLoaded + messages, + firstUnread, + unreadNotLoaded }; } }); diff --git a/server/methods/loadNextMessages.js b/server/methods/loadNextMessages.js index e4906ae4682..5012eedf108 100644 --- a/server/methods/loadNextMessages.js +++ b/server/methods/loadNextMessages.js @@ -43,7 +43,7 @@ Meteor.methods({ }); return { - messages: messages + messages }; } }); diff --git a/server/methods/loadSurroundingMessages.js b/server/methods/loadSurroundingMessages.js index 1a8aaeedaa4..6739677a6dc 100644 --- a/server/methods/loadSurroundingMessages.js +++ b/server/methods/loadSurroundingMessages.js @@ -71,8 +71,8 @@ Meteor.methods({ return { messages: messages.concat(afterMessages), - moreBefore: moreBefore, - moreAfter: moreAfter + moreBefore, + moreAfter }; } }); diff --git a/server/methods/messageSearch.js b/server/methods/messageSearch.js index db60ff9436c..69d130fa564 100644 --- a/server/methods/messageSearch.js +++ b/server/methods/messageSearch.js @@ -1,5 +1,5 @@ Meteor.methods({ - messageSearch: function(text, rid, limit) { + messageSearch(text, rid, limit) { const result = { messages: [], users: [], diff --git a/server/publications/channelAndPrivateAutocomplete.js b/server/publications/channelAndPrivateAutocomplete.js index 139a69f567b..fec41bbeafd 100644 --- a/server/publications/channelAndPrivateAutocomplete.js +++ b/server/publications/channelAndPrivateAutocomplete.js @@ -20,13 +20,13 @@ Meteor.publish('channelAndPrivateAutocomplete', function(selector) { }; const cursorHandle = RocketChat.models.Rooms.findByNameStartingAndTypes(selector.name, ['c', 'p'], options).observeChanges({ - added: function(_id, record) { + added(_id, record) { return pub.added('autocompleteRecords', _id, record); }, - changed: function(_id, record) { + changed(_id, record) { return pub.changed('autocompleteRecords', _id, record); }, - removed: function(_id, record) { + removed(_id, record) { return pub.removed('autocompleteRecords', _id, record); } }); diff --git a/server/publications/fullUserData.js b/server/publications/fullUserData.js index 81eeee1254c..76455a9e204 100644 --- a/server/publications/fullUserData.js +++ b/server/publications/fullUserData.js @@ -5,8 +5,8 @@ Meteor.publish('fullUserData', function(filter, limit) { const result = RocketChat.getFullUserData({ userId: this.userId, - filter: filter, - limit: limit + filter, + limit }); if (!result) { diff --git a/server/publications/messages.js b/server/publications/messages.js index e37563d712c..1a97be102bd 100644 --- a/server/publications/messages.js +++ b/server/publications/messages.js @@ -21,13 +21,13 @@ Meteor.publish('messages', function(rid/*, start*/) { }); const cursorHandle = cursor.observeChanges({ - added: function(_id, record) { + added(_id, record) { record.starred = _.findWhere(record.starred, { _id: publication.userId }); return publication.added('rocketchat_message', _id, record); }, - changed: function(_id, record) { + changed(_id, record) { record.starred = _.findWhere(record.starred, { _id: publication.userId }); @@ -42,12 +42,12 @@ Meteor.publish('messages', function(rid/*, start*/) { }); const cursorDeleteHandle = cursorDelete.observeChanges({ - added: function(_id/*, record*/) { + added(_id/*, record*/) { return publication.added('rocketchat_message', _id, { _hidden: true }); }, - changed: function(_id/*, record*/) { + changed(_id/*, record*/) { return publication.added('rocketchat_message', _id, { _hidden: true }); diff --git a/server/publications/roomFiles.js b/server/publications/roomFiles.js index 432d3da3a4a..7f537371af1 100644 --- a/server/publications/roomFiles.js +++ b/server/publications/roomFiles.js @@ -6,13 +6,13 @@ Meteor.publish('roomFiles', function(rid, limit = 50) { const pub = this; const cursorFileListHandle = RocketChat.models.Uploads.findNotHiddenFilesOfRoom(rid, limit).observeChanges({ - added: function(_id, record) { + added(_id, record) { return pub.added('room_files', _id, record); }, - changed: function(_id, record) { + changed(_id, record) { return pub.changed('room_files', _id, record); }, - removed: function(_id, record) { + removed(_id, record) { return pub.removed('room_files', _id, record); } }); diff --git a/server/publications/spotlight.js b/server/publications/spotlight.js index a7a86e0121c..c96f6fb8720 100644 --- a/server/publications/spotlight.js +++ b/server/publications/spotlight.js @@ -1,5 +1,5 @@ Meteor.methods({ - spotlight: function(text, usernames, type = {users: true, rooms: true}) { + spotlight(text, usernames, type = {users: true, rooms: true}) { const result = { users: [], rooms: [] diff --git a/server/publications/subscription.js b/server/publications/subscription.js index ded2f9a098d..e373f5c71ee 100644 --- a/server/publications/subscription.js +++ b/server/publications/subscription.js @@ -34,7 +34,7 @@ Meteor.methods({ this.unblock(); const options = { - fields: fields + fields }; const records = RocketChat.models.Subscriptions.findByUserId(Meteor.userId(), options).fetch(); @@ -60,6 +60,6 @@ Meteor.methods({ RocketChat.models.Subscriptions.on('changed', function(type, subscription) { return RocketChat.Notifications.notifyUserInThisInstance(subscription.u._id, 'subscriptions-changed', type, RocketChat.models.Subscriptions.processQueryOptionsOnResult(subscription, { - fields: fields + fields })); }); diff --git a/server/publications/userAutocomplete.js b/server/publications/userAutocomplete.js index 18c89f28456..a5a88607d1b 100644 --- a/server/publications/userAutocomplete.js +++ b/server/publications/userAutocomplete.js @@ -23,13 +23,13 @@ Meteor.publish('userAutocomplete', function(selector) { const exceptions = selector.exceptions || []; const cursorHandle = RocketChat.models.Users.findActiveByUsernameOrNameRegexWithExceptions(selector.term, exceptions, options).observeChanges({ - added: function(_id, record) { + added(_id, record) { return pub.added('autocompleteRecords', _id, record); }, - changed: function(_id, record) { + changed(_id, record) { return pub.changed('autocompleteRecords', _id, record); }, - removed: function(_id, record) { + removed(_id, record) { return pub.removed('autocompleteRecords', _id, record); } }); diff --git a/server/startup/avatar.js b/server/startup/avatar.js index 41daf1229a4..e0c873b07d9 100644 --- a/server/startup/avatar.js +++ b/server/startup/avatar.js @@ -32,7 +32,7 @@ Meteor.startup(function() { this.RocketChatFileAvatarInstance = new RocketChatStore({ name: 'avatars', absolutePath: path, - transformWrite: transformWrite + transformWrite }); return WebApp.connectHandlers.use('/avatar/', Meteor.bindEnvironment(function(req, res/*, next*/) { diff --git a/server/startup/cron.js b/server/startup/cron.js index b95ad34de22..f60056d1ae4 100644 --- a/server/startup/cron.js +++ b/server/startup/cron.js @@ -3,7 +3,7 @@ const logger = new Logger('SyncedCron'); SyncedCron.config({ - logger: function(opts) { + logger(opts) { return logger[opts.level].call(logger, opts.message); }, collectionName: 'rocketchat_cron_history' @@ -36,7 +36,7 @@ Meteor.startup(function() { SyncedCron.add({ name: 'Generate and save statistics', - schedule: function(parser) { + schedule(parser) { return parser.cron(new Date().getMinutes() + ' * * * *'); }, job: generateStatistics @@ -44,7 +44,7 @@ Meteor.startup(function() { SyncedCron.add({ name: 'Cleanup OEmbed cache', - schedule: function(parser) { + schedule(parser) { const now = new Date(); return parser.cron(now.getMinutes() + ' ' + now.getHours() + ' * * *'); }, diff --git a/server/startup/migrations/v004.js b/server/startup/migrations/v004.js index 2541b47da74..92b117a34db 100644 --- a/server/startup/migrations/v004.js +++ b/server/startup/migrations/v004.js @@ -31,7 +31,7 @@ RocketChat.Migrations.add({ rid: item._id }, { $set: { - name: name + name } }, { multi: true @@ -56,7 +56,7 @@ RocketChat.Migrations.add({ rid: item._id }, { $set: { - name: name + name } }, { multi: true diff --git a/server/startup/migrations/v007.js b/server/startup/migrations/v007.js index d3b798b9347..e4b28335841 100644 --- a/server/startup/migrations/v007.js +++ b/server/startup/migrations/v007.js @@ -19,7 +19,7 @@ RocketChat.Migrations.add({ message.urls = message.urls.map((url) => { if (_.isString(url)) { return { - url: url + url }; } return url; diff --git a/server/startup/migrations/v015.js b/server/startup/migrations/v015.js index 05505d484ad..85e45c7eb64 100644 --- a/server/startup/migrations/v015.js +++ b/server/startup/migrations/v015.js @@ -33,7 +33,7 @@ RocketChat.Migrations.add({ complete: true, uploading: false, store: 'rocketchat_uploads', - extension: extension, + extension, userId: cfsRecord.userId, uploadedAt: cfsRecord.updatedAt, url: Meteor.absoluteUrl() + url diff --git a/server/startup/migrations/v037.js b/server/startup/migrations/v037.js index b5d9686af7d..96c813a3424 100644 --- a/server/startup/migrations/v037.js +++ b/server/startup/migrations/v037.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 37, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Permissions) { // Find permission add-user (changed it to create-user) diff --git a/server/startup/migrations/v038.js b/server/startup/migrations/v038.js index f39f20d878c..57680958930 100644 --- a/server/startup/migrations/v038.js +++ b/server/startup/migrations/v038.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 38, - up: function() { + up() { if (RocketChat && RocketChat.settings && RocketChat.settings.get) { const allowPinning = RocketChat.settings.get('Message_AllowPinningByAnyone'); diff --git a/server/startup/migrations/v039.js b/server/startup/migrations/v039.js index d0182deb681..9c73bfa1763 100644 --- a/server/startup/migrations/v039.js +++ b/server/startup/migrations/v039.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 39, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Settings) { const footer = RocketChat.models.Settings.findOne({ _id: 'Layout_Sidenav_Footer' }); diff --git a/server/startup/migrations/v040.js b/server/startup/migrations/v040.js index 715240b428a..e5b2df54c04 100644 --- a/server/startup/migrations/v040.js +++ b/server/startup/migrations/v040.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 40, - up: function() { + up() { RocketChat.models.Settings.find({ _id: /Accounts_OAuth_Custom_/, i18nLabel: 'Accounts_OAuth_Custom_Enable' }).forEach(function(customOauth) { const parts = customOauth._id.split('_'); const name = parts[3]; diff --git a/server/startup/migrations/v041.js b/server/startup/migrations/v041.js index e539016ff4c..c327d695f5a 100644 --- a/server/startup/migrations/v041.js +++ b/server/startup/migrations/v041.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 41, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Users) { RocketChat.models.Users.update({ bot: true }, { $set: { type: 'bot' } }, { multi: true }); RocketChat.models.Users.update({ 'profile.guest': true }, { $set: { type: 'visitor' } }, { multi: true }); diff --git a/server/startup/migrations/v043.js b/server/startup/migrations/v043.js index e634f7560ec..829bf70b6f2 100644 --- a/server/startup/migrations/v043.js +++ b/server/startup/migrations/v043.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 43, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Permissions) { RocketChat.models.Permissions.update({ _id: 'pin-message' }, { $addToSet: { roles: 'admin' } }); } diff --git a/server/startup/migrations/v044.js b/server/startup/migrations/v044.js index 3efc499ce18..9dd425f750a 100644 --- a/server/startup/migrations/v044.js +++ b/server/startup/migrations/v044.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 44, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Users) { RocketChat.models.Users.find({ $or: [ { 'settings.preferences.disableNewRoomNotification': { $exists: 1 } }, { 'settings.preferences.disableNewMessageNotification': { $exists: 1 } } ] }).forEach(function(user) { const newRoomNotification = !(user && user.settings && user.settings.preferences && user.settings.preferences.disableNewRoomNotification); diff --git a/server/startup/migrations/v045.js b/server/startup/migrations/v045.js index f9d845ed7de..0047c7bccba 100644 --- a/server/startup/migrations/v045.js +++ b/server/startup/migrations/v045.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 45, - up: function() { + up() { // finds the latest created visitor const lastVisitor = RocketChat.models.Users.find({ type: 'visitor' }, { fields: { username: 1 }, sort: { createdAt: -1 }, limit: 1 }).fetch(); diff --git a/server/startup/migrations/v046.js b/server/startup/migrations/v046.js index f3a6618e4b6..f4b60f36176 100644 --- a/server/startup/migrations/v046.js +++ b/server/startup/migrations/v046.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 46, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Users) { RocketChat.models.Users.update({ type: { $exists: false } }, { $set: { type: 'user' } }, { multi: true }); } diff --git a/server/startup/migrations/v047.js b/server/startup/migrations/v047.js index 4fa452ef26d..e23d770207b 100644 --- a/server/startup/migrations/v047.js +++ b/server/startup/migrations/v047.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 47, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Settings) { const autolinkerUrls = RocketChat.models.Settings.findOne({ _id: 'AutoLinker_Urls' }); if (autolinkerUrls) { diff --git a/server/startup/migrations/v048.js b/server/startup/migrations/v048.js index 7c8f4041bf8..7f606f1dd19 100644 --- a/server/startup/migrations/v048.js +++ b/server/startup/migrations/v048.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 48, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Settings) { const RocketBot_Enabled = RocketChat.models.Settings.findOne({ diff --git a/server/startup/migrations/v049.js b/server/startup/migrations/v049.js index 9b1e0e22581..93861317df9 100644 --- a/server/startup/migrations/v049.js +++ b/server/startup/migrations/v049.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 49, - up: function() { + up() { let count = 1; diff --git a/server/startup/migrations/v050.js b/server/startup/migrations/v050.js index f442e26328f..0d2d6ed4206 100644 --- a/server/startup/migrations/v050.js +++ b/server/startup/migrations/v050.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 50, - up: function() { + up() { RocketChat.models.Subscriptions.tryDropIndex('u._id_1_name_1_t_1'); RocketChat.models.Subscriptions.tryEnsureIndex({ 'u._id': 1, 'name': 1, 't': 1 }); } diff --git a/server/startup/migrations/v051.js b/server/startup/migrations/v051.js index 1a205c83241..b87882c1a11 100644 --- a/server/startup/migrations/v051.js +++ b/server/startup/migrations/v051.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 51, - up: function() { + up() { RocketChat.models.Rooms.find({ t: 'l', 'v.token': { $exists: true }, label: { $exists: false }}).forEach(function(room) { const user = RocketChat.models.Users.findOne({ 'profile.token': room.v.token }); if (user) { diff --git a/server/startup/migrations/v052.js b/server/startup/migrations/v052.js index f115ed10520..23dca763a6f 100644 --- a/server/startup/migrations/v052.js +++ b/server/startup/migrations/v052.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 52, - up: function() { + up() { RocketChat.models.Users.update({ _id: 'rocket.cat' }, { $addToSet: { roles: 'bot' } }); } }); diff --git a/server/startup/migrations/v053.js b/server/startup/migrations/v053.js index 5f908ca07d1..8474669d211 100644 --- a/server/startup/migrations/v053.js +++ b/server/startup/migrations/v053.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 53, - up: function() { + up() { RocketChat.models.Settings.update({ _id: 'Email_Header', value: '' }, { $set: { value: '

[Site_Name]

' diff --git a/server/startup/migrations/v054.js b/server/startup/migrations/v054.js index 2b955d33316..ef32323c4ea 100644 --- a/server/startup/migrations/v054.js +++ b/server/startup/migrations/v054.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 54, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Users) { // Set default message viewMode to 'normal' or 'cozy' depending on the users' current settings and remove the field 'compactView' RocketChat.models.Users.update({ 'settings.preferences.compactView': true }, { $set: { 'settings.preferences.viewMode': 1 }, $unset: { 'settings.preferences.compactView': 1 } }, { multi: true }); diff --git a/server/startup/migrations/v055.js b/server/startup/migrations/v055.js index 30eef917dad..ed1fed5ff9b 100644 --- a/server/startup/migrations/v055.js +++ b/server/startup/migrations/v055.js @@ -1,9 +1,9 @@ RocketChat.Migrations.add({ version: 55, - up: function() { + up() { RocketChat.models.Rooms.find({ 'topic': { $exists: 1, $ne: '' } }, { topic: 1 }).forEach(function(room) { const topic = s.escapeHTML(room.topic); - RocketChat.models.Rooms.update({ _id: room._id }, { $set: { topic: topic }}); + RocketChat.models.Rooms.update({ _id: room._id }, { $set: { topic }}); RocketChat.models.Messages.update({ t: 'room_changed_topic', rid: room._id }, { $set: { msg: topic }}); }); } diff --git a/server/startup/migrations/v056.js b/server/startup/migrations/v056.js index 2c20633542c..8dc3333c3f3 100644 --- a/server/startup/migrations/v056.js +++ b/server/startup/migrations/v056.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 56, - up: function() { + up() { RocketChat.models.Messages.find({ _id: /\./ }).forEach(function(message) { const oldId = message._id; message._id = message._id.replace(/(.*)\.S?(.*)/, 'slack-$1-$2'); diff --git a/server/startup/migrations/v057.js b/server/startup/migrations/v057.js index 8a18681d853..fa9dcccfb5d 100644 --- a/server/startup/migrations/v057.js +++ b/server/startup/migrations/v057.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 57, - up: function() { + up() { RocketChat.models.Messages.find({ _id: /slack-([a-zA-Z0-9]+)S([0-9]+-[0-9]+)/ }).forEach(function(message) { const oldId = message._id; message._id = message._id.replace(/slack-([a-zA-Z0-9]+)S([0-9]+-[0-9]+)/, 'slack-$1-$2'); diff --git a/server/startup/migrations/v058.js b/server/startup/migrations/v058.js index 329900d3d5f..294a9c28fc7 100644 --- a/server/startup/migrations/v058.js +++ b/server/startup/migrations/v058.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 58, - up: function() { + up() { RocketChat.models.Settings.update({ _id: 'Push_gateway', value: 'https://rocket.chat' }, { $set: { value: 'https://gateway.rocket.chat', diff --git a/server/startup/migrations/v059.js b/server/startup/migrations/v059.js index 7f6a5583c66..4fbaebc3ebe 100644 --- a/server/startup/migrations/v059.js +++ b/server/startup/migrations/v059.js @@ -1,10 +1,10 @@ RocketChat.Migrations.add({ version: 59, - up: function() { + up() { const users = RocketChat.models.Users.find({}, { sort: { createdAt: 1 }, limit: 1 }).fetch(); if (users && users.length > 0) { const createdAt = users[0].createdAt; - RocketChat.models.Settings.update({ createdAt: { $exists: 0 } }, { $set: { createdAt: createdAt } }, { multi: true }); + RocketChat.models.Settings.update({ createdAt: { $exists: 0 } }, { $set: { createdAt } }, { multi: true }); RocketChat.models.Statistics.update({ installedAt: { $exists: 0 } }, { $set: { installedAt: createdAt } }, { multi: true }); } } diff --git a/server/startup/migrations/v060.js b/server/startup/migrations/v060.js index 963a6815904..eee784829f9 100644 --- a/server/startup/migrations/v060.js +++ b/server/startup/migrations/v060.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 60, - up: function() { + up() { let subscriptions = RocketChat.models.Subscriptions.find({ $or: [ { name: { $exists: 0 } }, { name: { $not: { $type: 2 } } } ] }).fetch(); if (subscriptions && subscriptions.length > 0) { RocketChat.models.Subscriptions.remove({ _id: { $in: _.pluck(subscriptions, '_id') } }); diff --git a/server/startup/migrations/v061.js b/server/startup/migrations/v061.js index df8d4383950..766351a2fb8 100644 --- a/server/startup/migrations/v061.js +++ b/server/startup/migrations/v061.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 61, - up: function() { + up() { RocketChat.models.Users.find({ active: false }).forEach(function(user) { RocketChat.models.Subscriptions.setArchivedByUsername(user.username, true); }); diff --git a/server/startup/migrations/v062.js b/server/startup/migrations/v062.js index 20d968cec9e..1c51f11b8bc 100644 --- a/server/startup/migrations/v062.js +++ b/server/startup/migrations/v062.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 62, - up: function() { + up() { RocketChat.models.Settings.remove({ _id: 'Atlassian Crowd', type: 'group' }); } }); diff --git a/server/startup/migrations/v063.js b/server/startup/migrations/v063.js index 086d331a011..af27b43d34f 100644 --- a/server/startup/migrations/v063.js +++ b/server/startup/migrations/v063.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 63, - up: function() { + up() { const forward = RocketChat.models.Settings.findOne({ _id:'Livechat_forward_open_chats' }); const timeout = RocketChat.models.Settings.findOne({ _id:'Livechat_forward_open_chats_timeout' }); diff --git a/server/startup/migrations/v064.js b/server/startup/migrations/v064.js index 854dd315e6f..aae3feff7b5 100644 --- a/server/startup/migrations/v064.js +++ b/server/startup/migrations/v064.js @@ -1,9 +1,9 @@ RocketChat.Migrations.add({ version: 64, - up: function() { + up() { RocketChat.models.Messages.find({ 't': 'room_changed_topic', 'msg': / { RocketChat.models.Settings.remove({ _id: setting._id }); diff --git a/server/startup/migrations/v077.js b/server/startup/migrations/v077.js index a2dc4b13468..7b18f288be9 100644 --- a/server/startup/migrations/v077.js +++ b/server/startup/migrations/v077.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 77, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Rooms) { RocketChat.models.Rooms.find({ t: 'l', diff --git a/server/startup/migrations/v078.js b/server/startup/migrations/v078.js index 41f5dbb4a5a..0780924855c 100644 --- a/server/startup/migrations/v078.js +++ b/server/startup/migrations/v078.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 78, - up: function() { + up() { RocketChat.models.Permissions.update({ _id: { $in: ['create-c', 'create-d', 'create-p'] }}, { $addToSet: { roles: 'bot' }}, { multi: true }); } }); diff --git a/server/startup/migrations/v079.js b/server/startup/migrations/v079.js index a3e4571bab9..ca87271c551 100644 --- a/server/startup/migrations/v079.js +++ b/server/startup/migrations/v079.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 79, - up: function() { + up() { const integrations = RocketChat.models.Integrations.find({type: 'webhook-incoming'}).fetch(); for (const integration of integrations) { diff --git a/server/startup/migrations/v080.js b/server/startup/migrations/v080.js index 1e2a66706f2..aa3d4e46666 100644 --- a/server/startup/migrations/v080.js +++ b/server/startup/migrations/v080.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 80, - up: function() { + up() { const query = { type: 'webhook-outgoing', $or: [{ diff --git a/server/startup/migrations/v081.js b/server/startup/migrations/v081.js index 36f0d5f6f6d..eb751ca70eb 100644 --- a/server/startup/migrations/v081.js +++ b/server/startup/migrations/v081.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 81, - up: function() { + up() { RocketChat.models.OAuthApps.update({ _id: 'zapier' }, { $set: { active: true, diff --git a/server/startup/migrations/v082.js b/server/startup/migrations/v082.js index 93e88d9830e..8dd9ac18c1b 100644 --- a/server/startup/migrations/v082.js +++ b/server/startup/migrations/v082.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 82, - up: function() { + up() { const admins = RocketChat.authz.getUsersInRole('admin').fetch(); if (admins.length === 1 && admins[0]._id === 'rocket.cat') { RocketChat.authz.removeUserFromRoles('rocket.cat', 'admin'); diff --git a/server/startup/migrations/v083.js b/server/startup/migrations/v083.js index 4b91d08317e..6422665bd1d 100644 --- a/server/startup/migrations/v083.js +++ b/server/startup/migrations/v083.js @@ -1,11 +1,11 @@ RocketChat.Migrations.add({ version: 83, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Settings && RocketChat.models.Users) { const setting = RocketChat.models.Settings.findOne({ _id: 'InternalHubot_Username' }); if (setting && setting.value) { const username = setting.value; - const user = RocketChat.models.Users.findOne({ username: username }); + const user = RocketChat.models.Users.findOne({ username }); if (!user && setting.value === 'Rocket.Cat') { RocketChat.models.Settings.update({ _id: 'InternalHubot_Username' }, { $set: { value: 'rocket.cat', packageValue: 'rocket.cat' } }); } diff --git a/server/startup/migrations/v086.js b/server/startup/migrations/v086.js index f2f82c65d9e..2d3780cbf28 100644 --- a/server/startup/migrations/v086.js +++ b/server/startup/migrations/v086.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 86, - up: function() { + up() { // Disabled this migration for it was not updating any user } }); diff --git a/server/startup/migrations/v087.js b/server/startup/migrations/v087.js index 1c61138c47f..cb7f7d04297 100644 --- a/server/startup/migrations/v087.js +++ b/server/startup/migrations/v087.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 87, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Users) { RocketChat.models.Users.update({ 'settings.preferences.newMessageNotification': false }, { $set: { 'settings.preferences.newMessageNotification': 'none' } }, { multi: true }); RocketChat.models.Users.update({ 'settings.preferences.newMessageNotification': true }, { $unset: { 'settings.preferences.newMessageNotification': 1 } }, { multi: true }); diff --git a/server/startup/migrations/v088.js b/server/startup/migrations/v088.js index 6accae69dc0..9e52d841ca7 100644 --- a/server/startup/migrations/v088.js +++ b/server/startup/migrations/v088.js @@ -1,6 +1,6 @@ RocketChat.Migrations.add({ version: 88, - up: function() { + up() { if (RocketChat && RocketChat.models && RocketChat.models.Settings) { const setting = RocketChat.models.Settings.findOne({ _id: 'Layout_Sidenav_Footer' }); if (setting && setting.value && setting.packageValue) { diff --git a/tests/end-to-end/api/01-users.js b/tests/end-to-end/api/01-users.js index 423800592e5..396146e05d1 100644 --- a/tests/end-to-end/api/01-users.js +++ b/tests/end-to-end/api/01-users.js @@ -29,7 +29,7 @@ describe('Users', function() { email: apiEmail, name: apiUsername, username: apiUsername, - password: password, + password, active: true, roles: ['user'], joinDefaultChannels: true, @@ -137,7 +137,7 @@ describe('Users', function() { email: apiEmail, name: 'edited'+apiUsername, username: 'edited'+apiUsername, - password: password, + password, active: true, roles: ['user'] } diff --git a/tests/end-to-end/api/02-channels.js b/tests/end-to-end/api/02-channels.js index 4ef4efb03c0..eea72bdf637 100644 --- a/tests/end-to-end/api/02-channels.js +++ b/tests/end-to-end/api/02-channels.js @@ -11,7 +11,7 @@ function getRoomInfo(roomId) { request.get(api('channels.info')) .set(credentials) .query({ - roomId: roomId + roomId }) .end((err, req) => { resolve(req.body); diff --git a/tests/end-to-end/api/03-groups.js b/tests/end-to-end/api/03-groups.js index 462b8f399e9..3452b05ad15 100644 --- a/tests/end-to-end/api/03-groups.js +++ b/tests/end-to-end/api/03-groups.js @@ -11,7 +11,7 @@ function getRoomInfo(roomId) { request.get(api('groups.info')) .set(credentials) .query({ - roomId: roomId + roomId }) .end((err, req) => { resolve(req.body); diff --git a/tests/pageobjects/global.js b/tests/pageobjects/global.js index b0a89f39e1d..c0b8ede63c0 100644 --- a/tests/pageobjects/global.js +++ b/tests/pageobjects/global.js @@ -14,8 +14,8 @@ class Global { setWindowSize(width, height) { browser.windowHandleSize({ - width: width, - height: height + width, + height }); }