koishi-plugin-chat-patch 5.0.3 → 5.1.0

package/client/web/dist/index.html

@@ -11,7 +11,7 @@
         <link rel="stylesheet" href="./bcui/css/style.css">
         <link rel="stylesheet" href="./bcui/css/color-light.css">
         <link rel="stylesheet" href="./css/append-light.css">
-      <script type="module" crossorigin src="./assets/index-CwyyQN13.js"></script>
+      <script type="module" crossorigin src="./assets/index-Cz89G4we.js"></script>
       <link rel="stylesheet" crossorigin href="./assets/index-BgOX_tNa.css">
     </head>
 

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

@@ -25,7 +25,7 @@ import { useChatStore } from '../state/chat'
 import { useContactStore } from '../state/contact'
 import { useSettingsStore } from '../state/settings'
 import { getMsgRawTxt, hasAtMe, updateBaseOnMsgList } from './utils/msgUtil'
-import { normalizeSessionId } from './utils/sessionUtil'
+import { normalizeSessionId, setSessionContact } from './utils/sessionUtil'
 import { buildQqGroupAvatar } from './utils/avatarUtil'
 import type { ConnectionHistoryItem, LoginCacheElem } from './elements/system'
 import type { UserFriendElem, UserGroupElem } from './elements/information'
@@ -350,7 +350,7 @@ function updateBotStateGroup(
   const session = state?.onMsgList.find((item) => String(item.group_id) === sessionId)
   if (!state || !session) return
   apply(session as unknown as Record<string, unknown>)
-  const key = normalizeSessionId(String(sessionId))
+  const key = normalizeSessionId(String(session.channel_id ?? session.channelId ?? sessionId))
   const baseList = [...state.baseList]
   const baseIndex = baseList.findIndex(([baseKey]) => normalizeSessionId(String(baseKey)) === key)
   const typedSession = session as unknown as UserFriendElem & UserGroupElem
@@ -550,6 +550,7 @@ function recordBotMessage(platform: string, selfId: string, msg: Record<string,
     identityDebug('recordBotMessage: skipped invalid session', { sessionId, msg })
     return
   }
+  const sessionKey = String(channelId || sessionId)
   identityDebug('recordBotMessage: session', { sessionId })
   const sender = getObject(msg.sender)
   const hasSenderAvatar = hasUsableAvatar(sender.avatar)
@@ -628,7 +629,7 @@ function recordBotMessage(platform: string, selfId: string, msg: Record<string,
   } else {
     state.onMsgList.unshift(session)
   }
-  const baseKey = normalizeSessionId(String(sessionId))
+  const baseKey = normalizeSessionId(sessionKey)
   const baseList = [...state.baseList]
   const baseIndex = baseList.findIndex(([key]) => normalizeSessionId(String(key)) === baseKey)
   const typedSession = session as unknown as UserFriendElem & UserGroupElem
@@ -644,12 +645,9 @@ function recordBotMessage(platform: string, selfId: string, msg: Record<string,
   })
   if (
     isActiveBot({ platform, selfId }) &&
-    !contactStore.baseOnMsgList.has(String(sessionId))
+    !contactStore.baseOnMsgList.has(normalizeSessionId(sessionKey))
   ) {
-    contactStore.baseOnMsgList.set(
-      String(sessionId),
-      session as unknown as UserFriendElem & UserGroupElem,
-    )
+    setSessionContact(contactStore.baseOnMsgList, session as unknown as UserFriendElem & UserGroupElem)
     updateBaseOnMsgList()
   }
 
@@ -678,7 +676,8 @@ function recordBotMessage(platform: string, selfId: string, msg: Record<string,
     // 实时消息直接写入当前聊天窗口，避免依赖旧的消息解析链路
     chatStore.messageList.push(msg)
   }
