koishi-plugin-chat-patch 5.1.0 → 5.3.1

package/client/web/src/function/model/emoji.ts

@@ -3,30 +3,7 @@ export default class Emoji {
   static readonly descMap = new Map<string, string>()
   static readonly allList = new Set<number>()
   static readonly allSuperList = new Set<number>()
-
-  static readonly superList: readonly number[] = [
-    5, 311, 312, 314, 317, 318, 319, 320, 324, 325, 337,
-    338, 339, 341, 342, 343, 344, 345, 346, 181, 74, 75,
-    351, 349, 350, 395, 114, 326, 53, 137, 333, 424, 415,
-    392, 425, 427, 426, 419, 429, 472, 474, 475, 476, 477,
-    478, 479,
-  ]
-
-  static readonly normalList: readonly number[] = [
-    14, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 0, 15, 16,
-    96, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
-    31, 32, 33, 34, 35, 36, 37, 38, 39, 97, 98, 99, 100,
-    101, 102, 103, 104, 105, 106, 107, 108, 305, 109, 110,
-    111, 172, 182, 179, 173, 174, 212, 175, 178, 177, 176,
-    183, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271,
-    272, 277, 307, 306, 281, 282, 283, 284, 285, 293, 286,
-    287, 289, 294, 297, 298, 299, 300, 323, 332, 336, 353,
-    355, 356, 354, 352, 357, 428, 334, 347, 303, 302, 295,
-    49, 66, 63, 64, 187, 146, 116, 67, 60, 185, 76, 124,
-    118, 78, 119, 79, 120, 121, 77, 123, 201, 273, 46, 112,
-    56, 169, 171, 59, 144, 147, 148, 89, 41, 125, 42, 43, 86, 129,
-    85,
-  ]
+  static readonly normalList: readonly number[] = []
 
   static readonly emojiList: readonly number[] = [
     128522, 128524, 128538, 128531, 128560, 128541, 128513, 128540,
@@ -40,19 +17,6 @@ export default class Emoji {
     10068, 128299, 128147, 127978,
   ]
 
-  static readonly responseApngId: readonly number[] = [
-    5, 314, 318, 319, 320, 324, 337, 338, 339, 341, 342, 343, 344,
-    345, 346, 181, 74, 75, 351, 349, 350, 395, 326, 53, 333, 424,
-    425, 427, 426, 14, 4, 8, 9, 10, 12, 16, 96, 21, 23, 24, 25, 26,
-    27, 28, 29, 30, 32, 33, 34, 38, 39, 97, 98, 99, 100, 101, 102,
-    103, 104, 106, 305, 109, 111, 182, 179, 173, 174, 212, 175, 176,
-    183, 262, 264, 265, 266, 267, 268, 269, 270, 271, 272, 277, 307,
-    306, 281, 282, 284, 285, 293, 287, 289, 294, 297, 298, 299, 332,
-    336, 353, 355, 356, 354, 352, 357, 428, 334, 347, 303, 302, 295,
-    49, 66, 63, 116, 60, 76, 124, 118, 78, 79, 120, 123, 201, 273,
-    171, 144, 147, 89, 41, 125, 42, 43, 129, 85,
-  ]
-
   static readonly responseEmojiId: readonly number[] = [
     128522, 128524, 128538, 128531, 128560, 128541, 128513, 128540,
     9786, 128532, 128516, 128527, 128530, 128563, 128536, 128557,
@@ -67,7 +31,7 @@ export default class Emoji {
 
   private constructor(
     public id: number,
-    public type: 'apng' | 'emoji',
+    public type: 'emoji',
     public hasSuper: boolean,
     public superSuffix: number[],
   ) {
@@ -77,28 +41,16 @@ export default class Emoji {
   }
 
   static get(id: number): Emoji | undefined {
-    if (id < 5000) {
-      const value = this.apngMap.get(id)
-      return value ? new Emoji(id, 'apng', value.super, value.suffix) : undefined
-    }
+    if (id < 5000) return undefined
     return new Emoji(id, 'emoji', false, [])
   }
 
   static has(id: number): boolean {
-    return id >= 5000 || this.apngMap.has(id)
-  }
-
-  static init() {
-    for (const id of [...this.superList, ...this.normalList, ...this.responseApngId]) {
-      const isSuper = this.superList.includes(id)
-      this.apngMap.set(id, { super: isSuper, suffix: [] })
-      if (isSuper) this.allSuperList.add(id)
-      this.allList.add(id)
-    }
+    return id >= 5000
   }
 
   static get responseId(): readonly number[] {
-    return [...this.responseApngId, ...this.responseEmojiId]
+    return this.responseEmojiId
   }
 
   get description(): string {
@@ -106,22 +58,10 @@ export default class Emoji {
   }
 
   get value(): string {
-    return this.type === 'apng' ? this.getNormalUrl(this.id) : String.fromCodePoint(this.id)
+    return String.fromCodePoint(this.id)
   }
 
   get superValue(): string | undefined {
-    if (!this.hasSuper) return undefined
-    return this.getSuperUrl(this.id, this.suffixId)
-  }
-
-  private getNormalUrl(id: number): string {
-    return `https://lib.stapxs.cn/download/stapxs-qq-lite/qq_emoji/${id}/apng/${id}.png`
-  }
-
-  private getSuperUrl(id: number, suffix?: number): string {
-    const name = suffix ? `${id}_${suffix}` : `${id}`
-    return `https://lib.stapxs.cn/download/stapxs-qq-lite/qq_emoji/${id}/lottie/${name}.json`
+    return undefined
   }
 }
-
-setTimeout(Emoji.init.bind(Emoji), 0)

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

@@ -87,6 +87,7 @@ import { useUIStore } from '../state/ui'
 import { useSettingsStore } from '../state/settings'
 import { useQzoneStore } from '../state/qzone'
 import {
+    findSessionContact,
     getSessionId,
     getMissingGroupPreviewSessions,
     mergeEarlySessionContacts,
@@ -119,6 +120,11 @@ 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()
@@ -963,9 +969,11 @@ const msgFunctions = {
                     )
                     // 更新消息列表
                     const onmsg = contactStore.baseOnMsgList.get(normalizeSessionId(id))
+                        ?? findSessionContact(Array.from(contactStore.baseOnMsgList.values()), id)
                     if (onmsg && list[0]) {
+                        const canonicalId = normalizeSessionId(getSessionId(onmsg))
                         Object.assign(onmsg, formatMessageData(list[0], Boolean(onmsg.group_id)))
-                        contactStore.baseOnMsgList.set(normalizeSessionId(id), onmsg)
+                        contactStore.baseOnMsgList.set(canonicalId, onmsg)
                         updateBaseOnMsgList()
                     }
                 }
@@ -1606,12 +1614,18 @@ function saveUser(msg: { [key: string]: any }, type: string) {
                     list = list.filter((item, index, arr) => {
                         return (
                             arr.findIndex((item2) => {
-                                const idA = String(item2.channel_id ?? item2.channelId ?? item2.group_id)
-                                const idB = String(item.channel_id ?? item.channelId ?? item.group_id)
-                                return idA === idB || (
-                                    !item2.channel_id && !item.channel_id &&
-                                    normalizeGroupId(idA) === normalizeGroupId(idB)
-                                )
+                                const channelA = String(item2.channel_id ?? item2.channelId ?? '')
+                                const channelB = String(item.channel_id ?? item.channelId ?? '')
+                                const groupA = String(item2.group_id ?? item2.id ?? item2.guild_id ?? '')
+                                const groupB = String(item.group_id ?? item.id ?? item.guild_id ?? '')
+                                if (channelA && channelB) {
+                                    return normalizeGroupId(channelA) === normalizeGroupId(channelB)
+                                }
+                                if (channelA || channelB) {
+                                    return normalizeGroupId(channelA || channelB)
+                                        === normalizeGroupId(groupA || groupB)
+                                }
+                                return normalizeGroupId(groupA) === normalizeGroupId(groupB)
                             }) == index
                         )
                     })
@@ -1681,15 +1695,34 @@ function saveUser(msg: { [key: string]: any }, type: string) {
             list,
             contactStore.baseOnMsgList,
         )
-        const existingIds = new Set(
-            contactStore.userList.map((item) => {
-                return normalizeSessionId(String(item.channel_id ?? item.channelId ?? item.user_id ?? item.group_id ?? ''))
-            }),
-        )
+        const sessionDedupKey = (item: any): 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, '')}`
+        }
+        const existingIds = new Set(contactStore.userList.map(sessionDedupKey))
         const freshList = list.filter((item) => {
-            return !existingIds.has(normalizeSessionId(String(item.channel_id ?? item.channelId ?? item.user_id ?? item.group_id ?? '')))
+            return !existingIds.has(sessionDedupKey(item))
         })
-        contactStore.userList = contactStore.userList.concat(freshList)
+        const mergedContacts = [...contactStore.userList, ...freshList] as (UserFriendElem & UserGroupElem)[]
+        const userMap = new Map<string, UserFriendElem & UserGroupElem>()
+        for (const item of mergedContacts) {
+            const key = sessionDedupKey(item)
+            const existing = userMap.get(key)
+            if (existing) {
+                const pyName = existing.py_name
+                const pyStart = existing.py_start
+                Object.assign(existing, item)
+                if (pyName) existing.py_name = pyName
+                if (pyStart) existing.py_start = pyStart
+                userMap.set(key, existing)
+            } else {
+                userMap.set(key, item)
+            }
+        }
+        contactStore.userList = [...userMap.values()]
         if (
             settingsStore.sysConfig.session_display_mode === 'all' ||
             didMergeEarlySessions
@@ -1858,13 +1891,11 @@ async function saveMsg(msg: any, append = undefined as undefined | string) {
         const lastMsg =
             chatStore.messageList[chatStore.messageList.length - 1]
         if (lastMsg) {
-            const user = contactStore.userList.find((item) => {
-                return (
-                    item.group_id == chatStore.chatInfo.show.id ||
-                    item.user_id == chatStore.chatInfo.show.id
-                )
-            })
-            const sessionId = normalizeSessionId(chatStore.chatInfo.show.id)
+            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
             if (session) {
                 const preview = formatMessageData(
@@ -2302,6 +2333,7 @@ function newMsg(_: string, data: any) {
         getString(getDataObject(data.channel).id)
     const loginId = String(authStore.loginInfo.uin ?? '')
     const showId = String(chatStore.chatInfo.show.id ?? '')
+    const showChannelId = getString(chatStore.chatInfo.show.channel_id)
     const sender = getString(rawInfo.sender) ||
         getString(getDataObject(data.sender).user_id) ||
         getString(data.user_id)
@@ -2323,6 +2355,16 @@ function newMsg(_: string, data: any) {
     const sessionChannelId = getString(rawInfo.channel_id) || getString(data.channel_id)
     const sessionGuildId = getString(rawInfo.guild_id) || getString(data.guild_id)
     if (!id || id === '0') return
+    const isCurrentSession = Boolean(
+        (
+            sessionChannelId &&
+            showChannelId &&
+            normalizeChannelForMatch(sessionChannelId) === normalizeChannelForMatch(showChannelId)
+        ) || (
+            (!sessionChannelId || !showChannelId) &&
+            (id === showId || targetId === showId || String(sessionChannelId || sessionGuildId || '') === showId)
+        ),
+    )
     // 在好友列表里找一下他
     const senderInfo = contactStore.userList.find((item) => {
         return String(item.user_id ?? '') === sender
@@ -2377,7 +2419,7 @@ function newMsg(_: string, data: any) {
         }
 
         // 显示消息 ============================================
-        if (id && (id === showId || targetId === showId)) {
+        if (id && isCurrentSession) {
             // 如果有正在输入的提示，清除它
             chatStore.chatInfo.show.appendInfo = undefined
             const cachedAvatar = getCachedUserAvatar(
@@ -2517,7 +2559,7 @@ function newMsg(_: string, data: any) {
                 sender != loginId &&
                 sender !== '' &&
                 sender !== '0' &&
-                sessionId !== showId &&
+                !isCurrentSession &&
                 allowGroupInnerNotice
             ) {
                 if (!session.new_msg) {
@@ -2525,7 +2567,7 @@ function newMsg(_: string, data: any) {
                     contactStore.newMsgCount++
                 }
             }
-            if (sessionId !== showId && allowGroupInnerNotice) {
+            if (!isCurrentSession && allowGroupInnerNotice) {
                 if (data.atme) { session.highlight = $t('[有人@你]') }
                 if (data.atall) { session.highlight = $t('[@全体]') }
                 if (isImportant) { session.highlight = $t('[特別关心]') }
@@ -2542,7 +2584,7 @@ function newMsg(_: string, data: any) {
             allowGroupSystemNotice
         ) {
             logger.add(LogType.DEBUG, '通知判定：', {
-                notShow: sessionId !== showId,
+                notShow: !isCurrentSession,
                 notFocus: !document.hasFocus(),
                 hidden: document.hidden,
                 isImportant: isImportant
@@ -2554,7 +2596,7 @@ function newMsg(_: string, data: any) {
             if (
                 forceGroupSystemNotice ||
                 forceImportantNotice ||
-                sessionId !== showId ||
+                !isCurrentSession ||
                 !document.hasFocus() ||
                 document.hidden
             ) {

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

@@ -234,6 +234,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 +257,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) {

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) {
@@ -94,6 +114,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 +141,10 @@ export function getBootstrap(): Promise<SatoriBootstrap> {
   return resolveBootstrap()
 }
 
+export function getBlockedPlatforms(): SatoriBootstrap['blockedPlatforms'] {
+  return bootstrap?.blockedPlatforms ?? []
+}
+
 export function getLogins(): SatoriLogin[] {
   return logins
 }
@@ -219,6 +246,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 +288,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

@@ -1026,10 +1026,7 @@ export function checkOpenTimes() {
 */
 export function checkNotice() {
     const uiStore = useUIStore()
-    let url = 'https://lib.stapxs.cn/download/stapxs-qq-lite/notice-config.json'
-    if (import.meta.env.DEV) {
-        url = 'notice_local.json'
-    }
+    const url = 'notice_local.json'
     const version = 3
     const fetchData = {
         time: new Date().getTime().toString(),

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

@@ -20,11 +20,14 @@ import { useContactStore } from '../../state/contact'
 import { useUIStore } from '../../state/ui'
 import { useAuthStore } from '../../state/auth'
 import { useChatStore } from '../../state/chat'
-import {
-    findSessionContact,
-    getSessionId,
-    normalizeSessionId,
-} from './sessionUtil'
+import {
+    findSessionContact,
+    getSessionAliases,
+    getSessionDedupKey,
+    getSessionId,
+    mergeSessionState,
+    normalizeSessionId,
+} from './sessionUtil'
 
 const logger = new Logger()
 
@@ -787,8 +790,9 @@ export function updateLastestHistory(item: UserFriendElem & UserGroupElem) {
     const authStore = useAuthStore()
     // 发起获取历史消息请求
     const type = item.user_id ? 'user' : 'group'
-    const id = item.user_id ? item.user_id : item.group_id
-    let name
+    const id = item.user_id ? item.user_id : item.group_id
+    const sessionId = normalizeSessionId(getSessionId(item))
+    let name
     if (authStore.jsonMap.message_list && type != 'group') {
         name = authStore.jsonMap.message_list.private_name
     } else {
@@ -804,7 +808,7 @@ export function updateLastestHistory(item: UserFriendElem & UserGroupElem) {
             message_id: 0,
             count: 1,
         },
-        'getChatHistoryOnMsg_' + id,
+        'getChatHistoryOnMsg_' + sessionId,
     )
 }
 
@@ -817,47 +821,75 @@ function getSessionSortName(item: UserFriendElem & UserGroupElem) {
     return item.py_start ?? getShowName(item.group_name ?? item.nickname ?? '', item.remark ?? '')
 }
 
-function normalizeBaseSessionMap() {
-    const contactStore = useContactStore()
-    let needNormalize = false
-    for (const id of contactStore.baseOnMsgList.keys()) {
-        if (typeof id !== 'string') {
-            needNormalize = true
-            break
-        }
-    }
-    if (!needNormalize) return
-
-    const normalized = new Map<string, UserFriendElem & UserGroupElem>()
-    contactStore.baseOnMsgList.forEach((item, id) => {
-        normalized.set(normalizeSessionId(id), item)
-    })
-    contactStore.baseOnMsgList.clear()
-    for (const [id, item] of normalized) {
-        contactStore.baseOnMsgList.set(id, item)
-    }
-}
-
-function getSessionList() {
-    const contactStore = useContactStore()
-    const settingsStore = useSettingsStore()
-    const sessionMap = new Map<string, UserFriendElem & UserGroupElem>()
-
-    if (settingsStore.sysConfig.session_display_mode === 'all') {
-        contactStore.userList.forEach((item) => {
-            const id = normalizeSessionId(getSessionId(item))
-            if (id !== '0' && id !== '') {
-                sessionMap.set(id, item)
-            }
-        })
-    }
-
-    contactStore.baseOnMsgList.forEach((item, id) => {
-        sessionMap.set(normalizeSessionId(id), item)
-    })
-
-    return [...sessionMap.values()]
-}
+function normalizeBaseSessionMap() {
+    const contactStore = useContactStore()
+    let needNormalize = false
+    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
+        const existing = seen.get(id)
+        if (existing && existing !== item) {
+            needNormalize = true
+            continue
+        }
+        seen.set(id, item)
+        if (
+            typeof rawKey !== 'string' ||
+            !getSessionAliases(item).includes(normalizeSessionId(rawKey))
+        ) {
+            needNormalize = true
+        }
+    }
+    if (!needNormalize) return
+
+    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
+        const existing = canonical.get(id)
+        if (existing && existing !== item) {
+            canonical.set(id, mergeSessionState(existing, item))
+        } else if (!existing) {
+            canonical.set(id, item)
+        }
+    })
+    contactStore.baseOnMsgList.clear()
+    for (const [id, item] of canonical) {
+        for (const alias of getSessionAliases(item)) {
+            contactStore.baseOnMsgList.set(alias, item)
+        }
+    }
+}
+
+function getSessionList() {
+    const contactStore = useContactStore()
+    const settingsStore = useSettingsStore()
+    const sessionMap = new Map<string, UserFriendElem & UserGroupElem>()
+
+    const addSession = (item: UserFriendElem & UserGroupElem) => {
+        const id = getSessionDedupKey(item)
+        if (id === 'group:0' || id === 'group:' || id === 'user:0' || id === 'user:') return
+        const existing = sessionMap.get(id)
+        if (existing && existing !== item) {
+            sessionMap.set(id, mergeSessionState(existing, item))
+        } else if (!existing) {
+            sessionMap.set(id, item)
+        }
+    }
+
+    if (settingsStore.sysConfig.session_display_mode === 'all') {
+        contactStore.userList.forEach((item) => {
+            addSession(item)
+        })
+    }
+
+    contactStore.baseOnMsgList.forEach((item) => {
+        addSession(item)
+    })
+
+    return [...sessionMap.values()]
+}
 
 /**
  * 刷新消息列表排序
@@ -890,9 +922,11 @@ export function updateBaseOnMsgList() {
     let groupAssistList = [] as any[]
     if (settingsStore.sysConfig.bubble_sort_user) {
         // 将 normalList 进行拆分
-        const shouldShowInMainList = (item: UserFriendElem & UserGroupElem) => {
-            return item.user_id || item.always_top
-        }
+        const shouldShowInMainList = (item: UserFriendElem & UserGroupElem) => {
+            return item.group_id
+                ? item.always_top
+                : Boolean(item.user_id) || item.always_top
+        }
         onMsgList = topList.concat(normalList.filter((item) => {
             return shouldShowInMainList(item)
         }))