css/base.css

@@ -31,10 +31,6 @@
     background: #202020;
 }
 
-.dark .code {
-    color: var(--color-content-high);
-}
-
 html:not(.dark) .card.\@low:not(.\~neutral):not(.\~positive):not(.\~urge):not(.\~warning):not(.\~info):not(.\~critical) {
     --color-fill: va(--color-fill);
     --color-content: var(--color-content);

discord.go

@@ -310,21 +310,19 @@ 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)
+	cCommands, err := d.bot.ApplicationCommandBulkOverwrite(d.bot.State.User.ID, d.guildID, commands)
-	// if err != nil {
+	if err != nil {
-	// 	d.app.err.Printf("Discord: Cannot create commands: %v", err)
+		d.app.err.Printf("Discord: Cannot create commands: %v", err)
-	// }
+	}
-	for i, cmd := range commands {
+	for i, cmd := range cCommands {
-		command, err := d.bot.ApplicationCommandCreate(d.bot.State.User.ID, d.guildID, cmd)
+		// command, err := d.bot.ApplicationCommandCreate(d.bot.State.User.ID, d.guildID, cmd)
-		if err != nil {
+		// if err != nil {
-			d.app.err.Printf("Discord: Cannot create command \"%s\": %v", cmd.Name, err)
+		// 	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] = cmd.ID
-			d.commandIDs[i] = command.ID
-		}
 	}
 }
 

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-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>
+                            <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>
                             <div id="captcha-img" class="mt-2 mb-2"></div>
                             <input class="field ~neutral @low" id="captcha-input" class="mt-2" placeholder="CAPTCHA">
                         </div>

lang/common/en-us.json

@@ -22,7 +22,6 @@
         "linkDiscord": "Link Discord",
         "linkMatrix": "Link Matrix",
         "contactDiscord": "Contact through Discord",
-        "theme": "Theme",
+        "theme": "Theme"
-        "refresh": "Refresh"
     }
 }

ts/form.ts

@@ -271,7 +271,7 @@ let captchaVerified = false;
 let captchaID = "";
 let captchaInput = document.getElementById("captcha-input") as HTMLInputElement;
 
-const genCaptcha = () => {
+if (window.captcha) {
     _get("/captcha/gen/"+window.code, null, (req: XMLHttpRequest) => {
         if (req.readyState == 4) {
             if (req.status == 200) {
@@ -279,15 +279,9 @@ const genCaptcha = () => {
                 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) => {

views.go

@@ -504,7 +504,7 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
 		data["discordUsername"] = app.discord.username
 		data["discordRequired"] = app.config.Section("discord").Key("required").MustBool(false)
 		data["discordSendPINMessage"] = template.HTML(app.storage.lang.Form[lang].Strings.template("sendPINDiscord", tmpl{
-			"command":        `<span class="code font-mono">/` + app.config.Section("discord").Key("start_command").MustString("start") + `</span>`,
+			"command":        `<code class="code">/` + app.config.Section("discord").Key("start_command").MustString("start") + `</code>`,
 			"server_channel": app.discord.serverChannelName,
 		}))
 		data["discordServerName"] = app.discord.serverName