koishi-plugin-chat-patch 5.1.0 → 5.3.1

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

package/client/web/src/main.ts

@@ -21,10 +21,15 @@ import './assets/css/sys_notice.css'
 
 import { getPortableFileLang } from './function/utils/systemUtil'
 import { preloadPinyin } from './function/utils/pinyin'
+import { avatarError, isAvatarImage } from './function/utils/avatarUtil'
 
 // 媒体资源由 <img>/<audio> 等元素加载时，失败事件只在前端控制台输出
 window.addEventListener('error', (event) => {
   const target = event.target
+  if (target instanceof HTMLImageElement && isAvatarImage(target)) {
+    avatarError(event)
+    return
+  }
   if (!(target instanceof HTMLImageElement) && !(target instanceof HTMLMediaElement)) return
   const source = target.currentSrc || target.src
   if (source.includes('/chat-patch/web/media') || source.includes('/chat-patch/api/media')) {

package/client/web/src/pages/Chat.vue

@@ -25,7 +25,7 @@
         <!-- 聊天基本信息 -->
         <div class="info">
             <font-awesome-icon class="back" :icon="['fas', 'angle-left']" @click="exitWin" />
-            <img :src="chat.show.avatar || '/img/icons/icon.svg'" @error="avatarError">
+            <img data-avatar :src="chat.show.avatar || '/img/icons/icon.svg'" @error="avatarError">
             <div class="info">
                 <p>
                     {{ chat.show.name }}
@@ -181,7 +181,7 @@
                                 <div v-for="(item, index) in chat.info.jin_info.list"
                                     :key="'jin-' + index">
                                     <div>
-                                        <img :src="item.sender_avatar || '/img/icons/icon.svg'">
+                                        <img data-avatar :src="item.sender_avatar || '/img/icons/icon.svg'">
                                         <div>
                                             <a>{{ item.sender_nick }}</a>
                                             <span>{{ item.sender_time ? Intl.DateTimeFormat(
@@ -517,7 +517,7 @@
                         <div><font-awesome-icon :icon="['fas', 'arrow-up-right-from-square']" /></div>
                         <a>{{ $t('跳转到消息') }}</a>
                     </div>
-                    <div v-show="isDev" @click="consoleLogMsg">
+                    <div @click="consoleLogMsg">
                         <div><font-awesome-icon :icon="['fas', 'screwdriver-wrench']" /></div>
                         <a>{{ $t('调试信息') }}</a>
                     </div>
@@ -738,7 +738,6 @@ const searchRequestId = ref(0)
 const forwardList = ref(contactStore.userList)
 const chatImg = ref<any>(undefined)
 const trueLang = getTrueLang()
-const isDev = import.meta.env.DEV
 let selfRefreshTimer: number | null = null
 
 function ensureChannelPrefix(channelId: string, prefix: string): string {

package/client/web/src/pages/Friends.vue

@@ -50,23 +50,23 @@
                         {{ $t('空') }}
                     </div>
                     <FriendBody v-for="item in contactStore.showList"
-                        :key="'search-' + item.user_id + '-' + item.group_id"
+                        :key="'search-' + (item.channel_id || item.channelId || item.user_id || item.group_id)"
                         :data="item"
                         from="friend"
                         @click="userClick(item, $event)" />
                 </div>
                 <template v-else>
-                    <div v-for="bot in satoriLogins" :key="'bot-' + bot.selfId"
-                        :class="['robot-accordion', { expanded: bot.selfId === activeBotId }]">
+                    <div v-for="bot in satoriLogins" :key="'bot-' + botKey(bot.platform, bot.selfId)"
+                        :class="['robot-accordion', { expanded: botKey(bot.platform, bot.selfId) === activeBotId }]">
                         <div class="robot-accordion-header" @click="toggleRobot(bot)">
-                            <img :src="bot.avatar || '/img/icons/icon.svg'" :alt="bot.name" @error="avatarError">
+                            <img data-avatar :src="bot.avatar || '/img/icons/icon.svg'" :alt="bot.name" @error="avatarError">
                             <div>
                                 <span :title="bot.name">{{ bot.name }}</span>
                                 <small>{{ bot.platform }}</small>
                             </div>
-                            <font-awesome-icon :icon="['fas', bot.selfId === activeBotId ? 'angle-up' : 'angle-down']" />
+                            <font-awesome-icon :icon="['fas', botKey(bot.platform, bot.selfId) === activeBotId ? 'angle-up' : 'angle-down']" />
                         </div>
-                        <div v-if="bot.selfId === activeBotId" class="robot-accordion-content">
+                        <div v-if="botKey(bot.platform, bot.selfId) === activeBotId" class="robot-accordion-content">
                             <div v-if="!contactStore.friendLoading && contactStore.userList.length === 0"
                                 class="empty-state">
                                 {{ $t('空') }}
@@ -100,7 +100,7 @@
                                                                     return ( get.class_id == info.class_id )
                                                                 },
                                                             )"
-                                                    :key=" 'fb-' + (item.user_id ? item.user_id : item.group_id) "
+                                                    :key=" 'fb-' + (item.channel_id || item.channelId || item.user_id || item.group_id) "
                                                     :data="item" from="friend"
                                                     @click="userClick(item, $event)" />
                                             </div>
@@ -125,7 +125,7 @@
                                                                 return get.class_id == undefined
                                                             },
                                                         )"
-                                                :key="'fb-' + (item.user_id ? item.user_id : item.group_id)"
+                                                :key="'fb-' + (item.channel_id || item.channelId || item.user_id || item.group_id)"
                                                 :data="item"
                                                 from="friend"
                                                 @click="userClick(item, $event)" />
@@ -134,7 +134,7 @@
                                 </template>
                                 <template v-else>
                                     <FriendBody v-for="item in contactStore.userList"
-                                        :key="'fb-' + (item.user_id ? item.user_id : item.group_id)"
+                                        :key="'fb-' + (item.channel_id || item.channelId || item.user_id || item.group_id)"
                                         :data="item"
                                         from="friend"
                                         @click="userClick(item, $event)" />
@@ -144,7 +144,7 @@
                             <div v-else class="list">
                                 <div>
                                     <FriendBody v-for="item in contactStore.showList"
-                                        :key="'fb-' + (item.user_id ? item.user_id : item.group_id)"
+                                        :key="'fb-' + (item.channel_id || item.channelId || item.user_id || item.group_id)"
                                         :data="item" from="friend"
                                         @click="userClick(item, $event)" />
                                 </div>
@@ -183,8 +183,8 @@
 
     import { reloadUsers } from '../function/utils/appUtil'
     import { Connector, flushPendingBotEvents, loadContactsFromCache, login as loginInfo } from '../function/connect'
-    import { getActiveBot, getLogins, setActiveBot } from '../function/satori'
-    import { normalizeSessionId } from '../function/utils/sessionUtil'
+    import { botKey, getActiveBot, getLogins, setActiveBot } from '../function/satori'
+    import { normalizeGroupId, normalizeSessionId } from '../function/utils/sessionUtil'
     import { avatarError } from '../function/utils/avatarUtil'
     import { backend } from '../runtime/backend'
     import { matchPinyin } from '../function/utils/pinyin'
@@ -220,7 +220,12 @@
     const searchInfo = ref('')
     const classStatus = ref<{ [key: string]: boolean }>({})
     const satoriLogins = ref<Array<{ platform: string; selfId: string; name: string; avatar?: string; status?: number; features?: string[] }>>(getLogins())
-    const activeBotId = ref(getActiveBot()?.selfId ?? loginInfo.selectedSatoriBot ?? '')
+    const active = getActiveBot()
+    const activeBotId = ref(
+        active?.platform && active.selfId
+            ? botKey(active.platform, active.selfId)
+            : loginInfo.selectedSatoriBot ?? '',
+    )
 
     watch(() => loginInfo.satoriLogins, (list) => {
         satoriLogins.value = list ?? []
@@ -230,7 +235,7 @@
     }, { immediate: true })
 
     const currentBotName = computed(() => {
-        return satoriLogins.value.find((item) => item.selfId === activeBotId.value)?.name ?? ''
+        return satoriLogins.value.find((item) => botKey(item.platform, item.selfId) === activeBotId.value)?.name ?? ''
     })
 
     const allContacts = computed<ContactWithBot[]>(() => {
@@ -240,17 +245,27 @@
             bot?: ContactWithBot['_bot'],
         ) => {
             for (const item of items) {
-                const id = String(item.user_id ?? item.group_id ?? '')
+                const rawId = String(
+                    item.channel_id
+                    || item.channelId
+                    || item.user_id
+                    || item.group_id
+                    || '',
+                )
+                const groupId = String(item.group_id || '')
+                const id = groupId
+                    ? `group:${normalizeGroupId(rawId || groupId)}`
+                    : `user:${rawId.replace(/^(?:private|direct):/i, '')}`
                 const key = [bot?.platform ?? '', bot?.selfId ?? '', id]
                     .map((value) => encodeURIComponent(String(value)))
                     .join(':')
                 map.set(key, { ...item, _bot: bot })
             }
         }
-        const currentBot = satoriLogins.value.find((item) => item.selfId === activeBotId.value)
+        const currentBot = satoriLogins.value.find((item) => botKey(item.platform, item.selfId) === activeBotId.value)
         addContacts(contactStore.userList, currentBot)
-        for (const [selfId, state] of contactStore.botStates) {
-            const bot = satoriLogins.value.find((item) => item.selfId === selfId)
+        for (const [stateKey, state] of contactStore.botStates) {
+            const bot = satoriLogins.value.find((item) => botKey(item.platform, item.selfId) === stateKey)
             addContacts(state.userList, bot)
         }
         return [...map.values()]
@@ -274,9 +289,10 @@
     }
 
     function selectRobot(bot: { platform: string; selfId: string; name: string; avatar?: string; features?: string[] }) {
-        if (bot.selfId === activeBotId.value) return
+        const key = botKey(bot.platform, bot.selfId)
+        if (key === activeBotId.value) return
         snapshotCurrentBot()
-        activeBotId.value = bot.selfId
+        activeBotId.value = key
         setActiveBot(bot.platform, bot.selfId)
         loginInfo.uin = bot.selfId
         loginInfo.nickname = bot.name
@@ -289,14 +305,31 @@
             platform: bot.platform,
             avatar: bot.avatar,
             satoriLogins: satoriLogins.value,
-            selectedSatoriBot: bot.selfId,
+            selectedSatoriBot: key,
         }
-        const saved = contactStore.botStates.get(bot.selfId)
+        const saved = contactStore.botStates.get(key)
         if (saved) {
             contactStore.userList = saved.userList
             contactStore.baseOnMsgList.clear()
-            for (const [key, value] of saved.baseList) {
-                contactStore.baseOnMsgList.set(normalizeSessionId(key), value)
+            for (const [, value] of saved.baseList) {
+                const id = String(value.channel_id || value.channelId || value.user_id || value.group_id || '')
+                if (id && id !== '0') {
+                    contactStore.baseOnMsgList.set(normalizeSessionId(id), value)
+                    const legacyId = String(value.user_id || value.group_id || '')
+                    if (legacyId && legacyId !== id) {
+                        contactStore.baseOnMsgList.set(normalizeSessionId(legacyId), value)
+                    }
+                }
+            }
+            for (const item of saved.onMsgList) {
+                const id = String(item.channel_id || item.channelId || item.user_id || item.group_id || '')
+                if (id && id !== '0') {
+                    contactStore.baseOnMsgList.set(normalizeSessionId(id), item)
+                    const legacyId = String(item.user_id || item.group_id || '')
+                    if (legacyId && legacyId !== id) {
+                        contactStore.baseOnMsgList.set(normalizeSessionId(legacyId), item)
+                    }
+                }
             }
             contactStore.onMsgList = saved.onMsgList
             flushPendingBotEvents(bot.platform, bot.selfId)
@@ -312,7 +345,7 @@
     }
 
     function toggleRobot(bot: { platform: string; selfId: string; name: string; avatar?: string; features?: string[] }) {
-        if (activeBotId.value === bot.selfId) {
+        if (activeBotId.value === botKey(bot.platform, bot.selfId)) {
             backToRobots()
         } else {
             selectRobot(bot)
@@ -368,7 +401,7 @@
     }
 
     function userClick(data: ContactWithBot, event: Event) {
-        if (data._bot && data._bot.selfId !== activeBotId.value) {
+        if (data._bot && botKey(data._bot.platform, data._bot.selfId) !== activeBotId.value) {
             selectRobot(data._bot)
         }
         const sender = event.currentTarget as HTMLDivElement
@@ -380,18 +413,27 @@
         contactStore.showList = [] as any[]
 
         const back = {
-            type: data.user_id ? 'user' : 'group',
-            id: data.user_id ? data.user_id : data.group_id,
+            type: data.group_id ? 'group' : 'user',
+            id: data.group_id || data.user_id,
             name: getShowName(data),
             avatar: data.avatar || '/img/icons/icon.svg',
             jump: sender.dataset.jump,
-            channel_id: data.channel_id,
+            channel_id: data.channel_id || data.channelId,
             guild_id: data.guild_id,
         } as BaseChatInfoElem
         if (back.id === undefined || back.id === null || String(back.id) === '' || String(back.id) === '0') return
         // 更新聊天框
         emit('userClick', back)
-        contactStore.baseOnMsgList.set(normalizeSessionId(back.id), data)
+        const sessionId = String(
+            data.channel_id
+            || data.channelId
+            || data.user_id
+            || data.group_id
+            || '',
+        )
+        if (sessionId && sessionId !== '0') {
+            contactStore.baseOnMsgList.set(normalizeSessionId(sessionId), data)
+        }
         // 获取历史消息
         if(!uiStore.nowGetHistory) {
             emit('loadHistory', back)

package/client/web/src/pages/Info.vue

@@ -16,7 +16,7 @@
             </header>
             <div class="chat-info-base user">
                 <div>
-                    <img :src="chat.show.avatar || '/img/icons/icon.svg'" @error="avatarError">
+                    <img data-avatar :src="chat.show.avatar || '/img/icons/icon.svg'" @error="avatarError">
                     <div>
                         <a>{{ chat.show.name }}</a>
                         <span>{{ chat.show.id }}</span>
@@ -109,7 +109,7 @@
                         :item-size="60"
                         key-field="user_id">
                         <div class="member-item edit">
-                            <img alt="nk" loading="lazy"
+                            <img alt="nk" loading="lazy" data-avatar
                                 :src="memberAvatar(item) || '/img/icons/icon.svg'">
                             <div>
                                 <a @click="startChat(item)">{{
@@ -128,7 +128,7 @@
             </BcTab>
             <div :class="'ss-card user-config' + (Object.keys(showUserConfig).length > 0 ? ' show' : '')">
                 <div>
-                    <img alt="nk" :src="showUserConfig.avatar || '/img/icons/icon.svg'">
+                    <img alt="nk" data-avatar :src="showUserConfig.avatar || '/img/icons/icon.svg'">
                     <div>
                         <a>{{ showUserConfig.card != '' ? showUserConfig.card : showUserConfig.nickname }}</a>
                         <span>{{ showUserConfig.user_id }}</span>