diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index 5c5c233b..c956cdf8 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -816,26 +816,17 @@ function TICK_httpREQ_getAccessToken(task) coroutine.yield() local response,request_error=client.poll(task) if response then - if response.code==200 then - local res=json.decode(response.body) - if res.message=="OK"then - LOG.print(text.accessSuccessed) - USER.access_token=res.access_token - FILE.save(USER,"conf/user") - SCN.swapTo("net_menu") - else - LOG.print(text.netErrorCode..response.code..": "..res.message,"warn") - end + local res=json.decode(response.body) + if response.code==200 and res.message=="OK"then + LOG.print(text.accessSuccessed) + USER.access_token=res.access_token + FILE.save(USER,"conf/user") + SCN.swapTo("net_menu") else LOGIN=false USER.access_token=false USER.auth_token=false - local err=json.decode(response.body) - if err then - LOG.print(text.loginFailed..": "..text.netErrorCode..response.code.."-"..err.message,"warn") - else - LOG.print(text.loginFailed..": "..text.netErrorCode,"warn") - end + LOG.print(text.loginFailed..": "..text.httpCode..response.code.."-"..res.message,"warn") end return elseif request_error then diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 21322aea..8159f7b8 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -74,7 +74,7 @@ return{ versionIsNew="You are now on the latest version.", versionIsOld="Version $1 is available now!", - netErrorCode="Network error code", + httpCode="Http status code", jsonError="Json error", noUsername="Please enter your username", @@ -101,6 +101,7 @@ return{ chatHistory="------New messages below------", noRooms="No Rooms Now", + roomsCreateFailed="Failed to create room", roomsFetchFailed="Failed to fetch rooms", errorMsg="An error has occurred and Techmino needs to restart.\nError info has been created, and you can send it to the author.", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index ca583733..6ce6d71a 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -76,7 +76,7 @@ return{ versionIsNew="Vous êtes sur la dernière version", versionIsOld="La version $1 est disponible !", - netErrorCode="Code d'erreur réseau", + -- httpCode="Http status code", jsonError="Erreur json", noUsername="Entrez votre nom d'utilisateur", @@ -103,6 +103,7 @@ return{ -- chatHistory="------New messages below------", -- noRooms="No Rooms Now", + -- roomsCreateFailed="Failed to create room", -- roomsFetchFailed="Failed to fetch rooms", errorMsg="Une erreur est survenue et Techmino doit redémarrer.\nDes informations concernant l'erreur ont été créées, et vous pouvez les envoyer au créateur.", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index a0f5ac33..98b32876 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -74,7 +74,7 @@ return{ versionIsNew="Você esta na versão mais nova.", versionIsOld="Versão $1 esta disponível agora!", - netErrorCode="Network error code", + -- httpCode="Http status code", jsonError="Json error", noUsername="Insira seu nome de usuário", @@ -101,6 +101,7 @@ return{ chatHistory="------Novas mensagens abaixo------", noRooms="Nenhuma sala agora", + -- roomsCreateFailed="Failed to create room", roomsFetchFailed="Falha ao buscar salas", errorMsg="Um erro ocorreu e Techmino precisa reiniciar.\nInformação do erro foi criada, e você pode mandar ao autor.", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 97b914b8..e439af55 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -76,7 +76,7 @@ return{ versionIsNew="Esta es la versión más reciente disponible.", versionIsOld="¡Está disponible la nueva versión $1!", - netErrorCode="Código de error de conexión", + -- httpCode="Http status code", -- jsonError="Json error", noUsername="Por favor ingresa un nombre de usuario", @@ -104,6 +104,7 @@ return{ -- chatHistory="------New messages below------", -- noRooms="No Rooms Now", + -- roomsCreateFailed="Failed to create room", -- roomsFetchFailed="Failed to fetch rooms", errorMsg="Ha ocurrido un error y Techmino necesita reiniciarse.\nSe creó un registro de error, puedes enviarlo al autor.", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 9cb20f34..7a711c77 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -75,7 +75,7 @@ return{ versionIsNew="游戏已是最新版本", versionIsOld="最新版本$1可以下载了!", - netErrorCode="网络错误码", + httpCode="Http码", jsonError="json错误", noUsername="请填写用户名", @@ -102,6 +102,7 @@ return{ chatHistory="------以上是历史消息------", noRooms="一个房间都没有哎...", + roomsCreateFailed="创建房间失败", roomsFetchFailed="拉取房间列表失败", errorMsg="Techmino遭受了雷击,需要重新启动.\n我们已收集了一些错误信息,你可以向作者进行反馈.", diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index 322c42ac..7269073a 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -10,17 +10,15 @@ local function tick_httpREQ_launch(task) local response,request_error=client.poll(task) if response then local res=json.decode(response.body) - if res.message=="OK"then - if response.code==200 then - LOG.print(res.notice,360,COLOR.sky) - if VERSION_CODE>=res.version_code then - LOG.print(text.versionIsNew,360,COLOR.sky) - else - LOG.print(string.gsub(text.versionIsOld,"$1",res.version_name),"warn") - end + if res.message=="OK"and response.code==200 then + LOG.print(res.notice,360,COLOR.sky) + if VERSION_CODE>=res.version_code then + LOG.print(text.versionIsNew,360,COLOR.sky) else - LOG.print(text.netErrorCode..response.code..": "..res.message,"warn") + LOG.print(string.gsub(text.versionIsOld,"$1",res.version_name),"warn") end + else + LOG.print(text.httpCode..response.code..": "..res.message,"warn") end return elseif request_error then @@ -40,20 +38,13 @@ local function tick_httpREQ_autoLogin(task) coroutine.yield() local response,request_error=client.poll(task) if response then - if response.code==200 then - local res=json.decode(response.body) - if res.message=="OK"then - LOGIN=true - LOG.print(text.loginSuccessed) - else - LOG.print(text.netErrorCode..response.code..": "..res.message,"warn") - end + local res=json.decode(response.body) + if response.code==200 and res.message=="OK"then + LOGIN=true + LOG.print(text.loginSuccessed) else LOGIN=false - local err=json.decode(response.body) - if err then - LOG.print(text.loginFailed..": "..text.netErrorCode..response.code.."-"..err.message,"warn") - end + LOG.print(text.loginFailed..": "..text.httpCode..response.code.."-"..res.message,"warn") end return elseif request_error then diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua index d0a2bad8..b68beea1 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -4,32 +4,30 @@ local function tick_httpREQ_newLogin(task) coroutine.yield() local response,request_error=client.poll(task) if response then - if response.code==200 then - local res=json.decode(response.body) - if res.message=="OK"then - LOGIN=true - USER.email=res.email - USER.auth_token=res.auth_token - USER.name=res.name - USER.id=res.id - USER.motto=res.motto - USER.avatar=res.avatar - FILE.save(USER,"conf/user","q") - LOG.print(text.loginSuccessed) + local res=json.decode(response.body) + if response.code==200 and res.message=="OK"then + LOGIN=true + USER.email=res.email + USER.auth_token=res.auth_token + USER.name=res.name + USER.id=res.id + USER.motto=res.motto + USER.avatar=res.avatar + FILE.save(USER,"conf/user","q") + LOG.print(text.loginSuccessed) - httpRequest( - TICK_httpREQ_getAccessToken, - PATH.api..PATH.access, - "POST", - {["Content-Type"]="application/json"}, - json.encode{ - email=USER.email, - auth_token=USER.auth_token, - } - ) - else - LOG.print(text.netErrorCode..response.code..": "..res.message,"warn") - end + httpRequest( + TICK_httpREQ_getAccessToken, + PATH.api..PATH.access, + "POST", + {["Content-Type"]="application/json"}, + json.encode{ + email=USER.email, + auth_token=USER.auth_token, + } + ) + else + LOG.print(text.httpCode..response.code..": "..res.message,"warn") end return elseif request_error then diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index 45ba169b..3ce67201 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -1,6 +1,6 @@ local gc=love.graphics -local function tick_httpREQ_checkAccessToken(task) +local function tick_httpREQ_manualAutoLogin(task) local time=0 while true do coroutine.yield() @@ -23,7 +23,7 @@ local function tick_httpREQ_checkAccessToken(task) else local err=json.decode(response.body) if err then - LOG.print(text.netErrorCode..response.code..": "..err.message,"warn") + LOG.print(text.httpCode..response.code..": "..err.message,"warn") end end return @@ -111,7 +111,7 @@ scene.widgetList={ if LOGIN then if USER.access_token then httpRequest( - tick_httpREQ_checkAccessToken, + tick_httpREQ_manualAutoLogin, PATH.api..PATH.access, "GET", {["Content-Type"]="application/json"}, diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index a46ade61..d77f8079 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -11,13 +11,11 @@ local function task_fetchRooms(task) coroutine.yield() local response,request_error=client.poll(task) if response then - if response.code==200 then - local res=json.decode(response.body) - if res.message=="OK"then - rooms=res.room_list - else - LOG.print(text.netErrorCode..response.code..": "..res.message,"warn") - end + local res=json.decode(response.body) + if response.code==200 and res.message=="OK"then + rooms=res.room_list + else + LOG.print(text.httpCode..response.code..": "..res.message,"warn") end return elseif request_error then diff --git a/parts/scenes/register.lua b/parts/scenes/register.lua index 155de174..42da0920 100644 --- a/parts/scenes/register.lua +++ b/parts/scenes/register.lua @@ -4,19 +4,17 @@ local function tick_httpREQ_register(task) coroutine.yield() local response,request_error=client.poll(task) if response then - if response.code==200 then - local res=json.decode(response.body) - if res.message=="OK"then - LOGIN=true - USER.name=res.name - USER.id=res.id - USER.motto=res.motto - USER.avatar=res.avatar - FILE.save(USER,"conf/user","q") - LOG.print(text.registerSuccessed..": "..res.message) - else - LOG.print(text.netErrorCode..response.code..": "..res.message,"warn") - end + local res=json.decode(response.body) + if response.code==200 and res.message=="OK"then + LOGIN=true + USER.name=res.name + USER.id=res.id + USER.motto=res.motto + USER.avatar=res.avatar + FILE.save(USER,"conf/user","q") + LOG.print(text.registerSuccessed..": "..res.message) + else + LOG.print(text.httpCode..response.code..": "..res.message,"warn") end return elseif request_error then