Merge pull request #366 from LLOneBot/dev

3.30.4

.github/workflows/publish.yml

@@ -14,7 +14,7 @@ jobs:
       - name: setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: install dependenies
         run: |

manifest.json

@@ -4,7 +4,7 @@
   "name": "LLOneBot",
   "slug": "LLOneBot",
   "description": "实现 OneBot 11 协议，用于 QQ 机器人开发",
-  "version": "3.30.2",
+  "version": "3.30.4",
   "icon": "./icon.webp",
   "authors": [
     {

src/ntqqapi/api/group.ts

@@ -98,6 +98,10 @@ export class NTQQGroupApi {
         )
       return notifies
     } else {
+      invoke({
+        methodName: ReceiveCmdS.GROUP_NOTIFY,
+        classNameIsRegister: true,
+      })
       return (await invoke<GroupNotifies>({
         methodName: NTMethod.GET_GROUP_NOTICE,
         cbCmd: ReceiveCmdS.GROUP_NOTIFY,

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 {

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 }
   }
 }

src/version.ts

@@ -1 +1 @@
-export const version = '3.30.2'
+export const version = '3.30.4'