Renaming files (#4118)

* moving from coffee to js

* renaming method
pull/4027/head^2
Gabriel Engel 10 years ago committed by GitHub
parent dbb700beca
commit 0928bbe8b2
  1. 3
      client/startup/emailVerification.js
  2. 12
      client/startup/userSetUtcOffset.js
  3. 6
      client/startup/userTimezone.coffee
  4. 2
      packages/rocketchat-importer-hipchat/server.coffee
  5. 2
      packages/rocketchat-importer-slack/server.coffee
  6. 2
      packages/rocketchat-slackbridge/slackbridge.js
  7. 4
      server/methods/userSetUtcOffset.coffee

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

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

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

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

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

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

@ -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
Loading…
Cancel
Save