koishi-plugin-chat-patch 5.3.0 → 5.5.0

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

@@ -1,9 +1,7 @@
 import type { Session } from '../elements/information'
 
 export function normalizeGroupId(value: string): string {
-  const raw = value.replace(/^(?:group|room|chat|channel|guild):/i, '').trim()
-  const wrapped = raw.match(/^\[_?([\s\S]+?)_?\]$/)
-  return wrapped ? wrapped[1] : raw || value
+  return String(value)
 }
 
 export function normalizeSessionId(value: number | string): string {
@@ -27,12 +25,6 @@ export function getSessionAliases(item: Session): string[] {
         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'
@@ -44,11 +36,10 @@ 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)}`
+    if (channelId) return normalizeSessionId(channelId)
+    if (groupId) return normalizeSessionId(groupId)
+    if (userId) return normalizeSessionId(userId)
+    return ''
 }
 
 export function setSessionContact(
@@ -60,6 +51,21 @@ export function setSessionContact(
   }
 }
 
+export function upsertSessionContact(
+  contacts: Session[],
+  item: Session,
+): Session[] {
+  const key = getSessionDedupKey(item)
+  if (!key) return contacts
+  const index = contacts.findIndex((current) => getSessionDedupKey(current) === key)
+  if (index >= 0) {
+    const next = [...contacts]
+    Object.assign(next[index], item)
+    return next
+  }
+  return [...contacts, item]
+}
+
 export function findSessionContact(
     contacts: Session[],
     sessionId: number | string,
@@ -67,10 +73,6 @@ export function findSessionContact(
     const target = normalizeSessionId(sessionId)
     return contacts.find((item) => {
         return getSessionAliases(item).some((alias) => alias === target)
-            || (
-                Boolean(item.group_id) &&
-                normalizeGroupId(String(item.group_id)) === normalizeGroupId(target)
-            )
     })
 }
 

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,13 +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 {
-    if (/^(?:group|room|chat|channel|guild|private):/i.test(channelId)) return channelId
-    return `${prefix}:${channelId}`
-}
 
 function messageLocalTimeMs(item: any): number {
     const local = Number(item?.local_time ?? item?.timestamp_ms ?? item?.time_ms ?? 0)
@@ -757,8 +750,8 @@ async function refreshSelfHistory() {
     const id = chat.show.id
     if (!id || id === 0 || details.value[3].open || tags.value.showForwardPan) return
     const channelId = chat.show.type === 'group'
-        ? ensureChannelPrefix(String(chat.show.channel_id ?? id), 'group')
-        : ensureChannelPrefix(String(chat.show.channel_id ?? id), 'private')
+        ? String(chat.show.channel_id ?? id)
+        : String(chat.show.channel_id ?? id)
     let cached: Record<string, unknown>[] = []
     try {
         cached = await loadChatHistoryFromCache({
@@ -799,22 +792,8 @@ async function refreshSelfHistory() {
 }
 
 function startSelfRefresh() {
-    if (selfRefreshTimer !== null) {
-        window.clearInterval(selfRefreshTimer)
-        selfRefreshTimer = null
-    }
     if (!chat.show.id) return
     void refreshSelfHistory()
-    selfRefreshTimer = window.setInterval(() => {
-        void refreshSelfHistory()
-    }, 2500)
-}
-
-function stopSelfRefresh() {
-    if (selfRefreshTimer !== null) {
-        window.clearInterval(selfRefreshTimer)
-        selfRefreshTimer = null
-    }
 }
 
 //#region == 窗口移动相关 ==================================================
@@ -974,7 +953,6 @@ onMounted(() => {
 })
 
 onBeforeUnmount(() => {
-    stopSelfRefresh()
     if (resizeMainInputFrame !== null) {
         cancelAnimationFrame(resizeMainInputFrame)
         resizeMainInputFrame = null
@@ -1218,19 +1196,24 @@ async function loadMoreHistory() {
         }
         uiStore.loadHistoryFail = false
 
+        const channelId = String(
+            chatStore.chatInfo.show.channel_id
+            ?? chatStore.chatInfo.show.id
+            ?? '',
+        )
         if (useMixedHistory) {
             let localMsgs = [] as any[]
             if (Number.isFinite(firstMsgTime)) {
                 localMsgs = await dbGetBeforeByTime(
                     authStore.loginInfo.uin,
-                    chatStore.chatInfo.show.id,
+                    channelId,
                     firstMsgTime,
                     20,
                 )
             } else {
                 localMsgs = await dbGetBefore(
                     authStore.loginInfo.uin,
-                    chatStore.chatInfo.show.id,
+                    channelId,
                     firstMsgId,
                     20,
                 )
@@ -1252,12 +1235,6 @@ async function loadMoreHistory() {
             }
         }
 
-        const type = chatStore.chatInfo.show.type
-        const id = chatStore.chatInfo.show.id
-        const rawChannelId = String(chatStore.chatInfo.show.channel_id ?? '')
-        const channelId = type === 'group'
-            ? ensureChannelPrefix(rawChannelId || String(id), 'group')
-            : ensureChannelPrefix(rawChannelId || String(id), 'private')
         const cached = await loadChatHistoryFromCache({
             platform: String(authStore.loginInfo.platform ?? ''),
             selfId: String(authStore.loginInfo.uin ?? ''),
@@ -2031,6 +2008,7 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
                             targetType as 'group' | 'user',
                             targetId,
                             msgBody,
+                            targetChannelId || undefined,
                         )
                         if (!result.ok) {
                             new PopInfo().add(PopType.ERR, $t('合并转发发送失败'))
@@ -2073,11 +2051,7 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
                                     scrollToMsg('chat-' + sentMsg.message_id, true)
                                 })
                             }
-                            const sentChannelId = targetType === 'group'
-                                ? (targetChannelId || targetId)
-                                : /^(?:private|direct):/i.test(targetChannelId || '')
-                                  ? targetChannelId
-                                  : `private:${targetId}`
+                            const sentChannelId = result.channelId || targetChannelId || targetId
                             if (result.native && !result.messageId) {
                                 // 原生路径已经由后端 before-send/发送拦截写入，缺少消息 id 时不再重复写入
                             } else {
@@ -2097,7 +2071,8 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
                                     kind: 'forward',
                                 })
                             }
-                            const targetSession = contactStore.baseOnMsgList.get(normalizeSessionId(targetId))
+                            const targetSessionKey = targetChannelId || targetId
+                            const targetSession = contactStore.baseOnMsgList.get(normalizeSessionId(targetSessionKey))
                             if (targetSession) {
                                 const preview = `[${$t('聊天记录')}]`
                                 targetSession.raw_msg_base = preview
@@ -2105,7 +2080,7 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
                                     ? `${String(authStore.loginInfo.nickname ?? '')}: ${preview}`
                                     : preview
                                 targetSession.time = Math.floor(sentTime / 1000)
-                                contactStore.baseOnMsgList.set(normalizeSessionId(targetId), targetSession)
+                                contactStore.baseOnMsgList.set(normalizeSessionId(targetSessionKey), targetSession)
                                 updateBaseOnMsgList()
                             }
                         }
@@ -2154,8 +2129,9 @@ function forwardMsg(data: UserFriendElem & UserGroupElem) {
 
 function finishForward(data: UserFriendElem & UserGroupElem, id: string | number) {
     cancelForward()
-    if(contactStore.baseOnMsgList.get(normalizeSessionId(id)) == undefined) {
-        contactStore.baseOnMsgList.set(normalizeSessionId(id), data)
+    const sessionKey = String(data.channel_id ?? data.channelId ?? id ?? '')
+    if(contactStore.baseOnMsgList.get(normalizeSessionId(sessionKey)) == undefined) {
+        contactStore.baseOnMsgList.set(normalizeSessionId(sessionKey), data)
     }
     nextTick(() => {
         const user = document.getElementById('user-' + id)
@@ -2268,7 +2244,15 @@ async function revokeMsg() {
         ?? chatStore.chatInfo.show.channel_id
         ?? chat.show.id,
     )
-    await Connector.callApi('delete_msg', { channel_id: channelId, message_id: msgId })
+    try {
+        await Connector.callApi('delete_msg', { channel_id: channelId, message_id: msgId })
+    } catch {
+        new PopInfo().add(PopType.ERR, $t('撤回失败'))
+        return
+    }
+    msgData.revoke = true
+    msgData.revoked = true
+    msgData.revokeTime = Date.now() / 1000
 }
 
 async function reeditMsg() {
@@ -2630,13 +2614,31 @@ function sendVideo(file: File, fileName: string | null) {
     sendMedia(file, fileName, 'video')
 }
 
+async function isGifImage(file: File): Promise<boolean> {
+    if (file.type === 'image/gif' || /\.gif$/i.test(file.name || '')) return true
+    try {
+        const buffer = await file.slice(0, 6).arrayBuffer()
+        const bytes = new Uint8Array(buffer)
+        return bytes.length >= 6
+            && bytes[0] === 0x47
+            && bytes[1] === 0x49
+            && bytes[2] === 0x46
+            && bytes[3] === 0x38
+            && (bytes[4] === 0x37 || bytes[4] === 0x39)
+            && bytes[5] === 0x61
+    } catch {
+        return false
+    }
+}
+
 async function setImg(file: File | null) {
     const popInfo = new PopInfo()
     if (!file) return
     if (!file.type.includes('image/')) return
     if (file.size === 0) return
+    const isGif = await isGifImage(file)
 
-    if (file.size > 3145728) {
+    if (file.size > 3145728 && !isGif) {
         const options = { maxSizeMB: 3, useWebWorker: true }
         try {
             popInfo.add(PopType.INFO, $t('正在压缩图片 ……'))
@@ -3171,7 +3173,8 @@ async function handleInput(event: Event) {
             searchDebounceTimer.value = setTimeout(async () => {
                 const results = await dbSearchMessages(
                     authStore.loginInfo.uin,
-                    chatStore.chatInfo.show.id,
+                    chatStore.chatInfo.show.channel_id
+                    ?? chatStore.chatInfo.show.id,
                     value,
                 )
                 if (requestId !== searchRequestId.value || !details.value[3].open) return

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

@@ -14,7 +14,7 @@
         <div id="friend-list" :class="'friend-list' + (uiStore.openSideBar ? ' open' : '')">
             <div>
                 <div class="base">
-                    <span>{{ $t('列表') }}</span>
+                    <span>{{ $t('联系人列表') }}</span>
                     <div style="flex: 1" />
                     <font-awesome-icon :icon="['fas', 'rotate-right']" @click="reloadUser" />
                 </div>
@@ -56,17 +56,17 @@
                         @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('空') }}
@@ -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 { normalizeGroupId, normalizeSessionId } from '../function/utils/sessionUtil'
+    import { botKey, getActiveBot, getLogins, setActiveBot } from '../function/satori'
+    import { 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[]>(() => {
@@ -248,19 +253,17 @@
                     || '',
                 )
                 const groupId = String(item.group_id || '')
-                const id = groupId
-                    ? `group:${normalizeGroupId(rawId || groupId)}`
-                    : `user:${rawId.replace(/^(?:private|direct):/i, '')}`
+                const id = `${groupId ? 'group' : 'user'}|${String(rawId || groupId || item.user_id || '')}`
                 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()]
@@ -284,9 +287,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
@@ -299,9 +303,9 @@
             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()
@@ -339,7 +343,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)
@@ -395,7 +399,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
@@ -659,12 +663,12 @@
         font-size: 0.9rem;
     }
 
-    @media (max-width: 700px) {
+    @media (max-width: 800px) {
         .exp-header:not(.open) {
             display: none;
         }
     }
-    @media (max-width: 500px) {
+    @media (max-width: 800px) {
         .exp-header > span {
             display: block !important;
         }

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>
@@ -246,7 +246,7 @@ function userChannelId(): string {
         || props.chat.show.channelId
         || props.chat.info.user_info.channel_id
         || props.chat.info.user_info.channelId
-        || `private:${props.chat.show.id}`,
+        || String(props.chat.show.id),
     )
 }
 
@@ -256,7 +256,7 @@ function groupChannelId(): string {
         || props.chat.show.channelId
         || props.chat.info.group_info.channel_id
         || props.chat.info.group_info.channelId
-        || `group:${props.chat.show.id}`,
+        || String(props.chat.show.id),
     )
 }