From fc8399e10bc9d6fa7a70fe6fb45ce5189c5fa914 Mon Sep 17 00:00:00 2001
From: zhaoyingbo <zhaoyingbo@xiaomi.com>
Date: Tue, 17 Dec 2024 11:41:02 +0000
Subject: [PATCH] =?UTF-8?q?feat(lark-msg-tool):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7Id=E5=92=8COpenId=E8=8E=B7=E5=8F=96=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E4=BB=A5=E6=94=AF=E6=8C=81=E4=BA=8B=E4=BB=B6=E5=92=8C?=
 =?UTF-8?q?=E5=8A=A8=E4=BD=9C=E6=B6=88=E6=81=AF=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/lark-msg-tool/src/larkBody/index.ts | 44 +++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/lark-msg-tool/src/larkBody/index.ts b/packages/lark-msg-tool/src/larkBody/index.ts
index f7bb557..81f907b 100644
--- a/packages/lark-msg-tool/src/larkBody/index.ts
+++ b/packages/lark-msg-tool/src/larkBody/index.ts
@@ -101,8 +101,6 @@ class LarkBody {
       this.eventType = this.getEventType(eventBody)
       this.isMessageEvent = this.getIsMessageEvent(eventBody)
       this.msgType = this.getMsgType(eventBody)
-      this.userId = this.getUserId(eventBody)
-      this.openId = this.getOpenId(eventBody)
       this.msgText = this.getMsgText(eventBody)
       this.rawMsgText = this.getRawMsgText(eventBody)
       this.chatType = this.getChatType(eventBody)
@@ -121,6 +119,8 @@ class LarkBody {
 
     this.chatId = this.getChatId(body)
     this.messageId = this.getMessageId(body)
+    this.userId = this.getUserId(body)
+    this.openId = this.getOpenId(body)
     this.isLarkBody = this.isEvent || this.isAction
   }
 
@@ -169,24 +169,6 @@ class LarkBody {
     return body?.event?.message?.message_type
   }
 
-  /**
-   * 获取用户Id
-   * @param body 事件消息体
-   * @returns 用户Id
-   */
-  private getUserId(body: LarkEvent.Data) {
-    return body?.event?.sender?.sender_id?.user_id
-  }
-
-  /**
-   * 获取用户OpenId
-   * @param body 事件消息体
-   * @returns 用户OpenId
-   */
-  private getOpenId(body: LarkEvent.Data) {
-    return body?.event?.sender?.sender_id?.open_id
-  }
-
   /**
    * 获取文本内容并剔除艾特信息
    * @param body 事件消息体
@@ -299,6 +281,28 @@ class LarkBody {
     return ""
   }
 
+  /**
+   * 获取用户Id
+   * @param body 事件消息体
+   * @returns 用户Id
+   */
+  private getUserId(body: LarkEvent.Data | LarkAction.Data) {
+    if (this.getIsEvent(body)) return body?.event?.sender?.sender_id?.user_id
+    if (this.getIsAction(body)) return body?.user_id
+    return ""
+  }
+
+  /**
+   * 获取用户OpenId
+   * @param body 事件消息体
+   * @returns 用户OpenId
+   */
+  private getOpenId(body: LarkEvent.Data | LarkAction.Data) {
+    if (this.getIsEvent(body)) return body?.event?.sender?.sender_id?.open_id
+    if (this.getIsAction(body)) return body?.open_id
+    return ""
+  }
+
   /**
    * 是否艾特了机器人
    * @param name 机器人名字