-  const knownSessionAvatar = contactStore.baseOnMsgList.get(String(sessionId))
+  const knownSessionAvatar = contactStore.baseOnMsgList.get(normalizeSessionId(sessionKey))
+    ?? contactStore.baseOnMsgList.get(normalizeSessionId(sessionId))
   const knownWithAvatar = hasUsableAvatar(session.avatar)
     || Boolean(
       knownSessionAvatar &&
@@ -777,10 +776,10 @@ export function restoreBotStateFromMessageCache(platform: string, selfId: string
   const baseList = [...state.baseList]
   const baseKeys = new Set(baseList.map(([key]) => normalizeSessionId(key)))
   const existing = new Set(state.onMsgList.map((item) => {
-    return String(item.user_id ?? item.group_id ?? '')
+    return String(item.channel_id ?? item.channelId ?? item.user_id ?? item.group_id ?? '')
   }))
   for (const session of sessions) {
-    const id = String(session.user_id ?? session.group_id ?? '')
+    const id = String(session.channel_id ?? session.channelId ?? session.user_id ?? session.group_id ?? '')
     if (id && !existing.has(id)) {
       state.onMsgList.unshift(session)
       existing.add(id)
@@ -1360,6 +1359,7 @@ async function loadAllBotsCache() {
     for (const raw of groupRaws) {
       const id = normalizeGroupId(getString(raw.group_id) || getString(raw.id))
       if (!id) continue
+      raw.group_id = id
       const name = getString(raw.group_name) || getString(raw.name)
       const avatar = hasUsableAvatar(raw.avatar)
         ? getString(raw.avatar)
@@ -1492,6 +1492,7 @@ function buildGroupItem(
   const channel = getObject(root.channel)
   const item = { ...getObject(raw) }
   const id = normalizeGroupId(getString(item.group_id) || getString(item.id) || getString(item.guild_id) || '')
+  item.group_id = id
   const name = getString(guild.name)
     || getString(channel.name)
     || getString(item.group_name)

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

@@ -90,8 +90,10 @@ import {
     getSessionId,
     getMissingGroupPreviewSessions,
     mergeEarlySessionContacts,
+    normalizeGroupId,
     normalizeSessionId,
     resolveIncomingSession,
+    setSessionContact,
 } from './utils/sessionUtil'
 
 const popInfo = new PopInfo()
@@ -1604,7 +1606,12 @@ function saveUser(msg: { [key: string]: any }, type: string) {
                     list = list.filter((item, index, arr) => {
                         return (
                             arr.findIndex((item2) => {
-                                return item2.group_id == item.group_id
+                                const 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)
+                                )
                             }) == index
                         )
                     })
@@ -1676,11 +1683,11 @@ function saveUser(msg: { [key: string]: any }, type: string) {
         )
         const existingIds = new Set(
             contactStore.userList.map((item) => {
-                return String(item.user_id ?? item.group_id ?? '')
+                return normalizeSessionId(String(item.channel_id ?? item.channelId ?? item.user_id ?? item.group_id ?? ''))
             }),
         )
         const freshList = list.filter((item) => {
-            return !existingIds.has(String(item.user_id ?? item.group_id ?? ''))
+            return !existingIds.has(normalizeSessionId(String(item.channel_id ?? item.channelId ?? item.user_id ?? item.group_id ?? '')))
         })
         contactStore.userList = contactStore.userList.concat(freshList)
         if (
@@ -2474,8 +2481,10 @@ function newMsg(_: string, data: any) {
 
         // 会话状态更新 ============================================
         const sessionId = isTempGroupMessage ? sender : id
-        const normalizedSessionId = normalizeSessionId(sessionId)
+        const sessionKey = String(sessionChannelId || sessionId)
+        const normalizedSessionId = normalizeSessionId(sessionKey)
         let session = contactStore.baseOnMsgList.get(normalizedSessionId)
+            ?? contactStore.baseOnMsgList.get(normalizeSessionId(sessionId))
         if (!session) {
             if (isTempGroupMessage) {
                 session = {
@@ -2521,7 +2530,7 @@ function newMsg(_: string, data: any) {
                 if (data.atall) { session.highlight = $t('[@全体]') }
                 if (isImportant) { session.highlight = $t('[特別关心]') }
             }
-            contactStore.baseOnMsgList.set(normalizedSessionId, session)
+            setSessionContact(contactStore.baseOnMsgList, session)
             updateBaseOnMsgList()
         }
 

package/client/web/src/function/satori-model.ts

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

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

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

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

@@ -1,13 +1,35 @@
 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
+}
+
 export function normalizeSessionId(value: number | string): string {
   return String(value)
 }
 
 export function getSessionId(item: Session): number | string {
+    const channelId = item.channel_id ?? item.channelId
+    if (channelId !== undefined && channelId !== null && String(channelId) !== '') {
+        return channelId
+    }
     return item.user_id ?? item.group_id ?? 0
 }
 
+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)
+  }
+}
+
 export function findSessionContact(
     contacts: Session[],
     sessionId: number | string,

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

@@ -401,14 +401,16 @@
                 }
             }
             // 清除新消息标记
-            const item = contactStore.baseOnMsgList.get(normalizeSessionId(id))
+            const sessionKey = data.channel_id ?? data.channelId ?? id
+            const item = contactStore.baseOnMsgList.get(normalizeSessionId(sessionKey))
+                ?? contactStore.baseOnMsgList.get(normalizeSessionId(id))
             if(item) {
                 if(item.new_msg) {
                     item.new_msg = false
                     contactStore.newMsgCount--
                 }
                 item.highlight = undefined
-                contactStore.baseOnMsgList.set(normalizeSessionId(id), item)
+                contactStore.baseOnMsgList.set(normalizeSessionId(sessionKey), item)
                 // 关闭所有通知
                 new Notify().closeAll((item.group_id ?? item.user_id).toString())
             }
@@ -472,14 +474,16 @@
      */
     function readMsg(data: UserFriendElem & UserGroupElem) {
         const id = data.group_id ? data.group_id : data.user_id
-        const item = contactStore.baseOnMsgList.get(normalizeSessionId(id))
+        const sessionKey = data.channel_id ?? data.channelId ?? id
+        const item = contactStore.baseOnMsgList.get(normalizeSessionId(sessionKey))
+            ?? contactStore.baseOnMsgList.get(normalizeSessionId(id))
         if(item) {
             if(item.new_msg) {
                 item.new_msg = false
                 contactStore.newMsgCount--
             }
             item.highlight = undefined
-            contactStore.baseOnMsgList.set(normalizeSessionId(id), item)
+            contactStore.baseOnMsgList.set(normalizeSessionId(sessionKey), item)
         }
         // pop
         new PopInfo().add(

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.0.3",
+  "version": "5.1.0",
   "scripts": {
     "build:web": "npm --prefix client/web run build",
     "prepack": "npm run build:web",