Merge branch 'master' into swaps

open-chat-labs · Dec 13, 2024 · 4443882 · 4443882
2 parents 6007ba4 + 6158e2e
commit 4443882
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/frontend/app/src/components/home/PrizeContent.svelte b/frontend/app/src/components/home/PrizeContent.svelte
@@ -74,7 +74,7 @@
         if (e.isTrusted && chatId.kind !== "direct_chat" && !me && userEligible) {
             claimsStore.add(messageId);
             client
-                .claimPrize(chatId, messageId)
+                .claimPrize(chatId, messageId, e)
                 .then((success) => {
                     if (!success) {
                         toastStore.showFailureToast(i18nKey("prizes.claimFailed"));

diff --git a/frontend/app/src/utils/bots.ts b/frontend/app/src/utils/bots.ts
@@ -1,6 +1,6 @@
 import type { SlashCommandPermissions } from "openchat-client";
 
-export let botsEnabled = localStorage.getItem("openchat_bots_enabled") === "true";
+export const botsEnabled = localStorage.getItem("openchat_bots_enabled") === "true";
 
 export function togglePermission<P extends keyof SlashCommandPermissions>(
     permissions: SlashCommandPermissions,

diff --git a/frontend/openchat-client/src/openchat.ts b/frontend/openchat-client/src/openchat.ts
@@ -5988,13 +5988,16 @@ export class OpenChat extends OpenChatAgentWorker {
         });
     }
 
-    private stackTrace() {
-        return new Error().stack ?? "";
+    private validMouseEvent(e: MouseEvent) {
+        return e instanceof MouseEvent && e.isTrusted && e.type === "click";
     }
 
-    claimPrize(chatId: MultiUserChatIdentifier, messageId: bigint): Promise<boolean> {
-        const stack = this.stackTrace();
-        if (!stack.includes("HTMLButtonElement.click")) {
+    claimPrize(
+        chatId: MultiUserChatIdentifier,
+        messageId: bigint,
+        e: MouseEvent,
+    ): Promise<boolean> {
+        if (!this.validMouseEvent(e)) {
             return Promise.resolve(false);
         }