From d5ca94569d52fe77ebc27bae1b2a5bdbd8ded86d Mon Sep 17 00:00:00 2001
From: idranme <idranme@outlook.com>
Date: Fri, 23 Aug 2024 13:32:58 +0800
Subject: [PATCH] fix

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

diff --git a/src/ntqqapi/api/webapi.ts b/src/ntqqapi/api/webapi.ts
index 820244c..27ef955 100644
--- a/src/ntqqapi/api/webapi.ts
+++ b/src/ntqqapi/api/webapi.ts
@@ -197,7 +197,7 @@ export class WebApi {
       let res = '';
       let resJson;
       try {
-        res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': CookieValue });
+        res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': cookieStr });
         const match = res.match(/window\.__INITIAL_STATE__=(.*?);/);
         if (match) {
           resJson = JSON.parse(match[1].trim());
@@ -214,7 +214,8 @@ export class WebApi {
     }
 
     let HonorInfo: any = { group_id: groupCode };
-    const CookieValue = (await NTQQUserApi.getCookies('qun.qq.com')).cookies;
+    const cookieObject = await NTQQUserApi.getCookies('qun.qq.com')
+    const cookieStr = Object.entries(cookieObject).map(([key, value]) => `${key}=${value}`).join('; ')
 
     if (getType === WebHonorType.TALKACTIVE || getType === WebHonorType.ALL) {
       try {
diff --git a/src/onebot11/action/user/GetCookie.ts b/src/onebot11/action/user/GetCookie.ts
index 968759c..ff32d08 100644
--- a/src/onebot11/action/user/GetCookie.ts
+++ b/src/onebot11/action/user/GetCookie.ts
@@ -15,10 +15,13 @@ export class GetCookies extends BaseAction<Payload, Response> {
   actionName = ActionName.GetCookies
 
   protected async _handle(payload: Payload) {
+    if (!payload.domain) {
+      throw '缺少参数 domain'
+    }
     const cookiesObject = await NTQQUserApi.getCookies(payload.domain)
     //把获取到的cookiesObject转换成 k=v; 格式字符串拼接在一起
     const cookies = Object.entries(cookiesObject).map(([key, value]) => `${key}=${value}`).join('; ')
-    const bkn = WebApi.genBkn(cookiesObject.p_skey)
+    const bkn = cookiesObject.skey ? WebApi.genBkn(cookiesObject.skey) : ''
     return { cookies, bkn }
   }
 }