From d8a9413627fd9d4a1e62f4d827d3d209e5b575e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Mon, 24 Feb 2025 16:57:00 +0800
Subject: [PATCH] x

---
 src/plugin/index.ts | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/plugin/index.ts b/src/plugin/index.ts
index ebbebd3e..488ecf34 100644
--- a/src/plugin/index.ts
+++ b/src/plugin/index.ts
@@ -1,5 +1,5 @@
-import { NapCatOneBot11Adapter, OB11ArrayMessage, OB11MessageDataType } from '@/onebot';
-import { NapCatCore, RawMessage } from '@/core';
+import { NapCatOneBot11Adapter, OB11ArrayMessage, OB11MessageData, OB11MessageDataType } from '@/onebot';
+import { NapCatCore } from '@/core';
 import { ActionMap } from '@/onebot/action';
 import { OB11PluginAdapter } from '@/onebot/network/plugin';
 import { OpenAI } from 'openai';
@@ -32,21 +32,25 @@ async function createChatCompletionWithRetry(params: any, retries: number = 3):
     }
 }
 
-async function handleMessage2String(message: RawMessage): Promise<string> {
-    let data = '';
-    for (let element of message.elements) {
-        if (element.textElement) {
-            data += element.textElement.content.replaceAll('->', '').replaceAll('<-', '');
-        }
-        if (element.replyElement) {
-            const records = message.records.find(msgRecord => msgRecord.msgId === element.replyElement?.sourceMsgIdInRecords);
-            if (records) {
-                data += '[Reply] 回应内容 源消息[' + await handleMessage2String(records) + ']';
-            }
+async function msg2string(adapter: string, msg: OB11MessageData[], group_id: string, action: ActionMap, plugin: OB11PluginAdapter): Promise<string> {
+    let ret = '';
+    for (const m of msg) {
+        if (m.type === 'reply') {
+            const msgcontext = await action.get('get_msg')?._handle({ message_id: m.data.id }, adapter, plugin.config);
+            ret += `[CQ:reply,id=${m.data.id},orimsg=${msgcontext}]`;
+        } else if (m.type === 'text') {
+            ret += m.data.text;
+        } else if (m.type === 'at') {
+            const memberInfo = await action.get('get_group_member_info')
+                ?.handle({ group_id: group_id, user_id: m.data.qq }, adapter, plugin.config);
+            ret += `[CQ:at=${m.data.qq},name=${memberInfo?.data?.nickname}]`;
+        } else if (m.type === 'image') {
+            ret += '[CQ:image,file=' + m.data.url + ']';
+        } else if (m.type === 'face') {
+            ret += '[CQ:face,id=' + m.data.id + ']';
         }
     }
-    if (data.length === 0) throw new Error('消息为空');
-    return (message.sendMemberName || message.sendNickName) + ' 说: ->' + data + '<- ';
+    return ret;
 }
 
 function updateMemoryLayer(memoryLayer: Map<string, string[]>, group_id: string, newMessages: string[]) {
@@ -155,7 +159,7 @@ export const plugin_onmessage = async (
     }
     let msg_string = '';
     try {
-        msg_string = await handleMessage2String(message.raw!);
+        msg_string = await msg2string(adapter, message.message, message.group_id?.toString()!, action, instance);
     } catch (error) {
         if (msg_string == '') {
             return;