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

v3 adapt v2: misc fixes

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-04-12 12:59:30 +02:00
parent fa32dabc92
commit 40c9366a47
6 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
website/src/controllers/api-v2/user.js
View File

@@ -7,6 +7,9 @@ var shared = require('../../../../common');
import {
model as User,
} from '../../models/user';
import {
NotFound,
} from '../../libs/api-v3/errors';
import { model as Tag } from '../../models/tag';
import * as Tasks from '../../models/task';
import Q from 'q';
@@ -32,6 +35,8 @@ var api = module.exports;
var firebase = require('../../libs/api-v2/firebase');
var webhook = require('../../libs/api-v2/webhook');
const partyMembersFields = 'profile.name stats achievements items.special';
// api.purchase // Shared.ops
api.getContent = function(req, res, next) {
@@ -610,8 +615,8 @@ api.cast = async function(req, res, next) {
let spellId = req.params.spellId;
let targetId = req.query.targetId;
let klass = common.content.spells.special[spellId] ? 'special' : user.stats.class;
let spell = common.content.spells[klass][spellId];
let klass = shared.content.spells.special[spellId] ? 'special' : user.stats.class;
let spell = shared.content.spells[klass][spellId];
if (!spell) return res.status(404).json({err: 'Spell "' + req.params.spell + '" not found.'});
if (spell.mana > user.stats.mp) return res.status(400).json({err: 'Not enough mana to cast spell'});
@@ -893,13 +898,13 @@ _.each(shared.ops, function(op,k){
// If we want to send something other than 500, pass err as {code: 200, message: "Not enough GP"}
res.locals.user.save(function(err){
if (err) return next(err);
if (response === user) { // add tasks
user.getTransformedData(function (err, transformedUser) {
if (opResponse === res.locals.user) { // add tasks
res.locals.user.getTransformedData(function (err, transformedUser) {
if (err) return next(err);
res.status(200).json(transformedUser);
});
} else {
res.status(200).json(response);
res.status(200).json(opResponse);
}
});
}