koishi-plugin-chat-patch 5.3.0 → 5.3.1

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

@@ -38,17 +38,17 @@
                     </div>
                 </div>
                 <div id="message-list-body" class="robot-accordion-list">
-                    <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="!showGroupAssist &&
                                 !contactStore.systemNoticesList &&
                                 (!contactStore.groupAssistList || contactStore.groupAssistList.length === 0) &&
@@ -218,7 +218,7 @@
     import { library } from '@fortawesome/fontawesome-svg-core'
     import { login as loginInfo } from '../function/connect'
     import { Connector, flushPendingBotEvents, loadContactsFromCache, restoreBotStateFromMessageCache } from '../function/connect'
-    import { getActiveBot, getLogins, setActiveBot } from '../function/satori'
+    import { botKey, getActiveBot, getLogins, setActiveBot } from '../function/satori'
     import { getShowName, updateBaseOnMsgList } from '../function/utils/msgUtil'
 
     import {
@@ -249,7 +249,12 @@
     const chatStore = useChatStore()
     const settingsStore = useSettingsStore()
     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 ?? []
@@ -259,7 +264,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 ?? ''
     })
 
     function backToRobots() {
@@ -280,7 +285,7 @@
     }
 
     function restoreBotStateUi(bot: { platform: string; selfId: string }) {
-        const restored = contactStore.botStates.get(bot.selfId)
+        const restored = contactStore.botStates.get(botKey(bot.platform, bot.selfId))
         if (!restored) return
         contactStore.baseOnMsgList.clear()
         for (const [, value] of restored.baseList) {
@@ -309,9 +314,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
@@ -324,9 +330,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()
@@ -354,7 +360,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)

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

@@ -65,7 +65,7 @@
                 class="qzone-feed-card ss-card">
                 <article>
                     <header class="qzone-feed-card-header">
-                        <img :src="item.avatar" :alt="item.nickname">
+                        <img data-avatar :src="item.avatar" :alt="item.nickname">
                         <div class="qzone-feed-meta">
                             <a>{{ item.nickname }}</a>
                             <span>{{ item.timeText }}</span>
@@ -149,7 +149,7 @@
                     </template>
                 </div>
                 <div class="qzone-feed-reply">
-                    <img :src="authStore.loginInfo.avatar || '/img/icons/icon.svg'">
+                    <img data-avatar :src="authStore.loginInfo.avatar || '/img/icons/icon.svg'">
                     <label :for="`qzone-reply-input-${item.id}`" class="sr-only">{{ $t('评论输入框') }}</label>
                     <input :id="`qzone-reply-input-${item.id}`"
                         v-model="getReplyDraft(item.id).content"

package/client/web/src/pages/chat-view/SystemNotice.vue

@@ -20,7 +20,7 @@
                 :key="'sysNot-' + index">
                 <div v-if="notice.request_type == 'friend'">
                     <div>
-                        <img :src="notice.avatar || '/img/icons/icon.svg'">
+                        <img data-avatar :src="notice.avatar || '/img/icons/icon.svg'">
                         <div>
                             <span>{{ notice.user_id }}
                                 {{ $t('请求加为好友') }}</span>
@@ -49,7 +49,7 @@
                 </div>
                 <div v-else-if="notice.request_type == 'group'">
                     <div v-if="notice.sub_type == 'add'">
-                        <img :src="notice.avatar || '/img/icons/icon.svg'">
+                        <img data-avatar :src="notice.avatar || '/img/icons/icon.svg'">
                         <div>
                             <span>{{ getName(notice.user_id) }}
                                 {{ $t('申请加入群聊') }}
@@ -68,7 +68,7 @@
                     </div>
                     <div v-else>
                         <!-- TODO：这情况会出现在 notice 里？记不太清了，先放着吧 😭 -->
-                        <img :src="notice.group_avatar || '/img/icons/icon.svg'">
+                        <img data-avatar :src="notice.group_avatar || '/img/icons/icon.svg'">
                         <div>
                             <span>{{ getName(notice.user_id) }}
                                 {{ $t('邀请你加入群聊') }}

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

@@ -13,7 +13,7 @@
             <div v-for="account in accounts"
                 :key="account.platform + ':' + account.selfId"
                 :class="['ss-card', 'account-info', { active: isActive(account) }]">
-                <img :src="account.avatar || '/img/icons/icon.svg'">
+                <img data-avatar :src="account.avatar || '/img/icons/icon.svg'">
                 <div>
                     <div>
                         <span>{{ account.name || account.selfId }}</span>
@@ -38,7 +38,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import { login as loginInfo } from '../../function/connect'
-import { getActiveBot } from '../../function/satori'
+import { botKey, getActiveBot, getLogins } from '../../function/satori'
 import { useAuthStore } from '../../state/auth'
 import { i18n } from '../../main'
 
@@ -63,9 +63,11 @@ const accounts = computed<SatoriAccount[]>(() => {
 const activeBot = computed(() => {
     const current = getActiveBot()
     if (current?.platform && current.selfId) return current
+    const selectedKey = String(authStore.loginInfo.selectedSatoriBot ?? '')
+    const selected = getLogins().find((item) => botKey(item.platform, item.selfId) === selectedKey)
     return {
-        platform: String(authStore.loginInfo.platform ?? ''),
-        selfId: String(authStore.loginInfo.uin ?? authStore.loginInfo.selectedSatoriBot ?? ''),
+        platform: String(selected?.platform ?? authStore.loginInfo.platform ?? ''),
+        selfId: String(selected?.selfId ?? authStore.loginInfo.uin ?? ''),
     }
 })
 

package/lib/index.js

@@ -844,8 +844,8 @@ var _Recorder = class _Recorder {
   }
   async handleSession(session) {
     const platform = session.platform || "unknown";
-    if (this.isBlocked(platform)) return;
     if (!MESSAGE_TYPES.has(session.type)) return;
+    if (this.isBlocked(platform)) return;
     const event = session.toJSON();
     const message = event.message;
     const record = {
@@ -866,15 +866,15 @@ var _Recorder = class _Recorder {
     };
     try {
       await this.database.appendMessage(record);
-      void this.cacheMessageContacts(event).catch((error) => {
-        this.logger.warn("缓存消息联系人失败:", error);
-      });
-      void this.cacheMessageMedia(event).catch((error) => {
-        this.logger.warn("异步缓存消息媒体失败:", error);
-      });
     } catch (error) {
       this.logger.warn("写入历史消息失败:", error);
     }
+    void this.cacheMessageContacts(event).catch((error) => {
+      this.logger.warn("缓存消息联系人失败:", error);
+    });
+    void this.cacheMessageMedia(event).catch((error) => {
+      this.logger.warn("异步缓存消息媒体失败:", error);
+    });
   }
   async cacheMessageContacts(event) {
     const platform = event.platform || "";
@@ -1622,7 +1622,8 @@ function registerBootstrap(ctx, config, database, logger) {
     return {
       endpoint: resolveEndpoint(ctx, config),
       token: ctx.satori?.server?.config?.token ?? "",
-      basePath: config.basePath
+      basePath: config.basePath,
+      blockedPlatforms: config.blockedPlatforms ?? []
     };
   }, { authority: 4 });
   ctx.console.addListener("chat-patch/history", async (query) => {
@@ -1706,13 +1707,12 @@ function registerWeb(ctx, config, database, contactCache, logger) {
     koa.status = 404;
     koa.body = "";
   }, "servePublicFile");
-  const registerDevPublic = /* @__PURE__ */ __name((pattern, prefix) => {
-    ctx.server.get(pattern, async (koa, next) => {
-      if (!getVite()) return next();
+  const registerPublic = /* @__PURE__ */ __name((pattern, prefix) => {
+    ctx.server.get(pattern, async (koa) => {
       await servePublicFile(koa, prefix);
     });
-  }, "registerDevPublic");
-  registerDevPublic("/img(.*)", "img");
+  }, "registerPublic");
+  registerPublic("/img(.*)", "img");
   const toExtension2 = /* @__PURE__ */ __name((value) => {
     const ext = value.startsWith(".") ? value : `.${value}`;
     return ext.toLowerCase();
@@ -2283,7 +2283,7 @@ var Config = import_koishi2.Schema.intersect([
     blockedPlatforms: import_koishi2.Schema.array(import_koishi2.Schema.object({
       platformName: import_koishi2.Schema.string(),
       exactMatch: import_koishi2.Schema.boolean().default(true)
-    })).role("table").description("不记录历史的平台").default([
+    })).role("table").description("屏蔽消息接收的平台").default([
       { platformName: "qq", exactMatch: true },
       { platformName: "qqguild", exactMatch: true },
       { platformName: "sandbox", exactMatch: false }

package/lib/types.d.ts

@@ -0,0 +1,115 @@
+import type { Awaitable } from 'koishi';
+export interface SatoriBootstrap {
+    endpoint: string;
+    token: string;
+    basePath: string;
+    blockedPlatforms: Array<{
+        platformName: string;
+        exactMatch: boolean;
+    }>;
+}
+export interface MessageRecord {
+    id?: string;
+    sequence?: number;
+    type: string;
+    platform: string;
+    selfId: string;
+    channelId?: string;
+    guildId?: string;
+    userId?: string;
+    timestamp: number;
+    timestampMs?: number;
+    receivedAt?: number;
+    content?: string;
+    elements?: unknown[];
+    raw?: unknown;
+}
+export type SelfMessageChannelType = 'group' | 'user';
+export type SelfMessageSource = 'webui' | 'bot' | 'plugin';
+export interface SelfMessageRecord {
+    id: string;
+    platform: string;
+    selfId: string;
+    channelId: string;
+    guildId?: string;
+    channelType?: SelfMessageChannelType;
+    messageId?: string;
+    content?: string;
+    elements?: unknown[];
+    message?: unknown[];
+    forwardId?: string;
+    forwardContent?: unknown[];
+    sentAt: number;
+    sequence: number;
+    source: SelfMessageSource;
+    kind: string;
+    fingerprint?: string;
+}
+export interface SelfMessagePayload {
+    id?: string;
+    platform: string;
+    selfId: string;
+    channelId: string;
+    guildId?: string;
+    channelType?: SelfMessageChannelType;
+    messageId?: string;
+    content?: string;
+    elements?: unknown[];
+    message?: unknown[];
+    forwardId?: string;
+    forwardContent?: unknown[];
+    sentAt?: number;
+    sequence?: number;
+    source?: SelfMessageSource;
+    kind?: string;
+}
+export interface HistoryQuery {
+    platform: string;
+    selfId: string;
+    channelId: string;
+    limit?: number;
+}
+export interface HistoryResult {
+    messages: MessageRecord[];
+}
+export interface PinnedState {
+    bots: string[];
+    channels: string[];
+}
+export interface PluginConfigPayload {
+    basePath: string;
+    maxMessagesPerChannel: number;
+    historyPageSize: number;
+    maxMediaFiles: number;
+    blockedPlatforms: Array<{
+        platformName: string;
+        exactMatch: boolean;
+    }>;
+    loggerinfo: boolean;
+}
+export interface ContactCacheItem {
+    id: string;
+    name: string;
+    avatar?: string;
+    channelId?: string;
+    guildId?: string;
+    raw?: unknown;
+}
+export interface ContactCacheQuery {
+    platform: string;
+    selfId: string;
+    type: string;
+    contacts?: ContactCacheItem[];
+    append?: boolean;
+}
+export interface ContactCacheResult {
+    contacts?: ContactCacheItem[];
+}
+declare module '@koishijs/console' {
+    interface Events {
+        'chat-patch/bootstrap'(): SatoriBootstrap;
+        'chat-patch/history'(query: HistoryQuery): Awaitable<HistoryResult>;
+        'chat-patch/config'(): PluginConfigPayload;
+        'chat-patch/contact-cache'(query: ContactCacheQuery): Awaitable<ContactCacheResult>;
+    }
+}

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

package/src/bootstrap.ts

@@ -31,6 +31,7 @@ export function registerBootstrap(
       endpoint: resolveEndpoint(ctx, config),
       token: ctx.satori?.server?.config?.token ?? '',
       basePath: config.basePath,
+      blockedPlatforms: config.blockedPlatforms ?? [],
     }
   }, { authority: 4 })
 

package/src/config.ts

@@ -25,7 +25,7 @@ export const Config: Schema<Config> = Schema.intersect([
     blockedPlatforms: Schema.array(Schema.object({
       platformName: Schema.string(),
       exactMatch: Schema.boolean().default(true),
-    })).role('table').description('不记录历史的平台').default([
+    })).role('table').description('屏蔽消息接收的平台').default([
       { platformName: 'qq', exactMatch: true },
       { platformName: 'qqguild', exactMatch: true },
       { platformName: 'sandbox', exactMatch: false },

package/src/recorder.ts

@@ -41,8 +41,8 @@ export class Recorder {
 
   private async handleSession(session: Session) {
     const platform = session.platform || 'unknown'
-    if (this.isBlocked(platform)) return
     if (!MESSAGE_TYPES.has(session.type)) return
+    if (this.isBlocked(platform)) return
 
     const event = session.toJSON()
     const message = event.message
@@ -65,15 +65,15 @@ export class Recorder {
 
     try {
       await this.database.appendMessage(record)
-      void this.cacheMessageContacts(event).catch((error) => {
-        this.logger.warn('缓存消息联系人失败:', error)
-      })
-      void this.cacheMessageMedia(event).catch((error) => {
-        this.logger.warn('异步缓存消息媒体失败:', error)
-      })
     } catch (error) {
       this.logger.warn('写入历史消息失败:', error)
     }
+    void this.cacheMessageContacts(event).catch((error) => {
+      this.logger.warn('缓存消息联系人失败:', error)
+    })
+    void this.cacheMessageMedia(event).catch((error) => {
+      this.logger.warn('异步缓存消息媒体失败:', error)
+    })
   }
 
   private async cacheMessageContacts(event: ReturnType<Session['toJSON']>) {

package/src/types.ts

@@ -5,6 +5,10 @@ export interface SatoriBootstrap {
   endpoint: string
   token: string
   basePath: string
+  blockedPlatforms: Array<{
+    platformName: string
+    exactMatch: boolean
+  }>
 }
 
 export interface MessageRecord {

package/src/web.ts

@@ -82,15 +82,14 @@ export function registerWeb(
     koa.body = ''
   }
 
-  // web 应用里仍有 /img 这类运行时绝对路径，开发模式直接由 Koishi 服务托管
-  const registerDevPublic = (pattern: string, prefix: string) => {
-    ctx.server.get(pattern, async (koa: WebContext, next: () => Promise<void>) => {
-      if (!getVite()) return next()
-      await servePublicFile(koa, prefix)
-    })
-  }
-
-  registerDevPublic('/img(.*)', 'img')
+  // web 应用里仍有 /img 这类运行时绝对路径，生产/开发模式都要由 Koishi 服务托管
+  const registerPublic = (pattern: string, prefix: string) => {
+    ctx.server.get(pattern, async (koa: WebContext) => {
+      await servePublicFile(koa, prefix)
+    })
+  }
+
+  registerPublic('/img(.*)', 'img')
 
   const toExtension = (value: string): string => {
     const ext = value.startsWith('.') ? value : `.${value}`