wechaty-web-panel 1.1.11 → 1.2.0

package/CHANGELOG.md

@@ -1,4 +1,8 @@
 ## 更新日志
+### V1.1.21(2022-10-31)
+
+1、添加群中关键词触发是否需要@功能
+
 ### V1.0.6(2022-07-14)
 
 1、修复机器人无法对话功能

package/README.md

@@ -5,6 +5,8 @@
 
 Wechaty Web Panel 插件，让你的 wechaty 机器人快速接入 web 控制面板
 
+本项目为面板源码，如需可直接运行的项目，请直接拉取 [https://github.com/leochen-g/wechat-assistant-pro](https://github.com/leochen-g/wechat-assistant-pro) 即可
+
 ## 面板主要功能
 
 - [x] 微信每日说,定时给女朋友发送每日天气提醒，以及每日一句

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

@@ -8,7 +8,7 @@ export function getContactTextReply(that: any, contact: any, msg: any): Promise<
  * @param {*} name 发消息者昵称
  * @param {*} id 发消息者id
  */
-export function getRoomTextReply(that: any, content: any, name: any, id: any, avatar: any, room: any): Promise<number>;
+export function getRoomTextReply({ that, content, name, id, avatar, room, isMention }: any): Promise<number>;
 declare namespace _default {
     export { getContactTextReply };
     export { getRoomTextReply };

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

@@ -19,8 +19,8 @@ exports.getContactTextReply = getContactTextReply;
  * @param {*} name 发消息者昵称
  * @param {*} id 发消息者id
  */
-async function getRoomTextReply(that, content, name, id, avatar, room) {
-    let result = await msg_filter_service_js_1.default.filterRoomMsg(that, content, name, id, avatar, room);
+async function getRoomTextReply({ that, content, name, id, avatar, room, isMention }) {
+    let result = await msg_filter_service_js_1.default.filterRoomMsg({ that, msg: content, name, id, avatar, room, isMention });
     return result;
 }
 exports.getRoomTextReply = getRoomTextReply;

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

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

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

@@ -10,7 +10,7 @@ const roomDb_js_1 = require("../db/roomDb.js");
 const ignoreRecord = [
     { type: "include", word: "加入了群聊" },
     { type: "include", word: "与群里其他人都不是朋友关系" },
-    { type: "include", word: "收到一条暂不支持的消息类型" },
+    { type: "include", word: "收到一条暂不支持的消息类型" }
 ];
 /**
  * 检测是否属于忽略的消息
@@ -23,7 +23,7 @@ function checkIgnore(msg, list) {
     for (let item of list) {
         const word = item.word;
         const type = item.type;
-        if ((type === 'start' && msg.startsWith(word)) || (type === 'end' && msg.endsWith(word)) || (type === 'equal' && msg === word) || (type === 'include' && msg.includes(word))) {
+        if ((type === "start" && msg.startsWith(word)) || (type === "end" && msg.endsWith(word)) || (type === "equal" && msg === word) || (type === "include" && msg.includes(word))) {
             return true;
         }
     }
@@ -40,7 +40,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
         const type = msg.type();
         const contact = msg.talker(); // 发消息人
         const isOfficial = contact.type() === that.Contact.Type.Official;
-        let content = '';
+        let content = "";
         let replys = [];
         switch (type) {
             case that.Message.Type.Text:
@@ -57,7 +57,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
                     }
                 }
                 else {
-                    console.log('公众号消息');
+                    console.log("公众号消息");
                 }
                 break;
             case that.Message.Type.Emoticon:
@@ -80,7 +80,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
         }
     }
     catch (error) {
-        console.log('监听消息错误', error);
+        console.log("监听消息错误", error);
     }
 }
 /**
@@ -99,32 +99,45 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
         const roomName = await room.topic();
         const type = msg.type();
         const userSelfName = that.currentUser?.name() || that.userSelf()?.name();
-        let content = '';
-        let replys = '';
-        let contactId = contact.id || '111';
+        let content = "";
+        let replys = "";
+        let contactId = contact.id || "111";
         let contactAvatar = await contact.avatar();
         switch (type) {
             case that.Message.Type.Text:
                 content = msg.text();
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content}`);
                 const mentionSelf = content.includes(`@${userSelfName}`);
-                if (mentionSelf) {
-                    content = content.replace(/@[^,，：:\s@]+/g, '').trim();
-                    // 检测是否需要这条消息
-                    const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
-                    if (isIgnore)
-                        return;
-                    replys = await (0, reply_js_1.getRoomTextReply)(that, content, contactName, contactId, contactAvatar, room);
-                    for (let reply of replys) {
-                        await (0, index_js_2.delay)(1000);
-                        await index_js_1.roomSay.call(that, room, contact, reply);
-                    }
+                content = content.replace(/@[^,，：:\s@]+/g, "").trim();
+                // 检测是否需要这条消息
+                const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
+                if (isIgnore)
+                    return;
+                replys = await (0, reply_js_1.getRoomTextReply)({
+                    that,
+                    content,
+                    name: contactName,
+                    id: contactId,
+                    avatar: contactAvatar,
+                    room,
+                    isMention: mentionSelf
+                });
+                for (let reply of replys) {
+                    await (0, index_js_2.delay)(1000);
+                    await index_js_1.roomSay.call(that, room, contact, reply);
                 }
                 const cloudRoom = config.cloudRoom;
-                if (role === 'vip' && cloudRoom.includes(roomName) && !checkIgnore(content, ignoreRecord)) {
+                if (role === "vip" && cloudRoom.includes(roomName) && !checkIgnore(content, ignoreRecord)) {
                     const regex = /(<([^>]+)>)/ig;
                     content = content.replace(regex, "");
-                    (0, roomDb_js_1.addRoomRecord)({ roomName, roomId: room.id, content, contact: contactName, wxid: contactId, time: new Date().getTime() });
+                    (0, roomDb_js_1.addRoomRecord)({
+                        roomName,
+                        roomId: room.id,
+                        content,
+                        contact: contactName,
+                        wxid: contactId,
+                        time: new Date().getTime()
+                    });
                 }
                 break;
             case that.Message.Type.Emoticon:
@@ -148,7 +161,7 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
         }
     }
     catch (e) {
-        console.log('error', e);
+        console.log("error", e);
     }
 }
 async function onMessage(msg) {
@@ -164,7 +177,7 @@ async function onMessage(msg) {
             const contact = msg.talker(); // 发消息人
             const contactName = contact.name();
             await dispatchRoomFilterByMsgType(this, room, msg);
-            if (role === 'vip' && roomName !== contactName) {
+            if (role === "vip" && roomName !== contactName) {
                 const roomAsyncList = config.roomAsyncList || [];
                 if (roomAsyncList.length) {
                     await (0, room_async_service_js_1.dispatchAsync)(this, msg, roomAsyncList);
@@ -176,7 +189,7 @@ async function onMessage(msg) {
         }
     }
     catch (e) {
-        console.log('监听消息失败', e);
+        console.log("监听消息失败", e);
     }
 }
 exports.default = onMessage;

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

@@ -12,7 +12,7 @@ const userDb_js_1 = require("../db/userDb.js");
  */
 async function onReady() {
     try {
-        const userInfo = await (0, userDb_js_1.getUser)();
+        await (0, userDb_js_1.getUser)();
         console.log(`所有数据准备完毕`);
         await (0, aibotk_js_1.sendHeartBeat)('live');
         await index_js_1.default.updateContactInfo(this);

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

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.1.11",
+    "version": "1.2.0",
     "description": "",
     "exports": {
         ".": {

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

@@ -175,9 +175,7 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
                     const replys = [];
                     multiList.forEach((item) => {
                         item = item.replace(/<\/?.+?\/?>/g, '');
-                        console.log('item', item);
                         const reply = getFormatReply(item, resData.options || [], userInfo, config.puppetType);
-                        console.log('reply', reply);
                         replys.push(...reply);
                     });
                     return replys;
@@ -190,13 +188,14 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
             else if (resData.answer_type === 'music') {
                 // web 端协议以文字和图片的形式发送
                 if (config.puppetType === 'wechaty-puppet-wechat') {
-                    const music = resData.msg[0];
-                    const musicContent = `【歌名】：《${music && music.song_name}》\n【歌手】：${music && music.singer_name}\n【听歌地址】：${music && music.music_url}`;
-                    const musicPic = music && music.pic_url;
+                    const res = JSON.parse(resData.answer);
+                    const music = res.news.articles[0];
+                    const musicContent = `【歌名】：《${music && music.title}》\n【听歌地址】：${music && music.url}`;
+                    const musicPic = music && music.picurl;
                     return [
                         {
                             type: 1,
-                            content: resData.answer + '\n\n' + musicContent,
+                            content: musicContent,
                         },
                         {
                             type: 2,
@@ -208,11 +207,7 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
                     // 其他协议可以发链接的用H5卡片发送
                     const music = resData.msg[0];
                     return [
-                        {
-                            type: 1,
-                            content: resData.answer,
-                        },
-                        { type: 4, url: music.music_url, title: music.song_name, thumbnailUrl: music.pic_url, description: music.singer_name },
+                        { type: 4, url: music.url, title: music.title, thumbnailUrl: music.picurl, description: music.description },
                     ];
                 }
             }

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

@@ -24,5 +24,5 @@ export function filterFriendMsg(that: any, contact: Object, msg: string): number
  * 1 开启了好友验证 || 朋友推荐消息 || 发送的文字消息过长,大于40个字符
  * 2 初次添加好友
  */
-export function filterRoomMsg(that: any, msg: any, name: any, id: any, avatar: any, room: any): number;
+export function filterRoomMsg({ that, msg, name, id, avatar, room, isMention }: any): number;
 //# sourceMappingURL=msg-filter-service.d.ts.map

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

@@ -10,13 +10,13 @@ const WEIXINOFFICIAL = ['朋友推荐消息', '微信支付', '微信运动', '
 const DELETEFRIEND = '开启了朋友验证'; // 被人删除后，防止重复回复
 const REMINDKEY = '提醒';
 const NEWADDFRIEND = '你已添加';
-async function getMsgReply(resArray, { that, msg, name, contact, config, avatar, id, room }) {
+async function getMsgReply(resArray, { that, msg, name, contact, config, avatar, id, room, isMention }) {
     try {
         let msgArr = [];
         for (let i = 0; i < resArray.length; i++) {
             const item = resArray[i];
             if (item.bool) {
-                msgArr = (await msg_filters_js_1.default[item.method]({ that, msg, name, contact, config, avatar, id, room })) || [];
+                msgArr = (await msg_filters_js_1.default[item.method]({ that, msg, name, contact, config, avatar, id, room, isMention })) || [];
             }
             if (msgArr.length > 0) {
                 return msgArr;
@@ -40,7 +40,6 @@ async function getMsgReply(resArray, { that, msg, name, contact, config, avatar,
 async function filterFriendMsg(that, contact, msg) {
     try {
         const config = await (0, configDb_js_1.allConfig)(); // 获取配置信息
-        console.log('callback', config.callBackEvents);
         const name = contact.name();
         const id = contact.id;
         const avatar = await contact.avatar();
@@ -76,7 +75,7 @@ exports.filterFriendMsg = filterFriendMsg;
  * 1 开启了好友验证 || 朋友推荐消息 || 发送的文字消息过长,大于40个字符
  * 2 初次添加好友
  */
-async function filterRoomMsg(that, msg, name, id, avatar, room) {
+async function filterRoomMsg({ that, msg, name, id, avatar, room, isMention }) {
     try {
         const config = await (0, configDb_js_1.allConfig)(); // 获取配置信息
         const resArray = [
@@ -87,7 +86,7 @@ async function filterRoomMsg(that, msg, name, id, avatar, room) {
             { bool: true, method: 'keywordsMsg' },
             { bool: config.autoReply, method: 'robotMsg' },
         ];
-        const msgArr = await getMsgReply(resArray, { that, msg, name, config, avatar, id, room });
+        const msgArr = await getMsgReply(resArray, { that, msg, name, config, avatar, id, room, isMention });
         return msgArr.length > 0 ? msgArr : [{ type: 1, content: '', url: '' }];
     }
     catch (e) {

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

@@ -21,13 +21,14 @@ export default _default;
  * @param room
  * @returns Promise
  */
-export function callbackEvent({ that, msg, name, id, config, room }: {
+export function callbackEvent({ that, msg, name, id, config, room, isMention }: {
     that: any;
     msg: any;
     name: any;
     id: any;
     config: any;
     room: any;
+    isMention: any;
 }): Promise<never[] | import("axios").AxiosResponse<any, any>>;
 /**
  * 头像处理
@@ -72,7 +73,7 @@ export function scheduleJobMsg({ that, msg, name }: {
     msg: any;
     name: any;
 }): Promise<any>;
-export function eventMsg({ that, msg, name, id, avatar, config, room }: {
+export function eventMsg({ that, msg, name, id, avatar, config, room, isMention }: {
     that: any;
     msg: any;
     name: any;
@@ -80,19 +81,24 @@ export function eventMsg({ that, msg, name, id, avatar, config, room }: {
     avatar: any;
     config: any;
     room: any;
+    isMention: any;
 }): Promise<string | never[]>;
 /**
  * 关键词回复
  * @returns {Promise<*>}
  */
-export function keywordsMsg({ msg, config }: {
+export function keywordsMsg({ msg, config, room, isMention }: {
     msg: any;
     config: any;
+    room: any;
+    isMention: any;
 }): Promise<any>;
-export function robotMsg({ msg, name, id, config }: {
+export function robotMsg({ msg, name, id, config, isMention, room }: {
     msg: any;
     name: any;
     id: any;
     config: any;
+    isMention: any;
+    room: any;
 }): Promise<any[]>;
 //# sourceMappingURL=msg-filters.d.ts.map

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

@@ -147,11 +147,15 @@ async function getEventReply(that, event, msg, name, id, avatar, room) {
  * @param room
  * @returns Promise
  */
-async function callbackEvent({ that, msg, name, id, config, room }) {
+async function callbackEvent({ that, msg, name, id, config, room, isMention }) {
     try {
         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) {
+                        return [];
+                    }
                     msg = msg.trim();
                     const data = {
                         uid: id,
@@ -181,11 +185,15 @@ async function callbackEvent({ that, msg, name, id, config, room }) {
     }
 }
 exports.callbackEvent = callbackEvent;
-async function eventMsg({ that, msg, name, id, avatar, config, room }) {
+async function eventMsg({ that, msg, name, id, avatar, config, room, isMention }) {
     try {
         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) {
+                        return [];
+                    }
                     msg = msg.replace(key, '');
                     let res = await getEventReply(that, item.event, msg, name, id, avatar, room);
                     return res;
@@ -204,17 +212,25 @@ exports.eventMsg = eventMsg;
  * 关键词回复
  * @returns {Promise<*>}
  */
-async function keywordsMsg({ msg, config }) {
+async function keywordsMsg({ msg, config, room, isMention }) {
     try {
         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) {
+                        return [];
+                    }
                     console.log(`精确匹配到关键词${msg},正在回复用户`);
                     return item.replys;
                 }
                 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) {
+                                return [];
+                            }
                             console.log(`模糊匹配到关键词${msg},正在回复用户`);
                             return item.replys;
                         }
@@ -232,22 +248,28 @@ async function keywordsMsg({ msg, config }) {
     }
 }
 exports.keywordsMsg = keywordsMsg;
-async function robotMsg({ msg, name, id, config }) {
-    try {
-        let msgArr = []; // 返回的消息列表
-        if (config.autoReply) {
-            console.log('开启了机器人自动回复功能');
-            msgArr = await event_dispatch_service_js_1.default.dispatchAiBot(config.defaultBot, msg, name, id);
+async function robotMsg({ msg, name, id, config, isMention, room }) {
+    // 如果群里没有提及不开启机器人聊天
+    if (room && !isMention) {
+        return [];
+    }
+    else {
+        try {
+            let msgArr = []; // 返回的消息列表
+            if (config.autoReply) {
+                console.log('开启了机器人自动回复功能');
+                msgArr = await event_dispatch_service_js_1.default.dispatchAiBot(config.defaultBot, msg, name, id);
+            }
+            else {
+                console.log('没有开启机器人自动回复功能');
+                msgArr = [{ type: 1, content: '', url: '' }];
+            }
+            return msgArr;
         }
-        else {
-            console.log('没有开启机器人自动回复功能');
-            msgArr = [{ type: 1, content: '', url: '' }];
+        catch (e) {
+            console.log('robotMsg error:', e);
+            return [];
         }
-        return msgArr;
-    }
-    catch (e) {
-        console.log('robotMsg error:', e);
-        return [];
     }
 }
 exports.robotMsg = robotMsg;

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

@@ -102,7 +102,7 @@ exports.sendRoomTaskMessage = sendRoomTaskMessage;
 async function setEveryDayTask(that, item, name) {
     try {
         let time = item.date;
-        let contact = (await that.Contact.find({ alias: item.alias })) || (await that.Contact.find({ name: item.name })); // 获取你要发送的联系人
+        let contact = item.name && (await that.Contact.find({ name: item.name })) || item.alias && (await that.Contact.find({ alias: item.alias })); // 获取你要发送的联系人
         if (!contact) {
             console.log(`查找不到用户昵称为'${item.name}'或备注为'${item.alias}'的用户，请检查设置用户是否正确`);
             return;
@@ -129,7 +129,7 @@ async function setEveryDayTask(that, item, name) {
 async function sendContactTaskMessage(that, info) {
     try {
         const item = info.message;
-        let contact = (await that.Contact.find({ alias: item.alias })) || (await that.Contact.find({ name: item.name })); // 获取你要发送的联系人
+        let contact = item.name && (await that.Contact.find({ name: item.name })) || item.alias && (await that.Contact.find({ alias: item.alias })); // 获取你要发送的联系人
         if (!contact) {
             console.log(`查找不到用户昵称为'${item.name}'或备注为'${item.alias}'的用户，请检查设置用户是否正确`);
             return;

package/dist/esm/src/common/reply.d.ts

@@ -8,7 +8,7 @@ export function getContactTextReply(that: any, contact: any, msg: any): Promise<
  * @param {*} name 发消息者昵称
  * @param {*} id 发消息者id
  */
-export function getRoomTextReply(that: any, content: any, name: any, id: any, avatar: any, room: any): Promise<number>;
+export function getRoomTextReply({ that, content, name, id, avatar, room, isMention }: any): Promise<number>;
 declare namespace _default {
     export { getContactTextReply };
     export { getRoomTextReply };

package/dist/esm/src/common/reply.js

@@ -12,8 +12,8 @@ export async function getContactTextReply(that, contact, msg) {
  * @param {*} name 发消息者昵称
  * @param {*} id 发消息者id
  */
-export async function getRoomTextReply(that, content, name, id, avatar, room) {
-    let result = await service.filterRoomMsg(that, content, name, id, avatar, room);
+export async function getRoomTextReply({ that, content, name, id, avatar, room, isMention }) {
+    let result = await service.filterRoomMsg({ that, msg: content, name, id, avatar, room, isMention });
     return result;
 }
 export default {

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

@@ -24,10 +24,15 @@ async function onLogin(user) {
         };
         await addUser(userInfo); // 全局存储登录用户信息
         const file = await user.avatar();
-        const base = await file.toBase64();
-        const avatarUrl = await putqn(base, userId);
-        await sendRobotInfo(avatarUrl, user.name(), userInfo.robotId); // 更新用户头像
-        await delay(3000);
+        if (file) {
+            const base = await file.toBase64();
+            const avatarUrl = await putqn(base, userId);
+            await sendRobotInfo(avatarUrl, user.name(), userInfo.robotId); // 更新用户头像
+            await delay(1000);
+        }
+        else {
+            console.log('头像未获取到，不影响项目正常使用');
+        }
         await initAllSchedule(this); // 初始化任务
         await initMqtt(this); // 初始化mqtt任务
     }

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

@@ -1,14 +1,14 @@
-import { contactSay, roomSay } from '../common/index.js';
-import { getContactTextReply, getRoomTextReply } from '../common/reply.js';
-import { delay } from '../lib/index.js';
-import { dispatchAsync } from '../service/room-async-service.js';
-import { allConfig } from '../db/configDb.js';
-import { getAibotConfig } from '../db/aiDb.js';
-import { addRoomRecord } from '../db/roomDb.js';
+import { contactSay, roomSay } from "../common/index.js";
+import { getContactTextReply, getRoomTextReply } from "../common/reply.js";
+import { delay } from "../lib/index.js";
+import { dispatchAsync } from "../service/room-async-service.js";
+import { allConfig } from "../db/configDb.js";
+import { getAibotConfig } from "../db/aiDb.js";
+import { addRoomRecord } from "../db/roomDb.js";
 const ignoreRecord = [
     { type: "include", word: "加入了群聊" },
     { type: "include", word: "与群里其他人都不是朋友关系" },
-    { type: "include", word: "收到一条暂不支持的消息类型" },
+    { type: "include", word: "收到一条暂不支持的消息类型" }
 ];
 /**
  * 检测是否属于忽略的消息
@@ -21,7 +21,7 @@ function checkIgnore(msg, list) {
     for (let item of list) {
         const word = item.word;
         const type = item.type;
-        if ((type === 'start' && msg.startsWith(word)) || (type === 'end' && msg.endsWith(word)) || (type === 'equal' && msg === word) || (type === 'include' && msg.includes(word))) {
+        if ((type === "start" && msg.startsWith(word)) || (type === "end" && msg.endsWith(word)) || (type === "equal" && msg === word) || (type === "include" && msg.includes(word))) {
             return true;
         }
     }
@@ -38,7 +38,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
         const type = msg.type();
         const contact = msg.talker(); // 发消息人
         const isOfficial = contact.type() === that.Contact.Type.Official;
-        let content = '';
+        let content = "";
         let replys = [];
         switch (type) {
             case that.Message.Type.Text:
@@ -55,7 +55,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
                     }
                 }
                 else {
-                    console.log('公众号消息');
+                    console.log("公众号消息");
                 }
                 break;
             case that.Message.Type.Emoticon:
@@ -78,7 +78,7 @@ async function dispatchFriendFilterByMsgType(that, msg) {
         }
     }
     catch (error) {
-        console.log('监听消息错误', error);
+        console.log("监听消息错误", error);
     }
 }
 /**
@@ -97,32 +97,45 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
         const roomName = await room.topic();
         const type = msg.type();
         const userSelfName = that.currentUser?.name() || that.userSelf()?.name();
-        let content = '';
-        let replys = '';
-        let contactId = contact.id || '111';
+        let content = "";
+        let replys = "";
+        let contactId = contact.id || "111";
         let contactAvatar = await contact.avatar();
         switch (type) {
             case that.Message.Type.Text:
                 content = msg.text();
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content}`);
                 const mentionSelf = content.includes(`@${userSelfName}`);
-                if (mentionSelf) {
-                    content = content.replace(/@[^,，：:\s@]+/g, '').trim();
-                    // 检测是否需要这条消息
-                    const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
-                    if (isIgnore)
-                        return;
-                    replys = await getRoomTextReply(that, content, contactName, contactId, contactAvatar, room);
-                    for (let reply of replys) {
-                        await delay(1000);
-                        await roomSay.call(that, room, contact, reply);
-                    }
+                content = content.replace(/@[^,，：:\s@]+/g, "").trim();
+                // 检测是否需要这条消息
+                const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
+                if (isIgnore)
+                    return;
+                replys = await getRoomTextReply({
+                    that,
+                    content,
+                    name: contactName,
+                    id: contactId,
+                    avatar: contactAvatar,
+                    room,
+                    isMention: mentionSelf
+                });
+                for (let reply of replys) {
+                    await delay(1000);
+                    await roomSay.call(that, room, contact, reply);
                 }
                 const cloudRoom = config.cloudRoom;
-                if (role === 'vip' && cloudRoom.includes(roomName) && !checkIgnore(content, ignoreRecord)) {
+                if (role === "vip" && cloudRoom.includes(roomName) && !checkIgnore(content, ignoreRecord)) {
                     const regex = /(<([^>]+)>)/ig;
                     content = content.replace(regex, "");
-                    addRoomRecord({ roomName, roomId: room.id, content, contact: contactName, wxid: contactId, time: new Date().getTime() });
+                    addRoomRecord({
+                        roomName,
+                        roomId: room.id,
+                        content,
+                        contact: contactName,
+                        wxid: contactId,
+                        time: new Date().getTime()
+                    });
                 }
                 break;
             case that.Message.Type.Emoticon:
@@ -146,7 +159,7 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
         }
     }
     catch (e) {
-        console.log('error', e);
+        console.log("error", e);
     }
 }
 async function onMessage(msg) {
@@ -162,7 +175,7 @@ async function onMessage(msg) {
             const contact = msg.talker(); // 发消息人
             const contactName = contact.name();
             await dispatchRoomFilterByMsgType(this, room, msg);
-            if (role === 'vip' && roomName !== contactName) {
+            if (role === "vip" && roomName !== contactName) {
                 const roomAsyncList = config.roomAsyncList || [];
                 if (roomAsyncList.length) {
                     await dispatchAsync(this, msg, roomAsyncList);
@@ -174,7 +187,7 @@ async function onMessage(msg) {
         }
     }
     catch (e) {
-        console.log('监听消息失败', e);
+        console.log("监听消息失败", e);
     }
 }
 export default onMessage;

package/dist/esm/src/handlers/on-ready.js

@@ -7,7 +7,7 @@ import { getUser } from '../db/userDb.js';
  */
 async function onReady() {
     try {
-        const userInfo = await getUser();
+        await getUser();
         console.log(`所有数据准备完毕`);
         await sendHeartBeat('live');
         await common.updateContactInfo(this);

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

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.1.11",
+    "version": "1.2.0",
     "description": "",
     "exports": {
         ".": {

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

@@ -169,9 +169,7 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
                     const replys = [];
                     multiList.forEach((item) => {
                         item = item.replace(/<\/?.+?\/?>/g, '');
-                        console.log('item', item);
                         const reply = getFormatReply(item, resData.options || [], userInfo, config.puppetType);
-                        console.log('reply', reply);
                         replys.push(...reply);
                     });
                     return replys;
@@ -184,13 +182,14 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
             else if (resData.answer_type === 'music') {
                 // web 端协议以文字和图片的形式发送
                 if (config.puppetType === 'wechaty-puppet-wechat') {
-                    const music = resData.msg[0];
-                    const musicContent = `【歌名】：《${music && music.song_name}》\n【歌手】：${music && music.singer_name}\n【听歌地址】：${music && music.music_url}`;
-                    const musicPic = music && music.pic_url;
+                    const res = JSON.parse(resData.answer);
+                    const music = res.news.articles[0];
+                    const musicContent = `【歌名】：《${music && music.title}》\n【听歌地址】：${music && music.url}`;
+                    const musicPic = music && music.picurl;
                     return [
                         {
                             type: 1,
-                            content: resData.answer + '\n\n' + musicContent,
+                            content: musicContent,
                         },
                         {
                             type: 2,
@@ -202,11 +201,7 @@ async function getTencentOpenReply({ msg, id, userInfo }) {
                     // 其他协议可以发链接的用H5卡片发送
                     const music = resData.msg[0];
                     return [
-                        {
-                            type: 1,
-                            content: resData.answer,
-                        },
-                        { type: 4, url: music.music_url, title: music.song_name, thumbnailUrl: music.pic_url, description: music.singer_name },
+                        { type: 4, url: music.url, title: music.title, thumbnailUrl: music.picurl, description: music.description },
                     ];
                 }
             }

package/dist/esm/src/service/msg-filter-service.d.ts

@@ -24,5 +24,5 @@ export function filterFriendMsg(that: any, contact: Object, msg: string): number
  * 1 开启了好友验证 || 朋友推荐消息 || 发送的文字消息过长,大于40个字符
  * 2 初次添加好友
  */
-export function filterRoomMsg(that: any, msg: any, name: any, id: any, avatar: any, room: any): number;
+export function filterRoomMsg({ that, msg, name, id, avatar, room, isMention }: any): number;
 //# sourceMappingURL=msg-filter-service.d.ts.map

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

@@ -4,13 +4,13 @@ const WEIXINOFFICIAL = ['朋友推荐消息', '微信支付', '微信运动', '
 const DELETEFRIEND = '开启了朋友验证'; // 被人删除后，防止重复回复
 const REMINDKEY = '提醒';
 const NEWADDFRIEND = '你已添加';
-async function getMsgReply(resArray, { that, msg, name, contact, config, avatar, id, room }) {
+async function getMsgReply(resArray, { that, msg, name, contact, config, avatar, id, room, isMention }) {
     try {
         let msgArr = [];
         for (let i = 0; i < resArray.length; i++) {
             const item = resArray[i];
             if (item.bool) {
-                msgArr = (await msgFilter[item.method]({ that, msg, name, contact, config, avatar, id, room })) || [];
+                msgArr = (await msgFilter[item.method]({ that, msg, name, contact, config, avatar, id, room, isMention })) || [];
             }
             if (msgArr.length > 0) {
                 return msgArr;
@@ -34,7 +34,6 @@ async function getMsgReply(resArray, { that, msg, name, contact, config, avatar,
 async function filterFriendMsg(that, contact, msg) {
     try {
         const config = await allConfig(); // 获取配置信息
-        console.log('callback', config.callBackEvents);
         const name = contact.name();
         const id = contact.id;
         const avatar = await contact.avatar();
@@ -69,7 +68,7 @@ async function filterFriendMsg(that, contact, msg) {
  * 1 开启了好友验证 || 朋友推荐消息 || 发送的文字消息过长,大于40个字符
  * 2 初次添加好友
  */
-async function filterRoomMsg(that, msg, name, id, avatar, room) {
+async function filterRoomMsg({ that, msg, name, id, avatar, room, isMention }) {
     try {
         const config = await allConfig(); // 获取配置信息
         const resArray = [
@@ -80,7 +79,7 @@ async function filterRoomMsg(that, msg, name, id, avatar, room) {
             { bool: true, method: 'keywordsMsg' },
             { bool: config.autoReply, method: 'robotMsg' },
         ];
-        const msgArr = await getMsgReply(resArray, { that, msg, name, config, avatar, id, room });
+        const msgArr = await getMsgReply(resArray, { that, msg, name, config, avatar, id, room, isMention });
         return msgArr.length > 0 ? msgArr : [{ type: 1, content: '', url: '' }];
     }
     catch (e) {

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

@@ -21,13 +21,14 @@ export default _default;
  * @param room
  * @returns Promise
  */
-export function callbackEvent({ that, msg, name, id, config, room }: {
+export function callbackEvent({ that, msg, name, id, config, room, isMention }: {
     that: any;
     msg: any;
     name: any;
     id: any;
     config: any;
     room: any;
+    isMention: any;
 }): Promise<never[] | import("axios").AxiosResponse<any, any>>;
 /**
  * 头像处理
@@ -72,7 +73,7 @@ export function scheduleJobMsg({ that, msg, name }: {
     msg: any;
     name: any;
 }): Promise<any>;
-export function eventMsg({ that, msg, name, id, avatar, config, room }: {
+export function eventMsg({ that, msg, name, id, avatar, config, room, isMention }: {
     that: any;
     msg: any;
     name: any;
@@ -80,19 +81,24 @@ export function eventMsg({ that, msg, name, id, avatar, config, room }: {
     avatar: any;
     config: any;
     room: any;
+    isMention: any;
 }): Promise<string | never[]>;
 /**
  * 关键词回复
  * @returns {Promise<*>}
  */
-export function keywordsMsg({ msg, config }: {
+export function keywordsMsg({ msg, config, room, isMention }: {
     msg: any;
     config: any;
+    room: any;
+    isMention: any;
 }): Promise<any>;
-export function robotMsg({ msg, name, id, config }: {
+export function robotMsg({ msg, name, id, config, isMention, room }: {
     msg: any;
     name: any;
     id: any;
     config: any;
+    isMention: any;
+    room: any;
 }): Promise<any[]>;
 //# sourceMappingURL=msg-filters.d.ts.map

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

@@ -136,11 +136,15 @@ async function getEventReply(that, event, msg, name, id, avatar, room) {
  * @param room
  * @returns Promise
  */
-async function callbackEvent({ that, msg, name, id, config, room }) {
+async function callbackEvent({ that, msg, name, id, config, room, isMention }) {
     try {
         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) {
+                        return [];
+                    }
                     msg = msg.trim();
                     const data = {
                         uid: id,
@@ -169,11 +173,15 @@ async function callbackEvent({ that, msg, name, id, config, room }) {
         return [];
     }
 }
-async function eventMsg({ that, msg, name, id, avatar, config, room }) {
+async function eventMsg({ that, msg, name, id, avatar, config, room, isMention }) {
     try {
         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) {
+                        return [];
+                    }
                     msg = msg.replace(key, '');
                     let res = await getEventReply(that, item.event, msg, name, id, avatar, room);
                     return res;
@@ -191,17 +199,25 @@ async function eventMsg({ that, msg, name, id, avatar, config, room }) {
  * 关键词回复
  * @returns {Promise<*>}
  */
-async function keywordsMsg({ msg, config }) {
+async function keywordsMsg({ msg, config, room, isMention }) {
     try {
         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) {
+                        return [];
+                    }
                     console.log(`精确匹配到关键词${msg},正在回复用户`);
                     return item.replys;
                 }
                 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) {
+                                return [];
+                            }
                             console.log(`模糊匹配到关键词${msg},正在回复用户`);
                             return item.replys;
                         }
@@ -218,22 +234,28 @@ async function keywordsMsg({ msg, config }) {
         return [];
     }
 }
-async function robotMsg({ msg, name, id, config }) {
-    try {
-        let msgArr = []; // 返回的消息列表
-        if (config.autoReply) {
-            console.log('开启了机器人自动回复功能');
-            msgArr = await dispatch.dispatchAiBot(config.defaultBot, msg, name, id);
+async function robotMsg({ msg, name, id, config, isMention, room }) {
+    // 如果群里没有提及不开启机器人聊天
+    if (room && !isMention) {
+        return [];
+    }
+    else {
+        try {
+            let msgArr = []; // 返回的消息列表
+            if (config.autoReply) {
+                console.log('开启了机器人自动回复功能');
+                msgArr = await dispatch.dispatchAiBot(config.defaultBot, msg, name, id);
+            }
+            else {
+                console.log('没有开启机器人自动回复功能');
+                msgArr = [{ type: 1, content: '', url: '' }];
+            }
+            return msgArr;
         }
-        else {
-            console.log('没有开启机器人自动回复功能');
-            msgArr = [{ type: 1, content: '', url: '' }];
+        catch (e) {
+            console.log('robotMsg error:', e);
+            return [];
         }
-        return msgArr;
-    }
-    catch (e) {
-        console.log('robotMsg error:', e);
-        return [];
     }
 }
 /**

package/dist/esm/src/task/index.js

@@ -98,7 +98,7 @@ async function sendRoomTaskMessage(that, info) {
 async function setEveryDayTask(that, item, name) {
     try {
         let time = item.date;
-        let contact = (await that.Contact.find({ alias: item.alias })) || (await that.Contact.find({ name: item.name })); // 获取你要发送的联系人
+        let contact = item.name && (await that.Contact.find({ name: item.name })) || item.alias && (await that.Contact.find({ alias: item.alias })); // 获取你要发送的联系人
         if (!contact) {
             console.log(`查找不到用户昵称为'${item.name}'或备注为'${item.alias}'的用户，请检查设置用户是否正确`);
             return;
@@ -125,7 +125,7 @@ async function setEveryDayTask(that, item, name) {
 async function sendContactTaskMessage(that, info) {
     try {
         const item = info.message;
-        let contact = (await that.Contact.find({ alias: item.alias })) || (await that.Contact.find({ name: item.name })); // 获取你要发送的联系人
+        let contact = item.name && (await that.Contact.find({ name: item.name })) || item.alias && (await that.Contact.find({ alias: item.alias })); // 获取你要发送的联系人
         if (!contact) {
             console.log(`查找不到用户昵称为'${item.name}'或备注为'${item.alias}'的用户，请检查设置用户是否正确`);
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.1.11",
+  "version": "1.2.0",
   "description": "",
   "exports": {
     ".": {
@@ -72,7 +72,7 @@
   },
   "publishConfig": {
     "registry": " https://registry.npmjs.org/",
-    "tag": "next",
+    "tag": "latest",
     "access": "public"
   },
   "_id": "wechaty-web-panel@1.0.6",