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

Merge remote-tracking branch 'upstream/develop' into fix-antidotes-from-revert

Browse Source
This commit is contained in:
Xaz16
2019-12-07 22:32:25 +03:00
parent da8346ea50 97a1d0f474
commit aa1fcb4956
340 changed files with 33840 additions and 28916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/server/libs/cron.js
View File

@@ -6,6 +6,7 @@ import { model as User } from '../models/user';
import common from '../../common';
import { preenUserHistory } from './preening';
import sleep from './sleep';
import { revealMysteryItems } from './payments/subscriptions';
const CRON_SAFE_MODE = nconf.get('CRON_SAFE_MODE') === 'true';
const CRON_SEMI_SAFE_MODE = nconf.get('CRON_SEMI_SAFE_MODE') === 'true';
@@ -75,6 +76,9 @@ function grantEndOfTheMonthPerks (user, now) {
count: 0, offset: 0, trinkets: 0, gemCapExtra: 0,
});
// Award mystery items
revealMysteryItems(user, elapsedMonths);
// 1 for one-month recurring or gift subscriptions; later set to 3 for 3-month recurring, etc.
let planMonthsLength = 1;