Merge branch 'nanin/develop' into develop

src/main/services/chat-service.ts

@@ -449,6 +449,23 @@ export async function listMessagesAsync(
   return mergeRecallArchiveMessages(userMd5, sourceMessages, startTime, endTime, options?.limit)
 }
 
+export async function listMessagesForExport(
+  userMd5: string,
+  startTime?: number,
+  endTime?: number
+): Promise<FormattedMessage[]> {
+  if (!dbRef) return []
+  const rawMessages = await dbRef.getUserMessagesForExport(userMd5, startTime, endTime)
+  const sourceMessages = listSourceMessages(userMd5, startTime, endTime, undefined, rawMessages)
+  const username = dbRef.getWcdb4Client().getUsernameByMd5(userMd5) || ''
+  recordRecallArchiveMessages(userMd5, username, sourceMessages)
+  const mergedMessages = mergeRecallArchiveMessages(userMd5, sourceMessages, startTime, endTime)
+  console.log(
+    `[ChatService] listMessagesForExport end md5=${userMd5} source=${sourceMessages.length} merged=${mergedMessages.length}`
+  )
+  return mergedMessages
+}
+
 export function getGroupSnapshot(userMd5: string): GroupSnapshot | null {
   if (!dbRef) return null
   const wcdb4Client = dbRef.getWcdb4Client()

src/main/services/recall-archive-service.ts

@@ -40,12 +40,13 @@ let archivePath = ''
 let writeTimer: NodeJS.Timeout | null = null
 let writeQueue: Promise<void> = Promise.resolve()
 
-function messageIdentity(message: Message): string {
+export function messageIdentity(message: Message): string {
   if (message.recoveredFromRecallJournal) {
     return `recovered:${message.localId || 0}:${message.serverId || message.id}`
   }
-  if (message.localId) return `local:${message.localId}`
-  if (message.serverId) return `server:${message.serverId}`
+  const serverId = String(message.serverId || '').trim()
+  if (serverId && serverId !== '0') return `server:${serverId}`
+  if (message.localId) return `local:${message.localId}:${message.createTime || 0}`
   if (message.id) return `id:${message.id}`
   return `${message.createTime || 0}:${message.from}:${message.type}:${message.content}`
 }