koishi-plugin-chat-patch 2.0.1 → 2.1.1

package/src/message-handler.ts

@@ -50,55 +50,78 @@ export class MessageHandler {
 
   // 更新频道信息到JSON文件
   async updateChannelInfoToFile(session: Session): Promise<string> {
+    const isDirect = session.isDirect || session.channelId?.includes('private')
     let guildName = session.channelId
-    let directUserName = session.username || session.userId || '未知用户'
+    // 直接使用 session.username 作为私聊用户名
+    const directUserName = session.username || session.event?.user?.name || session.userId
 
     const data = this.fileManager.readChatDataFromFile()
 
-    try {
-      // 获取群组名称
-      if (session.guildId && session.bot.getGuild && typeof session.bot.getGuild === 'function') {
-        const guild = await session.bot.getGuild(session.guildId)
-        guildName = guild?.name || session.channelId
-      }
-
-      // 获取私聊用户昵称
-      if (session.userId && session.isDirect && session.bot.getUser && typeof session.bot.getUser === 'function') {
-        try {
-          const user = await session.bot.getUser(session.userId)
-          directUserName = user?.name || session.username || session.userId || '未知用户'
-        } catch (userError) {
-          this.logInfo('获取用户信息失败，使用备用名称:', userError)
+    if (!isDirect) {
+      try {
+        // 获取群组名称
+        if (session.guildId && session.bot.getGuild && typeof session.bot.getGuild === 'function') {
+          const guild = await session.bot.getGuild(session.guildId)
+          guildName = guild?.name || session.channelId
         }
-      }
 
-      // 如果没有getGuild方法，尝试使用getChannel方法
-      if (session.guildId && !session.bot.getGuild && session.bot.getChannel && typeof session.bot.getChannel === 'function') {
-        try {
-          const channel = await session.bot.getChannel(session.guildId)
-          guildName = channel?.name || session.channelId
-        } catch (channelError) {
-          this.logInfo('获取频道信息失败，使用频道ID作为备用:', channelError)
+        // 如果没有getGuild方法，尝试使用getChannel方法
+        if (session.guildId && !session.bot.getGuild && session.bot.getChannel && typeof session.bot.getChannel === 'function') {
+          try {
+            const channel = await session.bot.getChannel(session.guildId)
+            guildName = channel?.name || session.channelId
+          } catch (channelError) {
+            this.logInfo('获取频道信息失败，使用频道ID作为备用:', channelError)
+          }
         }
+      } catch (error) {
+        this.logInfo('获取频道信息失败，使用频道ID作为备用:', error)
+        guildName = session.channelId
       }
-    } catch (error) {
-      this.logInfo('获取频道信息失败，使用频道ID作为备用:', error)
-      guildName = session.channelId
     }
 
     if (!data.channels[session.selfId]) {
       data.channels[session.selfId] = {}
     }
 
+    // 获取现有频道信息
+    const existingChannel = data.channels[session.selfId][session.channelId]
+
+    // 构造频道名称
+    let finalName: string
+    if (isDirect) {
+      // 私聊频道：优先使用真实用户名
+      if (directUserName && directUserName !== session.userId) {
+        finalName = `私聊（${directUserName}）`
+      } else if (existingChannel?.name && !existingChannel.name.includes('未知')) {
+        // 如果已有名称且不是"未知用户"，保持原名称
+        finalName = existingChannel.name
+      } else if (session.platform && session.platform.toLowerCase().includes('sandbox')) {
+        // sandbox 平台直接使用 userId 作为频道名称
+        finalName = `私聊（${session.userId}）`
+      } else {
+        finalName = '私聊（未知用户）'
+      }
+    } else {
+      finalName = guildName || session.channelId
+    }
+
     const channelInfo: ChannelInfo = {
       id: session.channelId,
-      name: session.isDirect
-        ? `私聊（${session.username || session.userId || directUserName}）`
-        : `${guildName} (${session.channelId})`,
+      name: finalName,
       type: session.type || 0,
       channelId: session.channelId,
       guildName: guildName,
-      isDirect: session.isDirect
+      isDirect: !!isDirect
+    }
+
+    // 记录名称变化
+    if (existingChannel && existingChannel.name !== finalName) {
+      this.logInfo('更新频道名称:', {
+        channelId: session.channelId,
+        oldName: existingChannel.name,
+        newName: finalName
+      })
     }
 
     data.channels[session.selfId][session.channelId] = channelInfo
@@ -108,13 +131,72 @@ export class MessageHandler {
     return guildName
   }
 
+  // 下载并缓存媒体文件
+  public async downloadAndCacheMedia(url: string, type: 'image' | 'media' | 'avatar') {
+    try {
+      if (!url || url.startsWith('data:') || url.startsWith('file:')) return url
+
+      let folder = 'media'
+      if (type === 'image') folder = 'images'
+      else if (type === 'avatar') folder = 'avatars'
+
+      const dir = require('node:path').join(this.ctx.baseDir, 'data', 'chat-patch', 'persist-media', folder)
+      if (!require('node:fs').existsSync(dir)) {
+        require('node:fs').mkdirSync(dir, { recursive: true })
+      }
+
+      // 使用 URL 的 hash 作为文件名，避免重复下载
+      const crypto = require('node:crypto')
+      const hash = crypto.createHash('md5').update(url).digest('hex')
+      const ext = require('node:path').extname(new URL(url).pathname) || (type === 'image' ? '.jpg' : '.mp4')
+      const filename = `${hash}${ext}`
+      const filePath = require('node:path').join(dir, filename)
+
+      if (require('node:fs').existsSync(filePath)) {
+        return require('node:url').pathToFileURL(filePath).href
+      }
+
+      const buffer = await this.ctx.http.get(url, { responseType: 'arraybuffer' })
+      require('node:fs').writeFileSync(filePath, Buffer.from(buffer))
+
+      return require('node:url').pathToFileURL(filePath).href
+    } catch (e) {
+      return url
+    }
+  }
+
+  // 处理消息中的媒体元素并缓存
+  private async processMediaElements(elements: h[]) {
+    if (!elements) return elements
+    for (const el of elements) {
+      if (['image', 'img', 'mface'].includes(el.type)) {
+        const src = el.attrs.src || el.attrs.url || el.attrs.file
+        if (src) el.attrs.src = await this.downloadAndCacheMedia(src, 'image')
+      } else if (['audio', 'video'].includes(el.type)) {
+        const src = el.attrs.src || el.attrs.url || el.attrs.file
+        if (src) el.attrs.src = await this.downloadAndCacheMedia(src, 'media')
+      }
+      if (el.children) await this.processMediaElements(el.children)
+    }
+    return elements
+  }
+
   async broadcastMessageEvent(session: Session) {
     try {
       await this.updateBotInfoToFile(session)
       const guildName = await this.updateChannelInfoToFile(session)
+      const isDirect = session.isDirect || session.channelId?.includes('private')
 
       const timestamp = Date.now()
 
+      // 处理媒体缓存
+      if (session.elements) {
+        await this.processMediaElements(session.elements)
+      }
+      if (session.quote?.elements) {
+        await this.processMediaElements(session.quote.elements)
+      }
+
       // 处理 quote 信息
       let quoteInfo: QuoteInfo | undefined = undefined
       if (session.quote) {
@@ -169,7 +251,7 @@ export class MessageHandler {
         guildName: guildName,
         platform: session.platform || 'unknown',
         quote: quoteInfo ? this.utils.cleanBase64Content(quoteInfo) : undefined,
-        isDirect: session.isDirect
+        isDirect: !!isDirect
       }
 
       await this.fileManager.addMessageToFile(messageInfo)
@@ -208,24 +290,20 @@ export class MessageHandler {
       // 获取正确的 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)
+      const isDirect = session.isDirect || finalChannelId?.includes('private')
 
       const timestamp = Date.now()
 
+      // 处理媒体缓存
+      if (session.event?.message?.elements) {
+        await this.processMediaElements(session.event.message.elements)
+      }
+
       // 优先使用 session.content，它包含了完整的消息内容（含标签）
       let content = session.content || ''
 
@@ -233,6 +311,44 @@ export class MessageHandler {
         content = this.utils.extractTextContent(session.event.message.elements).trim()
       }
 
+      // 尝试从 content 中提取 quote id 并构建 quote 对象
+      let quoteInfo: QuoteInfo | undefined = undefined
+      const quoteMatch = content.match(/<quote id="([^"]+)"\/>/)
+      if (quoteMatch) {
+        const quoteId = quoteMatch[1]
+        const data = this.fileManager.readChatDataFromFile()
+        const channelKey = `${session.selfId}:${finalChannelId}`
+        // 在当前频道的消息历史中查找被引用的消息
+        const quotedMsg = data.messages[channelKey]?.find(m => m.id === quoteId)
+
+        if (quotedMsg) {
+          // 如果是虚拟 ID，尝试获取其真实的 messageId
+          const realId = quotedMsg.id.startsWith('bot-msg-') ? (quotedMsg as any).realId : quotedMsg.id
+
+          quoteInfo = {
+            messageId: realId || quotedMsg.id,
+            id: realId || quotedMsg.id,
+            content: quotedMsg.content,
+            elements: quotedMsg.elements,
+            user: {
+              id: quotedMsg.userId,
+              name: quotedMsg.username,
+              userId: quotedMsg.userId,
+              avatar: quotedMsg.avatar,
+              username: quotedMsg.username
+            },
+            timestamp: quotedMsg.timestamp
+          }
+          // 移除 content 中的 quote 标签，避免重复显示
+          content = content.replace(/<quote id="[^"]+"\/>\s*/, '')
+
+          // 修正 content 中的 quote 标签为真实 ID，以便 bot.sendMessage 能够正确识别
+          if (realId) {
+            session.content = session.content.replace(/id="[^"]+"/, `id="${realId}"`)
+          }
+        }
+      }
+
       // 创建机器人消息信息对象
       const messageInfo: MessageInfo = {
         id: `bot-msg-${timestamp}`,
@@ -247,7 +363,9 @@ export class MessageHandler {
         type: 'bot',
         guildName: guildName,
         platform: session.platform || 'unknown',
-        isDirect: session.isDirect
+        quote: quoteInfo,
+        isDirect: !!isDirect,
+        sending: true // 标记为正在发送
       }
 
       await this.fileManager.addMessageToFile(messageInfo)
@@ -266,32 +384,15 @@ export class MessageHandler {
         guildName: guildName,
         channelType: session.event?.channel?.type || session.type || 0,
         elements: this.utils.cleanBase64Content(session.event?.message?.elements),
-        isDirect: session.isDirect,
+        quote: quoteInfo,
+        isDirect: !!isDirect,
+        sending: true,
         bot: {
           avatar: session.bot.user?.avatar,
           name: session.bot.user?.name,
         }
       }
 
-      // 检查是否包含图片元素
-      const imageElements = session.event?.message?.elements?.filter((element: any) =>
-        element.type === 'img' || element.type === 'image' || element.type === 'mface'
-      ) || []
-
-      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

@@ -48,6 +48,8 @@ export interface MessageInfo {
   platform: string
   quote?: QuoteInfo
   isDirect?: boolean
+  sending?: boolean
+  realId?: string
 }
 
 export interface ChatData {