wechaty-web-panel 1.2.8 → 1.2.10

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

@@ -105,7 +105,7 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
         const contactName = contact.name();
         const roomName = await room.topic();
         const type = msg.type();
-        const userSelfName = that.currentUser?.name() || that.userSelf()?.name();
+        const receiver = msg.to();
         let content = "";
         let replys = "";
         let contactId = contact.id || "111";
@@ -114,8 +114,9 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
             case that.Message.Type.Text:
                 content = msg.text();
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content}`);
-                const mentionSelf = content.includes(`@${userSelfName}`);
-                content = content.replace(/@[^,，：:\s@]+/g, "").trim();
+                const mentionSelf = await msg.mentionSelf();
+                const receiverName = receiver?.name();
+                content = content.replace(receiverName, "").trim();
                 // 检测是否需要这条消息
                 const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
                 if (isIgnore)

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

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

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

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

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

@@ -15,12 +15,18 @@ async function geGPTReply(content) {
     }
     const api = new chatgpt_1.ChatGPTAPI({ sessionToken: config.gpttoken });
     await api.ensureAuth();
-    const threeMinutesMs = 2 * 60 * 1000;
+    const threeMinutesMs = 3 * 60 * 1000;
     const response = await (0, p_timeout_1.default)(api.sendMessage(content), {
         milliseconds: threeMinutesMs,
         message: 'ChatGPT返回超时了，用的人太多，太火爆了，等会再试吧'
     });
-    let replys = response.match(/.{1,680}/g);
+    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,

package/dist/cjs/src/service/event-dispatch-service.d.ts

@@ -20,5 +20,5 @@ export function dispatchEventContent(that: any, eName: string, msg: string, name
  * @param {*} name 发消息人
  * @param {*} id 发消息人id
  */
-export function dispatchAiBot(bot: any, msg: any, name: any, id: any): Promise<any[] | "" | null | undefined>;
+export function dispatchAiBot(bot: any, msg: any, name: any, id: any): Promise<any[] | "" | undefined>;
 //# sourceMappingURL=event-dispatch-service.d.ts.map

package/dist/cjs/src/service/room-async-service.js

@@ -426,10 +426,8 @@ async function oneToMany(that, config, msg) {
  */
 async function dispatchAsync(that, msg, list) {
     try {
-        const userSelfName = that.currentUser?.name?.();
         const type = msg.type();
-        const content = msg.text();
-        const mentionSelf = content.includes(`@${userSelfName}`);
+        const mentionSelf = await msg.mentionSelf();
         if (7 === type && mentionSelf) {
             // 如果内容中有提及机器人的内容，不进行转发
             return;

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

@@ -103,7 +103,7 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
         const contactName = contact.name();
         const roomName = await room.topic();
         const type = msg.type();
-        const userSelfName = that.currentUser?.name() || that.userSelf()?.name();
+        const receiver = msg.to();
         let content = "";
         let replys = "";
         let contactId = contact.id || "111";
@@ -112,8 +112,9 @@ async function dispatchRoomFilterByMsgType(that, room, msg) {
             case that.Message.Type.Text:
                 content = msg.text();
                 console.log(`群名: ${roomName} 发消息人: ${contactName} 内容: ${content}`);
-                const mentionSelf = content.includes(`@${userSelfName}`);
-                content = content.replace(/@[^,，：:\s@]+/g, "").trim();
+                const mentionSelf = await msg.mentionSelf();
+                const receiverName = receiver?.name();
+                content = content.replace(receiverName, "").trim();
                 // 检测是否需要这条消息
                 const isIgnore = checkIgnore(content, aibotConfig.ignoreMessages);
                 if (isIgnore)

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

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

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

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

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

@@ -9,12 +9,18 @@ async function geGPTReply(content) {
     }
     const api = new ChatGPTAPI({ sessionToken: config.gpttoken });
     await api.ensureAuth();
-    const threeMinutesMs = 2 * 60 * 1000;
+    const threeMinutesMs = 3 * 60 * 1000;
     const response = await pTimeout(api.sendMessage(content), {
         milliseconds: threeMinutesMs,
         message: 'ChatGPT返回超时了，用的人太多，太火爆了，等会再试吧'
     });
-    let replys = response.match(/.{1,680}/g);
+    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,

package/dist/esm/src/service/event-dispatch-service.d.ts

@@ -20,5 +20,5 @@ export function dispatchEventContent(that: any, eName: string, msg: string, name
  * @param {*} name 发消息人
  * @param {*} id 发消息人id
  */
-export function dispatchAiBot(bot: any, msg: any, name: any, id: any): Promise<any[] | "" | null | undefined>;
+export function dispatchAiBot(bot: any, msg: any, name: any, id: any): Promise<any[] | "" | undefined>;
 //# sourceMappingURL=event-dispatch-service.d.ts.map

package/dist/esm/src/service/room-async-service.js

@@ -397,10 +397,8 @@ async function oneToMany(that, config, msg) {
  */
 async function dispatchAsync(that, msg, list) {
     try {
-        const userSelfName = that.currentUser?.name?.();
         const type = msg.type();
-        const content = msg.text();
-        const mentionSelf = content.includes(`@${userSelfName}`);
+        const mentionSelf = await msg.mentionSelf();
         if (7 === type && mentionSelf) {
             // 如果内容中有提及机器人的内容，不进行转发
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-web-panel",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "description": "",
   "exports": {
     ".": {