wechaty-web-panel 1.2.11 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## 更新日志
 
+### V1.4.0(2023-01-13)
+
+1、增加更多消息类型的解析，小程序和链接支持返回解析参数
+2、定时任务同时支持群和好友，每日说，新闻资讯，自定义定时任务，回调事件均已适配
+3、所有关键词回复，机器人回复，回调事件，技能中心支持配置触发范围，可以指定只在群，或者私聊中触发
+4、增加H5和小程序素材，为后续推出puppet-engine做准备
+5、素材添加分类标签，支持筛选和归类，方便查询
+6、在线素材发送支持小程序和h5链接
+7、智能微秘书平台菜单重新规划，关键词回复改为简单问答，关键词事件改为技能中心
+
+### V1.2.12(2022-12-21)
+
+1、修改ChatGPT 为官方api版本
+
 ### V1.2.8(2022-12-07)
 
 1、添加ChatGPT让你的机器人更智能

package/README.md

@@ -2,6 +2,7 @@
 
 [![Wechaty Plugin Web Panel](https://img.shields.io/badge/Wechaty%20Plugin-WebPanel-brightgreen.svg)](https://github.com/gengchen528/wechaty-web-panel)
 [![Powered by Wechaty](https://img.shields.io/badge/Powered%20By-Wechaty-brightgreen.svg)](https://github.com/Wechaty/wechaty)
+[![NPM Version](https://badge.fury.io/js/wechaty-web-panel.svg)](https://www.npmjs.com/package/wechaty-web-panel)
 
 Wechaty Web Panel 插件，让你的 wechaty 机器人快速接入 web 控制面板
 
@@ -9,8 +10,6 @@ Wechaty Web Panel 插件，让你的 wechaty 机器人快速接入 web 控制面
 
 ## 面板主要功能
 
-- [x] 微信每日说,定时给女朋友发送每日天气提醒，以及每日一句
-
 * 定时提醒
 
 - [x] 当天定时提醒 例："提醒 我 18:00 下班了，记得带好随身物品"
@@ -22,15 +21,18 @@ Wechaty Web Panel 插件，让你的 wechaty 机器人快速接入 web 控制面
 - [x] 天行机器人
 - [x] 图灵机器人
 - [x] 腾讯闲聊机器人
+- [x] ChatGPT api
+- [x] 微信对话开放平台
 - [ ] 更多
 
-* 群定时任务
+* 定时任务
 
-- [x] 群新闻定时发送
-- [x] 群消息定时发送
+- [x] 新闻定时发送
+- [x] 自定义内容定时发送
+- [x] 微信每日说,定时给女朋友和群友发送每日天气提醒，以及每日一句
 - [ ] 更多功能等你来 pr
 
-* 关键词
+* 技能中心
 
 - [x] 关键词加好友
 - [x] 关键词加群
@@ -65,6 +67,8 @@ Wechaty Web Panel 插件，让你的 wechaty 机器人快速接入 web 控制面
 - [x] 主动更新配置
 - [x] 主动同步好友和群列表
 - [x] 多群消息同步
+- [x] 回调事件
+- [x] 群发助手
 - [x] openapi请求
 
 更多详情介绍：[传送门](https://www.xkboke.com/web-inn/secretary/client.html#%E5%B0%8F%E5%8A%A9%E6%89%8B%E5%8A%9F%E8%83%BD%E4%B8%80%E8%A7%88)
@@ -131,7 +135,7 @@ npm install wechaty-web-panel@latest wechaty@latest --save
 $ vim mybot.js
 
 const {WechatyBuilder} = require('wechaty')
-const WechatyWebPanelPlugin = require('../src/index')
+const WechatyWebPanelPlugin = require('wechaty-web-panel')
 
 const name = 'wechat-assistant'
 
@@ -167,7 +171,6 @@ $ node mybot.js
 ![](./doc/img/index.png)
 ![](./doc/img/roomasync.png)
 ![](./doc/img/everyday.png)
-![](./doc/img/schedule.png)
 ![](./doc/img/event.png)
 ![](./doc/img/material.png)
 
@@ -181,8 +184,9 @@ $ node mybot.js
 
 群消息同步
 
-![](./doc/img/async.png)
+<img src="./doc/img/async.png" width="300">
 
 群合影
 
-![](./doc/img/group.jpeg)
+<img src="./doc/img/group.jpeg" width="300">
+

package/dist/cjs/src/common/index.d.ts

@@ -10,6 +10,7 @@ declare namespace _default {
     export { roomSay };
     export { addRoomWelcomeSay };
     export { updateContactAndRoom };
+    export { getRoomEveryDayContent };
 }
 export default _default;
 /**
@@ -80,4 +81,5 @@ export function addRoomWelcomeSay(room: any, roomName: any, contactName: any, ms
  * @returns {Promise<void>}
  */
 export function updateContactAndRoom(that: any): Promise<void>;
+export function getRoomEveryDayContent(date: any, city: any, endWord: any): Promise<string>;
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/src/common/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateContactAndRoom = exports.addRoomWelcomeSay = exports.roomSay = exports.contactSay = exports.addRoom = exports.updateRoomInfo = exports.updateContactInfo = exports.getEveryDayRoomContent = exports.getEveryDayContent = exports.updateContactOnly = exports.updateRoomOnly = void 0;
+exports.getRoomEveryDayContent = exports.updateContactAndRoom = exports.addRoomWelcomeSay = exports.roomSay = exports.contactSay = exports.addRoom = exports.updateRoomInfo = exports.updateContactInfo = exports.getEveryDayRoomContent = exports.getEveryDayContent = exports.updateContactOnly = exports.updateRoomOnly = void 0;
 const api_js_1 = require("../proxy/api.js");
 const aibotk_js_1 = require("../proxy/aibotk.js");
 const userDb_js_1 = require("../db/userDb.js");
@@ -35,6 +35,15 @@ async function getEveryDayContent(date, city, endWord) {
     return str;
 }
 exports.getEveryDayContent = getEveryDayContent;
+async function getRoomEveryDayContent(date, city, endWord) {
+    let one = await (0, aibotk_js_1.getOne)(); //获取每日一句
+    let weather = await (0, api_js_1.getTXweather)(city); //获取天气信息
+    let today = (0, index_js_1.formatDate)(new Date()); //获取今天的日期
+    let memorialDay = (0, index_js_1.getDay)(date); //获取纪念日天数
+    let str = `${today}\n家人们相聚在一起的第${memorialDay}天\n\n元气满满的一天开始啦,家人们要努力保持活跃啊^_^\n\n今日天气\n${weather.weatherTips}\n${weather.todayWeather}\n每日一句:\n${one}\n\n————————${endWord}`;
+    return str;
+}
+exports.getRoomEveryDayContent = getRoomEveryDayContent;
 /**
  * 更新用户信息
  */
@@ -160,11 +169,13 @@ exports.addRoomWelcomeSay = addRoomWelcomeSay;
  * @param {*} isRoom
  */
 async function roomSay(room, contact, msg) {
-    console.log('msg', msg);
     const config = await (0, configDb_js_1.allConfig)();
     const { role } = config.userInfo;
     if (msg.id && role === 'vip') {
-        msg = await (0, aibotk_js_1.getMaterial)(msg.id);
+        const res = await (0, aibotk_js_1.getMaterial)(msg.id);
+        if (res.id) {
+            msg = res;
+        }
     }
     try {
         if (msg.type === 1 && msg.content) {
@@ -194,10 +205,9 @@ async function roomSay(room, contact, msg) {
                 title: msg.title,
                 url: msg.url,
             });
-            console.log(url);
             await room.say(url);
         }
-        else if (msg.type === 5 && msg.appid && msg.title && msg.pagePath && msg.description && msg.thumbUrl && msg.thumbKey) {
+        else if (msg.type === 5 && msg.appid && msg.title && msg.pagePath && msg.description && msg.thumbUrl) {
             let miniProgram = new this.MiniProgram({
                 appid: msg.appid,
                 title: msg.title,
@@ -205,6 +215,7 @@ async function roomSay(room, contact, msg) {
                 description: msg.description,
                 thumbUrl: msg.thumbUrl,
                 thumbKey: msg.thumbKey,
+                username: msg.username || ''
             });
             await room.say(miniProgram);
         }
@@ -222,11 +233,13 @@ exports.roomSay = roomSay;
  *  type 1 文字 2 图片url 3 图片base64 4 url链接 5 小程序  6 名片
  */
 async function contactSay(contact, msg, isRoom = false) {
-    console.log('msg', msg);
     const config = await (0, configDb_js_1.allConfig)();
     const { role } = config.userInfo;
     if (msg.id && role === 'vip') {
-        msg = await (0, aibotk_js_1.getMaterial)(msg.id);
+        const res = await (0, aibotk_js_1.getMaterial)(msg.id);
+        if (res.id) {
+            msg = res;
+        }
     }
     try {
         if (msg.type === 1 && msg.content) {
@@ -259,7 +272,7 @@ async function contactSay(contact, msg, isRoom = false) {
             });
             await contact.say(url);
         }
-        else if (msg.type === 5 && msg.appid && msg.title && msg.pagePath && msg.description && msg.thumbUrl && msg.thumbKey) {
+        else if (msg.type === 5 && msg.appid && msg.title && msg.pagePath && msg.description && msg.thumbUrl) {
             let miniProgram = new this.MiniProgram({
                 appid: msg.appid,
                 title: msg.title,
@@ -267,6 +280,7 @@ async function contactSay(contact, msg, isRoom = false) {
                 description: msg.description,
                 thumbUrl: msg.thumbUrl,
                 thumbKey: msg.thumbKey,
+                username: msg.username || ''
             });
             await contact.say(miniProgram);
         }
@@ -352,5 +366,6 @@ exports.default = {
     roomSay,
     addRoomWelcomeSay,
     updateContactAndRoom,
+    getRoomEveryDayContent
 };
 //# sourceMappingURL=index.js.map

package/dist/cjs/src/handlers/on-login.js

@@ -24,14 +24,16 @@ async function onLogin(user) {
             robotId: payload.weixin || (0, index_js_1.MD5)(user.name()),
         };
         await (0, userDb_js_1.addUser)(userInfo); // 全局存储登录用户信息
-        const file = await user.avatar();
-        if (file) {
-            const base = await file.toBase64();
-            const avatarUrl = await (0, aibotk_js_1.putqn)(base, userId);
-            (0, aibotk_js_1.sendRobotInfo)(avatarUrl, user.name(), userInfo.robotId); // 更新用户头像
-        }
-        else {
-            console.log('头像未获取到，不影响项目正常使用');
+        if (payload.avatar) {
+            const file = await user.avatar();
+            if (file) {
+                const base = await file.toBase64();
+                const avatarUrl = await (0, aibotk_js_1.putqn)(base, userId);
+                (0, aibotk_js_1.sendRobotInfo)(avatarUrl, user.name(), userInfo.robotId); // 更新用户头像
+            }
+            else {
+                console.log('头像未获取到，不影响项目正常使用');
+            }
         }
         await (0, mqtt_js_1.initMqtt)(this); // 初始化mqtt任务
     }

package/dist/cjs/src/handlers/on-message.js

@@ -73,15 +73,34 @@ async function dispatchFriendFilterByMsgType(that, msg) {
             case that.Message.Type.Image:
                 console.log(`发消息人${await contact.name()}:发了一张图片`);
                 break;
-            case that.Message.Type.Url:
-                console.log(`发消息人${await contact.name()}:发了一个链接`);
-                break;
             case that.Message.Type.Video:
                 console.log(`发消息人${await contact.name()}:发了一个视频`);
                 break;
             case that.Message.Type.Audio:
                 console.log(`发消息人${await contact.name()}:发了一个视频`);
                 break;
+            case that.Message.Type.MiniProgram:
+                console.log(`发消息人${await contact.name()}:发了一个小程序`);
+                const miniProgram = await msg.toMiniProgram();
+                if (config.parseMini && miniProgram.payload) {
+                    const miniParse = `【小程序解析】\n\nappid：${miniProgram.appid()}\nusername：${miniProgram.username()}\n标题：${miniProgram.title()}\n描述：${miniProgram.description()}\n路径：${miniProgram.pagePath()}`;
+                    contact.say(miniParse);
+                }
+                console.log('mini', miniProgram);
+                break;
+            case that.Message.Type.Url:
+                console.log(`发消息人${await contact.name()}:发了一个h5链接`);
+                const urlLink = await msg.toUrlLink();
+                if (config.parseMini && urlLink.payload) {
+                    const urlParse = `【链接解析】\n\n标题：${urlLink.title()}\n描述：${urlLink.description()}\n链接：${urlLink.url()}\n缩略图：${urlLink.thumbnailUrl()}`;
+                    contact.say(urlParse);
+                }
+                console.log('urlLink', urlLink);
+                break;
+            case that.Message.Type.Transfer:
+                console.log(`发消息人${await contact.name()}: 发起一个转账，请在手机接收`);
+                console.log('内容', msg.payload);
+                break;
             default:
                 break;
         }
@@ -108,7 +127,7 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
         const receiver = msg.to();
         let content = "";
         let replys = "";
-        let contactId = contact.id || "111";
+        let contactId = contact.id;
         let contactAvatar = await contact.avatar();
         switch (type) {
             case that.Message.Type.Text:
@@ -155,15 +174,34 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
             case that.Message.Type.Image:
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 发了一张图片`);
                 break;
-            case that.Message.Type.Url:
-                console.log(`群名: ${roomName} 发消息人: ${contactName} 发了一个链接`);
-                break;
             case that.Message.Type.Video:
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 发了一个视频`);
                 break;
             case that.Message.Type.Audio:
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 发了一个语音`);
                 break;
+            case that.Message.Type.MiniProgram:
+                console.log(`群名: ${roomName} 发消息人: ${contactName} 发了一个小程序`);
+                const miniProgram = await msg.toMiniProgram();
+                if (config.parseMiniRooms.includes(roomName) && miniProgram.payload) {
+                    const miniParse = `【小程序解析】\n\nappid:${miniProgram.appid()}\nusername：${miniProgram.username()}\n标题：${miniProgram.title()}\n描述：${miniProgram.description()}\n路径：${miniProgram.pagePath()}\n`;
+                    room.say(miniParse);
+                }
+                console.log('mini', miniProgram);
+                break;
+            case that.Message.Type.Url:
+                console.log(`群名: ${roomName} 发消息人: ${contactName} 发了一个h5链接`);
+                const urlLink = await msg.toUrlLink();
+                if (config.parseMiniRooms.includes(roomName) && urlLink.payload) {
+                    const urlParse = `【链接解析】\n\n标题：${urlLink.title()}\n描述：${urlLink.description()}\n链接：${urlLink.url()}\n缩略图：${urlLink.thumbnailUrl()}`;
+                    room.say(urlParse);
+                }
+                console.log('urlLink', urlLink);
+                break;
+            case that.Message.Type.Transfer:
+                console.log(`群名: ${roomName} 发消息人: ${contactName} 发起了转账，请在手机查看`);
+                console.log('内容', msg.payload);
+                break;
             default:
                 break;
         }

package/dist/cjs/src/package-json.d.ts

@@ -43,6 +43,7 @@ export namespace packageJson {
         prettier: string;
         wechaty: string;
         "wechaty-puppet-wechat": string;
+        "wechaty-puppet-wechat4u": string;
     };
     const readme: string;
     namespace engines {
@@ -51,16 +52,17 @@ export namespace packageJson {
     }
     const dependencies: {
         axios: string;
-        chatgpt: string;
         ix: string;
         jsonwebtoken: string;
         mqtt: string;
         mustache: string;
         nedb: string;
         "node-schedule": string;
-        "p-timeout": string;
+        openai: string;
         puppeteer: string;
         "qrcode-terminal": string;
+        remark: string;
+        "strip-markdown": string;
         superagent: string;
     };
     namespace publishConfig {

package/dist/cjs/src/package-json.js

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.2.11",
+    "version": "1.4.0",
     "description": "",
     "exports": {
         ".": {
@@ -34,7 +34,11 @@ exports.packageJson = {
         "Wechaty",
         "wechatEveryDay",
         "wechaty",
-        "wechaty-plugin"
+        "wechaty-plugin",
+        "chatGPT",
+        "openai",
+        "chatBot",
+        "openGPT"
     ],
     "author": {
         "name": "Leo_chen",
@@ -56,7 +60,8 @@ exports.packageJson = {
         "npm-run-all": "^4.1.5",
         "prettier": "^2.0.5",
         "wechaty": "^1.20.2",
-        "wechaty-puppet-wechat": "^1.18.4"
+        "wechaty-puppet-wechat": "^1.18.4",
+        "wechaty-puppet-wechat4u": "^1.13.12"
     },
     "readme": "README.md",
     "engines": {
@@ -65,16 +70,17 @@ exports.packageJson = {
     },
     "dependencies": {
         "axios": "^0.27.2",
-        "chatgpt": "^1.4.0",
         "ix": "^4.5.2",
         "jsonwebtoken": "^8.5.1",
         "mqtt": "^4.2.6",
         "mustache": "^4.2.0",
         "nedb": "^1.8.0",
         "node-schedule": "^1.3.2",
-        "p-timeout": "^6.0.0",
+        "openai": "^3.1.0",
         "puppeteer": "^13.3.2",
         "qrcode-terminal": "^0.12.0",
+        "remark": "^14.0.2",
+        "strip-markdown": "^5.0.0",
         "superagent": "^5.2.2"
     },
     "publishConfig": {

package/dist/cjs/src/proxy/aibotk.js

@@ -122,7 +122,7 @@ async function getConfig() {
         let content = await (0, superagent_js_1.aiBotReq)(option);
         const config = JSON.parse(content.data.config);
         const cloudRoom = await getWordCloudRoom();
-        let cres = await (0, configDb_js_1.updateConfig)({ puppetType: 'wechaty-puppet-wechat', ...config, cloudRoom });
+        let cres = await (0, configDb_js_1.updateConfig)({ puppetType: 'wechaty-puppet-wechat', botScope: 'all', parseMini: false, parseMiniRooms: [], preventLength: 1000, ...config, cloudRoom });
         return cres;
     }
     catch (e) {

package/dist/cjs/src/proxy/chatgpt.d.ts

@@ -4,6 +4,6 @@ declare namespace _default {
 export default _default;
 export function geGPTReply(content: any): Promise<{
     type: number;
-    content: string;
+    content: any;
 }[]>;
 //# sourceMappingURL=chatgpt.d.ts.map

package/dist/cjs/src/proxy/chatgpt.js

@@ -4,36 +4,59 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.geGPTReply = void 0;
-const chatgpt_1 = require("chatgpt");
-const p_timeout_1 = __importDefault(require("p-timeout"));
+const remark_1 = require("remark");
+const strip_markdown_1 = __importDefault(require("strip-markdown"));
+const openai_1 = require("openai");
 const configDb_js_1 = require("../db/configDb.js");
+let openai = null;
+function markdownToText(markdown) {
+    return (0, remark_1.remark)()
+        .use(strip_markdown_1.default)
+        .processSync(markdown || '')
+        .toString();
+}
 async function geGPTReply(content) {
-    const config = await (0, configDb_js_1.allConfig)();
-    if (!config.gpttoken) {
-        console.log('请到智能微秘书平台配置ChatGPT token参数方可使用');
-        return [{ type: 1, content: '请到平台配置ChatGPT token参数方可使用' }];
+    try {
+        const config = await (0, configDb_js_1.allConfig)();
+        if (!config.gpttoken) {
+            console.log('请到智能微秘书平台配置Openai apikey参数方可使用');
+            return [{ type: 1, content: '请到平台配置Openai apikey参数方可使用' }];
+        }
+        if (!openai) {
+            let configuration = new openai_1.Configuration({
+                apiKey: config.gpttoken,
+            });
+            openai = new openai_1.OpenAIApi(configuration);
+        }
+        let response = await openai.createCompletion({
+            model: 'text-davinci-003',
+            prompt: content,
+            temperature: 0.9,
+            max_tokens: 2000,
+            top_p: 1,
+            frequency_penalty: 0.0,
+            presence_penalty: 0.6,
+            stop: [' Human:', ' AI:'],
+        });
+        response = markdownToText(response.data.choices[0].text);
+        let replys = [];
+        let message = response;
+        while (message.length > 500) {
+            replys.push(message.slice(0, 500));
+            message = message.slice(500);
+        }
+        replys.push(message);
+        replys = replys.map(item => {
+            return {
+                type: 1,
+                content: item
+            };
+        });
+        return replys;
     }
-    const api = new chatgpt_1.ChatGPTAPI({ sessionToken: config.gpttoken });
-    await api.ensureAuth();
-    const threeMinutesMs = 3 * 60 * 1000;
-    const response = await (0, p_timeout_1.default)(api.sendMessage(content), {
-        milliseconds: threeMinutesMs,
-        message: 'ChatGPT返回超时了，用的人太多，太火爆了，等会再试吧'
-    });
-    let replys = [];
-    let message = response;
-    while (message.length > 500) {
-        replys.push(message.slice(0, 500));
-        message = message.slice(500);
+    catch (e) {
+        return [{ type: 1, content: '现在询问我的人太多了，请稍后询问' }];
     }
-    replys.push(message);
-    replys = replys.map(item => {
-        return {
-            type: 1,
-            content: item
-        };
-    });
-    return replys;
 }
 exports.geGPTReply = geGPTReply;
 exports.default = {

package/dist/cjs/src/proxy/tencent-open.js

@@ -145,7 +145,7 @@ function getFormatReply(answer, options = [], userInfo, puppetType) {
                 replys = [{ type: 1, content: '收到了一个小程序，但是小秘书还没学会展示😭，等等我回去再修炼五百年💪' }];
             }
             else {
-                replys = [{ type: 5, appid: answer.miniprogrampage.appid, title: answer.miniprogrampage.title, pagePath: answer.miniprogrampage.pagepath, description: answer.miniprogrampage.title, thumbUrl: answer.miniprogrampage.thumb_url, thumbKey: undefined, username: userInfo.name }];
+                replys = [{ type: 5, appid: answer.miniprogrampage.appid, title: answer.miniprogrampage.title, pagePath: answer.miniprogrampage.pagepath, description: answer.miniprogrampage.title, thumbUrl: answer.miniprogrampage.thumb_url, thumbKey: undefined, username: answer.miniprogrampage.appid }];
             }
             break;
         default:
@@ -191,7 +191,7 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
                     // 其他协议可以发链接的用H5卡片发送
                     const music = resData.msg[0];
                     return [
-                        { type: 4, url: music.url, title: music.title, thumbnailUrl: music.picurl, description: music.description },
+                        { type: 4, url: music.url, title: music.title, thumbUrl: music.picurl, description: music.description },
                     ];
                 }
             }

package/dist/cjs/src/service/msg-filter-service.js

@@ -45,7 +45,8 @@ async function filterFriendMsg(that, contact, msg) {
         const avatar = await contact.avatar();
         const resArray = [
             { bool: msg === '', method: 'emptyMsg' },
-            { bool: msg.includes(DELETEFRIEND) || WEIXINOFFICIAL.includes(name) || msg.length > 1000, method: 'officialMsg' },
+            { bool: msg.includes(DELETEFRIEND) || WEIXINOFFICIAL.includes(name), method: 'officialMsg' },
+            { bool: config.preventLength && msg.length > config.preventLength, method: 'maxLengthMsg' },
             { bool: msg.includes(NEWADDFRIEND), method: 'newFriendMsg' },
             { bool: config.roomJoinKeywords && config.roomJoinKeywords.length > 0, method: 'roomInviteMsg' },
             { bool: msg.startsWith(REMINDKEY), method: 'scheduleJobMsg' },
@@ -53,7 +54,7 @@ async function filterFriendMsg(that, contact, msg) {
             { bool: config.eventKeywords && config.eventKeywords.length > 0, method: 'eventMsg' },
             { bool: config.avatarList && config.avatarList.length > 0, method: 'avatarCrop' },
             { bool: true, method: 'keywordsMsg' },
-            { bool: config.autoReply, method: 'robotMsg' },
+            { bool: config.autoReply && config.botScope !== 'room', method: 'robotMsg' },
         ];
         const msgArr = await getMsgReply(resArray, { that, msg, contact, name, config, avatar, id });
         return msgArr.length > 0 ? msgArr : [{ type: 1, content: '', url: '' }];
@@ -84,7 +85,7 @@ async function filterRoomMsg({ that, msg, name, id, avatar, room, isMention }) {
             { bool: config.eventKeywords && config.eventKeywords.length > 0, method: 'eventMsg' },
             { bool: config.avatarList && config.avatarList.length > 0, method: 'avatarCrop' },
             { bool: true, method: 'keywordsMsg' },
-            { bool: config.autoReply, method: 'robotMsg' },
+            { bool: config.autoReply && config.botScope !== 'friend', method: 'robotMsg' },
         ];
         const msgArr = await getMsgReply(resArray, { that, msg, name, config, avatar, id, room, isMention });
         return msgArr.length > 0 ? msgArr : [{ type: 1, content: '', url: '' }];

package/dist/cjs/src/service/msg-filters.d.ts

@@ -9,6 +9,7 @@ declare namespace _default {
     export { eventMsg };
     export { keywordsMsg };
     export { robotMsg };
+    export { maxLengthMsg };
 }
 export default _default;
 /**
@@ -104,4 +105,9 @@ export function robotMsg({ msg, name, id, config, isMention, room }: {
     isMention: any;
     room: any;
 }): Promise<any[]>;
+export function maxLengthMsg(): {
+    type: number;
+    content: string;
+    url: string;
+}[];
 //# sourceMappingURL=msg-filters.d.ts.map

package/dist/cjs/src/service/msg-filters.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.robotMsg = exports.keywordsMsg = exports.eventMsg = exports.scheduleJobMsg = exports.roomInviteMsg = exports.newFriendMsg = exports.officialMsg = exports.emptyMsg = exports.avatarCrop = exports.callbackEvent = void 0;
+exports.maxLengthMsg = exports.robotMsg = exports.keywordsMsg = exports.eventMsg = exports.scheduleJobMsg = exports.roomInviteMsg = exports.newFriendMsg = exports.officialMsg = exports.emptyMsg = exports.avatarCrop = exports.callbackEvent = void 0;
 const event_dispatch_service_js_1 = __importDefault(require("./event-dispatch-service.js"));
 const aibotk_js_1 = require("../proxy/aibotk.js");
 const index_js_1 = require("../lib/index.js");
@@ -20,10 +20,15 @@ function emptyMsg({ room, isMention }) {
 }
 exports.emptyMsg = emptyMsg;
 function officialMsg() {
-    console.log('字符超200字符，无效或官方消息，不做回复');
+    console.log('官方消息，不做回复');
     return [{ type: 1, content: '', url: '' }];
 }
 exports.officialMsg = officialMsg;
+function maxLengthMsg() {
+    console.log('字符超过设定值，不做回复');
+    return [{ type: 1, content: '', url: '' }];
+}
+exports.maxLengthMsg = maxLengthMsg;
 function newFriendMsg({ config, name }) {
     console.log(`新添加好友：${name}，默认回复`);
     return config.newFriendReplys || [{ type: 1, content: '', url: '' }];
@@ -154,8 +159,8 @@ async function callbackEvent({ that, msg, name, id, config, room, isMention }) {
         for (let item of config.callBackEvents) {
             for (let key of item.keywords) {
                 if ((item.reg === 1 && msg.includes(key)) || (item.reg === 2 && msg === key)) {
-                    // 如果匹配到关键词 群消息要求是必须@，但是没@ 就不需要回复
-                    if (room && item.needAt === 1 && !isMention || room && item.needAt === undefined && !isMention) {
+                    // 如果匹配到关键词 群消息要求是必须@，但是没@ 就不需要回复 || 当为群消息关键词只在好友私聊时触发 || 非群消息只在群中触发
+                    if (room && item.needAt === 1 && !isMention || room && item.needAt === undefined && !isMention || room && item.scope === 'friend' || !room && item.scope === 'room') {
                         return [];
                     }
                     msg = msg.trim();
@@ -194,8 +199,8 @@ async function eventMsg({ that, msg, name, id, avatar, config, room, isMention }
         for (let item of config.eventKeywords) {
             for (let key of item.keywords) {
                 if ((item.reg === 1 && msg.includes(key)) || (item.reg === 2 && msg === key)) {
-                    // 如果匹配到关键词 群消息要求是必须@，但是没@ 就不需要回复
-                    if (room && item.needAt === 1 && !isMention || room && item.needAt === undefined && !isMention) {
+                    // 如果匹配到关键词 群消息要求是必须@，但是没@ 就不需要回复 || 当为群消息关键词只在好友私聊时触发 || 非群消息只在群中触发
+                    if (room && item.needAt === 1 && !isMention || room && item.needAt === undefined && !isMention || room && item.scope === 'friend' || !room && item.scope === 'room') {
                         return [];
                     }
                     msg = msg.replace(key, '');
@@ -221,8 +226,8 @@ async function keywordsMsg({ msg, config, room, isMention }) {
         if (config.replyKeywords && config.replyKeywords.length > 0) {
             for (let item of config.replyKeywords) {
                 if (item.reg === 2 && item.keywords.includes(msg)) {
-                    // 如果匹配到关键词 群消息要求是必须@，但是没@ 就不需要回复
-                    if (room && item.needAt === 1 && !isMention || room && item.needAt === undefined && !isMention) {
+                    // 如果匹配到关键词 群消息要求是必须@，但是没@ 就不需要回复 || 当为群消息关键词只在好友私聊时触发 || 非群消息只在群中触发
+                    if (room && item.needAt === 1 && !isMention || room && item.needAt === undefined && !isMention || room && item.scope === 'friend' || !room && item.scope === 'room') {
                         return [];
                     }
                     console.log(`精确匹配到关键词${msg},正在回复用户`);
@@ -231,8 +236,8 @@ async function keywordsMsg({ msg, config, room, isMention }) {
                 else if (item.reg === 1) {
                     for (let key of item.keywords) {
                         if (msg.includes(key)) {
-                            // 如果匹配到关键词 群消息要求是必须@，但是没@ 就不需要回复
-                            if (room && item.needAt === 1 && !isMention || room && item.needAt === undefined && !isMention) {
+                            // 如果匹配到关键词 群消息要求是必须@，但是没@ 就不需要回复 || 当为群消息关键词只在好友私聊时触发 || 非群消息只在群中触发
+                            if (room && item.needAt === 1 && !isMention || room && item.needAt === undefined && !isMention || room && item.scope === 'friend' || !room && item.scope === 'room') {
                                 return [];
                             }
                             console.log(`模糊匹配到关键词${msg},正在回复用户`);
@@ -349,5 +354,6 @@ exports.default = {
     eventMsg,
     keywordsMsg,
     robotMsg,
+    maxLengthMsg
 };
 //# sourceMappingURL=msg-filters.js.map