wechaty-web-panel 1.4.7 → 1.4.8

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## 更新日志
 
+### V1.4.8(2023-02-08)
+1、修复历史消息问题
+2、添加两个chatGPT 回复模型，尽量保证有返回
+
 ### V1.4.6(2023-02-07)
 1、添加gpt3模型api
 

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

@@ -7,10 +7,6 @@ const index_js_2 = require("../common/index.js");
  * 好友添加
  */
 async function onFriend(friendship) {
-    if (friendship.payload && (friendship.payload.timestamp < parseInt(new Date().getTime() / 1000) - 5)) {
-        console.log('加好友历史消息记录');
-        return;
-    }
     try {
         const config = await (0, configDb_js_1.allConfig)();
         let logMsg, hello;

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

@@ -129,13 +129,14 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
         let replys = "";
         let contactId = contact.id;
         let contactAvatar = await contact.avatar();
+        const userSelfName = that.currentUser?.name() || that.userSelf()?.name();
         switch (type) {
             case that.Message.Type.Text:
                 content = msg.text();
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content}`);
-                const mentionSelf = await msg.mentionSelf();
+                const mentionSelf = await msg.mentionSelf() || content.includes(`@${userSelfName}`);
                 const receiverName = receiver?.name();
-                content = content.replace('@' + receiverName, "").replace(/@[^,，：:\s@]+/g, "").trim();
+                content = content.replace('@' + receiverName, "").replace('@' + userSelfName, "").replace(/@[^,，：:\s@]+/g, "").trim();
                 // 检测是否需要这条消息
                 const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
                 if (isIgnore)
@@ -212,11 +213,6 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
 }
 async function onMessage(msg) {
     try {
-        // 为了解决 web 端会把历史聊天记录重新发送一遍，处理接收到的消息是5s 以前的就直接舍弃
-        if (msg.payload && (msg.payload.timestamp < parseInt(new Date().getTime() / 1000) - 5)) {
-            console.log('历史消息记录');
-            return;
-        }
         const config = await (0, configDb_js_1.allConfig)();
         const { role } = config && config.userInfo || { role: 'default' };
         const room = msg.room(); // 是否为群消息

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

@@ -6,7 +6,7 @@ exports.packageJson = void 0;
  */
 exports.packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.4.7",
+    "version": "1.4.8",
     "description": "",
     "exports": {
         ".": {
@@ -60,7 +60,7 @@ exports.packageJson = {
         "npm-run-all": "^4.1.5",
         "prettier": "^2.0.5",
         "wechaty": "^1.20.2",
-        "wechaty-puppet-wechat4u": "^1.13.13"
+        "wechaty-puppet-wechat4u": "^1.13.14"
     },
     "readme": "README.md",
     "engines": {

package/dist/cjs/src/service/event-dispatch-service.js

@@ -229,6 +229,7 @@ async function dispatchAiBot(bot, msg, name, id) {
                 // ChatGPT3
                 res = await (0, chatgpt_js_1.geGPTReply)(msg, id);
                 if (res.length === 1 && !res[0].content) {
+                    console.log('第一个gpt接口返回失败，开始请求第二个gpt接口');
                     res = await (0, openAi_js_1.geGPT3Reply)(msg, id);
                 }
                 replys = res;

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

@@ -5,10 +5,6 @@ import { contactSay } from "../common/index.js";
  * 好友添加
  */
 async function onFriend(friendship) {
-    if (friendship.payload && (friendship.payload.timestamp < parseInt(new Date().getTime() / 1000) - 5)) {
-        console.log('加好友历史消息记录');
-        return;
-    }
     try {
         const config = await allConfig();
         let logMsg, hello;

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

@@ -127,13 +127,14 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
         let replys = "";
         let contactId = contact.id;
         let contactAvatar = await contact.avatar();
+        const userSelfName = that.currentUser?.name() || that.userSelf()?.name();
         switch (type) {
             case that.Message.Type.Text:
                 content = msg.text();
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content}`);
-                const mentionSelf = await msg.mentionSelf();
+                const mentionSelf = await msg.mentionSelf() || content.includes(`@${userSelfName}`);
                 const receiverName = receiver?.name();
-                content = content.replace('@' + receiverName, "").replace(/@[^,，：:\s@]+/g, "").trim();
+                content = content.replace('@' + receiverName, "").replace('@' + userSelfName, "").replace(/@[^,，：:\s@]+/g, "").trim();
                 // 检测是否需要这条消息
                 const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
                 if (isIgnore)
@@ -210,11 +211,6 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
 }
 async function onMessage(msg) {
     try {
-        // 为了解决 web 端会把历史聊天记录重新发送一遍，处理接收到的消息是5s 以前的就直接舍弃
-        if (msg.payload && (msg.payload.timestamp < parseInt(new Date().getTime() / 1000) - 5)) {
-            console.log('历史消息记录');
-            return;
-        }
         const config = await allConfig();
         const { role } = config && config.userInfo || { role: 'default' };
         const room = msg.room(); // 是否为群消息

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

@@ -3,7 +3,7 @@
  */
 export const packageJson = {
     "name": "wechaty-web-panel",
-    "version": "1.4.7",
+    "version": "1.4.8",
     "description": "",
     "exports": {
         ".": {
@@ -57,7 +57,7 @@ export const packageJson = {
         "npm-run-all": "^4.1.5",
         "prettier": "^2.0.5",
         "wechaty": "^1.20.2",
-        "wechaty-puppet-wechat4u": "^1.13.13"
+        "wechaty-puppet-wechat4u": "^1.13.14"
     },
     "readme": "README.md",
     "engines": {

package/dist/esm/src/service/event-dispatch-service.js

@@ -222,6 +222,7 @@ async function dispatchAiBot(bot, msg, name, id) {
                 // ChatGPT3
                 res = await geGPTReply(msg, id);
                 if (res.length === 1 && !res[0].content) {
+                    console.log('第一个gpt接口返回失败，开始请求第二个gpt接口');
                     res = await geGPT3Reply(msg, id);
                 }
                 replys = res;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "description": "",
   "exports": {
     ".": {
@@ -54,7 +54,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.5",
     "wechaty": "^1.20.2",
-    "wechaty-puppet-wechat4u": "^1.13.13"
+    "wechaty-puppet-wechat4u": "^1.13.14"
   },
   "readme": "README.md",
   "engines": {