diff --git a/common/script/public/config.js b/common/script/public/config.js index 4456909ef4..49fd576ac3 100644 --- a/common/script/public/config.js +++ b/common/script/public/config.js @@ -20,7 +20,9 @@ angular.module('habitrpg') // Something has changed on the user object that was not tracked here, sync the user if (isNotSync && ($rootScope.User.user._v - oldUserV) > 1) { + console.log('before sync', Date.now()) $rootScope.User.sync(); + console.log('after sync', Date.now()) } } } diff --git a/test/api/v3/unit/middlewares/cronMiddleware.js b/test/api/v3/unit/middlewares/cronMiddleware.js index cba4cf83c1..37accd9ee6 100644 --- a/test/api/v3/unit/middlewares/cronMiddleware.js +++ b/test/api/v3/unit/middlewares/cronMiddleware.js @@ -47,11 +47,11 @@ describe('cron middleware', () => { it('calls next when user is not attached', (done) => { res.locals.user = null; - cronMiddleware(req, res, (err) => done(err)); + cronMiddleware(req, res, done); }); it('calls next when days have not been missed', (done) => { - cronMiddleware(req, res, (err) => done(err)); + cronMiddleware(req, res, done); }); it('should clear todos older than 30 days for free users', async (done) => { diff --git a/website/client/js/services/userServices.js b/website/client/js/services/userServices.js index 255ac85d14..811b8d81b2 100644 --- a/website/client/js/services/userServices.js +++ b/website/client/js/services/userServices.js @@ -82,7 +82,9 @@ angular.module('habitrpg') .then(function (response) { if (response.data.message) Notification.text(response.data.message); + console.log('before extend', Date.now()) _.extend(user, response.data.data); + console.log('after extend', Date.now()) $rootScope.$emit('userUpdated', user); diff --git a/website/server/controllers/api-v3/members.js b/website/server/controllers/api-v3/members.js index 22a40afed2..7eca05160b 100644 --- a/website/server/controllers/api-v3/members.js +++ b/website/server/controllers/api-v3/members.js @@ -355,7 +355,7 @@ api.transferGems = { receiverName: receiver.profile.name, senderName: sender.profile.name, }); - message += res.t('privateMessageGiftGemsMessage', {gemAmount}); + message += ` ${res.t('privateMessageGiftGemsMessage', {gemAmount})}`; if (req.body.message) { message += req.body.message;