From 0e8ceeb6c9c9fb46c210aa46c2aabad21ced75ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?=
 <nanaeonn@outlook.com>
Date: Thu, 5 Dec 2024 11:36:06 +0800
Subject: [PATCH] refactor: CardChangedEvent

---
 src/onebot/api/group.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/onebot/api/group.ts b/src/onebot/api/group.ts
index 0a57086d..f4d3666b 100644
--- a/src/onebot/api/group.ts
+++ b/src/onebot/api/group.ts
@@ -51,9 +51,9 @@ export class OneBotGroupApi {
         if (memberUin && adminUin) {
             return new OB11GroupBanEvent(
                 this.core,
-                parseInt(GroupCode),
-                parseInt(memberUin),
-                parseInt(adminUin),
+                +GroupCode,
+                +memberUin,
+                +adminUin,
                 duration,
                 subType,
             );
@@ -98,8 +98,8 @@ export class OneBotGroupApi {
         }
         return new OB11GroupMsgEmojiLikeEvent(
             this.core,
-            parseInt(groupCode),
-            parseInt(senderUin),
+            +groupCode,
+            +senderUin,
             MessageUnique.getShortIdByMsgId(replyMsg.msgId)!,
             [{
                 emoji_id: emojiId,
@@ -111,9 +111,10 @@ export class OneBotGroupApi {
     async parseCardChangedEvent(msg: RawMessage) {
         if (msg.senderUin && msg.senderUin !== '0') {
             const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin);
-            if (member && member.cardName !== msg.sendMemberName) {
+            const oldName = member?.cardName || member?.nick || '';
+            if (member && oldName !== msg.sendMemberName) {
                 const newCardName = msg.sendMemberName ?? '';
-                const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
+                const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, oldName);
                 member.cardName = newCardName;
                 return event;
             }