fix: fix delete message logic

frontend-vue/src/components/chat/MessageItem.vue

@@ -39,6 +39,7 @@ import { useAudio } from '@/composables/useAudio'
 import { useToastStore } from '@/stores/toast'
 import { useAppStore } from '@/stores/app'
 import { apiService } from '@/services/api'
+import { syncService } from '@/services/sync'
 import { formatSmartTimestamp, formatTimestampForScreenReader } from '@/utils/time'
 import FileAttachment from './FileAttachment.vue'
 import type { ExtendedMessage, UnsentMessage, FileAttachment as FileAttachmentType } from '@/types'
@@ -205,11 +206,48 @@ const handleDelete = async () => {
       return
     }
 
-    // Sent message: call API then update store
+    // Sent message: optimistic removal, then server delete
     const msg = props.message as ExtendedMessage
-    await apiService.deleteMessage(msg.channel_id, msg.id)
+
+    // Capture original position for potential rollback
+    const channelMessages = appStore.messages[msg.channel_id] || []
+    const originalIndex = channelMessages.findIndex(m => m.id === msg.id)
+
+    // Optimistically remove from local state for snappy UI
     appStore.removeMessage(msg.id)
-    toastStore.success('Message deleted')
+
+    // Focus the closest message immediately after local removal
+    await nextTick()
+    if (targetToFocus && document.contains(targetToFocus)) {
+      if (!targetToFocus.hasAttribute('tabindex')) targetToFocus.setAttribute('tabindex', '-1')
+      targetToFocus.focus()
+    } else {
+      focusFallbackToInput()
+    }
+
+    try {
+      await apiService.deleteMessage(msg.channel_id, msg.id)
+      // Attempt to sync the channel to reconcile with server state
+      try {
+        await syncService.syncChannelMessages(msg.channel_id)
+      } catch (syncError) {
+        console.warn('Post-delete sync failed; continuing with local state.', syncError)
+      }
+      toastStore.success('Message deleted')
+    } catch (error) {
+      // Rollback local removal on failure
+      if (originalIndex !== -1) {
+        const list = appStore.messages[msg.channel_id] || []
+        list.splice(Math.min(originalIndex, list.length), 0, msg)
+      }
+      await nextTick()
+      const restoredEl = document.querySelector(`[data-message-id="${msg.id}"]`) as HTMLElement | null
+      if (restoredEl) {
+        if (!restoredEl.hasAttribute('tabindex')) restoredEl.setAttribute('tabindex', '-1')
+        restoredEl.focus()
+      }
+      throw error
+    }
     // focus the closest message
     await nextTick()
     if (targetToFocus && document.contains(targetToFocus)) {

frontend-vue/src/services/sync.ts

@@ -8,7 +8,11 @@ export class SyncService {
   }
 
   /**
-   * Sync messages for a channel: merge server data with local data
+   * Sync messages for a channel: replace local data with server data
+   *
+   * Prunes any local messages that are no longer present on the server
+   * instead of keeping them around. We still keep unsent messages in the
+   * separate unsent queue handled elsewhere.
    */
   async syncChannelMessages(channelId: number): Promise<void> {
     try {
@@ -19,55 +23,35 @@ export class SyncService {
       // Get server messages
       const serverResponse = await apiService.getMessages(channelId)
       const serverMessages = serverResponse.messages
-      
+
-      // Get local messages
+      console.log(`Server has ${serverMessages.length} messages, replacing local set for channel ${channelId}`)
-      const localMessages = appStore.messages[channelId] || []
+
-      
+      // Transform and sort server messages only (pruning locals not on server)
-      console.log(`Server has ${serverMessages.length} messages, local has ${localMessages.length} messages`)
+      const normalizedServerMessages: ExtendedMessage[] = serverMessages
-      
+        .map((msg: any) => {
-      // Merge messages using a simple strategy:
+          const transformedMsg: ExtendedMessage = {
-      // 1. Create a map of all messages by ID
+            id: msg.id,
-      // 2. Server messages take precedence (they may have been updated)
+            channel_id: msg.channelId || msg.channel_id,
-      // 3. Keep local messages that don't exist on server (may be unsent)
+            content: msg.content,
-      
+            created_at: msg.createdAt || msg.created_at,
-      const messageMap = new Map<number, ExtendedMessage>()
+            file_id: msg.fileId || msg.file_id,
-      
+            // Map the flattened file fields from backend
-      // Add local messages first
+            fileId: msg.fileId,
-      localMessages.forEach(msg => {
+            filePath: msg.filePath,
-        if (typeof msg.id === 'number') {
+            fileType: msg.fileType,
-          messageMap.set(msg.id, msg)
+            fileSize: msg.fileSize,
-        }
+            originalName: msg.originalName,
-      })
+            fileCreatedAt: msg.fileCreatedAt
-      
+          }
-      // Add/update with server messages (server wins for conflicts)
+          console.log(`Sync: Processing message ${msg.id}, has file:`, !!msg.fileId, `(${msg.originalName})`)
-      serverMessages.forEach((msg: any) => {
+          return transformedMsg
-        // Transform server message format to match our types
+        })
-        const transformedMsg: ExtendedMessage = {
+        .sort((a: ExtendedMessage, b: ExtendedMessage) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime())
-          id: msg.id,
+
-          channel_id: msg.channelId || msg.channel_id,
+      console.log(`Pruned + normalized result: ${normalizedServerMessages.length} messages`)
-          content: msg.content,
+
-          created_at: msg.createdAt || msg.created_at,
+      // Update local storage with server truth
-          file_id: msg.fileId || msg.file_id,
+      appStore.setMessages(channelId, normalizedServerMessages)
-          // Map the flattened file fields from backend
-          fileId: msg.fileId,
-          filePath: msg.filePath,
-          fileType: msg.fileType,
-          fileSize: msg.fileSize,
-          originalName: msg.originalName,
-          fileCreatedAt: msg.fileCreatedAt
-        }
-        console.log(`Sync: Processing message ${msg.id}, has file:`, !!msg.fileId, `(${msg.originalName})`)
-        messageMap.set(msg.id, transformedMsg)
-      })
-      
-      // Convert back to array, sorted by creation time
-      const mergedMessages = Array.from(messageMap.values())
-        .sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime())
-      
-      console.log(`Merged result: ${mergedMessages.length} messages`)
-      
-      // Update local storage
-      appStore.setMessages(channelId, mergedMessages)
       await appStore.saveState()
       
     } catch (error) {
@@ -302,4 +286,4 @@ export class SyncService {
   }
 }
 
-export const syncService = new SyncService()
+export const syncService = new SyncService()

frontend-vue/src/stores/app.ts

@@ -71,9 +71,22 @@ export const useAppStore = defineStore('app', () => {
     if (!messages.value[message.channel_id]) {
       messages.value[message.channel_id] = []
     }
-    messages.value[message.channel_id].push(message)
+
-    console.log('Store: Messages for channel', message.channel_id, 'now has', messages.value[message.channel_id].length, 'messages')
+    const channelMessages = messages.value[message.channel_id]
-    
+    const existingIndex = channelMessages.findIndex(m => m.id === message.id)
+
+    if (existingIndex !== -1) {
+      // Upsert: update existing to avoid duplicates from WebSocket vs sync
+      channelMessages[existingIndex] = { ...channelMessages[existingIndex], ...message }
+    } else {
+      channelMessages.push(message)
+    }
+
+    // Keep chronological order by created_at
+    channelMessages.sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime())
+
+    console.log('Store: Messages for channel', message.channel_id, 'now has', channelMessages.length, 'messages')
+
     // Note: Auto-save is now handled by the sync service to avoid excessive I/O
   }
 
@@ -175,4 +188,4 @@ export const useAppStore = defineStore('app', () => {
     loadState,
     saveState
   }
-})
+})