koishi-plugin-chat-patch 5.1.0 → 5.3.0

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

@@ -50,7 +50,7 @@
                         {{ $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)" />
@@ -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>
@@ -184,7 +184,7 @@
     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 { normalizeGroupId, normalizeSessionId } from '../function/utils/sessionUtil'
     import { avatarError } from '../function/utils/avatarUtil'
     import { backend } from '../runtime/backend'
     import { matchPinyin } from '../function/utils/pinyin'
@@ -240,7 +240,17 @@
             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(':')
@@ -295,8 +305,25 @@
         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)
@@ -380,18 +407,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/Messages.vue

@@ -98,7 +98,7 @@
                                 <!-- 其他消息 -->
                                 <FriendBody
                                     v-for="item in contactStore.onMsgList"
-                                    :key="'inMessage-' + (item.user_id ? item.user_id : item.group_id)"
+                                    :key="'inMessage-' + (item.channel_id || item.channelId || item.user_id || item.group_id)"
                                     :select="chat.show.id === item.user_id || (chat.show.id === item.group_id && chat.group_name != '')"
                                     :menu="menu.select && menu.select == item"
                                     :data="item"
@@ -150,7 +150,7 @@
                     <!-- 其他消息 -->
                     <FriendBody
                         v-for="item in contactStore.groupAssistList"
-                        :key="'inMessage-' + (item.user_id ? item.user_id : item.group_id)"
+                        :key="'inMessage-' + (item.channel_id || item.channelId || item.user_id || item.group_id)"
                         :select="chat.show.id === item.user_id || (chat.show.id === item.group_id && chat.group_name != '')"
                         :menu="menu.select && menu.select == item"
                         :data="item"
@@ -232,7 +232,7 @@
     import { refreshFavicon } from '../function/favicon'
     import { backend } from '../runtime/backend'
     import History from '../components/History.vue'
-    import { normalizeSessionId } from '../function/utils/sessionUtil'
+    import { findSessionContact, normalizeSessionId } from '../function/utils/sessionUtil'
     import { avatarError } from '../function/utils/avatarUtil'
     import { useUIStore } from '../state/ui'
     import { useAuthStore } from '../state/auth'
@@ -283,16 +283,27 @@
         const restored = contactStore.botStates.get(bot.selfId)
         if (!restored) return
         contactStore.baseOnMsgList.clear()
-        for (const [key, value] of restored.baseList) {
-            contactStore.baseOnMsgList.set(normalizeSessionId(key), value)
+        for (const [, value] of restored.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 restored.onMsgList) {
-            const id = String(item.user_id ?? item.group_id ?? '')
+            const id = String(item.channel_id || item.channelId || item.user_id || item.group_id || '')
             if (!id || id === '0') continue
             contactStore.baseOnMsgList.set(
                 normalizeSessionId(id),
                 item as UserFriendElem & UserGroupElem,
             )
+            const legacyId = String(item.user_id || item.group_id || '')
+            if (legacyId && legacyId !== id) {
+                contactStore.baseOnMsgList.set(normalizeSessionId(legacyId), item as UserFriendElem & UserGroupElem)
+            }
         }
         contactStore.onMsgList = restored.onMsgList
     }
