diff options
| -rw-r--r-- | public/client.html | 23 | ||||
| -rw-r--r-- | webAO/client.ts | 8 | ||||
| -rw-r--r-- | webAO/dom/twofactor.ts | 9 | ||||
| -rw-r--r-- | webAO/dom/window.ts | 1 |
4 files changed, 4 insertions, 37 deletions
diff --git a/public/client.html b/public/client.html index 5d862d8..a476915 100644 --- a/public/client.html +++ b/public/client.html @@ -36,13 +36,12 @@ <meta http-equiv="Content-Security-Policy" content=" - script-src-elem 'self' 'unsafe-inline' https://hcaptcha.com https://*.hcaptcha.com; + script-src-elem 'self' 'unsafe-inline'; style-src-elem 'self' 'unsafe-inline' https://golden-layout.com; - script-src 'self' 'unsafe-inline' 'unsafe-eval' https://hcaptcha.com https://*.hcaptcha.com; - style-src 'self' 'unsafe-inline' https://golden-layout.com https://hcaptcha.com https://*.hcaptcha.com; + script-src 'self' 'unsafe-inline' 'unsafe-eval'; + style-src 'self' 'unsafe-inline' https://golden-layout.com; img-src 'self' data: file: *; - frame-src https://hcaptcha.com https://*.hcaptcha.com; - connect-src 'self' ws: file: * https://hcaptcha.com https://*.hcaptcha.com; + connect-src 'self' ws: file: *; media-src 'self' file: *;" /> @@ -105,20 +104,6 @@ <div id="client_loading"> <h1 id="client_loadingtext">Loading</h1> </div> - <div id="client_secondfactor" style="display: none"> - <center> - <p>You seem to be new 👋</p> - <form method="POST"> - <div - class="h-captcha" - data-sitekey="6cbe7d73-706d-4e4b-9147-8b9aebb83b5d" - data-theme="dark" - data-callback="hcallback" - ></div> - <script src="https://js.hcaptcha.com/1/api.js" async defer></script> - </form> - </center> - </div> <div id="client_charselect"> <p>Choose your character</p> <button onclick="pickChar(-1)">Or spectate</button> diff --git a/webAO/client.ts b/webAO/client.ts index ab39ee9..50eb18b 100644 --- a/webAO/client.ts +++ b/webAO/client.ts @@ -136,7 +136,6 @@ class Client extends EventEmitter { musics: any; musics_time: boolean; callwords: string[]; - enableCaptcha: boolean; banned: boolean; hdid: string; resources: any; @@ -186,7 +185,6 @@ class Client extends EventEmitter { } }; - this.enableCaptcha = false; this.banned = false; this.hp = [0, 0]; this.playerID = 1; @@ -258,12 +256,6 @@ class Client extends EventEmitter { */ joinServer() { this.sender.sendServer(`HI#${hdid}#%`); - if (this.enableCaptcha && localStorage.getItem("hdid") !== hdid) { - this.sender.sendServer(localStorage.getItem("hdid")); - document.getElementById("client_secondfactor").style.display = "block"; - document.getElementById("client_charselect").remove(); - document.getElementById("client_ooc").remove(); - } } /** diff --git a/webAO/dom/twofactor.ts b/webAO/dom/twofactor.ts deleted file mode 100644 index 4f5fa81..0000000 --- a/webAO/dom/twofactor.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { client } from "../client"; - -export function hcallback(hcaptcharesponse: string) { - localStorage.setItem("hdid", client.hdid); - client.sender.sendServer(`2T#${hcaptcharesponse}#%`); - location.reload(); -} - -window.hcallback = hcallback; diff --git a/webAO/dom/window.ts b/webAO/dom/window.ts index ac43a0a..6fbbf14 100644 --- a/webAO/dom/window.ts +++ b/webAO/dom/window.ts @@ -55,7 +55,6 @@ declare global { onOOCEnter: (_event: any) => void; kickPlayer: (id: number) => void; banPlayer: (id: number) => void; - hcallback: (_event: any) => void; } } export {}; |