From 0928bbe8b23b00fdabe5ef0babc16e4bc3a5c0f8 Mon Sep 17 00:00:00 2001 From: Gabriel Engel Date: Thu, 25 Aug 2016 22:48:42 -0300 Subject: [PATCH] Renaming files (#4118) * moving from coffee to js * renaming method --- client/startup/emailVerification.js | 3 ++- client/startup/userSetUtcOffset.js | 12 ++++++++++++ client/startup/userTimezone.coffee | 6 ------ packages/rocketchat-importer-hipchat/server.coffee | 2 +- packages/rocketchat-importer-slack/server.coffee | 2 +- packages/rocketchat-slackbridge/slackbridge.js | 2 +- ...eUserUtcOffset.coffee => userSetUtcOffset.coffee} | 4 ++-- 7 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 client/startup/userSetUtcOffset.js delete mode 100644 client/startup/userTimezone.coffee rename server/methods/{updateUserUtcOffset.coffee => userSetUtcOffset.coffee} (74%) diff --git a/client/startup/emailVerification.js b/client/startup/emailVerification.js index cae42e4b19b..5be8d188380 100644 --- a/client/startup/emailVerification.js +++ b/client/startup/emailVerification.js @@ -1,6 +1,7 @@ Meteor.startup(function() { Tracker.autorun(function() { - if (Meteor.user() && Meteor.user().emails && Meteor.user().emails[0] && Meteor.user().emails[0].verified !== true && RocketChat.settings.get('Accounts_EmailVerification') === true && !Session.get('Accounts_EmailVerification_Warning')) { + var user = Meteor.user(); + if (user && user.emails && user.emails[0] && user.emails[0].verified !== true && RocketChat.settings.get('Accounts_EmailVerification') === true && !Session.get('Accounts_EmailVerification_Warning')) { toastr.warning(TAPi18n.__('You_have_not_verified_your_email')); Session.set('Accounts_EmailVerification_Warning', true); } diff --git a/client/startup/userSetUtcOffset.js b/client/startup/userSetUtcOffset.js new file mode 100644 index 00000000000..27444599d91 --- /dev/null +++ b/client/startup/userSetUtcOffset.js @@ -0,0 +1,12 @@ +Meteor.startup(function() { + Tracker.autorun(function() { + var user, utcOffset; + user = Meteor.user(); + if (user && user.statusConnection === 'online') { + utcOffset = moment().utcOffset() / 60; + if (user.utcOffset !== utcOffset) { + Meteor.call('userSetUtcOffset', utcOffset); + } + } + }); +}); diff --git a/client/startup/userTimezone.coffee b/client/startup/userTimezone.coffee deleted file mode 100644 index 0d35691abb6..00000000000 --- a/client/startup/userTimezone.coffee +++ /dev/null @@ -1,6 +0,0 @@ -Tracker.autorun -> - user = Meteor.user() - if user?.statusConnection is 'online' - utcOffset = moment().utcOffset() / 60 - if user.utcOffset isnt utcOffset - Meteor.call 'updateUserUtcOffset', utcOffset \ No newline at end of file diff --git a/packages/rocketchat-importer-hipchat/server.coffee b/packages/rocketchat-importer-hipchat/server.coffee index 3644f0bd04f..137f1de40b8 100644 --- a/packages/rocketchat-importer-hipchat/server.coffee +++ b/packages/rocketchat-importer-hipchat/server.coffee @@ -135,7 +135,7 @@ Importer.HipChat = class Importer.HipChat extends Importer.Base Meteor.call 'setUsername', user.mention_name Meteor.call 'joinDefaultChannels', true Meteor.call 'setAvatarFromService', user.photo_url, null, 'url' - Meteor.call 'updateUserUtcOffset', parseInt moment().tz(user.timezone).format('Z').toString().split(':')[0] + Meteor.call 'userSetUtcOffset', parseInt moment().tz(user.timezone).format('Z').toString().split(':')[0] if user.name? RocketChat.models.Users.setName userId, user.name diff --git a/packages/rocketchat-importer-slack/server.coffee b/packages/rocketchat-importer-slack/server.coffee index 242533f824d..1dde233446e 100644 --- a/packages/rocketchat-importer-slack/server.coffee +++ b/packages/rocketchat-importer-slack/server.coffee @@ -135,7 +135,7 @@ Importer.Slack = class Importer.Slack extends Importer.Base Meteor.call 'setAvatarFromService', url, null, 'url' # Slack's is -18000 which translates to Rocket.Chat's after dividing by 3600 if user.tz_offset - Meteor.call 'updateUserUtcOffset', user.tz_offset / 3600 + Meteor.call 'userSetUtcOffset', user.tz_offset / 3600 RocketChat.models.Users.update { _id: userId }, { $addToSet: { importIds: user.id } } diff --git a/packages/rocketchat-slackbridge/slackbridge.js b/packages/rocketchat-slackbridge/slackbridge.js index d093c317238..0201c422f4a 100644 --- a/packages/rocketchat-slackbridge/slackbridge.js +++ b/packages/rocketchat-slackbridge/slackbridge.js @@ -193,7 +193,7 @@ class SlackBridge { Meteor.call('setAvatarFromService', url, null, 'url'); // Slack's is -18000 which translates to Rocket.Chat's after dividing by 3600 if (userData.tz_offset) { - Meteor.call('updateUserUtcOffset', userData.tz_offset / 3600); + Meteor.call('userSetUtcOffset', userData.tz_offset / 3600); } if (userData.profile.real_name) { RocketChat.models.Users.setName(userData.rocketId, userData.profile.real_name); diff --git a/server/methods/updateUserUtcOffset.coffee b/server/methods/userSetUtcOffset.coffee similarity index 74% rename from server/methods/updateUserUtcOffset.coffee rename to server/methods/userSetUtcOffset.coffee index 9712ad9b5e7..fb8a7dd662f 100644 --- a/server/methods/updateUserUtcOffset.coffee +++ b/server/methods/userSetUtcOffset.coffee @@ -1,5 +1,5 @@ Meteor.methods - updateUserUtcOffset: (utcOffset) -> + userSetUtcOffset: (utcOffset) -> if not @userId? return @@ -9,6 +9,6 @@ Meteor.methods DDPRateLimiter.addRule type: 'method' - name: 'updateUserUtcOffset' + name: 'userSetUtcOffset' userId: -> return true , 1, 60000