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 机器人名字