Commit baa9348c authored by Joe's avatar Joe

Merge branch 'master' of github.com:moecube/ygopro-arena-api

parents 4a50172a 9e93645f
...@@ -11,6 +11,7 @@ var moment = require('moment') ...@@ -11,6 +11,7 @@ var moment = require('moment')
var _ = require('lodash') var _ = require('lodash')
var async = require('async') var async = require('async')
var fs = require('fs'); var fs = require('fs');
var request = require('superagent');
var config = require('../db.config') var config = require('../db.config')
var cardinfo = require('../cardinfo') var cardinfo = require('../cardinfo')
...@@ -191,7 +192,7 @@ router.post('/score', function (req, res) { ...@@ -191,7 +192,7 @@ router.post('/score', function (req, res) {
} }
var ep = new eventproxy(); var ep = new eventproxy();
ep.all('query_userA', 'query_userB', function (userA, userB) { ep.all(['query_userA', 'query_userB'], ['query_deckA', 'query_deckB'], function (userA, userB, deckA, deckB) {
var queries = [] var queries = []
let paramA = { let paramA = {
...@@ -357,7 +358,9 @@ router.post('/score', function (req, res) { ...@@ -357,7 +358,9 @@ router.post('/score', function (req, res) {
'${start}', '${start}',
'${end}', '${end}',
'${winner}', '${winner}',
'${firstWin}' '${firstWin}',
'${deckA}',
'${deckB}'
)`) )`)
queries.map(function (q) { queries.map(function (q) {
...@@ -457,6 +460,29 @@ router.post('/score', function (req, res) { ...@@ -457,6 +460,29 @@ router.post('/score', function (req, res) {
} }
}) })
if (req.body.userdeckA) {
request.post(process.env.DECK_IDENTIFIER_PATH).type('form').send({
deck: req.body.userdeckA
}).then(function (result) {
ep.emit('query_deckA', result.body.deck);
}).catch(function(err) {
console.log(err);
});
} else
ep.emit('query_deckA', "no deck")
if (req.body.userdeckB) {
request.post(process.env.DECK_IDENTIFIER_PATH).type('form').send({
deck: req.body.userdeckB
}).then(function (result) {
ep.emit('query_deckB', result.body.deck);
}).catch(function(err) {
console.log(err);
});
} else
ep.emit('query_deckB', "no deck")
res.json({ msg: 'success' }) res.json({ msg: 'success' })
}) })
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment