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

fix(valentines): adjust empty event daterange

Browse Source
This commit is contained in:
SabreCat
2022-02-14 15:20:37 -06:00
parent d1ef90db29
commit 77751223d3
3 changed files with 58 additions and 20082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20122
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
website/common/script/content/constants/events.js
View File

@@ -10,11 +10,17 @@ const gemsPromo = {
export const EVENTS = { export const EVENTS = {
noCurrentEvent: { noCurrentEvent: {
start: '2022-01-31T20:00-05:00', start: '2022-02-18T20:00-05:00',
end: '2022-02-28T20:00-05:00', end: '2022-03-31T20:00-05:00',
season: 'normal', season: 'normal',
npcImageSuffix: '', npcImageSuffix: '',
}, },
valentines2022: {
start: '2022-02-14T08:00-05:00',
end: '2022-02-18T20:00-05:00',
season: 'valentines',
npcImageSuffix: 'valentines',
},
winter2022: { winter2022: {
start: '2021-12-21T08:00-05:00', start: '2021-12-21T08:00-05:00',
end: '2022-01-31T20:00-05:00', end: '2022-01-31T20:00-05:00',
@@ -93,12 +99,6 @@ export const EVENTS = {
end: '2021-04-02T08:00-05:00', end: '2021-04-02T08:00-05:00',
aprilFools: 'invert', aprilFools: 'invert',
}, },
valentines2022: {
start: '2022-02-14T08:00-05:00',
end: '2022-02-18T08:00-05:00',
season: 'valentines',
npcImageSuffix: 'valentines',
},
winter2021: { winter2021: {
start: '2020-12-17T08:00-05:00', start: '2020-12-17T08:00-05:00',
end: '2021-01-31T20:00-05:00', end: '2021-01-31T20:00-05:00',

2
website/server/controllers/api-v3/user.js
View File

@@ -22,7 +22,6 @@ import {
} from '../../libs/email'; } from '../../libs/email';
import * as inboxLib from '../../libs/inbox'; import * as inboxLib from '../../libs/inbox';
import * as userLib from '../../libs/user'; import * as userLib from '../../libs/user';
import logger from '../../libs/logger';
const TECH_ASSISTANCE_EMAIL = nconf.get('EMAILS_TECH_ASSISTANCE_EMAIL'); const TECH_ASSISTANCE_EMAIL = nconf.get('EMAILS_TECH_ASSISTANCE_EMAIL');
const DELETE_CONFIRMATION = 'DELETE'; const DELETE_CONFIRMATION = 'DELETE';
@@ -1014,7 +1013,6 @@ api.purchase = {
if (req.body.quantity) quantity = req.body.quantity; if (req.body.quantity) quantity = req.body.quantity;
req.quantity = quantity; req.quantity = quantity;
logger.info('AAAAHHHHHH');
const purchaseRes = await common.ops.buy(user, req, res.analytics); const purchaseRes = await common.ops.buy(user, req, res.analytics);
await user.save(); await user.save();
res.respond(200, ...purchaseRes); res.respond(200, ...purchaseRes);