From 8a41a64c443623dc188d2be06b474706e33bb4ca Mon Sep 17 00:00:00 2001
From: Yuan Gao <wind.memory.cn@gmail.com>
Date: Tue, 6 Oct 2020 16:23:43 +0800
Subject: [PATCH] fix #2073 (#2074)

* fix #2073

* 0.48.12

* 0.48.13
---
 package.json        | 2 +-
 src/user/message.ts | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index df5d0bec..6f1e8d80 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wechaty",
-  "version": "0.48.11",
+  "version": "0.48.13",
   "description": "Wechaty is Conversational SDK Chatbot Makers, Powered by TypeScript, Docker, and 💖",
   "main": "dist/src/mod.js",
   "typings": "dist/src/mod.d.ts",
diff --git a/src/user/message.ts b/src/user/message.ts
index 2d3d887f..214c11f9 100644
--- a/src/user/message.ts
+++ b/src/user/message.ts
@@ -872,17 +872,22 @@ class Message extends EventEmitter implements Sayable {
    * })
    * .start()
    */
-  public async forward (to: Room | Contact): Promise<void> {
+  public async forward (to: Room | Contact): Promise<void | Message> {
     log.verbose('Message', 'forward(%s)', to)
 
     // let roomId
     // let contactId
 
     try {
-      await this.wechaty.puppet.messageForward(
+      const msgId = await this.wechaty.puppet.messageForward(
         to.id,
         this.id,
       )
+      if (msgId) {
+        const msg = this.wechaty.Message.load(msgId)
+        await msg.ready()
+        return msg
+      }
     } catch (e) {
       log.error('Message', 'forward(%s) exception: %s', to, e)
       throw e
-- 
GitLab