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

Revert "moving developer-only strings to api messages (#10188)"

Browse Source 
This reverts commit a42cb0e3ab. Testing hypothesis that this was causing Staging to break.
This commit is contained in:
SabreCat
2018-04-15 17:09:15 +00:00
parent ac98aa9271
commit 9f06d78db6
55 changed files with 136 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
website/server/controllers/api-v3/quests.js
View File

@@ -17,7 +17,6 @@ import {
} from '../../libs/email';
import common from '../../../common';
import { sendNotification as sendPushNotification } from '../../libs/pushNotifications';
import apiMessages from '../../libs/apiMessages';
const questScrolls = common.content.quests;
@@ -61,7 +60,7 @@ api.inviteToQuest = {
let questKey = req.params.questKey;
let quest = questScrolls[questKey];
req.checkParams('groupId', apiMessages('groupIdRequired')).notEmpty();
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
@@ -70,7 +69,7 @@ api.inviteToQuest = {
if (!group) throw new NotFound(res.t('groupNotFound'));
if (group.type !== 'party') throw new NotAuthorized(res.t('guildQuestsNotSupported'));
if (!quest) throw new NotFound(apiMessages('questNotFound', { key: questKey }));
if (!quest) throw new NotFound(res.t('questNotFound', { key: questKey }));
if (!user.items.quests[questKey]) throw new NotAuthorized(res.t('questNotOwned'));
if (user.stats.lvl < quest.lvl) throw new NotAuthorized(res.t('questLevelTooHigh', { level: quest.lvl }));
if (group.quest.key) throw new NotAuthorized(res.t('questAlreadyUnderway'));
@@ -173,7 +172,7 @@ api.acceptQuest = {
async handler (req, res) {
let user = res.locals.user;
req.checkParams('groupId', apiMessages('groupIdRequired')).notEmpty();
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
@@ -232,7 +231,7 @@ api.rejectQuest = {
async handler (req, res) {
let user = res.locals.user;
req.checkParams('groupId', apiMessages('groupIdRequired')).notEmpty();
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
@@ -295,7 +294,7 @@ api.forceStart = {
async handler (req, res) {
let user = res.locals.user;
req.checkParams('groupId', apiMessages('groupIdRequired')).notEmpty();
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
@@ -357,7 +356,7 @@ api.cancelQuest = {
let user = res.locals.user;
let groupId = req.params.groupId;
req.checkParams('groupId', apiMessages('groupIdRequired')).notEmpty();
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
@@ -409,7 +408,7 @@ api.abortQuest = {
let user = res.locals.user;
let groupId = req.params.groupId;
req.checkParams('groupId', apiMessages('groupIdRequired')).notEmpty();
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;
@@ -467,7 +466,7 @@ api.leaveQuest = {
let user = res.locals.user;
let groupId = req.params.groupId;
req.checkParams('groupId', apiMessages('groupIdRequired')).notEmpty();
req.checkParams('groupId', res.t('groupIdRequired')).notEmpty();
let validationErrors = req.validationErrors();
if (validationErrors) throw validationErrors;