From c459587dcd427178c84bf3e2570e8de4cfd13c36 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: Wed, 29 May 2024 12:03:35 +0800
Subject: [PATCH] refactor: get cookies

---
 src/ntqqapi/api/user.ts               | 5 +++++
 src/onebot11/action/user/GetCookie.ts | 8 --------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/ntqqapi/api/user.ts b/src/ntqqapi/api/user.ts
index 0aab61b..a6f058b 100644
--- a/src/ntqqapi/api/user.ts
+++ b/src/ntqqapi/api/user.ts
@@ -122,6 +122,11 @@ export class NTQQUserApi {
 
   @cacheFunc(60 * 30 * 1000)
   static async getCookies(domain: string) {
+    if (domain.endsWith("qzone.qq.com")) {
+      let data = (await NTQQUserApi.getQzoneCookies());
+      const CookieValue = 'p_skey=' + data.p_skey + '; skey=' + data.skey + '; p_uin=o' + selfInfo.uin + '; uin=o' + selfInfo.uin;
+      return { bkn: NTQQUserApi.genBkn(data.p_skey), cookies: CookieValue };
+    }
     const skey = await this.getSkey();
     const pskey = (await this.getPSkey([domain])).get(domain);
     if (!pskey || !skey) {
diff --git a/src/onebot11/action/user/GetCookie.ts b/src/onebot11/action/user/GetCookie.ts
index f192408..4b6f181 100644
--- a/src/onebot11/action/user/GetCookie.ts
+++ b/src/onebot11/action/user/GetCookie.ts
@@ -12,14 +12,6 @@ export class GetCookies extends BaseAction<Payload, { cookies: string; bkn: stri
 
   protected async _handle(payload: Payload) {
     const domain = payload.domain || 'qun.qq.com'
-    if (domain.endsWith("qzone.qq.com")) {
-      const _Skey = await NTQQUserApi.getSkey() as string;
-      // 兼容整个 *.qzone.qq.com
-      let data = (await NTQQUserApi.getQzoneCookies());
-      const Bkn = WebApi.genBkn(data.p_skey);
-      const CookieValue = 'p_skey=' + data.p_skey + '; skey=' + data.skey + '; p_uin=o' + selfInfo.uin + '; uin=o' + selfInfo.uin;
-      return { bkn: WebApi.genBkn(data.p_skey), cookies: CookieValue };
-    }
     return NTQQUserApi.getCookies(domain);
   }
 }