diff --git a/website/client-old/js/controllers/notificationCtrl.js b/website/client-old/js/controllers/notificationCtrl.js index 7dc2e3a033..2aaeed4be6 100644 --- a/website/client-old/js/controllers/notificationCtrl.js +++ b/website/client-old/js/controllers/notificationCtrl.js @@ -3,6 +3,8 @@ habitrpg.controller('NotificationCtrl', ['$scope', '$rootScope', 'Shared', 'Content', 'User', 'Guide', 'Notification', 'Analytics', 'Achievement', 'Social', 'Tasks', function ($scope, $rootScope, Shared, Content, User, Guide, Notification, Analytics, Achievement, Social, Tasks) { + var isRunningYesterdailies = false; + $rootScope.$watch('user', function (after, before) { runYesterDailies(); }); @@ -12,6 +14,8 @@ habitrpg.controller('NotificationCtrl', }); function runYesterDailies() { + if (isRunningYesterdailies) return; + var userLastCron = moment(User.user.lastCron).local(); var userDayStart = moment().startOf('day').add({ hours: User.user.preferences.dayStart }); @@ -20,6 +24,8 @@ habitrpg.controller('NotificationCtrl', if (!Boolean(dailys) || dailys.length === 0) return; + isRunningYesterdailies = true; + var yesterDay = moment().subtract('1', 'day').startOf('day').add({ hours: User.user.preferences.dayStart }); var yesterDailies = []; dailys.forEach(function (task) { @@ -31,7 +37,9 @@ habitrpg.controller('NotificationCtrl', }); if (yesterDailies.length === 0) { - User.runCron(); + User.runCron().then(function () { + isRunningYesterdailies = false; + }); return; }; @@ -61,7 +69,10 @@ habitrpg.controller('NotificationCtrl', }); $scope.ageDailies = function () { - User.runCron(); + User.runCron() + .then(function () { + isRunningYesterdailies = false; + }); }; }], }); diff --git a/website/client-old/js/services/userServices.js b/website/client-old/js/services/userServices.js index 7d12ee0c3e..5ba7b008c4 100644 --- a/website/client-old/js/services/userServices.js +++ b/website/client-old/js/services/userServices.js @@ -418,7 +418,7 @@ angular.module('habitrpg') }, runCron: function () { - $http({ + return $http({ method: "POST", url: 'api/v3/cron', })