From 4b02960fd10a58656cd035066d06177dc7978789 Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Wed, 26 Jan 2022 22:14:16 +0000
Subject: [PATCH] form: add captcha regen button

lots of false negatives so this is a solution for now.

Also the registering of each discord command is now logged for debugging
purposes.
---
 discord.go             | 24 +++++++++++++-----------
 html/form.html         |  2 +-
 lang/common/en-us.json |  3 ++-
 ts/form.ts             |  8 +++++++-
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/discord.go b/discord.go
index 150d4e2..d50ea21 100644
--- a/discord.go
+++ b/discord.go
@@ -310,19 +310,21 @@ func (d *DiscordDaemon) registerCommands() {
 		i++
 	}
 
-	d.deregisterCommands()
+	// d.deregisterCommands()
 
 	d.commandIDs = make([]string, len(commands))
-	cCommands, err := d.bot.ApplicationCommandBulkOverwrite(d.bot.State.User.ID, d.guildID, commands)
-	if err != nil {
-		d.app.err.Printf("Discord: Cannot create commands: %v", err)
-	}
-	for i, cmd := range cCommands {
-		// command, err := d.bot.ApplicationCommandCreate(d.bot.State.User.ID, d.guildID, cmd)
-		// if err != nil {
-		// 	d.app.err.Printf("Discord: Cannot create command \"%s\": %v", cmd.Name, err)
-		// }
-		d.commandIDs[i] = cmd.ID
+	// cCommands, err := d.bot.ApplicationCommandBulkOverwrite(d.bot.State.User.ID, d.guildID, commands)
+	// if err != nil {
+	// 	d.app.err.Printf("Discord: Cannot create commands: %v", err)
+	// }
+	for i, cmd := range commands {
+		command, err := d.bot.ApplicationCommandCreate(d.bot.State.User.ID, d.guildID, cmd)
+		if err != nil {
+			d.app.err.Printf("Discord: Cannot create command \"%s\": %v", cmd.Name, err)
+		} else {
+			d.app.debug.Printf("Discord: registered command \"%s\"", cmd.Name)
+			d.commandIDs[i] = command.ID
+		}
 	}
 }
 
diff --git a/html/form.html b/html/form.html
index 429e9ee..54c7b1f 100644
--- a/html/form.html
+++ b/html/form.html
@@ -177,7 +177,7 @@
                         </div>
                         {{ if .captcha }}
                         <div class="card ~neutral @low mb-4">
-                            <span class="label supra mb-2">CAPTCHA <span id="captcha-success" class="badge lg @low ~critical ml-2 float-right"><i class="ri-close-line"></i></span></span>
+                            <span class="label supra mb-2">CAPTCHA <span id="captcha-regen" title="{{ .strings.refresh }}" class="badge lg @low ~info ml-2 float-right"><i class="ri-refresh-line"></i></span><span id="captcha-success" class="badge lg @low ~critical ml-2 float-right"><i class="ri-close-line"></i></span></span>
                             <div id="captcha-img" class="mt-2 mb-2"></div>
                             <input class="field ~neutral @low" id="captcha-input" class="mt-2" placeholder="CAPTCHA">
                         </div>
diff --git a/lang/common/en-us.json b/lang/common/en-us.json
index db977e8..322febc 100644
--- a/lang/common/en-us.json
+++ b/lang/common/en-us.json
@@ -22,6 +22,7 @@
         "linkDiscord": "Link Discord",
         "linkMatrix": "Link Matrix",
         "contactDiscord": "Contact through Discord",
-        "theme": "Theme"
+        "theme": "Theme",
+        "refresh": "Refresh"
     }
 }
diff --git a/ts/form.ts b/ts/form.ts
index 7dc9580..c0984ae 100644
--- a/ts/form.ts
+++ b/ts/form.ts
@@ -271,7 +271,7 @@ let captchaVerified = false;
 let captchaID = "";
 let captchaInput = document.getElementById("captcha-input") as HTMLInputElement;
 
-if (window.captcha) {
+const genCaptcha = () => {
     _get("/captcha/gen/"+window.code, null, (req: XMLHttpRequest) => {
         if (req.readyState == 4) {
             if (req.status == 200) {
@@ -279,9 +279,15 @@ if (window.captcha) {
                 document.getElementById("captcha-img").innerHTML = `
                 <img class="w-100" src="${window.location.toString().substring(0, window.location.toString().lastIndexOf("/invite"))}/captcha/img/${window.code}/${captchaID}"></img>
                 `;
+                captchaInput.value = "";
             }
         }
     });
+};
+
+if (window.captcha) {
+    genCaptcha();
+    (document.getElementById("captcha-regen") as HTMLSpanElement).onclick = genCaptcha;
     const input = document.querySelector("input[type=submit]") as HTMLInputElement;
     const checkbox = document.getElementById("captcha-success") as HTMLSpanElement;
     captchaInput.onkeyup = () => _post("/captcha/verify/" + window.code + "/" + captchaID + "/" + captchaInput.value, null, (req: XMLHttpRequest) => {