diff --git a/public/index.html b/public/index.html index 6dba50e47..2bc20ed81 100644 --- a/public/index.html +++ b/public/index.html @@ -339,7 +339,7 @@ if (response.ok === true) { const getData = await response.json(); is_colab = getData.is_colab; - if(is_colab){ + if(is_colab != false){ var currentUrl = window.location.href; if (currentUrl.charAt(currentUrl.length - 1) === '/') { currentUrl = currentUrl.substring(0, currentUrl.length - 1); diff --git a/server.js b/server.js index f35e034ae..bf9baf6dc 100644 --- a/server.js +++ b/server.js @@ -249,11 +249,7 @@ app.post("/getchat", jsonParser, function(request, response){ }); app.post("/getstatus", jsonParser, function(request, response_getstatus = response){ if(!request.body) return response_getstatus.sendStatus(400); - if(is_colab == true){ - api_server = String(process.env.colaburl).trim(); - }else{ - api_server = request.body.api_server; - } + api_server = request.body.api_server; if(api_server.indexOf('localhost') != -1){ api_server = api_server.replace('localhost','127.0.0.1'); } @@ -506,8 +502,11 @@ app.post("/getbackgrounds", jsonParser, function(request, response){ }); app.post("/iscolab", jsonParser, function(request, response){ - - response.send({is_colab:is_colab}); + let send_data = false; + if(String(process.env.colaburl).trim() !== undefined){ + send_data = String(process.env.colaburl).trim(); + } + response.send({is_colab:send_data}); }); app.post("/getuseravatars", jsonParser, function(request, response){