koishi-plugin-chat-patch 5.1.0 → 5.3.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/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()
 
@@ -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)
         }))

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

@@ -5,30 +5,25 @@ export type PinYinData = {
     short: string[]
 }
 
-/* eslint-disable no-console */
-
-const PINYIN_SCRIPT_SRC = 'https://lib.stapxs.cn/modules/pinyin.min.js'
+type PinyinModule = typeof import('pinyin')
 
+let pinyinModule: PinyinModule | null = null
 let pinyinLoadPromise: Promise<boolean> | null = null
 
 function createEmptyPinyinData(): PinYinData {
     return {
         main: [],
-        short: []
+        short: [],
     }
 }
 
-function hasPinyinLib() {
-    return typeof window !== 'undefined' && typeof window.pinyin !== 'undefined'
-}
-
 function scheduleIdleTask(task: () => void) {
     if (typeof window === 'undefined') return
 
     const idleWindow = window as Window & {
         requestIdleCallback?: (
             callback: IdleRequestCallback,
-            options?: IdleRequestOptions
+            options?: IdleRequestOptions,
         ) => number
     }
 
@@ -41,57 +36,23 @@ function scheduleIdleTask(task: () => void) {
 }
 
 export function isPinyinReady() {
-    return hasPinyinLib()
+    return pinyinModule !== null
 }
 
 export function ensurePinyinLoaded(): Promise<boolean> {
-    if (hasPinyinLib()) return Promise.resolve(true)
-    if (typeof window === 'undefined' || typeof document === 'undefined') {
-        return Promise.resolve(false)
-    }
-    if (pinyinLoadPromise !== null) return pinyinLoadPromise
-
-    pinyinLoadPromise = new Promise((resolve) => {
-        let script = document.querySelector(
-            'script[data-ssqq-pinyin-lib="true"]',
-        ) as HTMLScriptElement | null
-
-        const finish = (success: boolean) => {
-            if (!success) {
-                pinyinLoadPromise = null
-            }
-            resolve(success)
-        }
-
-        const handleLoad = () => {
-            if (script) {
-                script.dataset.loaded = 'true'
-            }
-            finish(hasPinyinLib())
-        }
-
-        const handleError = () => {
-            if (isDebugMode()) console.warn('拼音库加载失败')
-            script?.remove()
-            finish(false)
-        }
-
-        if (script?.dataset.loaded === 'true') {
-            finish(hasPinyinLib())
-            return
-        }
-
-        if (!script) {
-            script = document.createElement('script')
-            script.src = PINYIN_SCRIPT_SRC
-            script.async = true
-            script.dataset.ssqqPinyinLib = 'true'
-            document.body.appendChild(script)
-        }
-
-        script.addEventListener('load', handleLoad, { once: true })
-        script.addEventListener('error', handleError, { once: true })
-    })
+    if (pinyinModule) return Promise.resolve(true)
+    if (pinyinLoadPromise) return pinyinLoadPromise
+
+    pinyinLoadPromise = import('pinyin')
+        .then((mod) => {
+            pinyinModule = mod
+            return true
+        })
+        .catch((error: unknown) => {
+            if (isDebugMode()) console.warn('本地拼音库加载失败:', error)
+            pinyinLoadPromise = null
+            return false
+        })
 
     return pinyinLoadPromise
 }
@@ -103,22 +64,21 @@ export function preloadPinyin() {
 }
 
 export function getPinyin(name: string): PinYinData {
-    if (!hasPinyinLib()) return createEmptyPinyinData()
+    if (!pinyinModule) return createEmptyPinyinData()
 
     try {
-        const pinyinLib = window.pinyin
-        if (!pinyinLib) return createEmptyPinyinData()
+        const pinyinLib = pinyinModule.pinyin
         return {
-            main: pinyinLib.pinyin(name, {
+            main: pinyinLib(name, {
                 heteronym: true,
                 compact: true,
                 style: 'normal',
-            }).map((item: string[]) => item.join('').toLowerCase()),
-            short: pinyinLib.pinyin(name, {
+            }).map((item) => item.join('').toLowerCase()),
+            short: pinyinLib(name, {
                 heteronym: true,
                 compact: true,
                 style: 'first_letter',
-            }).map((item: string[]) => item.join('').toLowerCase()),
+            }).map((item) => item.join('').toLowerCase()),
         }
     } catch (error) {
         if (isDebugMode()) console.warn('拼音转换失败:', error)
@@ -128,7 +88,7 @@ export function getPinyin(name: string): PinYinData {
 
 export function matchPinyin(
     pinyinData: PinYinData,
-    matchStr: string
+    matchStr: string,
 ): boolean {
     const str = matchStr.toLowerCase()
     for (const py of pinyinData.main) {

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

@@ -18,15 +18,45 @@ export function getSessionId(item: Session): number | string {
     return item.user_id ?? item.group_id ?? 0
 }
 
+function getLegacySessionId(item: Session): number | string | undefined {
+    return item.user_id ?? item.group_id
+}
+
+export function getSessionAliases(item: Session): string[] {
+    const rawAliases: Array<number | string | undefined> = [
+        getSessionId(item),
+        getLegacySessionId(item),
+    ]
+    if (item.group_id !== undefined && item.group_id !== null) {
+        rawAliases.push(normalizeGroupId(String(item.group_id)))
+    }
+    if (item.user_id !== undefined && item.user_id !== null) {
+        rawAliases.push(String(item.user_id).replace(/^(?:private|direct):/i, ''))
+    }
+    const aliases = rawAliases.filter((value): value is number | string => {
+        const text = String(value ?? '')
+        return text !== '' && text !== '0'
+    })
+    return [...new Set(aliases.map((value) => normalizeSessionId(value)))]
+}
+
+export function getSessionDedupKey(item: Session): string {
+    const channelId = String(item.channel_id ?? item.channelId ?? '')
+    const groupId = String(item.group_id ?? '')
+    const userId = String(item.user_id ?? '')
+    if (groupId) return `group:${normalizeGroupId(channelId || groupId)}`
+    if (userId) return `user:${userId.replace(/^(?:private|direct):/i, '')}`
+    return /^(?:private|direct):/i.test(channelId)
+        ? `user:${channelId.replace(/^(?:private|direct):/i, '')}`
+        : `group:${normalizeGroupId(channelId)}`
+}
+
 export function setSessionContact(
   map: Map<number | string, Session>,
   item: Session,
 ) {
-  const key = normalizeSessionId(getSessionId(item))
-  map.set(key, item)
-  const legacyId = item.user_id ?? item.group_id
-  if (legacyId !== undefined && legacyId !== null && String(legacyId) !== key) {
-    map.set(normalizeSessionId(String(legacyId)), item)
+  for (const alias of getSessionAliases(item)) {
+    map.set(alias, item)
   }
 }
 
@@ -34,8 +64,13 @@ export function findSessionContact(
     contacts: Session[],
     sessionId: number | string,
 ) {
+    const target = normalizeSessionId(sessionId)
     return contacts.find((item) => {
-        return normalizeSessionId(getSessionId(item)) === normalizeSessionId(sessionId)
+        return getSessionAliases(item).some((alias) => alias === target)
+            || (
+                Boolean(item.group_id) &&
+                normalizeGroupId(String(item.group_id)) === normalizeGroupId(target)
+            )
     })
 }
 
@@ -98,6 +133,28 @@ function copyDefinedSessionState<K extends SessionStateKey>(
 ) {
     const value = currentSession[key]
     if (value !== undefined) {
+        const current = contact[key]
+        if (
+            key === 'time' &&
+            typeof current === 'number' &&
+            typeof value === 'number' &&
+            current > value
+        ) {
+            return
+        }
+        contact[key] = value
+    }
+}
+
+function copyMissingIdentity<K extends keyof Session>(
+    contact: Session,
+    currentSession: Session,
+    key: K,
+) {
+    const value = currentSession[key]
+    if (value === undefined || value === null || String(value) === '') return
+    const current = contact[key]
+    if (current === undefined || current === null || String(current) === '') {
         contact[key] = value
     }
 }
@@ -106,6 +163,21 @@ export function mergeSessionState(
     contact: Session,
     currentSession: Session,
 ) {
+    const identityKeys = [
+        'channel_id',
+        'channelId',
+        'guild_id',
+        'guildId',
+        'group_id',
+        'user_id',
+        'group_name',
+        'nickname',
+        'remark',
+        'avatar',
+    ] as const
+    identityKeys.forEach((key) =>
+        copyMissingIdentity(contact, currentSession, key),
+    )
     SESSION_STATE_KEYS.forEach((key) =>
         copyDefinedSessionState(contact, currentSession, key),
     )
@@ -122,14 +194,18 @@ export function mergeEarlySessionContacts(
 ) {
     let didMerge = false
     contacts.forEach((contact) => {
-        const sessionId = normalizeSessionId(getSessionId(contact))
-        const currentSession = sessions.get(sessionId)
-        if (currentSession && currentSession !== contact) {
-            sessions.set(
-                sessionId,
-                mergeSessionState(contact, currentSession),
-            )
-            didMerge = true
+        for (const [key, currentSession] of sessions.entries()) {
+            if (currentSession === contact) continue
+            if (
+                findSessionContact([currentSession], getSessionId(contact))
+                || getSessionDedupKey(contact) === getSessionDedupKey(currentSession)
+            ) {
+                sessions.set(
+                    key,
+                    mergeSessionState(contact, currentSession),
+                )
+                didMerge = true
+            }
         }
     })
     return didMerge