Merge branch 'main' of https://github.com/NapNeko/NapCatQQ

NapNeko · Aug 14, 2024 · 8645a41 · 8645a41
2 parents acad07a + 51bbb48
commit 8645a41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/onebot/action/user/GetCookies.ts b/src/onebot/action/user/GetCookies.ts
@@ -67,7 +67,7 @@ export class GetCookies extends BaseAction<Payload, Response> {
         const cookiesObject = await NTQQUserApi.getCookies(payload.domain);
         //把获取到的cookiesObject转换成 k=v; 格式字符串拼接在一起
         const cookies = Object.entries(cookiesObject).map(([key, value]) => `${key}=${value}`).join('; ');
-        const bkn = NTQQWebApi.getBknFromCookie(cookiesObject);
+        const bkn = cookiesObject?.skey ? NTQQWebApi.getBknFromCookie(cookiesObject) : '';
         return { cookies, bkn };
     }
 }
diff --git a/src/onebot/helper/data.ts b/src/onebot/helper/data.ts
@@ -52,7 +52,7 @@ export class OB11Constructor {
         messagePostFormat: string = obcore.configLoader.configData.messagePostFormat
     ): Promise<OB11Message | undefined> {
         if (msg.senderUin == "0" || msg.senderUin == "") return;
-        if (msg.peerUin == "0" || msg.peerUin) return;
+        if (msg.peerUin == "0" || msg.peerUin == "") return;
         //跳过空消息
         const NTQQGroupApi = core.apis.GroupApi;
         const NTQQUserApi = core.apis.UserApi;