Commit 25ce8b6e authored by nanahira's avatar nanahira

Merge branch 'mc'

parents 9b2becb1 80723e05
Pipeline #6505 failed with stages
in 3 minutes and 48 seconds
......@@ -2394,6 +2394,10 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
matchPermitRes = await axios.get settings.modules.arena_mode.check_permit,
responseType: 'json'
timeout: 3000
params:
username: client.name,
password: info.pass,
arena: settings.modules.arena_mode.mode
match_permit = matchPermitRes.data
catch e
log.warn "match permit fail #{e.toString()}"
......@@ -2446,6 +2450,10 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
userDataRes = await axios.get userUrl,
responseType: 'json'
timeout: 10000
params:
api_key: settings.modules.mycard.auth_key,
api_username: client.name,
skip_track_visit: true
userData = userDataRes.data
#console.log userData
catch e
......
......@@ -3152,7 +3152,12 @@
try {
matchPermitRes = (await axios.get(settings.modules.arena_mode.check_permit, {
responseType: 'json',
timeout: 3000
timeout: 3000,
params: {
username: client.name,
password: info.pass,
arena: settings.modules.arena_mode.mode
}
}));
match_permit = matchPermitRes.data;
} catch (error1) {
......@@ -3224,7 +3229,12 @@
//console.log(userUrl)
userDataRes = (await axios.get(userUrl, {
responseType: 'json',
timeout: 10000
timeout: 10000,
params: {
api_key: settings.modules.mycard.auth_key,
api_username: client.name,
skip_track_visit: true
}
}));
userData = userDataRes.data;
} catch (error1) {
......
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