alemonjs-aichat 1.0.9 → 1.0.11

package/README.md

@@ -1,5 +1,5 @@
 
-## 安装
+## 1.安装
 
 ### yarn安装方式(推荐)
 
@@ -19,14 +19,14 @@ https://gitee.com/suancaixianyu/alemonjs-aichat.git
 release
 ```
 
-## 配置`alemon.config.yaml`
+## 2.配置`alemon.config.yaml`
 在配置中添加该插件, 使用`ALemonDesk`只需要启用插件即可
 ``` yaml
 app: 
   - 'alemonjs-aichat'
 ```
 
-## 配置redis
+## 3.配置redis
 `alemon.config.yaml`
 ``` yaml
 redis:
@@ -36,5 +36,20 @@ redis:
 
 ```
 
-## 使用
-指令`/ai帮助`查看使用方法
+## 4.使用
+
+需要先使用`#添加ai`,配置一个ai后才能使用对话功能
+
+|指令|作用|
+|---|---|
+|#添加ai|添加一个ai, 重名时更新|
+|#切换ai|切换一个ai配置并保留当前对话|
+|#开启对话|在当前位置启用ai聊天|
+|#ai配置|显示当前使用的配置|
+|#添加提示词|添加一个提示词|
+|#提示词列表|查看当前配置的所有提示词|
+|#切换提示词|切换一个提示词并保留当前对话|
+|#清空对话|清空当前对话并保留好感度|
+|#开启好感度|好感度会影响回复时的语气|
+|#好感度|查看自己的好感度|
+|#ai帮助|查看更多指令|

package/lib/config.js

