krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added check to prevent double cron (#8854)

Browse Source 
* Added check to prevent double cron

* Added then and fix style issues
This commit is contained in:
Keith Holliday
2017-07-07 12:14:36 -06:00
committed by Sabe Jones
parent ac3ac73737
commit 30437e158e
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
website/client-old/js/controllers/notificationCtrl.js
View File

@@ -3,6 +3,8 @@
habitrpg.controller('NotificationCtrl', habitrpg.controller('NotificationCtrl',
['$scope', '$rootScope', 'Shared', 'Content', 'User', 'Guide', 'Notification', 'Analytics', 'Achievement', 'Social', 'Tasks', ['$scope', '$rootScope', 'Shared', 'Content', 'User', 'Guide', 'Notification', 'Analytics', 'Achievement', 'Social', 'Tasks',
function ($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) { $rootScope.$watch('user', function (after, before) {
runYesterDailies(); runYesterDailies();
}); });
@@ -12,6 +14,8 @@ habitrpg.controller('NotificationCtrl',
}); });
function runYesterDailies() { function runYesterDailies() {
if (isRunningYesterdailies) return;
var userLastCron = moment(User.user.lastCron).local(); var userLastCron = moment(User.user.lastCron).local();
var userDayStart = moment().startOf('day').add({ hours: User.user.preferences.dayStart }); 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; if (!Boolean(dailys) || dailys.length === 0) return;
isRunningYesterdailies = true;
var yesterDay = moment().subtract('1', 'day').startOf('day').add({ hours: User.user.preferences.dayStart }); var yesterDay = moment().subtract('1', 'day').startOf('day').add({ hours: User.user.preferences.dayStart });
var yesterDailies = []; var yesterDailies = [];
dailys.forEach(function (task) { dailys.forEach(function (task) {
@@ -31,7 +37,9 @@ habitrpg.controller('NotificationCtrl',
}); });
if (yesterDailies.length === 0) { if (yesterDailies.length === 0) {
User.runCron(); User.runCron().then(function () {
isRunningYesterdailies = false;
});
return; return;
}; };
@@ -61,7 +69,10 @@ habitrpg.controller('NotificationCtrl',
}); });
$scope.ageDailies = function () { $scope.ageDailies = function () {
User.runCron(); User.runCron()
.then(function () {
isRunningYesterdailies = false;
});
}; };
}], }],
}); });

2
website/client-old/js/services/userServices.js
View File

@@ -418,7 +418,7 @@ angular.module('habitrpg')
}, },
runCron: function () { runCron: function () {
$http({ return $http({
method: "POST", method: "POST",
url: 'api/v3/cron', url: 'api/v3/cron',
}) })