From fa175d7b0136cd837942eb54db0c98c4314eaada Mon Sep 17 00:00:00 2001
From: stonedDiscord <Tukz@gmx.de>
Date: Mon, 28 Mar 2022 21:30:35 +0200
Subject: list http links even when coming from a https page

---
 webAO/master.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webAO/master.ts b/webAO/master.ts
index a48f4e9..ca129fd 100644
--- a/webAO/master.ts
+++ b/webAO/master.ts
@@ -132,6 +132,7 @@ function cachedServerlist(response: Response) {
 }
 
 function processServerlist(thelist: { name: string, description: string, ip: string, port: number, ws_port: number, assets: string, online: string }[]) {
+  const myURL: string = window.location.href.replace('https://','http://');
   for (let i = 0; i < thelist.length - 1; i++) {
     const serverEntry: { name: string, description: string, ip: string, port: number, ws_port: number, assets: string, online: string } = thelist[i];
 
@@ -142,8 +143,8 @@ function processServerlist(thelist: { name: string, description: string, ip: str
     if (serverEntry.ws_port) {
       document.getElementById('masterlist').innerHTML
 				+= `<li id="server${i}" onmouseover="setServ(${i})"><p>${safeTags(serverEntry.name)}</p>`
-				+ `<a class="button" href="client.html?mode=watch&ip=${ipport}">Watch</a>`
-				+ `<a class="button" href="client.html?mode=join&ip=${ipport}">Join</a></li>`;
+				+ `<a class="button" href="${myURL}/client.html?mode=watch&ip=${ipport}">Watch</a>`
+				+ `<a class="button" href="${myURL}/client.html?mode=join&ip=${ipport}">Join</a></li>`;
     }
   }
 }
-- 
cgit 


From 1d88577978b370ab3c96f007aa1cb646bdf6bf35 Mon Sep 17 00:00:00 2001
From: stonedDiscord <Tukz@gmx.de>
Date: Mon, 28 Mar 2022 21:50:09 +0200
Subject: don't need double slashes

---
 webAO/master.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webAO/master.ts b/webAO/master.ts
index ca129fd..5ac63b3 100644
--- a/webAO/master.ts
+++ b/webAO/master.ts
@@ -143,8 +143,8 @@ function processServerlist(thelist: { name: string, description: string, ip: str
     if (serverEntry.ws_port) {
       document.getElementById('masterlist').innerHTML
 				+= `<li id="server${i}" onmouseover="setServ(${i})"><p>${safeTags(serverEntry.name)}</p>`
-				+ `<a class="button" href="${myURL}/client.html?mode=watch&ip=${ipport}">Watch</a>`
-				+ `<a class="button" href="${myURL}/client.html?mode=join&ip=${ipport}">Join</a></li>`;
+				+ `<a class="button" href="${myURL}client.html?mode=watch&ip=${ipport}">Watch</a>`
+				+ `<a class="button" href="${myURL}client.html?mode=join&ip=${ipport}">Join</a></li>`;
     }
   }
 }
-- 
cgit 


From d3911aa9ad6bc16c70355fe11d1377d636b14565 Mon Sep 17 00:00:00 2001
From: stonedDiscord <Tukz@gmx.de>
Date: Mon, 28 Mar 2022 21:50:31 +0200
Subject: what was this still doing here

---
 webAO/master.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webAO/master.ts b/webAO/master.ts
index 5ac63b3..5c538d4 100644
--- a/webAO/master.ts
+++ b/webAO/master.ts
@@ -150,7 +150,6 @@ function processServerlist(thelist: { name: string, description: string, ip: str
 }
 
 function processVersion(data: string) {
-  console.debug(data);
   document.getElementById('clientinfo').innerHTML = `Client version: ${version}`;
   document.getElementById('serverinfo').innerHTML = `Master server version: ${data}`;
 }
-- 
cgit