Commit fb77d7de authored by nanahira's avatar nanahira

fix ban get

parent fdec62ea
Pipeline #6348 failed with stages
in 29 minutes and 43 seconds
...@@ -2121,16 +2121,16 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)-> ...@@ -2121,16 +2121,16 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
return return
if settings.modules.mycard.enabled and settings.modules.mycard.ban_get and !client.is_local if settings.modules.mycard.enabled and settings.modules.mycard.ban_get and !client.is_local
try axios.get settings.modules.mycard.ban_get,
banMCRequest = await axios.get settings.modules.mycard.ban_get,
paramsSerializer: qs.stringify paramsSerializer: qs.stringify
params: params:
user: client.name user: client.name
.then (banMCRequest) ->
if typeof(banMCRequest.data) == "object" if typeof(banMCRequest.data) == "object"
client.ban_mc = banMCRequest.data client.ban_mc = banMCRequest.data
else else
log.warn "ban get bad json", banMCRequest.data log.warn "ban get bad json", banMCRequest.data
catch e .catch (e) ->
log.warn 'ban get error', e.toString() log.warn 'ban get error', e.toString()
check_buffer_indentity = (buf)-> check_buffer_indentity = (buf)->
......
...@@ -2728,7 +2728,7 @@ ...@@ -2728,7 +2728,7 @@
}); });
ygopro.ctos_follow('JOIN_GAME', true, async function(buffer, info, client, server, datas) { ygopro.ctos_follow('JOIN_GAME', true, async function(buffer, info, client, server, datas) {
var available_logs, banMCRequest, check_buffer_indentity, create_room_with_action, duelLog, e, exactBan, index, j, l, len, len1, pre_room, recover_match, replay, replay_id, replays, room, struct; var available_logs, check_buffer_indentity, create_room_with_action, duelLog, exactBan, index, j, l, len, len1, pre_room, recover_match, replay, replay_id, replays, room, struct;
//log.info info //log.info info
info.pass = info.pass.trim(); info.pass = info.pass.trim();
client.pass = info.pass; client.pass = info.pass;
...@@ -2809,22 +2809,20 @@ ...@@ -2809,22 +2809,20 @@
return; return;
} }
if (settings.modules.mycard.enabled && settings.modules.mycard.ban_get && !client.is_local) { if (settings.modules.mycard.enabled && settings.modules.mycard.ban_get && !client.is_local) {
try { axios.get(settings.modules.mycard.ban_get, {
banMCRequest = (await axios.get(settings.modules.mycard.ban_get, {
paramsSerializer: qs.stringify, paramsSerializer: qs.stringify,
params: { params: {
user: client.name user: client.name
} }
})); }).then(function(banMCRequest) {
if (typeof banMCRequest.data === "object") { if (typeof banMCRequest.data === "object") {
client.ban_mc = banMCRequest.data; return client.ban_mc = banMCRequest.data;
} else { } else {
log.warn("ban get bad json", banMCRequest.data); return log.warn("ban get bad json", banMCRequest.data);
}
} catch (error1) {
e = error1;
log.warn('ban get error', e.toString());
} }
}).catch(function(e) {
return log.warn('ban get error', e.toString());
});
} }
check_buffer_indentity = function(buf) { check_buffer_indentity = function(buf) {
var checksum, i, m, ref; var checksum, i, m, ref;
......
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