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

Added nextDue field

Browse Source
This commit is contained in:
Keith Holliday
2017-05-11 13:11:16 -06:00
parent e7418472f6
commit 1292f9a3d5
9 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
website/server/libs/taskManager.js
View File

@@ -4,6 +4,7 @@ import {
} from './errors';
import Bluebird from 'bluebird';
import _ from 'lodash';
import cloneDeep from 'lodash/cloneDeep';
import shared from '../../common';
async function _validateTaskAlias (tasks, res) {
@@ -64,7 +65,15 @@ export async function createTasks (req, res, options = {}) {
newTask.userId = user._id;
}
if (newTask.type === 'daily') newTask.isDue = shared.shouldDo(Date.now(), newTask, user.preferences);
if (newTask.type === 'daily') {
let optionsForShouldDo = cloneDeep(user.preferences.toObject());
newTask.isDue = shared.shouldDo(Date.now(), newTask, optionsForShouldDo);
optionsForShouldDo.nextDue = true;
let nextDue = shared.shouldDo(Date.now(), newTask, optionsForShouldDo);
if (nextDue && nextDue.length > 0) {
newTask.nextDue = nextDue;
}
}
// Validate that the task is valid and throw if it isn't
// otherwise since we're saving user/challenge/group and task in parallel it could save the user/challenge/group with a tasksOrder that doens't match reality