koishi-plugin-chat-patch 5.3.1 → 5.5.0

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

@@ -31,6 +31,7 @@ import {
   getSessionDedupKey,
   normalizeSessionId,
   setSessionContact,
+  upsertSessionContact,
 } from './utils/sessionUtil'
 import { buildQqGroupAvatar } from './utils/avatarUtil'
 import type { ConnectionHistoryItem, LoginCacheElem } from './elements/system'
@@ -504,7 +505,7 @@ async function fetchUserIdentity(
     const guildId = getString(msg.guild_id) || getString(msg.group_id)
     const isPrivate = isPrivateMessage(msg)
     const channelId = isPrivate
-      ? (getString(msg.channel_id) || `private:${userId}`)
+      ? (getString(msg.channel_id) || userId)
       : ''
     const sender = getObject(msg.sender)
     const senderName = getString(sender.nickname) || getString(sender.card) || getString(sender.name)
@@ -555,10 +556,11 @@ function recordBotMessage(platform: string, selfId: string, msg: Record<string,
   })
   const isGroup = isGroupMessage(msg)
   const channelId = typeof msg.channel_id === 'string' ? msg.channel_id : ''
+  const guildId = typeof msg.guild_id === 'string' ? msg.guild_id : ''
   const sessionId = String(
-    msg.group_id
-      || msg.user_id
-      || (isGroup ? '' : channelId.replace(/^private:/, '')),
+    isGroup
+      ? (msg.group_id || channelId || guildId || '')
+      : (msg.user_id || channelId || ''),
   )
   if (!sessionId || sessionId === '0') {
     identityDebug('recordBotMessage: skipped invalid session', { sessionId, msg })
@@ -571,7 +573,8 @@ function recordBotMessage(platform: string, selfId: string, msg: Record<string,
   const senderId = String(
     sender.user_id
       || msg.user_id
-      || (isGroup ? '' : channelId.replace(/^private:/, '')),
+      || channelId
+      || '',
   )
   const raw = getMsgRawTxt(msg) || (typeof msg.raw_message === 'string' ? msg.raw_message : '')
   const senderName = String(sender.card || sender.nickname || (isGroup ? senderId : ''))
@@ -611,60 +614,108 @@ function recordBotMessage(platform: string, selfId: string, msg: Record<string,
     channel_id: typeof msg.channel_id === 'string' ? msg.channel_id : undefined,
     guild_id: typeof msg.guild_id === 'string' ? msg.guild_id : undefined,
   }
-  const existing = state.onMsgList.find((item) => {
-    const itemChannelId = String(item.channel_id || item.channelId || '')
-    if (itemChannelId) {
-      if (isGroup) {
+  const typedSession = session as unknown as UserFriendElem & UserGroupElem
+  const memberContact = isGroup && senderId && senderId !== '0'
+    ? {
+        user_id: senderId,
+        nickname: String(sender.nickname || sender.card || senderName || senderId),
+        remark: String(sender.nickname || sender.card || senderName || senderId),
+        avatar: hasUsableAvatar(sender.avatar) ? getString(sender.avatar) : undefined,
+        class_id: 0,
+        class_name: '我的好友',
+        _groupMember: true,
+        raw_msg: senderName ? `${senderName}: ${raw}` : raw,
+        raw_msg_base: raw,
+        time: sessionTime,
+        message_id: String(msg.message_id ?? ''),
+        guild_id: typeof msg.guild_id === 'string' ? msg.guild_id : undefined,
+      } as UserFriendElem & UserGroupElem
+    : undefined
+  let baseList = [...state.baseList]
+  if (isGroup) {
+    // 群消息进入群会话列表，群成员只进联系人列表
+    state.userList = upsertSessionContact(state.userList, typedSession)
+    if (memberContact) {
+      state.userList = upsertSessionContact(state.userList, memberContact)
+    }
+    const existing = state.onMsgList.find((item) => {
+      const itemChannelId = String(item.channel_id || item.channelId || '')
+      if (itemChannelId) {
         return normalizeGroupId(itemChannelId) === normalizeGroupId(channelId || sessionId)
       }
-      return itemChannelId.replace(/^(?:private|direct):/i, '')
-        === String(sessionId).replace(/^(?:private|direct):/i, '')
-    }
-    return isGroup
-      ? String(item.group_id) === sessionId
-      : String(item.user_id) === sessionId
-  })
-  if (existing) {
-    const previousAvatar = existing.avatar
-    const previousGroupName = existing.group_name
-    const previousNickname = existing.nickname
-    const previousRemark = existing.remark
-    Object.assign(existing, session)
-    if (!hasUsableAvatar(session.avatar) && hasUsableAvatar(previousAvatar)) {
-      existing.avatar = previousAvatar
+      return String(item.group_id) === sessionId
+    })
+    if (existing) {
+      const previousAvatar = existing.avatar
+      const previousGroupName = existing.group_name
+      Object.assign(existing, session)
+      if (!hasUsableAvatar(session.avatar) && hasUsableAvatar(previousAvatar)) {
+        existing.avatar = previousAvatar
+      }
+      if (
+        !msg.group_name &&
+        previousGroupName &&
+        String(previousGroupName) !== String(sessionId)
+      ) {
+        existing.group_name = previousGroupName
+      }
+      session = existing
+    } else {
+      state.onMsgList.unshift(session)
     }
-    if (
-      isGroup &&
-      !msg.group_name &&
-      previousGroupName &&
-      String(previousGroupName) !== String(sessionId)
-    ) {
-      existing.group_name = previousGroupName
+    const baseKey = normalizeSessionId(sessionKey)
+    const baseIndex = baseList.findIndex(([, value]) => value === session)
+    if (baseIndex >= 0) {
+      baseList[baseIndex] = [baseKey, typedSession]
+    } else {
+      baseList.push([baseKey, typedSession])
     }
-    if (!isGroup && !sender.nickname && previousNickname) {
-      existing.nickname = previousNickname
+  } else {
+    const existing = state.onMsgList.find((item) => {
+      const itemChannelId = String(item.channel_id || item.channelId || '')
+      if (itemChannelId) {
+        return itemChannelId === String(sessionId)
+      }
+      return String(item.user_id) === sessionId
+    })
+    if (existing) {
+      const previousAvatar = existing.avatar
+      const previousNickname = existing.nickname
+      const previousRemark = existing.remark
+      Object.assign(existing, session)
+      if (existing._groupMember) existing._groupMember = false
+      if (!hasUsableAvatar(session.avatar) && hasUsableAvatar(previousAvatar)) {
+        existing.avatar = previousAvatar
+      }
+      if (!isGroup && !sender.nickname && previousNickname) {
+        existing.nickname = previousNickname
+      }
+      if (!isGroup && !existing.remark && previousRemark) {
+        existing.remark = previousRemark
+      }
+      session = existing
+    } else {
+      state.onMsgList.unshift(session)
     }
-    if (!isGroup && !existing.remark && previousRemark) {
-      existing.remark = previousRemark
+    const baseKey = normalizeSessionId(sessionKey)
+    const baseIndex = baseList.findIndex(([, value]) => value === session)
+    if (baseIndex >= 0) {
+      baseList[baseIndex] = [baseKey, typedSession]
+    } else {
+      baseList.push([baseKey, typedSession])
     }
-    session = existing
-  } else {
-    state.onMsgList.unshift(session)
-  }
-  const baseKey = normalizeSessionId(sessionKey)
-  const baseList = [...state.baseList]
-  const baseIndex = baseList.findIndex(([, value]) => value === session)
-  const typedSession = session as unknown as UserFriendElem & UserGroupElem
-  if (baseIndex >= 0) {
-    baseList[baseIndex] = [baseKey, typedSession]
-  } else {
-    baseList.push([baseKey, typedSession])
   }
   contactStore.botStates.set(botKey(platform, selfId), {
     userList: [...state.userList],
     baseList,
     onMsgList: [...state.onMsgList],
   })
+  if (isGroup && isActiveBot({ platform, selfId })) {
+    contactStore.userList = upsertSessionContact(contactStore.userList, typedSession)
+    if (memberContact) {
+      contactStore.userList = upsertSessionContact(contactStore.userList, memberContact)
+    }
+  }
   if (
     isActiveBot({ platform, selfId }) &&
     !contactStore.baseOnMsgList.has(normalizeSessionId(sessionKey))
@@ -674,7 +725,7 @@ function recordBotMessage(platform: string, selfId: string, msg: Record<string,
   }
 
   const chatStore = useChatStore()
-  const cacheKey = [platform, selfId, sessionId].map(encodeKeyPart).join(':')
+  const cacheKey = [platform, selfId, sessionKey].map(encodeKeyPart).join(':')
   const messages = chatStore.sessionMessageCache.get(cacheKey) ?? []
   const messageId = String(msg.message_id ?? '')
   if (messageId && !messages.some((item) => String(item.message_id) === messageId)) {
@@ -778,7 +829,9 @@ export function restoreBotStateFromMessageCache(platform: string, selfId: string
     const msg = messages[messages.length - 1]
     if (!msg) continue
     const isGroup = isGroupMessage(msg)
-    const id = String(isGroup ? msg.group_id : msg.user_id)
+    const id = String(isGroup
+      ? (msg.group_id || msg.channel_id || msg.guild_id)
+      : (msg.user_id || msg.channel_id))
     if (!id || id === '0') continue
     const sender = getObject(msg.sender)
     const senderId = getString(sender.user_id) || getString(msg.user_id) || ''
@@ -818,23 +871,23 @@ export function restoreBotStateFromMessageCache(platform: string, selfId: string
   const baseMap = new Map<string, UserFriendElem & UserGroupElem>()
   for (const [, value] of state.baseList) {
     const id = getSessionDedupKey(value)
-    if (!id.endsWith(':0') && !id.endsWith(':')) baseMap.set(id, value)
+    if (id !== '0' && id !== '') baseMap.set(id, value)
   }
   const baseList = [...baseMap.entries()]
   const baseKeys = new Set(baseList.map(([key]) => key))
   const existing = new Set(
     state.onMsgList.map((item) => {
       const id = getSessionDedupKey(item)
-      return !id.endsWith(':0') && !id.endsWith(':') ? id : ''
+      return id !== '0' && id !== '' ? id : ''
     }).filter(Boolean),
   )
   for (const session of sessions) {
     const id = getSessionDedupKey(session)
-    if (!id.endsWith(':0') && !id.endsWith(':') && !existing.has(id)) {
+    if (id !== '0' && id !== '' && !existing.has(id)) {
       state.onMsgList.unshift(session)
       existing.add(id)
     }
-    if (!id.endsWith(':0') && !id.endsWith(':') && !baseKeys.has(id)) {
+    if (id !== '0' && id !== '' && !baseKeys.has(id)) {
       baseList.push([normalizeSessionId(String(session.channel_id || session.channelId || session.user_id || session.group_id || '')), session])
       baseKeys.add(id)
     }
@@ -977,9 +1030,7 @@ function contactId(item: 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 contactName(item: unknown): string {
@@ -1125,6 +1176,7 @@ export interface SendForwardResult {
   ok: boolean
   native: boolean
   messageId?: string
+  channelId?: string
 }
 
 function extractFirstMessageId(data: unknown): string | undefined {
@@ -1135,7 +1187,56 @@ function extractFirstMessageId(data: unknown): string | undefined {
       ? root.data as unknown[]
       : []
   const first = list.length > 0 ? getObject(list[0]) : root
-  return getString(first.id) || getString(first.message_id) || undefined
+  const id = first.id ?? first.message_id
+  return id == null ? undefined : String(id)
+}
+
+function extractDirectChannelId(data: unknown): string {
+  const root = getObject(data)
+  const nested = getObject(root.data)
+  const channel = getObject(root.channel)
+  const id = getString(channel.id)
+    || getString(nested.id)
+    || getString(root.id)
+  if (!id) throw new Error('user.channel.create 未返回频道 ID')
+  return id
+}
+
+function getPrivateSendUserId(action: string, params: Record<string, unknown>): string {
+  const normalized = action.replace(/^_/, '')
+  const userId = params.user_id == null ? '' : String(params.user_id)
+  const groupId = params.group_id == null ? '' : String(params.group_id)
+  const guildId = params.guild_id == null ? '' : String(params.guild_id)
+  if (normalized === 'send_private_msg') return userId
+  if (normalized === 'send_msg'
+    && userId
+    && !groupId
+    && !guildId) {
+    return userId
+  }
+  return ''
+}
+
+async function sendPrivateSatoriMessage(
+  userId: string,
+  content: string,
+  guildId: string | undefined,
+  active: ReturnType<typeof getActiveBot>,
+  channelIdHint?: string,
+): Promise<{ data: unknown; channelId: string }> {
+  // 不构造前缀，优先透传前端已有的完整频道 ID
+  let channelId = channelIdHint || userId
+  try {
+    const direct = await request('user.channel.create', { user_id: userId, guild_id: guildId }, active)
+    channelId = extractDirectChannelId(direct)
+  } catch {
+    // 兼容未实现 createDirectChannel 的适配器，无完整频道 ID 时退回 private: 前缀私聊
+    channelId = channelIdHint || (/^(?:private|direct):/i.test(userId) ? userId : `private:${userId}`)
+  }
+  return {
+    data: await request('message.create', { channel_id: channelId, content }, active),
+    channelId,
+  }
 }
 
 export async function sendForwardMessage(
@@ -1144,29 +1245,33 @@ export async function sendForwardMessage(
   type: 'group' | 'user',
   id: string,
   messages: unknown[],
+  channelIdHint?: string,
 ): Promise<SendForwardResult> {
   if (!platform || !selfId || !id || messages.length === 0) {
     return { ok: false, native: false }
   }
   // 优先走 Satori 原生合并转发，避免依赖 onebot 专属的 send-forward API
   if (platform) {
-    const channelId = type === 'group'
-      ? /^(?:group|room|chat|channel|guild):/i.test(id)
-        ? id
-        : platform === 'yunhu'
-          ? `group:${id}`
-          : id
-      : /^(?:private|direct):/i.test(id)
-        ? id
-        : `private:${id}`
+    // Satori 的 ID 是完整 string，调用方传什么就原样发什么
+    const channelId = channelIdHint || id
     const content = buildForwardMessage(messages)
     if (content) {
       try {
-        const data = await request('message.create', { channel_id: channelId, content }, { platform, selfId })
+        let finalChannelId = channelId
+        if (type === 'user') {
+          try {
+            const direct = await request('user.channel.create', { user_id: id }, { platform, selfId })
+            finalChannelId = extractDirectChannelId(direct)
+          } catch {
+            finalChannelId = channelIdHint || (/^(?:private|direct):/i.test(id) ? id : `private:${id}`)
+          }
+        }
+        const data = await request('message.create', { channel_id: finalChannelId, content }, { platform, selfId })
         return {
           ok: true,
           native: true,
           messageId: extractFirstMessageId(data),
+          channelId: finalChannelId,
         }
       } catch {
         // 原生路径失败时回退到旧 API，方便兼容尚未热重载的 Koishi 后端
@@ -1230,10 +1335,8 @@ function selfMessageToOneBot(record: unknown): Record<string, unknown> | null {
   const sentAt = Number(obj.sentAt ?? Date.now())
   const messageId = getString(obj.messageId)
   const localId = getString(obj.id) || `self-${sentAt}`
-  const channelType = getString(obj.channelType) === 'user'
-    || /^(?:private|direct):/i.test(channelId)
-    ? 'user'
-    : 'group'
+  // 只按记录里的显式 channelType 判断，不根据频道 ID 前缀推断
+  const channelType = getString(obj.channelType) === 'user' ? 'user' : 'group'
   if (!platform || !selfId || !channelId) return null
 
   const login = getLogins().find((item) => {
@@ -1284,7 +1387,7 @@ function selfMessageToOneBot(record: unknown): Record<string, unknown> | null {
   if (message.length === 0) return null
 
   const groupId = channelType === 'group' ? normalizeGroupId(channelId) : ''
-  const userId = channelType === 'user' ? channelId.replace(/^(?:private|direct):/i, '') : ''
+  const userId = channelType === 'user' ? channelId : ''
   const guildId = getString(obj.guildId)
   const fallbackId = messageId || `self-${localId}`
   const rawMessage = getString(obj.content) || getMsgRawTxt({ message })
@@ -1321,9 +1424,26 @@ function selfMessageToOneBot(record: unknown): Record<string, unknown> | null {
     },
     _from_self_cache: true,
   }
+  if (obj.revoked === true) {
+    msg.revoke = true
+    msg.revoked = true
+    msg.revokeTime = Number(obj.revokedAt) || Date.now() / 1000
+  }
   return msg
 }
 
+export async function clearAllCache(): Promise<boolean> {
+  try {
+    const info = await getBootstrap()
+    const response = await fetch(`${location.origin}${info.basePath}/api/clear-all`, {
+      method: 'POST',
+    })
+    return response.ok
+  } catch {
+    return false
+  }
+}
+
 export async function loadChatHistoryFromCache(params: {
   platform: string
   selfId: string
@@ -1369,6 +1489,11 @@ export async function loadChatHistoryFromCache(params: {
       target_id: getString(msg.target_id),
       sender: userId,
     }
+    if (recordObj.revoked === true) {
+      msg.revoke = true
+      msg.revoked = true
+      msg.revokeTime = Number(recordObj.revokedAt) || Date.now() / 1000
+    }
     messages.push(msg)
   }
   const existingIds = new Set(messages.map((item) => getString(item.message_id)))
@@ -1502,6 +1627,7 @@ function buildFriendItem(raw: unknown, data: unknown): Record<string, unknown> {
   const item: Record<string, unknown> = { ...getObject(raw) }
   if (!item.channel_id && item.channelId) item.channel_id = item.channelId
   if (!item.guild_id && item.guildId) item.guild_id = item.guildId
+  if (getString(item.guild_id) || getString(item.guildId)) item._groupMember = true
   if (name) {
     item.nickname = name
     item.remark = name
@@ -2011,6 +2137,20 @@ export class Connector {
     const mapped = mapAction(api, args)
     if (!mapped) return undefined
     const active = getActiveBot()
+    const privateUserId = getPrivateSendUserId(api, args)
+    if (privateUserId) {
+      const result = await sendPrivateSatoriMessage(
+        privateUserId,
+        getString(mapped.params.content),
+        getString(args.group_id) || getString(args.guild_id) || undefined,
+        active,
+        getString(mapped.params.channel_id) || getString(args.channel_id),
+      )
+      const response = satoriResponseToOneBot(api, result.data, active.platform)
+      response.channel_id = result.channelId
+      response.channelId = result.channelId
+      return response.data
+    }
     const data = await request(mapped.method, mapped.params, active)
     return satoriResponseToOneBot(api, data, active.platform).data
   }
@@ -2022,6 +2162,26 @@ export class Connector {
       return
     }
     const active = getActiveBot()
+    const privateUserId = getPrivateSendUserId(action, value)
+    if (privateUserId) {
+      void sendPrivateSatoriMessage(
+        privateUserId,
+        getString(mapped.params.content),
+        getString(value.group_id) || getString(value.guild_id) || undefined,
+        active,
+        getString(mapped.params.channel_id) || getString(value.channel_id),
+      )
+        .then((result) => {
+          const response = satoriResponseToOneBot(action, result.data, active.platform)
+          response.channel_id = result.channelId
+          response.channelId = result.channelId
+          dispatch(response, echo)
+        })
+        .catch((error: unknown) => {
+          dispatch({ retcode: -1, data: null, error: String(error) }, echo)
+        })
+      return
+    }
     if (active && (action === 'get_friend_list' || action === 'get_group_list')) {
       const type = action === 'get_friend_list' ? 'friend' : 'group'
       void loadContactType(active, { type, action, echo })

package/client/web/src/function/elements/information.ts

@@ -43,6 +43,7 @@ export interface UserElem {
     always_top?: boolean
     message_id?: string
     highlight?: string
+    _groupMember?: boolean
 }
 
 export interface UserFriendElem extends UserElem {

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