fix

Author: arcbtc

services.py

@@ -76,7 +76,6 @@ async def _broadcast_balance(chat_id: str, balance: int) -> None:
 async def _broadcast_claim(chat_id: str, claimed_by_id: str | None, claimed_by_name: str | None) -> None:
     payload = {
         "type": "claim",
-        "claimed_by_id": claimed_by_id,
         "claimed_by_name": claimed_by_name,
     }
     await _broadcast_chat(chat_id, payload)
@@ -197,7 +196,7 @@ async def get_public_chat(categories_id: str, chat_id: str) -> ChatSession:
     chat = await get_chat_for_category(categories_id, chat_id)
     if not chat:
         raise ValueError("Chat not found.")
-    return chat
+    return _sanitize_public_chat(chat)
 
 
 def _ensure_participant(chat: ChatSession, sender_id: str, sender_name: str, sender_role: str) -> None:
@@ -213,6 +212,20 @@ def _ensure_participant(chat: ChatSession, sender_id: str, sender_name: str, sen
     chat.participants.append(_serialize_participant(ChatParticipant(id=sender_id, name=sender_name, role=sender_role)))
 
 
+def _sanitize_public_chat(chat: ChatSession) -> ChatSession:
+    sanitized = chat.copy(deep=True)
+    sanitized.claimed_by_id = None
+    for participant in sanitized.participants:
+        if participant.get("role") == "admin":
+            name = participant.get("name") or "admin"
+            participant["id"] = f"admin-{name}"
+    for message in sanitized.messages:
+        if message.get("sender_role") == "admin":
+            name = message.get("sender_name") or "admin"
+            message["sender_id"] = f"admin-{name}"
+    return sanitized
+
+
 async def _append_message(chat: ChatSession, message: ChatMessage, unread: bool) -> ChatSession:
     payload = _serialize_message(message)
     chat.messages.append(payload)

static/embed.js

@@ -48,6 +48,10 @@ window.PageChatEmbed = {
     publicChatLink() {
       if (!this.categoriesId || !this.chatId) return ''
       return `${window.location.origin}/chat/${this.categoriesId}/${this.chatId}`
+    },
+    isClaimedByMe() {
+      if (!this.authUser?.username) return false
+      return this.chatData.claimed_by_name === this.authUser.username
     }
   },
   methods: {
@@ -398,7 +402,6 @@ window.PageChatEmbed = {
             this.applyBalanceUpdate(payload.balance)
           }
           if (payload.type === 'claim') {
-            this.chatData.claimed_by_id = payload.claimed_by_id
             this.chatData.claimed_by_name = payload.claimed_by_name
           }
         } catch (err) {

static/embed.vue

@@ -112,9 +112,9 @@
             flat
             color="primary"
             :label="
-              chatData.claimed_by_id === authUser.id
+              isClaimedByMe
                 ? 'Release'
-                : chatData.claimed_by_id
+                : chatData.claimed_by_name
                   ? 'Steal'
                   : 'Claim'
             "

static/index.js

@@ -296,7 +296,7 @@ window.PageChat = {
       this.sending = true
       try {
         const payload = {
-          sender_id: `admin-${this.g.user.id}`,
+          sender_id: `admin-${this.g.user.username || 'support'}`,
           sender_name: this.g.user.username || 'support',
           sender_role: 'admin',
           message: messageText

static/public_page.js

@@ -40,6 +40,10 @@ window.PageChatPublic = {
         this.publicPageData?.claim_split ?? this.publicPageData?.claimSplit
       const value = Number(raw)
       return Number.isFinite(value) ? value : 0
+    },
+    isClaimedByMe() {
+      if (!this.authUser?.username) return false
+      return this.chatData.claimed_by_name === this.authUser.username
     }
   },
 
@@ -425,7 +429,6 @@ window.PageChatPublic = {
             this.applyBalanceUpdate(payload.balance)
           }
           if (payload.type === 'claim') {
-            this.chatData.claimed_by_id = payload.claimed_by_id
             this.chatData.claimed_by_name = payload.claimed_by_name
           }
         } catch (err) {

static/public_page.vue

@@ -115,9 +115,9 @@
             outline
             color="primary"
             :label="
-              chatData.claimed_by_id === authUser.id
+              isClaimedByMe
                 ? 'Release'
-                : chatData.claimed_by_id
+                : chatData.claimed_by_name
                   ? 'Steal'
                   : 'Claim'
             "