koishi-plugin-chat-patch 5.3.1 → 5.5.1

package/client/web/src/function/satori-model.ts

@@ -21,9 +21,7 @@ function getString(value: unknown): string {
 }
 
 function normalizeGroupId(value: string): string {
-  const raw = value.replace(/^(?:group|room|chat|channel|guild):/i, '').trim()
-  const wrapped = raw.match(/^\[_?([\s\S]+?)_?\]$/)
-  return wrapped ? wrapped[1] : raw || value
+  return String(value)
 }
 
 function isDirectChannelType(channel: SatoriObject): boolean {
@@ -231,16 +229,23 @@ function normalizeAtText(name: string, id: string): string {
 }
 
 function containsElementMarkup(source: string): boolean {
-  return /<(img|image|audio|video|file|mface|face|quote|at|forward|json|xml|markdown|keyboard|p|br|i18n|a|text|sharp)(?:\s|\/|>)/i.test(source)
+  return /(?:<|&(?:amp;)?lt;)(?:img|image|audio|video|file|mface|face|faceType|quote|at|forward|json|xml|markdown|keyboard|p|br|i18n|a|text|sharp)(?:\s|\/|>|&(?:amp;)?gt;)/i.test(source)
 }
 
 // QQ 官方机器人会把部分大表情/图片消息的私有标记塞进 content，渲染前需要去掉
 function cleanQqFaceMarkup(source: string): string {
   return source
     .replace(/<faceType\b[^>]*>/gi, '')
-    .replace(/&lt;faceType\b[^>]*&gt;/gi, '')
+    .replace(/&(?:amp;)?lt;faceType\b[^>]*&(?:amp;)?gt;/gi, '')
 }
 
+const QQ_EXPRESSION_PLACEHOLDER = 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(
+  '<svg xmlns="http://www.w3.org/2000/svg" width="120" height="120" viewBox="0 0 120 120">'
+  + '<rect width="120" height="120" rx="12" fill="#f3f4f6"/>'
+  + '<text x="60" y="62" text-anchor="middle" dominant-baseline="middle" font-size="18" fill="#333">表情消息</text>'
+  + '</svg>',
+)
+
 function splitMarkupTextSegments(
   segments: Array<Record<string, unknown>>,
 ): Array<Record<string, unknown>> {
@@ -257,7 +262,18 @@ function splitMarkupTextSegments(
 }
 
 export function parseSatoriMarkup(source: string): Array<Record<string, unknown>> {
+  const hadQqFaceMarkup = /(?:&(?:amp;)?lt;|<)faceType\b/i.test(source)
   source = cleanQqFaceMarkup(source)
+  if (hadQqFaceMarkup && !source.trim()) {
+    return [{
+      type: 'image',
+      file: QQ_EXPRESSION_PLACEHOLDER,
+      url: QQ_EXPRESSION_PLACEHOLDER,
+      summary: '表情消息',
+      width: 120,
+      height: 120,
+    }]
+  }
   const result: Array<Record<string, unknown>> = []
   let index = 0
   while (index < source.length) {
@@ -449,11 +465,11 @@ export function satoriEventToOneBot(
   if (type === 'message' || type === 'message-created' || type === 'send') {
     const isGroup = isGroupChannel(channel, guild)
     const userId = getString(user.id)
-      || (isGroup ? '' : getString(channel.id).replace(/^private:/, ''))
+      || (isGroup ? '' : getString(channel.id))
     const groupId = isGroup
       ? normalizeGroupId(getString(guild.id)) || normalizeGroupId(getString(channel.id))
       : ''
-    const directChannelId = isGroup ? groupId : userId
+    const directChannelId = isGroup ? groupId : getString(channel.id) || userId
     const nickname = getString(user.name) || getString(user.nick) || userId
     const card = getString(member.nick) || getString(member.name) || ''
     return {
@@ -470,7 +486,7 @@ export function satoriEventToOneBot(
       group_avatar: isGroup
         ? (usableAvatar(guild.avatar) || usableAvatar(channel.avatar) || buildQqGroupAvatar(platform, groupId) || undefined)
         : undefined,
-      channel_id: getString(channel.id) || (isGroup ? groupId : `private:${userId}`),
+      channel_id: getString(channel.id) || (isGroup ? groupId : userId),
       guild_id: getString(guild.id),
       target_id: selfId,
       message: messageSegments(message),
@@ -486,7 +502,7 @@ export function satoriEventToOneBot(
         message_id: getString(message.id),
         private_id: isGroup ? '' : directChannelId,
         group_id: groupId,
-        channel_id: getString(channel.id) || (isGroup ? groupId : `private:${userId}`),
+        channel_id: getString(channel.id) || (isGroup ? groupId : userId),
         guild_id: getString(guild.id),
         target_id: selfId,
         sender: userId,
@@ -533,6 +549,24 @@ export function satoriEventToOneBot(
     }
   }
 
+  if (type === 'message-deleted') {
+    const isGroup = isGroupChannel(channel, guild)
+    const userId = getString(user.id) || (isGroup ? '' : getString(channel.id))
+    const groupId = isGroup
+      ? normalizeGroupId(getString(guild.id)) || normalizeGroupId(getString(channel.id))
+      : ''
+    return {
+      ...base,
+      post_type: 'notice',
+      notice_type: isGroup ? 'group_recall' : 'friend_recall',
+      group_id: groupId,
+      user_id: userId,
+      message_id: getString(message.id),
+      channel_id: getString(channel.id) || (isGroup ? groupId : userId),
+      guild_id: getString(guild.id),
+    }
+  }
+
   return null
 }
 
@@ -637,9 +671,7 @@ export function mapAction(action: string, params: Record<string, unknown>): {
   const guildId = getString(params.group_id) || getString(params.guild_id)
   const userId = getString(params.user_id)
   const messageId = getString(params.message_id)
-  const directChannel = userId && !/^(?:group|room|chat|channel|guild|private):/i.test(userId)
-    ? `private:${userId}`
-    : userId
+  const directChannel = userId
   const channelId = getString(params.channel_id) || guildId || directChannel || userId
   const content = Array.isArray(params.message)
     ? serializeSatoriContent(params.message)
@@ -696,8 +728,8 @@ function messageListFromResponse(data: unknown): unknown[] {
       ? normalizeGroupId(getString(guild.id)) || normalizeGroupId(getString(channel.id))
       : ''
     const userId = getString(user.id)
-      || (isGroup ? '' : getString(channel.id).replace(/^private:/, ''))
-    const directChannelId = isGroup ? groupId : userId
+      || (isGroup ? '' : getString(channel.id))
+    const directChannelId = isGroup ? groupId : getString(channel.id) || userId
     return {
       message_id: getString(message.id),
       sn: getNumber(message.sn),
@@ -709,7 +741,7 @@ function messageListFromResponse(data: unknown): unknown[] {
       channel_type: channel.type,
       group_id: groupId,
       user_id: groupId ? userId : directChannelId,
-      channel_id: getString(channel.id) || (isGroup ? groupId : `private:${userId}`),
+      channel_id: getString(channel.id) || (isGroup ? groupId : userId),
       guild_id: getString(guild.id),
       sender: {
         user_id: userId,

package/client/web/src/function/satori.ts

@@ -75,7 +75,8 @@ async function parseJsonResponse(response: Response): Promise<unknown> {
   try {
     return JSON.parse(text) as unknown
   } catch {
-    throw new Error(`Satori API 返回了非 JSON 内容: ${text.slice(0, 120)}`)
+    // 部分平台对 delete 等操作只回显纯文本（例如 OK），HTTP 200 即视为成功
+    return text
   }
 }
 

package/client/web/src/function/utils/appUtil.ts

@@ -53,11 +53,6 @@ function encodeKeyPart(value: unknown): string {
     return encodeURIComponent(String(value ?? ''))
 }
 
-function ensureChannelPrefix(channelId: string, prefix: string): string {
-    if (/^(?:group|room|chat|channel|guild|private):/i.test(channelId)) return channelId
-    return `${prefix}:${channelId}`
-}
-
 /**
  * 滚动到目标消息（不自动加载）
  * @param seqName DOM 名（chat-xx）
@@ -121,7 +116,8 @@ export async function loadHistory(info: BaseChatInfoElem) {
     uiStore.nowGetHistory = false
     uiStore.historyBeforeTime = undefined
     chatStore.messageList = []
-    const cacheKey = [authStore.loginInfo.platform, authStore.loginInfo.uin, info.id].map(encodeKeyPart).join(':')
+    const channelId = String(info.channel_id ?? info.id ?? '')
+    const cacheKey = [authStore.loginInfo.platform, authStore.loginInfo.uin, channelId].map(encodeKeyPart).join(':')
     const cachedMessages = chatStore.sessionMessageCache.get(cacheKey)
     if (cachedMessages?.length) {
         chatStore.messageList = [...cachedMessages]
@@ -133,17 +129,13 @@ export async function loadHistory(info: BaseChatInfoElem) {
     ) {
         const localMsgs = await dbGetLatest(
             authStore.loginInfo.uin,
-            info.id,
+            channelId,
             20,
         )
         if (localMsgs.length > 0) {
             chatStore.messageList = localMsgs
         }
     }
-    const rawChannelId = String(info.channel_id ?? '')
-    const channelId = info.type === 'group'
-        ? ensureChannelPrefix(rawChannelId || String(info.id), 'group')
-        : ensureChannelPrefix(rawChannelId || String(info.id), 'private')
     try {
         const cachedMessages = await loadChatHistoryFromCache({
             platform: String(authStore.loginInfo.platform ?? ''),

package/client/web/src/function/utils/localHistoryUtil.ts

@@ -18,7 +18,7 @@ const logger = new Logger()
 export interface LocalMsgRecord {
     /** Bot 侧的消息 ID */
     message_id: string
-    /** 会话 ID（group_id 或 user_id） */
+    /** 会话 ID：保存完整 channel_id，不剥离前缀 */
     chat_id: number | string
     /** 会话类型："group" | "private" */
     chat_type: string
@@ -115,18 +115,28 @@ function computeRawMessage(msg: any): string | null {
     }
 }
 
+function firstDefinedId(value: any, keys: string[]): number | string | undefined {
+    for (const key of keys) {
+        const current = value?.[key]
+        if (current != null && String(current) !== '') return current
+    }
+    return undefined
+}
+
 function deriveChatId(selfId: string | number, msgs: any[]): number | string | undefined {
     const firstMsg = msgs[0]
-    let chatId: number | string | undefined = firstMsg?.infoList?.group_id ?? firstMsg?.infoList?.target_id
+    const firstInfo = firstMsg?.infoList ?? firstMsg
+    const chatId = firstDefinedId(firstInfo, ['channel_id', 'channelId', 'private_id', 'group_id', 'user_id'])
+        ?? firstDefinedId(firstMsg, ['channel_id', 'channelId', 'private_id', 'group_id', 'user_id'])
     if (chatId != null) return chatId
 
     for (const item of msgs) {
-        if (item?.infoList?.sender != null && String(item.infoList.sender) !== String(selfId)) {
-            chatId = item.infoList.sender
-            break
+        const info = item?.infoList ?? item
+        if (info?.sender != null && String(info.sender) !== String(selfId)) {
+            return info.sender
         }
     }
-    return chatId
+    return undefined
 }
 
 export function ensureChatIdOnMsgs(selfId: string | number, msgs: any[]): any[] {
@@ -135,14 +145,21 @@ export function ensureChatIdOnMsgs(selfId: string | number, msgs: any[]): any[]
 
     return msgs.map((item: any) => {
         if (!item?.infoList) return item
-        if (item.infoList.group_id != null || item.infoList.target_id != null) {
+        if (
+            item.infoList.channel_id != null
+            || item.infoList.channelId != null
+            || item.infoList.private_id != null
+            || item.infoList.group_id != null
+            || item.infoList.user_id != null
+        ) {
             return item
         }
         return {
             ...item,
             infoList: {
                 ...item.infoList,
-                target_id: chatId,
+                channel_id: chatId,
+                channelId: chatId,
             },
         }
     })
@@ -158,12 +175,14 @@ export function msgToRecord(msg: any): LocalMsgRecord | null {
     const messageId = msg.message_id
     if (!messageId) return null
 
-    const chatId: number | string = msg.infoList.group_id ?? msg.infoList.target_id
+    const info = msg.infoList ?? msg
+    const chatId = firstDefinedId(info, ['channel_id', 'channelId', 'private_id', 'group_id', 'user_id'])
+        ?? firstDefinedId(msg, ['channel_id', 'channelId', 'private_id', 'group_id', 'user_id'])
     if (chatId == null) return null
 
     const chatType: string =
         msg.message_type ?? (msg.group_id != null ? 'group' : 'private')
-    const senderId: number | string = msg.infoList.sender
+    const senderId: number | string = info.sender ?? msg.sender?.user_id
     if (senderId == null) return null
 
     const senderName: string | null =
@@ -490,7 +509,8 @@ function deserializeRecord(record: LocalMsgRecord): any {
         message_id: record.message_id,
         private_id: isGroup ? undefined : record.chat_id,
         group_id: isGroup ? record.chat_id : undefined,
-        target_id: isGroup ? undefined : record.chat_id,
+        channel_id: record.chat_id,
+        channelId: record.chat_id,
         sender: record.sender_id,
     }
 
@@ -499,7 +519,9 @@ function deserializeRecord(record: LocalMsgRecord): any {
         message_id: record.message_id,
         message_type: record.chat_type,
         // 根据 chat_type 恢复对应的 id 字段
-        ...(isGroup ? { group_id: record.chat_id } : { user_id: record.chat_id }),
+        ...(isGroup ? { group_id: record.chat_id } : { user_id: record.sender_id }),
+        channel_id: record.chat_id,
+        channelId: record.chat_id,
         sender,
         time: record.time,
         timestamp_ms: timeMs || undefined,
@@ -509,6 +531,8 @@ function deserializeRecord(record: LocalMsgRecord): any {
         infoList,
         raw_message: record.raw_message ?? '',
         revoked: record.revoked,
+        revoke: record.revoked,
+        revokeTime: record.revoked ? Date.now() / 1000 : undefined,
         // 消息序列号（并非所有 Bot 都提供，可为 null）
         ...(record.seq != null ? { message_seq: record.seq, seq_id: record.seq } : {}),
         // 标记来源为本地缓存，业务层可按需用此字段区分

package/client/web/src/function/utils/msgUtil.ts

@@ -27,6 +27,7 @@ import {
     getSessionId,
     mergeSessionState,
     normalizeSessionId,
+    upsertSessionContact,
 } from './sessionUtil'
 
 const logger = new Logger()
@@ -681,21 +682,31 @@ export async function sendMsgRaw(
         chatStore.messageList = chatStore.messageList.concat([showMsg])
 
         // 发送方不一定会上报自身消息事件，先用预发送消息同步会话预览。
-        const sessionId = normalizeSessionId(String(id).split('/')[0])
+        const sessionId = normalizeSessionId(
+            targetChannelId
+            || chatStore.chatInfo.show.channel_id
+            || String(id).split('/')[0],
+        )
         const session = contactStore.baseOnMsgList.get(sessionId) ??
             findSessionContact(contactStore.userList, sessionId)
         if (session) {
             const raw = getMsgRawTxt(showMsg)
             const senderName = authStore.loginInfo.nickname
-            Object.assign(session, {
-                message_id: showMsg.message_id,
-                raw_msg: type === 'group' && senderName ? `${senderName}: ${raw}` : raw,
-                raw_msg_base: raw,
-                time: showMsg.time * 1000,
-            })
-            contactStore.baseOnMsgList.set(normalizeSessionId(sessionId), session)
-            updateBaseOnMsgList()
-        }
+            Object.assign(session, {
+                message_id: showMsg.message_id,
+                raw_msg: type === 'group' && senderName ? `${senderName}: ${raw}` : raw,
+                raw_msg_base: raw,
+                time: showMsg.time * 1000,
+            })
+            if (type === 'group') {
+                // 群发送预览同步到联系人列表，同时进入群会话列表
+                contactStore.userList = upsertSessionContact(contactStore.userList, session)
+            } else if (session._groupMember) {
+                session._groupMember = false
+            }
+            contactStore.baseOnMsgList.set(normalizeSessionId(sessionId), session)
+            updateBaseOnMsgList()
+        }
     }
     // 预发送保留 Base64 用于本地预览；真正发送前先写入后端临时目录
     try {
@@ -762,7 +773,7 @@ export async function sendMsgRaw(
                         {
                             user_id: id.split('/')[0],
                             group_id: id.split('/')[1],
-                            channel_id: String(targetChannelId ?? chatStore.chatInfo.show.channel_id ?? `private:${String(id).split('/')[0]}`),
+                            channel_id: String(targetChannelId ?? chatStore.chatInfo.show.channel_id ?? String(id).split('/')[0]),
                             message: msg,
                         },
                         echo + '_uuid_' + msgUUID,
@@ -773,7 +784,7 @@ export async function sendMsgRaw(
                         'send_msg',
                         {
                             user_id: id,
-                            channel_id: String(targetChannelId ?? chatStore.chatInfo.show.channel_id ?? (/^(?:group|room|chat|channel|guild|private):/i.test(String(id)) ? String(id) : `private:${String(id)}`)),
+                            channel_id: String(targetChannelId ?? chatStore.chatInfo.show.channel_id ?? String(id)),
                             message: msg,
                         },
                         echo + '_uuid_' + msgUUID,
@@ -827,7 +838,7 @@ function normalizeBaseSessionMap() {
     const seen = new Map<string, UserFriendElem & UserGroupElem>()
     for (const [rawKey, item] of contactStore.baseOnMsgList) {
         const id = getSessionDedupKey(item)
-        if (id.endsWith(':0') || id.endsWith(':')) continue
+        if (id === '0' || id === '') continue
         const existing = seen.get(id)
         if (existing && existing !== item) {
             needNormalize = true
@@ -846,7 +857,7 @@ function normalizeBaseSessionMap() {
     const canonical = new Map<string, UserFriendElem & UserGroupElem>()
     contactStore.baseOnMsgList.forEach((item) => {
         const id = getSessionDedupKey(item)
-        if (id === 'group:0' || id === 'group:' || id === 'user:0' || id === 'user:') return
+        if (id === '0' || id === '') return
         const existing = canonical.get(id)
         if (existing && existing !== item) {
             canonical.set(id, mergeSessionState(existing, item))
@@ -869,7 +880,7 @@ function getSessionList() {
 
     const addSession = (item: UserFriendElem & UserGroupElem) => {
         const id = getSessionDedupKey(item)
-        if (id === 'group:0' || id === 'group:' || id === 'user:0' || id === 'user:') return
+        if (id === '0' || id === '') return
         const existing = sessionMap.get(id)
         if (existing && existing !== item) {
             sessionMap.set(id, mergeSessionState(existing, item))
@@ -880,7 +891,7 @@ function getSessionList() {
 
     if (settingsStore.sysConfig.session_display_mode === 'all') {
         contactStore.userList.forEach((item) => {
-            addSession(item)
+            if (!item._groupMember) addSession(item)
         })
     }
 
@@ -894,11 +905,11 @@ function getSessionList() {
 /**
  * 刷新消息列表排序
  */
-export function updateBaseOnMsgList() {
-    const contactStore = useContactStore()
-    const settingsStore = useSettingsStore()
-    normalizeBaseSessionMap()
-    const allList = getSessionList()
+export function updateBaseOnMsgList() {
+    const contactStore = useContactStore()
+    const settingsStore = useSettingsStore()
+    normalizeBaseSessionMap()
+    const allList = getSessionList()
     // 先更具 item.always_top 是不是 true 拆为两个数组
     const topList = allList.filter((item) => item.always_top)
     const normalList = allList.filter((item) => !item.always_top)

package/client/web/src/function/utils/sessionUtil.ts

@@ -1,9 +1,7 @@
 import type { Session } from '../elements/information'
 
 export function normalizeGroupId(value: string): string {
-  const raw = value.replace(/^(?:group|room|chat|channel|guild):/i, '').trim()
-  const wrapped = raw.match(/^\[_?([\s\S]+?)_?\]$/)
-  return wrapped ? wrapped[1] : raw || value
+  return String(value)
 }
 
 export function normalizeSessionId(value: number | string): string {
@@ -27,12 +25,6 @@ export function getSessionAliases(item: Session): string[] {
         getSessionId(item),
         getLegacySessionId(item),
     ]
-    if (item.group_id !== undefined && item.group_id !== null) {
-        rawAliases.push(normalizeGroupId(String(item.group_id)))
-    }
-    if (item.user_id !== undefined && item.user_id !== null) {
-        rawAliases.push(String(item.user_id).replace(/^(?:private|direct):/i, ''))
-    }
     const aliases = rawAliases.filter((value): value is number | string => {
         const text = String(value ?? '')
         return text !== '' && text !== '0'
@@ -44,11 +36,10 @@ export function getSessionDedupKey(item: Session): string {
     const channelId = String(item.channel_id ?? item.channelId ?? '')
     const groupId = String(item.group_id ?? '')
     const userId = String(item.user_id ?? '')
-    if (groupId) return `group:${normalizeGroupId(channelId || groupId)}`
-    if (userId) return `user:${userId.replace(/^(?:private|direct):/i, '')}`
-    return /^(?:private|direct):/i.test(channelId)
-        ? `user:${channelId.replace(/^(?:private|direct):/i, '')}`
-        : `group:${normalizeGroupId(channelId)}`
+    if (channelId) return normalizeSessionId(channelId)
+    if (groupId) return normalizeSessionId(groupId)
+    if (userId) return normalizeSessionId(userId)
+    return ''
 }
 
 export function setSessionContact(
@@ -60,6 +51,21 @@ export function setSessionContact(
   }
 }
 
+export function upsertSessionContact(
+  contacts: Session[],
+  item: Session,
+): Session[] {
+  const key = getSessionDedupKey(item)
+  if (!key) return contacts
+  const index = contacts.findIndex((current) => getSessionDedupKey(current) === key)
+  if (index >= 0) {
+    const next = [...contacts]
+    Object.assign(next[index], item)
+    return next
+  }
+  return [...contacts, item]
+}
+
 export function findSessionContact(
     contacts: Session[],
     sessionId: number | string,
@@ -67,10 +73,6 @@ export function findSessionContact(
     const target = normalizeSessionId(sessionId)
     return contacts.find((item) => {
         return getSessionAliases(item).some((alias) => alias === target)
-            || (
-                Boolean(item.group_id) &&
-                normalizeGroupId(String(item.group_id)) === normalizeGroupId(target)
-            )
     })
 }