Skip to content

S
srvpro
Commit 69e855a8 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'mc'

parents 25ce8b6e 5b86e25b
Pipeline #6508 failed with stages
          in 10 minutes and 42 seconds
          Hide whitespace changes
          Inline Side-by-side
          Showing with 2 additions and 2 deletions
          ygopro-server.coffee
          View file @ 69e855a8
          ...@@ -2449,7 +2449,7 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)-> ...@@ -2449,7 +2449,7 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
          #console.log(userUrl) #console.log(userUrl)
          userDataRes = await axios.get userUrl, userDataRes = await axios.get userUrl,
          responseType: 'json' responseType: 'json'
          timeout: 10000 timeout: 4000
          params: params:
          api_key: settings.modules.mycard.auth_key, api_key: settings.modules.mycard.auth_key,
          api_username: client.name, api_username: client.name,
          ......
          ygopro-server.js
          View file @ 69e855a8
          ...@@ -3229,7 +3229,7 @@ ...@@ -3229,7 +3229,7 @@
          //console.log(userUrl) //console.log(userUrl)
          userDataRes = (await axios.get(userUrl, { userDataRes = (await axios.get(userUrl, {
          responseType: 'json', responseType: 'json',
          timeout: 10000, timeout: 4000,
          params: { params: {
          api_key: settings.modules.mycard.auth_key, api_key: settings.modules.mycard.auth_key,
          api_username: client.name, api_username: client.name,
          ......
          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