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

Node 8 (WIP) (#9946)

Browse Source 
* start upgrade to node 8

* upgrade travis

* improve travis

* Remove bluebird, babel (except for modules) from server (WIP) (#9947)

* remove bluebird, babel from server (except for modules)

* fixes

* fix path

* fix path

* fix export

* fix export

* fix test

* fix tests

* remove plugin for transform-object-rest-spread since it is supported in node8

* babel: correct syntax rest spread

* remove bluebird

* update migrations archive readme

* fix package-lock.json

* fix typo

* add package-loc
This commit is contained in:
Matteo Pagliazzi
2018-03-15 19:59:36 +01:00
committed by GitHub
parent b1b1e512f5
commit cb42a31c43
68 changed files with 786 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,4 @@
import _ from 'lodash';
import Bluebird from 'bluebird';
import { authWithHeaders } from '../../middlewares/auth';
import analytics from '../../libs/analyticsService';
import {
@@ -109,7 +108,7 @@ api.inviteToQuest = {
await group.startQuest(user);
}
let [savedGroup] = await Bluebird.all([
let [savedGroup] = await Promise.all([
group.save(),
user.save(),
]);
@@ -312,7 +311,7 @@ api.forceStart = {
await group.startQuest(user);
let [savedGroup] = await Bluebird.all([
let [savedGroup] = await Promise.all([
group.save(),
user.save(),
]);
@@ -372,7 +371,7 @@ api.cancelQuest = {
group.quest = Group.cleanGroupQuest();
group.markModified('quest');
let [savedGroup] = await Bluebird.all([
let [savedGroup] = await Promise.all([
group.save(),
User.update(
{'party._id': groupId},
@@ -441,7 +440,7 @@ api.abortQuest = {
group.quest = Group.cleanGroupQuest();
group.markModified('quest');
let [groupSaved] = await Bluebird.all([group.save(), memberUpdates, questLeaderUpdate]);
let [groupSaved] = await Promise.all([group.save(), memberUpdates, questLeaderUpdate]);
res.respond(200, groupSaved.quest);
},
@@ -486,7 +485,7 @@ api.leaveQuest = {
user.party.quest = Group.cleanQuestProgress();
user.markModified('party.quest');
let [savedGroup] = await Bluebird.all([
let [savedGroup] = await Promise.all([
group.save(),
user.save(),
]);