From 1d0d25eea2f4ad7d73271aca517a4cb1fdfbdb0f 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: Fri, 24 Jan 2025 18:55:10 +0800
Subject: [PATCH] fix: re at

6b041becb07b1025c79d2a38846ff5840a489e4e
---
 src/onebot/api/msg.ts | 50 +++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts
index 23efc116..e9a3ad75 100644
--- a/src/onebot/api/msg.ts
+++ b/src/onebot/api/msg.ts
@@ -90,18 +90,8 @@ export class OneBotMsgApi {
             } else {
                 let qq: string = 'all';
                 if (element.atType !== NTMsgAtType.ATTYPEALL) {
-                    const { atNtUid /* content */ } = element;
-                    let atUinStr = element.atUid;
-                    if (!atUinStr || atUinStr === '0') {
-                        atUinStr = await this.core.apis.UserApi.getUinByUidV2(atNtUid);
-                    }
-                    let atUin = parseInt(atUinStr);
-                    if (atUin < 0) {
-                        atUin += 4294967296;
-                    }
-                    if (atUinStr) {
-                        qq = `${atUin}`;
-                    }
+                    const { atNtUid, atUid } = element;
+                    qq = !atUid || atUid === '0' ? await this.core.apis.UserApi.getUinByUidV2(atNtUid) : atUid;
                 }
                 return {
                     type: OB11MessageDataType.at,
@@ -915,16 +905,16 @@ export class OneBotMsgApi {
         const calculateTotalSize = async (elements: SendMessageElement[]): Promise<number> => {
             const sizePromises = elements.map(async element => {
                 switch (element.elementType) {
-                case ElementType.PTT:
-                    return (await fsPromise.stat(element.pttElement.filePath)).size;
-                case ElementType.FILE:
-                    return (await fsPromise.stat(element.fileElement.filePath)).size;
-                case ElementType.VIDEO:
-                    return (await fsPromise.stat(element.videoElement.filePath)).size;
-                case ElementType.PIC:
-                    return (await fsPromise.stat(element.picElement.sourcePath)).size;
-                default:
-                    return 0;
+                    case ElementType.PTT:
+                        return (await fsPromise.stat(element.pttElement.filePath)).size;
+                    case ElementType.FILE:
+                        return (await fsPromise.stat(element.fileElement.filePath)).size;
+                    case ElementType.VIDEO:
+                        return (await fsPromise.stat(element.videoElement.filePath)).size;
+                    case ElementType.PIC:
+                        return (await fsPromise.stat(element.picElement.sourcePath)).size;
+                    default:
+                        return 0;
                 }
             });
             const sizes = await Promise.all(sizePromises);
@@ -1017,14 +1007,14 @@ export class OneBotMsgApi {
     }
     groupChangDecreseType2String(type: number): GroupDecreaseSubType {
         switch (type) {
-        case 130:
-            return 'leave';
-        case 131:
-            return 'kick';
-        case 3:
-            return 'kick_me';
-        default:
-            return 'kick';
+            case 130:
+                return 'leave';
+            case 131:
+                return 'kick';
+            case 3:
+                return 'kick_me';
+            default:
+                return 'kick';
         }
     }