fix: #696 fallback

NapNeko · Jan 7, 2025 · 3d16d52 · 3d16d52
1 parent 1ae47ff
commit 3d16d52
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/common/fall-back.ts b/src/common/fall-back.ts
@@ -20,19 +20,19 @@ export class Fallback<T> {
         for (const handler of this.handlers) {
             try {
                 const result = await handler();
-                try {
-                    return await this.checker(result);
-                } catch (checkerError) {
-                    errors.push(checkerError instanceof Error ? checkerError : new Error(String(checkerError)));
+                let data = await this.checker(result);
+                if (data) {
+                    return data;
                 }
             } catch (error) {
+                console.log(error);
                 errors.push(error instanceof Error ? error : new Error(String(error)));
             }
         }
         throw new AggregateError(errors, 'All handlers failed');
     }
 }
-export class FallbackUtil{
+export class FallbackUtil {
     static boolchecker<T>(value: T, condition: boolean): T {
         if (condition) {
             return value;

diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts
@@ -193,7 +193,7 @@ export class NTQQUserApi {
                 .add(() => this.context.session.getGroupService().getUidByUins([uin]).then((data) => data.uids.get(uin)))
                 .add(() => this.getUserDetailInfoByUin(uin).then((data) => data.detail.uid));
 
-        const uid = await fallback.run().catch(() => '0');
+        const uid = await fallback.run().catch(() => '');
         return uid ?? '';
     }
 

diff --git a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts
@@ -13,12 +13,13 @@ type Payload = Static<typeof SchemaData>;
 
 export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11User> {
     actionName = ActionName.GoCQHTTP_GetStrangerInfo;
-
+    payloadSchema = SchemaData;
     async _handle(payload: Payload): Promise<OB11User> {
         const user_id = payload.user_id.toString();
         const extendData = await this.core.apis.UserApi.getUserDetailInfoByUin(user_id);
         let uid = (await this.core.apis.UserApi.getUidByUinV2(user_id));
         if (!uid) uid = extendData.detail.uid;
+        console.log(uid);
         const info = (await this.core.apis.UserApi.getUserDetailInfo(uid));
         return {
             ...extendData.detail.simpleInfo.coreInfo,