koishi-plugin-chat-patch 1.0.13 → 1.0.15

package/lib/index.js

@@ -138,6 +138,17 @@ var MessageHandler = class {
   }
   logger;
   utils;
+  // 存储正确的 channelId 映射，key 是 selfId，value 是正确的 channelId
+  correctChannelIds = /* @__PURE__ */ new Map();
+  // 设置正确的 channelId
+  setCorrectChannelId(selfId, channelId) {
+    this.correctChannelIds.set(selfId, channelId);
+    this.logInfo("设置正确的 channelId:", { selfId, channelId });
+  }
+  // 获取正确的 channelId
+  getCorrectChannelId(selfId) {
+    return this.correctChannelIds.get(selfId);
+  }
   // 更新机器人信息到JSON文件
   async updateBotInfoToFile(session) {
     const data = this.fileManager.readChatDataFromFile();
@@ -170,10 +181,11 @@ var MessageHandler = class {
     }
     const channelInfo = {
       id: session.channelId,
-      name: session.guildId ? `${guildName} (${session.channelId})` : `私信 ${session.channelId}`,
+      name: session.isDirect ? `私信 ${session.channelId}` : `${guildName} (${session.channelId})`,
       type: session.type || 0,
-      guildId: session.guildId,
-      guildName
+      channelId: session.channelId,
+      guildName,
+      isDirect: session.isDirect
     };
     data.channels[session.selfId][session.channelId] = channelInfo;
     this.fileManager.writeChatDataToFile(data);
@@ -226,10 +238,10 @@ var MessageHandler = class {
         selfId: session.selfId,
         elements: this.utils.cleanBase64Content(elements),
         type: "user",
-        guildId: session.guildId,
         guildName,
         platform: session.platform || "unknown",
-        quote: quoteInfo ? this.utils.cleanBase64Content(quoteInfo) : void 0
+        quote: quoteInfo ? this.utils.cleanBase64Content(quoteInfo) : void 0,
+        isDirect: session.isDirect
       };
       await this.fileManager.addMessageToFile(messageInfo);
       const messageEvent = {
@@ -243,11 +255,11 @@ var MessageHandler = class {
         username: session.username || session.event?.user?.name || session.userId || "unknown",
         avatar: session.event?.user?.avatar,
         timestamp,
-        guildId: session.guildId,
         guildName,
         channelType: session.type || 0,
         elements: this.utils.cleanBase64Content(elements),
         quote: quoteInfo ? this.utils.cleanBase64Content(quoteInfo) : void 0,
+        isDirect: session.isDirect,
         bot: {
           avatar: session.bot.user?.avatar,
           name: session.bot.user?.name
@@ -261,6 +273,16 @@ var MessageHandler = class {
   // 处理机器人发送的消息
   async broadcastBotMessageEvent(session) {
     try {
+      const correctChannelId = this.getCorrectChannelId(session.selfId);
+      this.logInfo("机器人发送消息调试信息:", {
+        "session.channelId": session.channelId,
+        "session.event?.channel?.id": session.event?.channel?.id,
+        "correctChannelId": correctChannelId,
+        "session.guildId": session.guildId,
+        "session.isDirect": session.isDirect,
+        "session.platform": session.platform
+      });
+      const finalChannelId = correctChannelId || session.channelId;
       await this.updateBotInfoToFile(session);
       const guildName = await this.updateChannelInfoToFile(session);
       const timestamp = Date.now();
@@ -275,30 +297,30 @@ var MessageHandler = class {
         username: session.bot.user?.name || `Bot-${session.selfId}`,
         avatar: session.bot.user?.avatar,
         timestamp,
-        channelId: session.event?.channel?.id || session.channelId,
+        channelId: finalChannelId,
         selfId: session.selfId,
         elements: this.utils.cleanBase64Content(session.event?.message?.elements),
         type: "bot",
-        guildId: session.event?.guild?.id || session.guildId,
         guildName,
-        platform: session.platform || "unknown"
+        platform: session.platform || "unknown",
+        isDirect: session.isDirect
       };
       await this.fileManager.addMessageToFile(messageInfo);
       const messageEvent = {
         type: "bot-message",
         selfId: session.selfId,
         platform: session.platform || "unknown",
-        channelId: session.event?.channel?.id || session.channelId,
+        channelId: finalChannelId,
         messageId: `bot-msg-${timestamp}`,
         content,
         userId: session.selfId,
         username: session.bot.user?.name || `Bot-${session.selfId}`,
         avatar: session.bot.user?.avatar,
         timestamp,
-        guildId: session.event?.guild?.id || session.guildId,
         guildName,
         channelType: session.event?.channel?.type || session.type || 0,
         elements: this.utils.cleanBase64Content(session.event?.message?.elements),
+        isDirect: session.isDirect,
         bot: {
           avatar: session.bot.user?.avatar,
           name: session.bot.user?.name
@@ -310,11 +332,14 @@ var MessageHandler = class {
       this.logInfo("机器人发送消息 (before-send):", {
         selfId: session.selfId,
         channelId: messageEvent.channelId,
+        originalChannelId: session.channelId,
+        correctedChannelId: finalChannelId,
         content,
         platform: session.platform,
         imageCount: imageElements.length,
         imageUrls: imageElements.map((el) => el.attrs?.src || el.attrs?.url || el.attrs?.file)
       });
+      this.correctChannelIds.delete(session.selfId);
       this.ctx.console.broadcast("chat-bot-message-event", messageEvent);
     } catch (error) {
       this.logger.error("广播机器人消息事件失败:", error);
@@ -474,10 +499,11 @@ var FileManager = class {
 var import_koishi = require("koishi");
 var import_node_url = require("node:url");
 var ApiHandlers = class {
-  constructor(ctx, config, fileManager) {
+  constructor(ctx, config, fileManager, messageHandler) {
     this.ctx = ctx;
     this.config = config;
     this.fileManager = fileManager;
+    this.messageHandler = messageHandler;
     this.logger = ctx.logger("chat-patch");
   }
   static {
@@ -630,6 +656,7 @@ var ApiHandlers = class {
             }
           }
         }
+        this.messageHandler.setCorrectChannelId(data.selfId, data.channelId);
         const result = await bot.sendMessage(data.channelId, messageContent);
         this.logInfo("消息发送成功:", result);
         return {
@@ -972,7 +999,7 @@ async function apply(ctx, config) {
   const logger = ctx.logger("chat-patch");
   const fileManager = new FileManager(ctx, config);
   const messageHandler = new MessageHandler(ctx, config, fileManager);
-  const apiHandlers = new ApiHandlers(ctx, config, fileManager);
+  const apiHandlers = new ApiHandlers(ctx, config, fileManager, messageHandler);
   const utils = new Utils(config);
   const initialData = fileManager.readChatDataFromFile();
   const cleanedData = fileManager.cleanExcessMessages(initialData);

package/lib/message-handler.d.ts

@@ -0,0 +1,19 @@
+import { Context, Session } from 'koishi';
+import { FileManager } from './file-manager';
+import { Config } from './config';
+export declare class MessageHandler {
+    private ctx;
+    private config;
+    private fileManager;
+    private logger;
+    private utils;
+    private correctChannelIds;
+    constructor(ctx: Context, config: Config, fileManager: FileManager);
+    setCorrectChannelId(selfId: string, channelId: string): void;
+    getCorrectChannelId(selfId: string): string | undefined;
+    updateBotInfoToFile(session: Session): Promise<void>;
+    updateChannelInfoToFile(session: Session): Promise<string>;
+    broadcastMessageEvent(session: Session): Promise<void>;
+    broadcastBotMessageEvent(session: Session): Promise<void>;
+    private logInfo;
+}

package/lib/types.d.ts

@@ -0,0 +1,55 @@
+import { h } from 'koishi';
+export interface BotInfo {
+    selfId: string;
+    platform: string;
+    username: string;
+    avatar?: string;
+    status: 'online' | 'offline';
+}
+export interface ChannelInfo {
+    id: string;
+    name: string;
+    type: number | string;
+    channelId?: string;
+    guildName?: string;
+    isDirect?: boolean;
+}
+export interface QuoteInfo {
+    messageId: string;
+    id: string;
+    content: string;
+    elements?: h[];
+    user: {
+        id: string;
+        name: string;
+        userId: string;
+        avatar?: string;
+        username: string;
+    };
+    timestamp: number;
+}
+export interface MessageInfo {
+    id: string;
+    content: string;
+    userId: string;
+    username: string;
+    avatar?: string;
+    timestamp: number;
+    channelId: string;
+    selfId: string;
+    elements?: h[];
+    type: 'user' | 'bot';
+    guildId?: string;
+    guildName?: string;
+    platform: string;
+    quote?: QuoteInfo;
+    isDirect?: boolean;
+}
+export interface ChatData {
+    bots: Record<string, BotInfo>;
+    channels: Record<string, Record<string, ChannelInfo>>;
+    messages: Record<string, MessageInfo[]>;
+    pinnedBots: string[];
+    pinnedChannels: string[];
+    lastSaveTime?: number;
+}

package/lib/utils.d.ts

@@ -0,0 +1,9 @@
+import { Config } from './config';
+export declare class Utils {
+    private config;
+    constructor(config: Config);
+    isPlatformBlocked(platform: string): boolean;
+    extractTextContent(elements: any[]): string;
+    private isBase64;
+    cleanBase64Content(obj: any): any;
+}

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": "1.0.13",
+  "version": "1.0.15",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/src/api-handlers.ts

@@ -1,4 +1,5 @@
 import { FileManager } from './file-manager'
+import { MessageHandler } from './message-handler'
 import { Context, h, Logger } from 'koishi'
 import { Config } from './config'
 
@@ -10,7 +11,8 @@ export class ApiHandlers {
     constructor(
         private ctx: Context,
         private config: Config,
-        private fileManager: FileManager
+        private fileManager: FileManager,
+        private messageHandler: MessageHandler
     ) {
         this.logger = ctx.logger('chat-patch')
     }
@@ -218,6 +220,9 @@ export class ApiHandlers {
                     }
                 }
 
+                // 在发送消息前，通知 MessageHandler 正确的 channelId
+                this.messageHandler.setCorrectChannelId(data.selfId, data.channelId)
+
                 const result = await bot.sendMessage(data.channelId, messageContent)
                 this.logInfo('消息发送成功:', result)
 

package/src/index.ts

@@ -35,7 +35,7 @@ export async function apply(ctx: Context, config: Config) {
   // 初始化各个模块
   const fileManager = new FileManager(ctx, config)
   const messageHandler = new MessageHandler(ctx, config, fileManager)
-  const apiHandlers = new ApiHandlers(ctx, config, fileManager)
+  const apiHandlers = new ApiHandlers(ctx, config, fileManager, messageHandler)
   const utils = new Utils(config)
 
   // 初始化数据

package/src/message-handler.ts

@@ -7,6 +7,8 @@ import { Utils } from './utils'
 export class MessageHandler {
     private logger: Logger
     private utils: Utils
+    // 存储正确的 channelId 映射，key 是 selfId，value 是正确的 channelId
+    private correctChannelIds: Map<string, string> = new Map()
 
     constructor(
         private ctx: Context,
@@ -17,6 +19,17 @@ export class MessageHandler {
         this.utils = new Utils(config)
     }
 
+    // 设置正确的 channelId
+    setCorrectChannelId(selfId: string, channelId: string) {
+        this.correctChannelIds.set(selfId, channelId)
+        this.logInfo('设置正确的 channelId:', { selfId, channelId })
+    }
+
+    // 获取正确的 channelId
+    getCorrectChannelId(selfId: string): string | undefined {
+        return this.correctChannelIds.get(selfId)
+    }
+
     // 更新机器人信息到JSON文件
     async updateBotInfoToFile(session: Session) {
         const data = this.fileManager.readChatDataFromFile()
@@ -56,12 +69,13 @@ export class MessageHandler {
 
         const channelInfo: ChannelInfo = {
             id: session.channelId,
-            name: session.guildId
-                ? `${guildName} (${session.channelId})`
-                : `私信 ${session.channelId}`,
+            name: session.isDirect
+                ? `私信 ${session.channelId}`
+                : `${guildName} (${session.channelId})`,
             type: session.type || 0,
-            guildId: session.guildId,
-            guildName: guildName
+            channelId: session.channelId,
+            guildName: guildName,
+            isDirect: session.isDirect
         }
 
         data.channels[session.selfId][session.channelId] = channelInfo
@@ -129,10 +143,10 @@ export class MessageHandler {
                 selfId: session.selfId,
                 elements: this.utils.cleanBase64Content(elements),
                 type: 'user',
-                guildId: session.guildId,
                 guildName: guildName,
                 platform: session.platform || 'unknown',
-                quote: quoteInfo ? this.utils.cleanBase64Content(quoteInfo) : undefined
+                quote: quoteInfo ? this.utils.cleanBase64Content(quoteInfo) : undefined,
+                isDirect: session.isDirect
             }
 
             await this.fileManager.addMessageToFile(messageInfo)
@@ -148,11 +162,11 @@ export class MessageHandler {
                 username: session.username || session.event?.user?.name || session.userId || 'unknown',
                 avatar: session.event?.user?.avatar,
                 timestamp: timestamp,
-                guildId: session.guildId,
                 guildName: guildName,
                 channelType: session.type || 0,
                 elements: this.utils.cleanBase64Content(elements),
                 quote: quoteInfo ? this.utils.cleanBase64Content(quoteInfo) : undefined,
+                isDirect: session.isDirect,
                 bot: {
                     avatar: session.bot.user?.avatar,
                     name: session.bot.user?.name,
@@ -168,6 +182,22 @@ export class MessageHandler {
     // 处理机器人发送的消息
     async broadcastBotMessageEvent(session: Session) {
         try {
+            // 获取正确的 channelId
+            const correctChannelId = this.getCorrectChannelId(session.selfId)
+
+            // 调试日志：检查 channelId 的来源
+            this.logInfo('机器人发送消息调试信息:', {
+                'session.channelId': session.channelId,
+                'session.event?.channel?.id': session.event?.channel?.id,
+                'correctChannelId': correctChannelId,
+                'session.guildId': session.guildId,
+                'session.isDirect': session.isDirect,
+                'session.platform': session.platform
+            })
+
+            // 使用正确的 channelId，如果没有则使用 session.channelId
+            const finalChannelId = correctChannelId || session.channelId
+
             await this.updateBotInfoToFile(session)
             const guildName = await this.updateChannelInfoToFile(session)
 
@@ -187,13 +217,13 @@ export class MessageHandler {
                 username: session.bot.user?.name || `Bot-${session.selfId}`,
                 avatar: session.bot.user?.avatar,
                 timestamp: timestamp,
-                channelId: session.event?.channel?.id || session.channelId,
+                channelId: finalChannelId,
                 selfId: session.selfId,
                 elements: this.utils.cleanBase64Content(session.event?.message?.elements),
                 type: 'bot',
-                guildId: session.event?.guild?.id || session.guildId,
                 guildName: guildName,
-                platform: session.platform || 'unknown'
+                platform: session.platform || 'unknown',
+                isDirect: session.isDirect
             }
 
             await this.fileManager.addMessageToFile(messageInfo)
@@ -202,17 +232,17 @@ export class MessageHandler {
                 type: 'bot-message',
                 selfId: session.selfId,
                 platform: session.platform || 'unknown',
-                channelId: session.event?.channel?.id || session.channelId,
+                channelId: finalChannelId,
                 messageId: `bot-msg-${timestamp}`,
                 content: content,
                 userId: session.selfId,
                 username: session.bot.user?.name || `Bot-${session.selfId}`,
                 avatar: session.bot.user?.avatar,
                 timestamp: timestamp,
-                guildId: session.event?.guild?.id || session.guildId,
                 guildName: guildName,
                 channelType: session.event?.channel?.type || session.type || 0,
                 elements: this.utils.cleanBase64Content(session.event?.message?.elements),
+                isDirect: session.isDirect,
                 bot: {
                     avatar: session.bot.user?.avatar,
                     name: session.bot.user?.name,
@@ -227,12 +257,17 @@ export class MessageHandler {
             this.logInfo('机器人发送消息 (before-send):', {
                 selfId: session.selfId,
                 channelId: messageEvent.channelId,
+                originalChannelId: session.channelId,
+                correctedChannelId: finalChannelId,
                 content: content,
                 platform: session.platform,
                 imageCount: imageElements.length,
                 imageUrls: imageElements.map((el: any) => el.attrs?.src || el.attrs?.url || el.attrs?.file)
             })
 
+            // 清理已使用的 channelId 映射
+            this.correctChannelIds.delete(session.selfId)
+
             this.ctx.console.broadcast('chat-bot-message-event', messageEvent)
         } catch (error) {
             this.logger.error('广播机器人消息事件失败:', error)

package/src/types.ts

@@ -12,8 +12,9 @@ export interface ChannelInfo {
     id: string
     name: string
     type: number | string
-    guildId?: string
+    channelId?: string
     guildName?: string
+    isDirect?: boolean
 }
 
 export interface QuoteInfo {
@@ -46,6 +47,7 @@ export interface MessageInfo {
     guildName?: string
     platform: string
     quote?: QuoteInfo
+    isDirect?: boolean
 }
 
 export interface ChatData {