wechaty-web-panel 1.4.9 → 1.4.10

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 更新日志
 
+### V1.4.10(2023-02-26)
+1、回调添加更多参数
+
 ### V1.4.9(2023-02-15)
 1、添加倒计时功能
 2、默认使用带上下文的chatGPT模型

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

@@ -55,7 +55,7 @@ exports.getRoomEveryDayContent = getRoomEveryDayContent;
 function getCountDownContent(date, prefix, suffix, endWord) {
     let countDownDay = (0, index_js_1.getDay)(date); //获取倒计时天数
     let today = (0, index_js_1.formatDate)(new Date()); //获取今天的日期
-    let str = `${today}\r距离${prefix}还有\r\r✦✦✦✦ ${countDownDay}天 ✦✦✦✦\r\r${suffix}${endWord ? `\r\r————————${endWord}` : ''}`;
+    let str = `${today}\r距离${prefix}还有\r\r✦✦✦✦ ${countDownDay}天\r\r${suffix}${endWord ? `\r\r————————${endWord}` : ''}`;
     return str;
 }
 exports.getCountDownContent = getCountDownContent;
@@ -80,6 +80,7 @@ async function updateContactInfo(that) {
             let obj = {
                 robotId: hasWeixin ? contactSelf.weixin : (0, index_js_1.MD5)(contactSelf.name),
                 contactId: hasWeixin ? contact.id : (0, index_js_1.MD5)(contactSelf.name + contact.name + contact.alias + contact.province + contact.city + contact.gender),
+                wxid: contact.id,
                 name: contact.name,
                 alias: contact.alias,
                 gender: contact.gender,
@@ -127,6 +128,7 @@ async function updateRoomInfo(that) {
             let room = i.payload || i._payload;
             let obj = {
                 robotId: hasWeixin ? contactSelf.weixin : (0, index_js_1.MD5)(contactSelf.name),
+                wxid: room.id,
                 roomId: (0, index_js_1.MD5)(room.topic),
                 topic: room.topic,
                 avatar: room.avatar || '',
@@ -196,13 +198,11 @@ async function roomSay(room, contact, msg) {
     try {
         if (msg.type === 1 && msg.content) {
             // 文字
-            console.log('回复内容', msg.content);
             contact ? await room.say(msg.content, contact) : await room.say(msg.content);
         }
         else if (msg.type === 2 && msg.url) {
             // url文件
             let obj = file_box_1.FileBox.fromUrl(msg.url);
-            console.log('回复内容', obj);
             contact ? await room.say('', contact) : '';
             await (0, index_js_1.delay)(500);
             await room.say(obj);
@@ -261,18 +261,12 @@ async function contactSay(contact, msg, isRoom = false) {
     try {
         if (msg.type === 1 && msg.content) {
             // 文字
-            console.log('回复内容', msg.content);
             await contact.say(msg.content);
         }
         else if (msg.type === 2 && msg.url) {
             // url文件
             let obj = file_box_1.FileBox.fromUrl(msg.url);
             await obj.ready();
-            console.log('回复内容', obj);
-            if (isRoom) {
-                await contact.say(`@${contact.name()}`);
-                await (0, index_js_1.delay)(500);
-            }
             await contact.say(obj);
         }
         else if (msg.type === 3 && msg.url) {

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

@@ -17,8 +17,6 @@ declare namespace _default {
     export { contentDistinguish };
     export { msgArr };
     export { throttle };
-    export { formatContacts };
-    export { filterContacts };
     export { cancelAllSchedule };
     export { groupArray };
     export { getRoomAvatarList };
@@ -144,23 +142,6 @@ export function msgArr(type?: number, content?: string, url?: string): [{
  * @returns {Function}
  */
 export function throttle(fn: any, wait: any): Function;
-/**
- * 格式化联系人
- * @param {*} data
- */
-export function formatContacts(data: any): any;
-/**
- * @param {*} param1
- * name：名字
- * alias：别名
- * friend : 1是朋友 2不是朋友
- * type : 1个人   2 公众号  3 未知
- * gender : 1 男  2  女
- * province : 省份
- * city ：城市
- * address：地址
- */
-export function filterContacts(contacts: any, query: any): any;
 export function cancelAllSchedule(type: any): void;
 /**
  * 数组拆分

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

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNewsType = exports.getRoomAvatar = exports.getRoomAvatarList = exports.groupArray = exports.cancelAllSchedule = exports.filterContacts = exports.formatContacts = exports.throttle = exports.msgArr = exports.contentDistinguish = exports.getFormatQuery = exports.MD5 = exports.writeFile = exports.randomRange = exports.getConstellation = exports.isRealDate = exports.formatDate = exports.getDay = exports.convertTime = exports.getToday = exports.delay = exports.parseBody = exports.setLocalSchedule = exports.Base64Decode = exports.Base64Encode = void 0;
+exports.getNewsType = exports.getRoomAvatar = exports.getRoomAvatarList = exports.groupArray = exports.cancelAllSchedule = exports.throttle = exports.msgArr = exports.contentDistinguish = exports.getFormatQuery = exports.MD5 = exports.writeFile = exports.randomRange = exports.getConstellation = exports.isRealDate = exports.formatDate = exports.getDay = exports.convertTime = exports.getToday = exports.delay = exports.parseBody = exports.setLocalSchedule = exports.Base64Decode = exports.Base64Encode = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const schedule = __importStar(require("node-schedule"));
 const fs_1 = __importDefault(require("fs"));
@@ -445,64 +445,6 @@ function contentDistinguish(keywordArray, name) {
     return scheduleObj;
 }
 exports.contentDistinguish = contentDistinguish;
-//过滤联系人
-/**
- * @param {*} param1
- * name：名字
- * alias：别名
- * friend : 1是朋友 2不是朋友
- * type : 1个人   2 公众号  3 未知
- * gender : 1 男  2  女
- * province : 省份
- * city ：城市
- * address：地址
- */
-function filterContacts(contacts, query) {
-    let { name, alias, friend, type, gender, province, city, address } = query;
-    return contacts.filter((item) => {
-        let arr = [];
-        let payload = item.payload || item._payload;
-        if (friend) {
-            let bool = Number(friend) === 1 ? true : false;
-            arr.push(bool === payload.friend);
-        }
-        name && arr.push(payload.name.indexOf(name) >= 0);
-        alias && arr.push(payload.alias.indexOf(alias) >= 0);
-        type && arr.push(Number(type) === payload.type);
-        gender && arr.push(Number(gender) === payload.gender);
-        province && arr.push(payload.province.indexOf(province) >= 0);
-        city && arr.push(payload.city.indexOf(city) >= 0);
-        address && arr.push(payload.address.indexOf(address) >= 0);
-        return arr.indexOf(false) < 0;
-    });
-}
-exports.filterContacts = filterContacts;
-/**
- * 格式化联系人
- * @param {*} data
- */
-function formatContacts(data) {
-    let arr = data.map(function (item) {
-        // const file = await item.avatar()
-        // let avatar = await file.toBase64(file.name, true);
-        let payload = item.payload || item._payload;
-        return {
-            id: payload.id,
-            name: payload.name,
-            gender: payload.gender === 0 ? '无' : payload.gender === 1 ? '男' : '女',
-            alias: payload.alias,
-            friend: payload.friend ? '是' : '否',
-            star: payload.star ? '是' : '否',
-            type: payload.type === 1 ? '个人' : payload.type === 2 ? '公众号' : '未知',
-            signature: payload.signature,
-            province: payload.province,
-            city: payload.city,
-            address: payload.address,
-        };
-    });
-    return arr;
-}
-exports.formatContacts = formatContacts;
 /**
  * 函数节流
  * @param fn
@@ -645,8 +587,6 @@ exports.default = {
     contentDistinguish,
     msgArr,
     throttle,
-    formatContacts,
-    filterContacts,
     cancelAllSchedule,
     groupArray,
     getRoomAvatarList,

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

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.4.9",
+    "version": "1.4.10",
     "description": "智能微秘书插件",
     "exports": {
         ".": {

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

@@ -164,15 +164,18 @@ async function callbackEvent({ that, msg, name, id, config, room, isMention }) {
                         return [];
                     }
                     msg = msg.trim();
+                    const topic = await room.topic();
                     const data = {
                         uid: id,
                         uname: name,
+                        roomId: room && room.id || '',
+                        roomName: room && topic || '',
                         word: msg,
                     };
                     item.moreData &&
                         item.moreData.length &&
                         item.moreData.forEach((mItem) => {
-                            if (mItem.key !== 'uid' && mItem.key !== 'word') {
+                            if (mItem.key !== 'uid' && mItem.key !== 'uname' && mItem.key !== 'word' && mItem.key !== 'roomId' && mItem.key !== 'roomName') {
                                 data[mItem.key] = mItem.value;
                             }
                         });

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

@@ -49,7 +49,7 @@ async function getRoomEveryDayContent(date, city, endWord) {
 function getCountDownContent(date, prefix, suffix, endWord) {
     let countDownDay = getDay(date); //获取倒计时天数
     let today = formatDate(new Date()); //获取今天的日期
-    let str = `${today}\r距离${prefix}还有\r\r✦✦✦✦ ${countDownDay}天 ✦✦✦✦\r\r${suffix}${endWord ? `\r\r————————${endWord}` : ''}`;
+    let str = `${today}\r距离${prefix}还有\r\r✦✦✦✦ ${countDownDay}天\r\r${suffix}${endWord ? `\r\r————————${endWord}` : ''}`;
     return str;
 }
 /**
@@ -73,6 +73,7 @@ async function updateContactInfo(that) {
             let obj = {
                 robotId: hasWeixin ? contactSelf.weixin : MD5(contactSelf.name),
                 contactId: hasWeixin ? contact.id : MD5(contactSelf.name + contact.name + contact.alias + contact.province + contact.city + contact.gender),
+                wxid: contact.id,
                 name: contact.name,
                 alias: contact.alias,
                 gender: contact.gender,
@@ -119,6 +120,7 @@ async function updateRoomInfo(that) {
             let room = i.payload || i._payload;
             let obj = {
                 robotId: hasWeixin ? contactSelf.weixin : MD5(contactSelf.name),
+                wxid: room.id,
                 roomId: MD5(room.topic),
                 topic: room.topic,
                 avatar: room.avatar || '',
@@ -186,13 +188,11 @@ async function roomSay(room, contact, msg) {
     try {
         if (msg.type === 1 && msg.content) {
             // 文字
-            console.log('回复内容', msg.content);
             contact ? await room.say(msg.content, contact) : await room.say(msg.content);
         }
         else if (msg.type === 2 && msg.url) {
             // url文件
             let obj = FileBox.fromUrl(msg.url);
-            console.log('回复内容', obj);
             contact ? await room.say('', contact) : '';
             await delay(500);
             await room.say(obj);
@@ -250,18 +250,12 @@ async function contactSay(contact, msg, isRoom = false) {
     try {
         if (msg.type === 1 && msg.content) {
             // 文字
-            console.log('回复内容', msg.content);
             await contact.say(msg.content);
         }
         else if (msg.type === 2 && msg.url) {
             // url文件
             let obj = FileBox.fromUrl(msg.url);
             await obj.ready();
-            console.log('回复内容', obj);
-            if (isRoom) {
-                await contact.say(`@${contact.name()}`);
-                await delay(500);
-            }
             await contact.say(obj);
         }
         else if (msg.type === 3 && msg.url) {

package/dist/esm/src/lib/index.d.ts

@@ -17,8 +17,6 @@ declare namespace _default {
     export { contentDistinguish };
     export { msgArr };
     export { throttle };
-    export { formatContacts };
-    export { filterContacts };
     export { cancelAllSchedule };
     export { groupArray };
     export { getRoomAvatarList };
@@ -144,23 +142,6 @@ export function msgArr(type?: number, content?: string, url?: string): [{
  * @returns {Function}
  */
 export function throttle(fn: any, wait: any): Function;
-/**
- * 格式化联系人
- * @param {*} data
- */
-export function formatContacts(data: any): any;
-/**
- * @param {*} param1
- * name：名字
- * alias：别名
- * friend : 1是朋友 2不是朋友
- * type : 1个人   2 公众号  3 未知
- * gender : 1 男  2  女
- * province : 省份
- * city ：城市
- * address：地址
- */
-export function filterContacts(contacts: any, query: any): any;
 export function cancelAllSchedule(type: any): void;
 /**
  * 数组拆分

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

@@ -399,62 +399,6 @@ function contentDistinguish(keywordArray, name) {
     }
     return scheduleObj;
 }
-//过滤联系人
-/**
- * @param {*} param1
- * name：名字
- * alias：别名
- * friend : 1是朋友 2不是朋友
- * type : 1个人   2 公众号  3 未知
- * gender : 1 男  2  女
- * province : 省份
- * city ：城市
- * address：地址
- */
-function filterContacts(contacts, query) {
-    let { name, alias, friend, type, gender, province, city, address } = query;
-    return contacts.filter((item) => {
-        let arr = [];
-        let payload = item.payload || item._payload;
-        if (friend) {
-            let bool = Number(friend) === 1 ? true : false;
-            arr.push(bool === payload.friend);
-        }
-        name && arr.push(payload.name.indexOf(name) >= 0);
-        alias && arr.push(payload.alias.indexOf(alias) >= 0);
-        type && arr.push(Number(type) === payload.type);
-        gender && arr.push(Number(gender) === payload.gender);
-        province && arr.push(payload.province.indexOf(province) >= 0);
-        city && arr.push(payload.city.indexOf(city) >= 0);
-        address && arr.push(payload.address.indexOf(address) >= 0);
-        return arr.indexOf(false) < 0;
-    });
-}
-/**
- * 格式化联系人
- * @param {*} data
- */
-function formatContacts(data) {
-    let arr = data.map(function (item) {
-        // const file = await item.avatar()
-        // let avatar = await file.toBase64(file.name, true);
-        let payload = item.payload || item._payload;
-        return {
-            id: payload.id,
-            name: payload.name,
-            gender: payload.gender === 0 ? '无' : payload.gender === 1 ? '男' : '女',
-            alias: payload.alias,
-            friend: payload.friend ? '是' : '否',
-            star: payload.star ? '是' : '否',
-            type: payload.type === 1 ? '个人' : payload.type === 2 ? '公众号' : '未知',
-            signature: payload.signature,
-            province: payload.province,
-            city: payload.city,
-            address: payload.address,
-        };
-    });
-    return arr;
-}
 /**
  * 函数节流
  * @param fn
@@ -590,8 +534,6 @@ export { getFormatQuery };
 export { contentDistinguish };
 export { msgArr };
 export { throttle };
-export { formatContacts };
-export { filterContacts };
 export { cancelAllSchedule };
 export { groupArray };
 export { getRoomAvatarList };
@@ -616,8 +558,6 @@ export default {
     contentDistinguish,
     msgArr,
     throttle,
-    formatContacts,
-    filterContacts,
     cancelAllSchedule,
     groupArray,
     getRoomAvatarList,

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

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.4.9",
+    "version": "1.4.10",
     "description": "智能微秘书插件",
     "exports": {
         ".": {

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

@@ -152,15 +152,18 @@ async function callbackEvent({ that, msg, name, id, config, room, isMention }) {
                         return [];
                     }
                     msg = msg.trim();
+                    const topic = await room.topic();
                     const data = {
                         uid: id,
                         uname: name,
+                        roomId: room && room.id || '',
+                        roomName: room && topic || '',
                         word: msg,
                     };
                     item.moreData &&
                         item.moreData.length &&
                         item.moreData.forEach((mItem) => {
-                            if (mItem.key !== 'uid' && mItem.key !== 'word') {
+                            if (mItem.key !== 'uid' && mItem.key !== 'uname' && mItem.key !== 'word' && mItem.key !== 'roomId' && mItem.key !== 'roomName') {
                                 data[mItem.key] = mItem.value;
                             }
                         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.4.9",
+  "version": "1.4.10",
   "description": "智能微秘书插件",
   "exports": {
     ".": {