@@ -376,7 +387,7 @@
      * @param data 联系人对象
      */
     function userClick(data: UserFriendElem & UserGroupElem) {
-        const id = data.user_id ? data.user_id : data.group_id
+        const id = data.group_id || data.user_id
         if (id === undefined || id === null || String(id) === '' || String(id) === '0') return
         if (!trRead.value && id != props.chat.show.id) {
             if (uiStore.openSideBar) {
@@ -385,11 +396,11 @@
             const back = {
                 // 临时会话标志
                 temp: data.group_name == '' ? data.group_id : undefined,
-                type: data.user_id ? 'user' : 'group',
+                type: data.group_id ? 'group' : 'user',
                 id: id,
                 name: getShowName(data.group_name || data.nickname, data.remark),
                 avatar: data.avatar || '/img/icons/icon.svg',
-                channel_id: data.channel_id ?? data.channelId,
+                channel_id: data.channel_id || data.channelId,
                 guild_id: data.guild_id ?? data.guildId,
             }
             if (props.chat.id != back.id) {
@@ -401,9 +412,10 @@
                 }
             }
             // 清除新消息标记
-            const sessionKey = data.channel_id ?? data.channelId ?? id
+            const sessionKey = data.channel_id || data.channelId || id
             const item = contactStore.baseOnMsgList.get(normalizeSessionId(sessionKey))
                 ?? contactStore.baseOnMsgList.get(normalizeSessionId(id))
+                ?? findSessionContact(Array.from(contactStore.baseOnMsgList.values()), id)
             if(item) {
                 if(item.new_msg) {
                     item.new_msg = false
@@ -411,6 +423,7 @@
                 }
                 item.highlight = undefined
                 contactStore.baseOnMsgList.set(normalizeSessionId(sessionKey), item)
+                updateBaseOnMsgList()
                 // 关闭所有通知
                 new Notify().closeAll((item.group_id ?? item.user_id).toString())
             }
@@ -474,9 +487,10 @@
      */
     function readMsg(data: UserFriendElem & UserGroupElem) {
         const id = data.group_id ? data.group_id : data.user_id
-        const sessionKey = data.channel_id ?? data.channelId ?? id
+        const sessionKey = data.channel_id || data.channelId || id
         const item = contactStore.baseOnMsgList.get(normalizeSessionId(sessionKey))
             ?? contactStore.baseOnMsgList.get(normalizeSessionId(id))
+            ?? findSessionContact(Array.from(contactStore.baseOnMsgList.values()), id)
         if(item) {
             if(item.new_msg) {
                 item.new_msg = false
@@ -484,6 +498,7 @@
             }
             item.highlight = undefined
             contactStore.baseOnMsgList.set(normalizeSessionId(sessionKey), item)
+            updateBaseOnMsgList()
         }
         // pop
         new PopInfo().add(
@@ -518,7 +533,16 @@
                     )
                     if (topList.indexOf(id) >= 0) {
                         item.always_top = true
-                        contactStore.baseOnMsgList.set(normalizeSessionId(id), item)
+                        const sessionId = String(
+                            item.channel_id
+                            ?? item.channelId
+                            ?? item.user_id
+                            ?? item.group_id
+                            ?? '',
+                        )
+                        if (sessionId && sessionId !== '0') {
+                            contactStore.baseOnMsgList.set(normalizeSessionId(sessionId), item)
+                        }
                     }
                 })
             }
@@ -558,7 +582,10 @@
                     break
                 case 'remove': {
                     const id = item.user_id ? item.user_id : item.group_id
+                    const sessionId = String(item.channel_id || item.channelId || id || '')
                     contactStore.baseOnMsgList.delete(normalizeSessionId(id))
+                    contactStore.baseOnMsgList.delete(normalizeSessionId(sessionId))
+                    updateBaseOnMsgList()
                     refreshFavicon()
                     break
                 }

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

@@ -11,7 +11,7 @@
         <!-- 保留占位元素，避免设置页右侧布局被原有左侧选择器样式影响 -->
         <div class="opt-side-placeholder" style="display: none" />
         <div>
-            <BcTab v-show="show" :title="$t('设置')" class="opt-tab">
+            <SettingsTab v-show="show" class="opt-tab">
                 <div :name="$t('账号')">
                     <OptAccount :config="config" />
                 </div>
@@ -27,18 +27,18 @@
                 <div v-if="showAbout" :name="$t('关于')">
                     <AboutPan class="opt-about" show-u-i />
                 </div>
-            </BcTab>
+            </SettingsTab>
         </div>
     </div>
 </template>
 
 <script setup lang="ts">
-    import { ref, watch, onMounted, nextTick } from 'vue'
+    import { ref, watch, onMounted } from 'vue'
 
     import { i18n } from '../main'
     import { useSettingsStore } from '../state/settings'
 
-    import BcTab from 'vue3-bcui/packages/bc-tab'
+    import SettingsTab from '../components/SettingsTab.vue'
     import OptAccount from './options/OptAccount.vue'
     import OptView from './options/OptView.vue'
     import OptDev from './options/OptDev.vue'

package/client/web/src/pages/options/OptDev.vue

@@ -315,20 +315,7 @@ import packageInfo from '../../../package.json'
         }
 
         info += 'Network Info:\n'
-        const testList = [
-            ['Github          ', 'https://api.github.com'],
-            ['SSQQ API        ', 'https://api.stapxs.cn'],
-        ]
-        for (const item of testList) {
-            const start = new Date().getTime()
-            try {
-                await fetch(item[1], { method: 'GET' })
-                const end = new Date().getTime()
-                info += `    ${item[0]}  -> ${end - start} ms\n`
-            } catch (e) {
-                info += `    ${item[0]}  -> failed\n`
-            }
-        }
+        info += '    local only\n'
         info += '```'
         // 构建 popBox 内容
         const popInfo = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-chat-patch",
   "description": "[<ruby>chat-patch<rp>（</rp><rt>点我预览效果</rt><rp>）</rp></ruby>](https://i0.hdslb.com/bfs/openplatform/71074dfc9e5256fc3333d8bd8478bec1af874046.png) 视奸小插件((bushi( (低性能警告)。手机端适配。灵感来自 chat 插件。",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "scripts": {
     "build:web": "npm --prefix client/web run build",
     "prepack": "npm run build:web",