@@ -213,7 +213,7 @@ const tools = [
         type: "function",
         function: {
             name: "StableDiffusionImageToPrompt",
-            description: "使用 Stable Diffusion 将图片转换为提示词",
+            description: "使用 Stable Diffusion 将图片转换为提示词, 仅供绘图时使用, 其他场景请勿使用",
             parameters: {
                 type: "object",
                 properties: {

package/lib/data/help.json.js

@@ -1,6 +1,6 @@
 var title = "IA聊天插件";
 var name = "aichat";
-var version = "v1.0.9";
+var version = "v1.0.10";
 var by = "AlemonJS";
 var list = [
 	{
@@ -71,7 +71,7 @@ var list = [
 				},
 				{
 					cmd: "/[开启|关闭]语音回复",
-					desc: "开启或关闭语音回复功能。"
+					desc: "开启或关闭语音回复功能。仅限QQ平台使用。"
 				},
 				{
 					cmd: "/[开启|关闭]MCP工具",

package/lib/middleware/mw.js

@@ -10,7 +10,8 @@ var mw = onMiddleware(selects, async (event, next) => {
     event["msg"] = event.MessageText; // 消息内容
     event["guid"] = event.ChannelId ?? event.UserId; // 群号或用户QQ号
     event["uidkey"] = `${event["guid"]}:${event.UserName}(${event.UserId})`; // 唯一标识
-    event["nickname"] = `${event.UserName}(${event.UserId})`; // 昵称(用户名+QQ号)
+    event["nickname"] =
+        `${event.name == "private.message.create" ? "[私信]" : ""}${event.UserName}(${event.UserId})`; // 昵称(用户名+QQ号)
     // console.log('event["nickname"]', event["nickname"]);
     // console.log("event.IsMaster", event.UserId, config.master_id, event.IsMaster);
     if (event.Platform == "testone") {
@@ -41,7 +42,6 @@ var mw = onMiddleware(selects, async (event, next) => {
     if (event.Platform == "onebot") {
         // 获取客户端
         const [client] = useClient(event, API);
-        // 获取群成员存入redis
         const botInfo = await client.getLoginInfo();
         event["self_id"] = event.value.self_id; // 机器人QQ号
         event["originalMsg"] = event.value.message; // 原始消息内容
@@ -58,7 +58,6 @@ var mw = onMiddleware(selects, async (event, next) => {
                 data: { qq: item.data.qq, nickname: atInfo[0].data.nickname },
             };
         }));
-        console.log('event["at"]', event["at"]);
         // 是否at机器人
         event["atBot"] = event["at"].find((item) => item.data.qq == event.self_id);
         // 处理图片消息
@@ -82,6 +81,41 @@ var mw = onMiddleware(selects, async (event, next) => {
             }
         }
     }
+    if (event.Platform == "scbbs") {
+        event["msg"] = `${event["msg"]}`; // 消息内容包含at机器人昵称
+        event["self_id"] = event.value.toUser.id; // 机器人ID
+        event["originalMsg"] = event.value.content; // 原始消息内容
+        event["atBot"] =
+            event.name === "private.message.create" && event.Platform == "scbbs";
+        // 处理图片消息
+        event["img"] = (event.value.content || [])
+            .filter((item) => item.type === "image")
+            .map((item) => item.data.url);
+        // 判断是否为群管理员
+        event["isAdmin"] =
+            event.value.author.roles?.filter((role) => role.id == 1 || role.id == 2).length > 0;
+        event["bot"] = {
+            nickname: event.value.toUser.nickname,
+            user_id: event.value.toUser.id,
+        }; // 机器人信息
+        event["raw_message"] = event.value.content
+            .map((item) => {
+            if (item.type === "text") {
+                return item.data.text;
+            }
+            else if (item.type === "image") {
+                return `[CQ:image,${item.data.url}]`;
+            }
+            else if (item.type === "at") {
+                return `[CQ:at,qq=${item.data.id}]`;
+            }
+            else {
+                return `[${item.type.toUpperCase()}]`;
+            }
+        })
+            .join("");
+    }
+    console.log("处理后的事件", JSON.stringify(event, null, 2));
     // 常用于兼容其他框架或增强event功能
     next();
 });

package/lib/response/config/res.js

@@ -8,7 +8,8 @@ const regular$2 = /(\/|#)ai列表$/i;
 const regular$3 = /(\/|#)提示词列表$/i;
 const regular$4 = /(\/|#)清空对话$/i;
 const regular$5 = /(\/|#)清空(所有|全部)对话$/i;
-const regular = Regular.or(regular$1, regular$2, regular$3, regular$4, regular$5);
+const get = /(\/|#)get (.+)$/i;
+const regular = Regular.or(regular$1, regular$2, regular$3, regular$4, regular$5, get);
 var res = onResponse(selects, async (e, next) => {
     // 创建
     const [message] = useMessage(e);
@@ -38,6 +39,23 @@ var res = onResponse(selects, async (e, next) => {
         await clearAIChatHistory();
         message.send(format(Text("所有对话已清空")));
     }
+    // get请求一个地址
+    if (get.test(e.msg)) {
+        const match = e.msg.match(get);
+        if (!match) {
+            message.send(format(Text("格式错误，请按照 格式：/get <url> 进行请求")));
+            return;
+        }
+        const [, , url] = match;
+        try {
+            const res = await fetch(url);
+            const text = await res.text();
+            message.send(format(Text(`GET ${url} 的响应：\n${text}`)));
+        }
+        catch (error) {
+            message.send(format(Text(`请求 ${url} 失败：${error}`)));
+        }
+    }
     next();
 });
 

package/lib/response/setting/res.js

@@ -1,7 +1,6 @@
 import { addAI, switchAI, addPrompt, deletePrompt, switchPrompt, deleteAI, affectionSwitch, getAIList, getAIConfig } from '../../config.js';
 import { redis } from '../../redis.js';
-import { uploadImageToR2 } from '../../s3.js';
-import { useMessage, Text } from 'alemonjs';
+import { useMessage, Text, ImageFile } from 'alemonjs';
 import { Regular } from 'alemonjs/utils';
 
 const selects = onSelects(["message.create", "private.message.create"]);
@@ -20,21 +19,16 @@ const regular$14 = /(\/|#)(开启|关闭)语音回复$/i;
 const regular$15 = /(\/|#)(开启|关闭)(MCP)?工具$/i;
 const regular$16 = /(\/|#)切换图床(.*)$/i;
 const test = /(\/|#)测试$/i;
-const regular = Regular.or(regular$1, regular$2, regular$3, regular$4, regular$5, regular$6, regular$7, regular$8, regular$10, regular$11, regular$13, regular$14, regular$15, regular$16);
+const regular = Regular.or(regular$1, regular$2, regular$3, regular$4, regular$5, regular$6, regular$7, regular$8, regular$10, regular$11, regular$13, regular$14, regular$15, regular$16, test);
 var res = onResponse(selects, async (e, next) => {
     // 创建
     const [message] = useMessage(e);
     // 测试
     if (test.test(e.msg)) {
-        uploadImageToR2("./public/image_out/1769259547338.jpg").then((url) => {
-            console.log("上传成功，图片URL：", url);
-        });
-        // message.send(
-        //   format(
-        //     Text("测试消息"),
-        //     ImageFile("./public/image_out/1769257917858.jpg"),
-        //   ),
-        // );
+        // uploadImageToR2("./public/image_out/1769259547338.jpg").then((url) => {
+        //   console.log("上传成功，图片URL：", url);
+        // });
+        message.send(format(Text("测试消息"), ImageFile("./public/image_out/1769257917858.jpg")));
         // const a = await availableTools.StableDiffusionGenerateImage({
         //   prompt: "a cat playing with a ball",
         // });

package/lib/response/zreply/res.js

@@ -13,8 +13,11 @@ const regular = /.*/;
 let ttsClient;
 var res = onResponse(selects, async (e, next) => {
     console.log("收到消息");
+    console.log("e.UserId", e.UserId, e.bot.user_id);
     // 如果是命令则跳过
-    if (e.msg.startsWith("/") || e.msg.startsWith("#")) {
+    if (e.msg.startsWith("/") ||
+        e.msg.startsWith("#") ||
+        e.UserId == e.bot.user_id) {
         next();
         return;
     }
@@ -24,19 +27,21 @@ var res = onResponse(selects, async (e, next) => {
     const historyMessages = await getAIChatHistory(e.guid);
     const affections = await getAffectionLevelAll(e.guid);
     const imgs = [];
-    let rawMessage = e.value.raw_message || e.msg;
+    let rawMessage = e.value.raw_message || e.raw_message || e.msg;
     // 好感度开关
     const affectionIsOpen = (await redis.get(`ai:affection:switch:${e.guid}`)) || "1";
     const botName = e.bot.nickname || "小咸鱼";
     const systemPrompt = `你正在一个群聊中跟用户聊天,你的聊天昵称是'${botName}'
 关于回复格式:
   用户的发言方式为: [{'用户昵称(用户id)(发送时间)':回复内容}]
+  当聊天场景为私信时, 用户昵称前方会有[私信]前缀, 例如: [{'[私信]用户昵称(用户id)(发送时间)':回复内容}]
   你的回复方式为JSON: [{assistant:回复内容}],你可以在数组中加入多条消息来模拟更真实的聊天
   当然你觉得当前聊的话题确定与你有关是才回复,否则你就回复空数组[]来表示不回复.请尽可能降低回复频率.
 关于图片发送:
   如果你在使用画图工具后需要回复图片, 可在消息中追加image_url, 例如:
   [{'assistant':'画好啦','image_url':'图片地址'}]
   注意:图片地址必须是接口返回的完整地址, 通常是相对路径
+  注意:你的回复中除了json必要的双引号之外, 不要再添加多余的双引号, 否则会导致解析失败, 需要在回复内容中使用单引号来表示字符串, 例如: [{"assistant":"这是一个'引号'的例子"}]
 ` +
         (affectionIsOpen === "1"
             ? `当你认为对方在示好或骂你时,可添加{affections:数字}表示好感度变化,你可以根据好感度来适当改变回复语气.
@@ -205,8 +210,10 @@ var res = onResponse(selects, async (e, next) => {
         }
     }
     // 如果没有工具调用，处理最终回复
-    const reply = res.choices?.[0]?.message?.content?.trim().replace(/'/g, '"') || "";
+    let reply = res.choices?.[0]?.message?.content?.trim().replace(/'/g, '"') || "";
     log("AI回复内容:", reply);
+    // 修复assistant字段中多余的双引号
+    reply = reply.replace(/(?<="assistant":")(.*?)(?="[,}])/, (match) => match.replace(/"/g, "'"));
     // 提取好感变化, 使用incrementAffectionLevel更新好感
     if (affectionIsOpen === "1") {
         let affectionUpdated = false;

package/lib/s3.js

@@ -44,7 +44,7 @@ const uploadImageToR2 = async (source, key) => {
     // 1. 处理不同来源 → 统一得到 Buffer + contentType + fileName
     if (source.startsWith("http://") || source.startsWith("https://")) {
         // 远程 URL
-        const response = await fetch(source);
+        const response = await fetch(source.replace("!/fwfh/368x238", ""));
         if (!response.ok)
             throw new Error(`下载图片失败: ${response.statusText}`);
         buffer = Buffer.from(await response.arrayBuffer());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs-aichat",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "alemonjs-aichat",
   "author": "suancaixianyu",
   "license": "MIT",
@@ -73,6 +73,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.975.0",
     "@aws-sdk/s3-request-presigner": "^3.975.0",
+    "alemonjs-aichat": "^1.0.9",
     "mime-types": "^3.0.2",
     "openai": "^6.16.0"
   }