wx2tg-puppet 2.1.4 → 2.1.6

package/dist/action/common.d.ts

@@ -1,4 +1,4 @@
 import { ResponseMsg } from "../core/Message";
-export declare const say: (content: any, toWxid: string, ats: any) => Promise<import("axios").AxiosResponse<import("../types/ApiResponse").ApiResponse, any> | ResponseMsg | null | undefined>;
+export declare const say: (content: any, toWxid: string, ats: any) => Promise<ResponseMsg | null | undefined>;
 export declare const quote: (obj: any, toWxid: string) => Promise<ResponseMsg | null>;
 export declare const revoke: (content: any) => Promise<import("axios").AxiosResponse<import("../types/ApiResponse").ApiResponse, any>>;

package/dist/action/common.js

@@ -128,7 +128,7 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
                     if (imgRes.data.Code !== 0) {
                         throw new Error(`上传图片失败: ${imgRes.data.Message}`);
                     }
-                    return imgRes;
+                    return new Message_1.ResponseMsg(imgRes.data.Data);
                 case 'other':
                     // 直接从 FileBox 获取文件内容
                     const fileBuffer = yield content.toBuffer();
@@ -185,7 +185,7 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
             if (res.data.Code !== 0) {
                 throw new Error(`发送视频失败: ${res.data.Message}`);
             }
-            return new Message_1.ResponseMsg(res.data.Data.List[0]);
+            return new Message_1.ResponseMsg(res.data.Data);
         }
         else if (content instanceof VOICE_1.Voice) {
             const res = yield MsgApi_1.msgApi.SendVoice({
@@ -198,7 +198,7 @@ const say = (content, toWxid, ats) => __awaiter(void 0, void 0, void 0, function
             if (res.data.Code !== 0) {
                 throw new Error(`发送语音失败: ${res.data.Message}`);
             }
-            return new Message_1.ResponseMsg(res.data.Data.List[0]);
+            return new Message_1.ResponseMsg(res.data.Data);
         }
         //   }else if(content instanceof MiniApp){
         //     return SendMiniApp({

package/dist/core/Contact.d.ts

@@ -38,7 +38,7 @@ export declare class Contact {
     /**
      * Send text, Contact, or file to contact, return the message which the bot sent (only puppet-padplus supported).
      */
-    say(content: any): Promise<import("axios").AxiosResponse<import("../types/ApiResponse").ApiResponse, any> | ResponseMsg | null | undefined>;
+    say(content: any): Promise<ResponseMsg | null | undefined>;
     quoteSay(text: string, replyMsgId: string, fromId: string, content: string): Promise<ResponseMsg | null>;
     /**
      * Check if contact is self

package/dist/core/Message.d.ts

@@ -79,7 +79,7 @@ export declare class Message {
      * Reply a text, media file, or contact message to the sender.
      * Returns the message which the bot sent (only puppet-padplus supported).
      */
-    say(text: string): Promise<Axios.AxiosResponse<import("../types/ApiResponse").ApiResponse, any> | ResponseMsg | null | undefined>;
+    say(text: string): Promise<ResponseMsg | null | undefined>;
     quoteSay(text: string, replyMsgId: string, fromId: string, content: string): Promise<ResponseMsg | null>;
     /**
      * Get the type from the message.

package/dist/core/Message.js

@@ -106,6 +106,9 @@ class Message {
             let obj = Message.getXmlToJson(msg.Content);
             msg.Content = obj.msg.appmsg.title;
             this.refer = obj.msg.appmsg.refermsg;
+            if (this.refer.type !== 1 && this.refer.type !== 49) {
+                this.refer.content = '图片/文件/其他消息';
+            }
         }
     }
     /**
@@ -610,9 +613,9 @@ Message.Type = MessageType_1.MessageType;
 class ResponseMsg {
     constructor(obj) {
         var _a, _b;
-        this.newMsgId = (obj.NewMsgId || obj.newMsgId) + '';
-        this.msgId = (obj.ClientMsgid || obj.clientMsgId) ? (obj.ClientMsgid || obj.clientMsgId) + '' : '';
-        this.createTime = obj.Createtime || obj.createTime;
+        this.newMsgId = (obj.NewMsgId || obj.newMsgId || obj.Newmsgid) + '';
+        this.msgId = (obj.ClientMsgid || obj.clientMsgId || obj.ClientMsgId || obj.Msgid || obj.msgId) ? (obj.ClientMsgid || obj.clientMsgId || obj.ClientMsgId || obj.Msgid || obj.msgId) + '' : '';
+        this.createTime = obj.Createtime || obj.createTime || obj.CreateTime;
         this.toWxid = ((_a = obj.ToUsetName) === null || _a === void 0 ? void 0 : _a.string) || ((_b = obj.ToUserName) === null || _b === void 0 ? void 0 : _b.string) || obj.toUserName;
     }
     revoke() {

package/dist/core/Room.d.ts

@@ -43,7 +43,7 @@ export declare class Room {
      * Send text, media file, contact card, or text with mention @mention contact inside Room.
      * Returns the message which the bot sent (only puppet-padplus supported).
      */
-    say(content: any, ats: string | Contact | Contact[] | null): Promise<import("axios").AxiosResponse<import("../types/ApiResponse").ApiResponse, any> | import("./Message").ResponseMsg | null | undefined>;
+    say(content: any, ats: string | Contact | Contact[] | null): Promise<import("./Message").ResponseMsg | null | undefined>;
     quoteSay(text: string, replyMsgId: string, fromId: string, content: string): Promise<import("./Message").ResponseMsg | null>;
     /**
      * Add contact in a room

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wx2tg-puppet",
-  "version": "2.1.4",
+  "version": "2.1.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [