koishi-plugin-chat-patch 5.0.3 → 5.3.0

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

@@ -87,11 +87,14 @@ import { useUIStore } from '../state/ui'
 import { useSettingsStore } from '../state/settings'
 import { useQzoneStore } from '../state/qzone'
 import {
+    findSessionContact,
     getSessionId,
     getMissingGroupPreviewSessions,
     mergeEarlySessionContacts,
+    normalizeGroupId,
     normalizeSessionId,
     resolveIncomingSession,
+    setSessionContact,
 } from './utils/sessionUtil'
 
 const popInfo = new PopInfo()
@@ -117,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()
@@ -961,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()
                     }
                 }
@@ -1604,7 +1614,18 @@ function saveUser(msg: { [key: string]: any }, type: string) {
                     list = list.filter((item, index, arr) => {
                         return (
                             arr.findIndex((item2) => {
-                                return item2.group_id == item.group_id
+                                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
                         )
                     })
@@ -1674,15 +1695,34 @@ function saveUser(msg: { [key: string]: any }, type: string) {
             list,
             contactStore.baseOnMsgList,
         )
-        const existingIds = new Set(
-            contactStore.userList.map((item) => {
-                return String(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(String(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
@@ -1851,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(
@@ -2295,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)
@@ -2316,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
@@ -2370,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(
@@ -2474,8 +2523,10 @@ function newMsg(_: string, data: any) {
 
         // 会话状态更新 ============================================
         const sessionId = isTempGroupMessage ? sender : id
-        const normalizedSessionId = normalizeSessionId(sessionId)
+        const sessionKey = String(sessionChannelId || sessionId)
+        const normalizedSessionId = normalizeSessionId(sessionKey)
         let session = contactStore.baseOnMsgList.get(normalizedSessionId)
+            ?? contactStore.baseOnMsgList.get(normalizeSessionId(sessionId))
         if (!session) {
             if (isTempGroupMessage) {
                 session = {
@@ -2508,7 +2559,7 @@ function newMsg(_: string, data: any) {
                 sender != loginId &&
                 sender !== '' &&
                 sender !== '0' &&
-                sessionId !== showId &&
+                !isCurrentSession &&
                 allowGroupInnerNotice
             ) {
                 if (!session.new_msg) {
@@ -2516,12 +2567,12 @@ 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('[特別关心]') }
             }
-            contactStore.baseOnMsgList.set(normalizedSessionId, session)
+            setSessionContact(contactStore.baseOnMsgList, session)
             updateBaseOnMsgList()
         }
 
@@ -2533,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
@@ -2545,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

@@ -443,7 +443,7 @@ export function satoriEventToOneBot(
     const userId = getString(user.id)
       || (isGroup ? '' : getString(channel.id).replace(/^private:/, ''))
     const groupId = isGroup
-      ? getString(guild.id) || normalizeGroupId(getString(channel.id))
+      ? normalizeGroupId(getString(guild.id)) || normalizeGroupId(getString(channel.id))
       : ''
     const directChannelId = isGroup ? groupId : userId
     const nickname = getString(user.name) || getString(user.nick) || userId
@@ -685,7 +685,7 @@ function messageListFromResponse(data: unknown): unknown[] {
     const member = getObject(message.member)
     const isGroup = isGroupChannel(channel, guild)
     const groupId = isGroup
-      ? getString(guild.id) || normalizeGroupId(getString(channel.id))
+      ? normalizeGroupId(getString(guild.id)) || normalizeGroupId(getString(channel.id))
       : ''
     const userId = getString(user.id)
       || (isGroup ? '' : getString(channel.id).replace(/^private:/, ''))
@@ -740,7 +740,8 @@ export function satoriResponseToOneBot(
     const mapped = list.map((item) => {
       const value = getObject(item)
       const user = getObject(value.user)
-      const id = getString(value.id)
+      const rawId = getString(value.id)
+      const id = action === 'get_group_list' ? normalizeGroupId(rawId) : rawId
       const friendName = getString(user.name)
         || getString(user.nick)
         || getString(value.name)

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/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()
 
@@ -295,15 +298,15 @@ export function getMsgRawTxt(data: any): string {
                     const atText = String(message[i].text)
                     back += atText.startsWith('@') ? atText : '@' + atText
                     break
-                case 'text':
-                    back += message[i].text
-                        .replaceAll('\n', ' ')
-                        .replaceAll('\r', ' ')
-                    break
-                case 'i18n':
-                    back += message[i].path || '[i18n]'
-                    break
-                case 'forward':
+                case 'text':
+                    back += message[i].text
+                        .replaceAll('\n', ' ')
+                        .replaceAll('\r', ' ')
+                    break
+                case 'i18n':
+                    back += message[i].path || '[i18n]'
+                    break
+                case 'forward':
                     back += '[' + $t('聊天记录') + ']'
                     break
                 case 'face':
@@ -365,7 +368,7 @@ export function hasAtMe(data: any): boolean {
  * @param data
  * @returns CQCode 字符串
  */
-export function parseJSONCQCode(data: any) {
+export function parseJSONCQCode(data: any) {
     let back = ''
     data.forEach((item: any) => {
         if (item.type != 'text') {
@@ -380,9 +383,9 @@ export function parseJSONCQCode(data: any) {
         }
     })
     return back
-}
-
-/**
+}
+
+/**
  * 将扁平的 CQCode 消息处理成消息对象
  * @param msg CQCode 消息
  * @returns 消息对象
@@ -425,10 +428,10 @@ export function parseCQ(data: any) {
                         .substring(RegExp.$2.lastIndexOf('=') + 1)
                         .replaceAll('\\n', '\n')
                     // 对 html 转义字符进行反转义
-                    const a = document.createElement('a')
-                    a.innerHTML = info.text
-                    info.text = a.innerText
-                }
+                    const a = document.createElement('a')
+                    a.innerHTML = info.text
+                    info.text = a.innerText
+                }
                 // 对回复消息进行特殊处理
                 if (info.type == 'reply') {
                     data.source = {
@@ -604,15 +607,15 @@ async function persistBase64Media(msg: string | any[] | undefined): Promise<stri
     }))
 }
 
-export async function sendMsgRaw(
-    id: string,
-    type: string,
-    msg: string | any[] | undefined,
-    preShow = false,
-    echo = 'sendMsgBack',
-    targetChannelId?: string,
-    targetGuildId?: string,
-) {
+export async function sendMsgRaw(
+    id: string,
+    type: string,
+    msg: string | any[] | undefined,
+    preShow = false,
+    echo = 'sendMsgBack',
+    targetChannelId?: string,
+    targetGuildId?: string,
+) {
     const chatStore = useChatStore()
     const authStore = useAuthStore()
     const contactStore = useContactStore()
@@ -742,11 +745,11 @@ export async function sendMsgRaw(
                 Connector.send(
                     authStore.jsonMap.message_list.name_group_send ??
                     'send_msg',
-                    {
-                        group_id: id,
-                        guild_id: String(targetGuildId ?? chatStore.chatInfo.show.guild_id ?? id),
-                        channel_id: String(targetChannelId ?? chatStore.chatInfo.show.channel_id ?? id),
-                        message: msg,
+                    {
+                        group_id: id,
+                        guild_id: String(targetGuildId ?? chatStore.chatInfo.show.guild_id ?? id),
+                        channel_id: String(targetChannelId ?? chatStore.chatInfo.show.channel_id ?? id),
+                        message: msg,
                     },
                     echo + '_uuid_' + msgUUID,
                 )
@@ -757,9 +760,9 @@ export async function sendMsgRaw(
                         authStore.jsonMap.message_list.name_temp_send ??
                         'send_temp_msg',
                         {
-                            user_id: id.split('/')[0],
-                            group_id: id.split('/')[1],
-                            channel_id: String(targetChannelId ?? chatStore.chatInfo.show.channel_id ?? `private:${String(id).split('/')[0]}`),
+                            user_id: id.split('/')[0],
+                            group_id: id.split('/')[1],
+                            channel_id: String(targetChannelId ?? chatStore.chatInfo.show.channel_id ?? `private:${String(id).split('/')[0]}`),
                             message: msg,
                         },
                         echo + '_uuid_' + msgUUID,
@@ -769,8 +772,8 @@ export async function sendMsgRaw(
                         authStore.jsonMap.message_list.name_user_send ??
                         '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)}`)),
+                            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)}`)),
                             message: msg,
                         },
                         echo + '_uuid_' + msgUUID,
@@ -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)
-    })
+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)
+        }
+    }
+}
 
-    return [...sessionMap.values()]
-}
+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)
         }))