koishi-plugin-chat-patch 5.3.0 → 5.5.0

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

@@ -95,6 +95,7 @@ import {
     normalizeSessionId,
     resolveIncomingSession,
     setSessionContact,
+    upsertSessionContact,
 } from './utils/sessionUtil'
 
 const popInfo = new PopInfo()
@@ -120,11 +121,6 @@ function getString(value: unknown): string {
     return typeof value === 'string' ? value : String(value)
 }
 
-function normalizeChannelForMatch(value: string): string {
-    if (/^(?:private|direct):/i.test(value)) return value.replace(/^(?:private|direct):/i, '')
-    return normalizeGroupId(value)
-}
-
 // 其他 tag
 let listLoadTimes = 0
 const logger = new Logger()
@@ -995,10 +991,13 @@ const msgFunctions = {
         const chatStore = useChatStore()
         const rawData = msg.data
         const firstData = Array.isArray(rawData) ? rawData[0] : rawData
+        const firstRawId = getDataObject(firstData).id
+            ?? getDataObject(rawData).id
         const realMessageId = getString(msg.message_id)
             || getString(getDataObject(rawData).message_id)
             || getString(getDataObject(firstData).id)
             || getString(getDataObject(firstData).message_id)
+            || (firstRawId == null ? '' : String(firstRawId))
         if (realMessageId) msg.message_id = realMessageId
         if (echoList[1] == 'forward') {
             // PS：这儿写是写了转发成功，事实上不确定消息有没有真的发送出去（x
@@ -1341,8 +1340,16 @@ const msgFunctions = {
                     )
                     getMessageList(trueMsg).then((trueMsg) => {
                         if (trueMsg?.length == 1) {
+                            const nextMessage = Array.isArray(trueMsg[0].message)
+                                && trueMsg[0].message.some((item: any) => {
+                                    if (item?.type !== 'text') return true
+                                    const text = String(item?.text ?? item?.content ?? '')
+                                    return text.trim() !== ''
+                                })
+                                ? trueMsg[0].message
+                                : fakeMsg.message
                             // 使用消息对象引用直接更新，避免索引问题
-                            fakeMsg.message = trueMsg[0].message
+                            if (Array.isArray(nextMessage)) fakeMsg.message = nextMessage
                             fakeMsg.raw_message = trueMsg[0].raw_message
                             fakeMsg.time = trueMsg[0].time
                             fakeMsg.fake_msg = undefined
@@ -1699,8 +1706,9 @@ function saveUser(msg: { [key: string]: any }, type: string) {
             const channel = String(item.channel_id ?? item.channelId ?? '')
             const group = String(item.group_id ?? '')
             const user = String(item.user_id ?? '')
-            if (group) return `group:${normalizeGroupId(channel || group)}`
-            return `user:${String(user).replace(/^(?:private|direct):/i, '')}`
+            if (channel) return normalizeSessionId(channel)
+            if (group) return normalizeSessionId(group)
+            return normalizeSessionId(user)
         }
         const existingIds = new Set(contactStore.userList.map(sessionDedupKey))
         const freshList = list.filter((item) => {
@@ -1891,19 +1899,28 @@ async function saveMsg(msg: any, append = undefined as undefined | string) {
         const lastMsg =
             chatStore.messageList[chatStore.messageList.length - 1]
         if (lastMsg) {
+            const isGroup = chatStore.chatInfo.show.type === 'group'
             const user = findSessionContact(contactStore.userList, chatStore.chatInfo.show.id)
             const sessionId = normalizeSessionId(
                 chatStore.chatInfo.show.channel_id
                 ?? chatStore.chatInfo.show.id,
             )
-            const session = contactStore.baseOnMsgList.get(sessionId) ?? user
+            const session = isGroup
+                ? user
+                : contactStore.baseOnMsgList.get(sessionId) ?? user
             if (session) {
                 const preview = formatMessageData(
                     lastMsg,
-                    chatStore.chatInfo.show.type == 'group',
+                    isGroup,
                 )
                 if (user) Object.assign(user, preview)
                 Object.assign(session, preview)
+                if (isGroup) {
+                    // 群历史同步到联系人列表，同时进入群会话列表
+                    contactStore.userList = upsertSessionContact(contactStore.userList, session)
+                } else if (session._groupMember) {
+                    session._groupMember = false
+                }
                 contactStore.baseOnMsgList.set(sessionId, session)
                 updateBaseOnMsgList()
             }
@@ -2326,7 +2343,7 @@ function newMsg(_: string, data: any) {
     }
     // 消息基础信息：优先使用 Satori 转换层生成的 infoList，避免 OneBot pathMap 误解析。
     const rawInfo = getDataObject(data.infoList ?? data)
-    const id = getString(rawInfo.group_id) ||
+    const rawId = getString(rawInfo.group_id) ||
         getString(rawInfo.private_id) ||
         getString(data.group_id) ||
         getString(data.user_id) ||
@@ -2354,12 +2371,16 @@ function newMsg(_: string, data: any) {
         : data.message_type === 'group' || Boolean(data.group_id) || Boolean(rawInfo.group_id)
     const sessionChannelId = getString(rawInfo.channel_id) || getString(data.channel_id)
     const sessionGuildId = getString(rawInfo.guild_id) || getString(data.guild_id)
+    // 群消息必须用群/频道 ID 作为会话，不能退化成发送者用户 ID
+    const id = isGroupMessage
+        ? getString(rawInfo.group_id) || getString(data.group_id) || sessionChannelId || sessionGuildId || ''
+        : rawId
     if (!id || id === '0') return
     const isCurrentSession = Boolean(
         (
             sessionChannelId &&
             showChannelId &&
-            normalizeChannelForMatch(sessionChannelId) === normalizeChannelForMatch(showChannelId)
+            sessionChannelId === showChannelId
         ) || (
             (!sessionChannelId || !showChannelId) &&
             (id === showId || targetId === showId || String(sessionChannelId || sessionGuildId || '') === showId)
@@ -2572,6 +2593,13 @@ function newMsg(_: string, data: any) {
                 if (data.atall) { session.highlight = $t('[@全体]') }
                 if (isImportant) { session.highlight = $t('[特別关心]') }
             }
+            if (!isGroupMessage && session._groupMember) {
+                session._groupMember = false
+            }
+            if (isGroupMessage) {
+                // 群消息同步到联系人列表，同时进入群会话列表
+                contactStore.userList = upsertSessionContact(contactStore.userList, session)
+            }
             setSessionContact(contactStore.baseOnMsgList, session)
             updateBaseOnMsgList()
         }
@@ -2589,17 +2617,8 @@ function newMsg(_: string, data: any) {
                 hidden: document.hidden,
                 isImportant: isImportant
             })
-            // (发送者没有被打开 || 窗口没有焦点 || 窗口被最小化 || 在特别关心列表里) 这些情况需要进行消息通知
-            const forceGroupSystemNotice = isGroupMessage && groupNoticeType === 'all'
-            const forceImportantNotice = isImportant ||
-                (isGroupMessage && (data.atme || data.atall || isGroupNotice))
-            if (
-                forceGroupSystemNotice ||
-                forceImportantNotice ||
-                !isCurrentSession ||
-                !document.hasFocus() ||
-                document.hidden
-            ) {
+            // 当前会话已打开时不弹系统通知，新消息交给右下角置底箭头提示
+            if (!isCurrentSession) {
                 // 准备消息内容
                 let raw = getMsgRawTxt(data)
                 raw = raw === '' ? data.raw_message : raw

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 {
@@ -234,6 +232,13 @@ 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)
 }
 
+// QQ 官方机器人会把部分大表情/图片消息的私有标记塞进 content，渲染前需要去掉
+function cleanQqFaceMarkup(source: string): string {
+  return source
+    .replace(/<faceType\b[^>]*>/gi, '')
+    .replace(/&lt;faceType\b[^>]*&gt;/gi, '')
+}
+
 function splitMarkupTextSegments(
   segments: Array<Record<string, unknown>>,
 ): Array<Record<string, unknown>> {
@@ -250,6 +255,7 @@ function splitMarkupTextSegments(
 }
 
 export function parseSatoriMarkup(source: string): Array<Record<string, unknown>> {
+  source = cleanQqFaceMarkup(source)
   const result: Array<Record<string, unknown>> = []
   let index = 0
   while (index < source.length) {
@@ -441,11 +447,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 {
@@ -462,7 +468,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),
@@ -478,7 +484,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,
@@ -525,6 +531,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
 }
 
@@ -629,9 +653,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)
@@ -688,8 +710,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),
@@ -701,7 +723,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

@@ -4,6 +4,10 @@ export interface SatoriBootstrap {
   endpoint: string
   token: string
   basePath: string
+  blockedPlatforms: Array<{
+    platformName: string
+    exactMatch: boolean
+  }>
 }
 
 export interface SatoriLogin {
@@ -24,6 +28,11 @@ export interface SatoriEvent {
   body: Record<string, unknown>
 }
 
+// 同一机器人 ID 可能同时存在于不同平台（例如 qq / qqguild），用平台 + ID 做唯一键
+export function botKey(platform: string, selfId: string): string {
+  return [platform, selfId].map((value) => encodeURIComponent(value)).join(':')
+}
+
 interface PendingConsoleRequest {
   resolve: (value: unknown) => void
   reject: (reason: unknown) => void
@@ -47,6 +56,17 @@ function getObject(value: unknown): Record<string, unknown> {
   return typeof value === 'object' && value !== null ? value as Record<string, unknown> : {}
 }
 
+function isBlockedPlatform(
+  platform: string,
+  blockedPlatforms: SatoriBootstrap['blockedPlatforms'],
+): boolean {
+  return (blockedPlatforms ?? []).some((item) => {
+    return item.exactMatch
+      ? platform === item.platformName
+      : platform.includes(item.platformName)
+  })
+}
+
 async function parseJsonResponse(response: Response): Promise<unknown> {
   const text = await response.text()
   if (!response.ok) {
@@ -55,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
   }
 }
 
@@ -94,6 +115,9 @@ function receiveBootstrap(data: Record<string, unknown>) {
     endpoint: getString(payload.endpoint) || '/satori',
     token: getString(payload.token),
     basePath: getString(payload.basePath) || '/chat-patch',
+    blockedPlatforms: Array.isArray(payload.blockedPlatforms)
+      ? payload.blockedPlatforms as SatoriBootstrap['blockedPlatforms']
+      : [],
   }
   window.clearTimeout(bootstrapTimeout)
   resolveBootstrapCallback?.(bootstrap)
@@ -118,6 +142,10 @@ export function getBootstrap(): Promise<SatoriBootstrap> {
   return resolveBootstrap()
 }
 
+export function getBlockedPlatforms(): SatoriBootstrap['blockedPlatforms'] {
+  return bootstrap?.blockedPlatforms ?? []
+}
+
 export function getLogins(): SatoriLogin[] {
   return logins
 }
@@ -219,6 +247,9 @@ export function connect(
         endpoint: getString(payload.endpoint) || '/satori',
         token: getString(payload.token),
         basePath: getString(payload.basePath) || '/chat-patch',
+        blockedPlatforms: Array.isArray(payload.blockedPlatforms)
+          ? payload.blockedPlatforms as SatoriBootstrap['blockedPlatforms']
+          : [],
       }
     }
   }
@@ -258,7 +289,7 @@ export function connect(
               const platform = getString(login.platform) || getString(user.platform)
               const selfId = getString(user.id) || getString(login.selfId)
               const key = [platform, selfId].map((value) => encodeURIComponent(value)).join(':')
-              if (!platform || !selfId || seen.has(key)) continue
+              if (!platform || !selfId || seen.has(key) || isBlockedPlatform(platform, bootstrap?.blockedPlatforms ?? [])) continue
               seen.add(key)
               nextLogins.push({
                 platform: getString(login.platform) || getString(user.platform),

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/avatarUtil.ts

@@ -7,6 +7,8 @@ const QQ_GROUP_AVATAR_PLATFORMS = new Set([
     'llob',
 ])
 
+export const DEFAULT_AVATAR = '/img/icons/icon.svg'
+
 // 仅用于白名单平台的 QQ 群头像，不能用于用户头像
 export function buildQqGroupAvatar(
     platform: string,
@@ -24,8 +26,21 @@ export function buildQqGroupAvatar(
     return `https://p.qlogo.cn/gh/${rawId}/${rawId}/${safeSize}`
 }
 
+// 命中头像上下文后，任何加载失败都统一换默认 SVG
+export function isAvatarImage(img: HTMLImageElement): boolean {
+    if (img.hasAttribute('data-avatar') || img.getAttribute('name') === 'avatar') return true
+    if (img.dataset.avatarFallback === 'true') return true
+    if (img.closest('[data-avatar], .avatar, [class*="avatar"], [name="avatar"]')) return true
+    const source = img.currentSrc || img.src || img.getAttribute('src') || ''
+    return !source ? false : /(?:q\.qlogo\.cn|p\.qlogo\.cn|\/qqapp\/)/i.test(source)
+}
+
 export function avatarError(event: Event) {
-    const img = event.target as HTMLImageElement
-    const fallback = new URL('/img/icons/icon.svg', location.origin).href
-    if (img.src !== fallback) img.src = fallback
+    const img = event.target
+    if (!(img instanceof HTMLImageElement)) return
+    const fallback = new URL(DEFAULT_AVATAR, location.origin).href
+    const source = img.currentSrc || img.src
+    if (!source || source === fallback || img.dataset.avatarFallback === 'true') return
+    img.dataset.avatarFallback = 'true'
+    img.src = fallback
 }

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)