chore: v3.26.5

feat: support qzone cookies

manifest.json

@@ -1,10 +1,10 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "LLOneBot v3.26.1",
+  "name": "LLOneBot v3.26.5",
   "slug": "LLOneBot",
   "description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发, 不支持商店在线更新",
-  "version": "3.26.1",
+  "version": "3.26.5",
   "icon": "./icon.jpg",
   "authors": [
     {

src/common/config.ts

@@ -40,6 +40,7 @@ export class ConfigUtil {
       enableWsReverse: false,
       messagePostFormat: 'array',
       enableHttpHeart: false,
+      enableQOAutoQuote: false
     }
     let defaultConfig: Config = {
       ob11: ob11Default,

src/common/types.ts

@@ -10,6 +10,7 @@ export interface OB11Config {
   enableWsReverse?: boolean
   messagePostFormat?: 'array' | 'string'
   enableHttpHeart?: boolean
+  enableQOAutoQuote: boolean  // 快速操作回复自动引用原消息
 }
 export interface CheckVersion {
   result: boolean

src/common/utils/QQBasicInfo.ts

@@ -3,26 +3,34 @@ import fs from 'node:fs'
 import os from 'node:os'
 import { systemPlatform } from './system'
 
-export const exePath = process.execPath;
+export const exePath = process.execPath
 
-export const pkgInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'package.json');
-let configVersionInfoPath;
+function getPKGPath() {
+  let p = path.join(path.dirname(exePath), 'resources', 'app', 'package.json')
+  if (systemPlatform === 'darwin') {
+    p = path.join(path.dirname(path.dirname(exePath)), 'Resources', 'app', 'package.json')
+  }
+  return p
+}
 
+export const pkgInfoPath = getPKGPath()
+let configVersionInfoPath: string
 
 
 if (os.platform() !== 'linux') {
-  configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
-} else {
-  const userPath = os.homedir();
-  const appDataPath = path.resolve(userPath, './.config/QQ');
-  configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
+  configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json')
+}
+else {
+  const userPath = os.homedir()
+  const appDataPath = path.resolve(userPath, './.config/QQ')
+  configVersionInfoPath = path.resolve(appDataPath, './versions/config.json')
 }
 
 if (typeof configVersionInfoPath !== 'string') {
-  throw new Error('Something went wrong when load QQ info path');
+  throw new Error('Something went wrong when load QQ info path')
 }
 
-export { configVersionInfoPath };
+export { configVersionInfoPath }
 
 type QQPkgInfo = {
   version: string;
@@ -43,21 +51,21 @@ let _qqVersionConfigInfo: QQVersionConfigInfo = {
   'curVersion': '9.9.9-23361',
   'prevVersion': '',
   'onErrorVersions': [],
-  'buildId': '23361'
-};
+  'buildId': '23361',
+}
 
 if (fs.existsSync(configVersionInfoPath)) {
   try {
-    const _ =JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
-    _qqVersionConfigInfo = Object.assign(_qqVersionConfigInfo, _);
+    const _ = JSON.parse(fs.readFileSync(configVersionInfoPath).toString())
+    _qqVersionConfigInfo = Object.assign(_qqVersionConfigInfo, _)
   } catch (e) {
-    console.error('Load QQ version config info failed, Use default version', e);
+    console.error('Load QQ version config info failed, Use default version', e)
   }
 }
 
-export const qqVersionConfigInfo: QQVersionConfigInfo = _qqVersionConfigInfo;
+export const qqVersionConfigInfo: QQVersionConfigInfo = _qqVersionConfigInfo
 
-export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath);
+export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath)
 // platform_type: 3,
 // app_type: 4,
 // app_version: '9.9.9-23159',
@@ -66,10 +74,10 @@ export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath);
 // platVer: '10.0.26100',
 // clientVer: '9.9.9-23159',
 
-let _appid: string = '537213803';  // 默认为 Windows 平台的 appid
+let _appid: string = '537213803'  // 默认为 Windows 平台的 appid
 if (systemPlatform === 'linux') {
-  _appid = '537213827';
+  _appid = '537213827'
 }
 // todo: mac 平台的 appid
-export const appid = _appid;
+export const appid = _appid
 export const isQQ998: boolean = qqPkgInfo.buildVersion >= '22106'

src/common/utils/request.ts

@@ -1,30 +1,50 @@
 import https from 'node:https';
 import http from 'node:http';
+import { log } from '@/common/utils/log'
 
 export class RequestUtil {
   // 适用于获取服务器下发cookies时获取，仅GET
-  static async HttpsGetCookies(url: string): Promise<Map<string, string>> {
-    return new Promise<Map<string, string>>((resolve, reject) => {
-      const protocol = url.startsWith('https://') ? https : http;
-      protocol.get(url, (res) => {
-        const cookiesHeader = res.headers['set-cookie'];
-        if (!cookiesHeader) {
-          resolve(new Map<string, string>());
-        } else {
-          const cookiesMap = new Map<string, string>();
-          cookiesHeader.forEach((cookieStr) => {
-            cookieStr.split(';').forEach((cookiePart) => {
-              const trimmedPart = cookiePart.trim();
-              if (trimmedPart.includes('=')) {
-                const [key, value] = trimmedPart.split('=').map(part => part.trim());
-                cookiesMap.set(key, decodeURIComponent(value)); // 解码cookie值
-              }
-            });
+  static async HttpsGetCookies(url: string): Promise<{ [key: string]: string }> {
+    const client = url.startsWith('https') ? https : http;
+    return new Promise((resolve, reject) => {
+      client.get(url, (res) => {
+        let cookies: { [key: string]: string } = {};
+        const handleRedirect = (res: http.IncomingMessage) => {
+          //console.log(res.headers.location);
+          if (res.statusCode === 301 || res.statusCode === 302) {
+            if (res.headers.location) {
+              const redirectUrl = new URL(res.headers.location, url);
+              RequestUtil.HttpsGetCookies(redirectUrl.href).then((redirectCookies) => {
+                // 合并重定向过程中的cookies
+                log('redirectCookies', redirectCookies)
+                cookies = { ...cookies, ...redirectCookies };
+                resolve(cookies);
+              });
+            } else {
+              resolve(cookies);
+            }
+          } else {
+            resolve(cookies);
+          }
+        };
+        res.on('data', () => { }); // Necessary to consume the stream
+        res.on('end', () => {
+          handleRedirect(res);
+        });
+        if (res.headers['set-cookie']) {
+          // console.log(res.headers['set-cookie']);
+          log('set-cookie', url, res.headers['set-cookie']);
+          res.headers['set-cookie'].forEach((cookie) => {
+            const parts = cookie.split(';')[0].split('=');
+            const key = parts[0];
+            const value = parts[1];
+            if (key && value && key.length > 0 && value.length > 0) {
+              cookies[key] = value;
+            }
           });
-          resolve(cookiesMap);
         }
-      }).on('error', (error) => {
-        reject(error);
+      }).on('error', (err) => {
+        reject(err);
       });
     });
   }

src/main/main.ts

@@ -25,7 +25,7 @@ import {
   selfInfo,
   uidMaps,
 } from '../common/data'
-import { hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook } from '../ntqqapi/hook'
+import { hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook, startHook } from '../ntqqapi/hook'
 import { OB11Constructor } from '../onebot11/constructor'
 import {
   ChatType,
@@ -200,6 +200,7 @@ function onLoad() {
   }
 
   async function startReceiveHook() {
+    startHook().then()
     if (getConfigUtil().getConfig().enablePoke) {
       crychic.loadNode()
       crychic.registerPokeHandler((id, isGroup) => {
@@ -349,32 +350,48 @@ function onLoad() {
                 log('获取群通知的成员信息失败', notify, e.stack.toString())
               }
             }
-            else if ([GroupNotifyTypes.JOIN_REQUEST].includes(notify.type)) {
+            else if ([GroupNotifyTypes.JOIN_REQUEST, GroupNotifyTypes.JOIN_REQUEST_BY_INVITED].includes(notify.type)) {
               log('有加群请求')
               let groupRequestEvent = new OB11GroupRequestEvent()
               groupRequestEvent.group_id = parseInt(notify.group.groupCode)
-              let requestQQ = ''
-              try {
-                requestQQ = (await NTQQUserApi.getUserDetailInfo(notify.user1.uid)).uin
-              } catch (e) {
-                log('获取加群人QQ号失败', e)
+              let requestQQ = uidMaps[notify.user1.uid]
+              if (!requestQQ) {
+                try {
+                  requestQQ = (await NTQQUserApi.getUserDetailInfo(notify.user1.uid)).uin
+                } catch (e) {
+                  log('获取加群人QQ号失败', e)
+                }
               }
               groupRequestEvent.user_id = parseInt(requestQQ) || 0
               groupRequestEvent.sub_type = 'add'
               groupRequestEvent.comment = notify.postscript
               groupRequestEvent.flag = notify.seq
+              if (notify.type == GroupNotifyTypes.JOIN_REQUEST_BY_INVITED) {
+                // groupRequestEvent.sub_type = 'invite'
+                let invitorQQ = uidMaps[notify.user2.uid]
+                if (!invitorQQ) {
+                  try {
+                    let invitor = (await NTQQUserApi.getUserDetailInfo(notify.user2.uid))
+                    groupRequestEvent.invitor_id = parseInt(invitor.uin)
+                  } catch (e) {
+                    groupRequestEvent.invitor_id = 0
+                    log('获取邀请人QQ号失败', e)
+                  }
+                }
+              }
               postOb11Event(groupRequestEvent)
             }
             else if (notify.type == GroupNotifyTypes.INVITE_ME) {
               log('收到邀请我加群通知')
               let groupInviteEvent = new OB11GroupRequestEvent()
               groupInviteEvent.group_id = parseInt(notify.group.groupCode)
-              let user_id = (await getFriend(notify.user2.uid))?.uin
+              let user_id = uidMaps[notify.user2.uid]
               if (!user_id) {
                 user_id = (await NTQQUserApi.getUserDetailInfo(notify.user2.uid))?.uin
               }
               groupInviteEvent.user_id = parseInt(user_id)
               groupInviteEvent.sub_type = 'invite'
+              // groupInviteEvent.invitor_id = parseInt(user_id)
               groupInviteEvent.flag = notify.seq
               postOb11Event(groupInviteEvent)
             }
@@ -420,8 +437,33 @@ function onLoad() {
         uidMaps[value] = key
       }
     })
-    startReceiveHook().then()
-    NTQQGroupApi.getGroups(true).then()
+    try{
+      log('start get groups')
+      const _groups = await NTQQGroupApi.getGroups()
+      log('_groups', _groups)
+      await Promise.all(
+        _groups.map(async (group) => {
+          try {
+            const members = await NTQQGroupApi.getGroupMembers(group.groupCode)
+            group.members = members
+            groups.push(group)
+          } catch (e) {
+            log('获取群成员失败', e)
+          }
+        })
+      )
+    }
+    catch (e) {
+      log('获取群列表失败', e)
+    }
+    finally {
+      log('start activate group member info')
+      NTQQGroupApi.activateMemberInfoChange().then().catch(log)
+      NTQQGroupApi.activateMemberListChange().then().catch(log)
+      startReceiveHook().then()
+    }
+
+
     const config = getConfigUtil().getConfig()
     if (config.ob11.enableHttp) {
       ob11HTTPServer.start(config.ob11.httpPort)

src/ntqqapi/api/group.ts

@@ -7,15 +7,48 @@ import { log } from '../../common/utils/log'
 import { NTQQWindowApi, NTQQWindows } from './window'
 
 export class NTQQGroupApi {
+
+  static async activateMemberListChange(){
+    return await callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.ACTIVATE_MEMBER_LIST_CHANGE,
+      classNameIsRegister: true,
+      args: [],
+    })
+  }
+  static async activateMemberInfoChange(){
+    return await callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.ACTIVATE_MEMBER_INFO_CHANGE,
+      classNameIsRegister: true,
+      args: [],
+    })
+  }
+  static async getGroupAllInfo(groupCode: string, source: number=4){
+    return await callNTQQApi<GeneralCallResult & Group>({
+      methodName: NTQQApiMethod.GET_GROUP_ALL_INFO,
+      args: [
+        {
+          groupCode,
+          source
+        },
+        null,
+      ],
+    })
+  }
   static async getGroups(forced = false) {
-    let cbCmd = ReceiveCmdS.GROUPS
-    if (process.platform != 'win32') {
-      cbCmd = ReceiveCmdS.GROUPS_STORE
-    }
+    // let cbCmd = ReceiveCmdS.GROUPS
+    // if (process.platform != 'win32') {
+    //   cbCmd = ReceiveCmdS.GROUPS_STORE
+    // }
     const result = await callNTQQApi<{
       updateType: number
       groupList: Group[]
-    }>({ methodName: NTQQApiMethod.GROUPS, args: [{ force_update: forced }, undefined], cbCmd })
+    }>({
+      methodName: NTQQApiMethod.GROUPS,
+      args: [{ force_update: forced }, undefined],
+      cbCmd: [ReceiveCmdS.GROUPS, ReceiveCmdS.GROUPS_STORE],
+      afterFirstCmd: false,
+    })
+    log('get groups result', result)
     return result.groupList
   }
   static async getGroupMembers(groupQQ: string, num = 3000): Promise<GroupMember[]> {
@@ -58,6 +91,19 @@ export class NTQQGroupApi {
       return []
     }
   }
+  static async getGroupMembersInfo(groupCode: string, uids: string[], forceUpdate: boolean=false) {
+    return await callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.GROUP_MEMBERS_INFO,
+      args: [
+        {
+          forceUpdate,
+          groupCode,
+          uids
+        },
+        null,
+      ],
+    })
+  }
   static async getGroupNotifies() {
     // 获取管理员变更
     // 加群通知，退出通知，需要管理员权限
@@ -158,7 +204,8 @@ export class NTQQGroupApi {
     })
   }
   static async setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
-    return await callNTQQApi<GeneralCallResult>({
+    NTQQGroupApi.activateMemberListChange().then().catch(log)
+    const res = await callNTQQApi<GeneralCallResult>({
       methodName: NTQQApiMethod.SET_MEMBER_CARD,
       args: [
         {
@@ -169,6 +216,8 @@ export class NTQQGroupApi {
         null,
       ],
     })
+    NTQQGroupApi.getGroupMembersInfo(groupQQ, [memberUid], true).then().catch(log)
+    return res;
   }
   static async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
     return await callNTQQApi<GeneralCallResult>({

src/ntqqapi/api/msg.ts

@@ -29,7 +29,8 @@ async function sendWaiter(peer: Peer, waitComplete = true, timeout: number = 100
       await sleep(500)
       checkLastSendUsingTime += 500
       return await waitLastSend()
-    } else {
+    }
+    else {
       return
     }
   }
@@ -48,7 +49,8 @@ async function sendWaiter(peer: Peer, waitComplete = true, timeout: number = 100
         if ((await dbUtil.getMsgByLongId(sentMessage.msgId)).sendStatus == 2) {
           return sentMessage
         }
-      } else {
+      }
+      else {
         return sentMessage
       }
       // log(`给${peerUid}发送消息成功`)
@@ -60,10 +62,28 @@ async function sendWaiter(peer: Peer, waitComplete = true, timeout: number = 100
     await sleep(500)
     return await checkSendComplete()
   }
-  return checkSendComplete();
+  return checkSendComplete()
 }
 
 export class NTQQMsgApi {
+  static enterOrExitAIO(peer: Peer, enter: boolean) {
+    return callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.ENTER_OR_EXIT_AIO,
+      args: [
+        {
+          "info_list": [
+            {
+              peer,
+              "option": enter ? 1 : 2
+            }
+          ]
+        },
+        {
+          "send": true
+        },
+      ],
+    })
+  }
   static async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set: boolean = true) {
     // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览
     // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
@@ -83,6 +103,7 @@ export class NTQQMsgApi {
       ],
     })
   }
+
   static async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
     return await callNTQQApi<GeneralCallResult & { msgList: RawMessage[] }>({
       methodName: NTQQApiMethod.GET_MULTI_MSG,
@@ -97,6 +118,20 @@ export class NTQQMsgApi {
     })
   }
 
+  static async getMsgBoxInfo(peer: Peer) {
+    return await callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.GET_MSG_BOX_INFO,
+      args: [
+        {
+          contacts: [
+            peer
+          ],
+        },
+        null,
+      ],
+    })
+  }
+
   static async activateChat(peer: Peer) {
     // await this.fetchRecentContact();
     // await sleep(500);
@@ -105,6 +140,7 @@ export class NTQQMsgApi {
       args: [{ peer, cnt: 20 }, null],
     })
   }
+
   static async activateChatAndGetHistory(peer: Peer) {
     // await this.fetchRecentContact();
     // await sleep(500);
@@ -114,6 +150,7 @@ export class NTQQMsgApi {
       args: [{ peer, cnt: 20 }, null],
     })
   }
+
   static async getMsgHistory(peer: Peer, msgId: string, count: number) {
     // 消息时间从旧到新
     return await callNTQQApi<GeneralCallResult & { msgList: RawMessage[] }>({
@@ -129,6 +166,7 @@ export class NTQQMsgApi {
       ],
     })
   }
+
   static async fetchRecentContact() {
     await callNTQQApi({
       methodName: NTQQApiMethod.RECENT_CONTACT,
@@ -164,7 +202,7 @@ export class NTQQMsgApi {
   }
 
   static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-    const waiter = sendWaiter(peer, waitComplete, timeout);
+    const waiter = sendWaiter(peer, waitComplete, timeout)
     callNTQQApi({
       methodName: NTQQApiMethod.SEND_MSG,
       args: [
@@ -177,11 +215,11 @@ export class NTQQMsgApi {
         null,
       ],
     }).then()
-    return await waiter;
+    return await waiter
   }
 
   static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-    const waiter = sendWaiter(destPeer, true, 10000);
+    const waiter = sendWaiter(destPeer, true, 10000)
     callNTQQApi<GeneralCallResult>({
       methodName: NTQQApiMethod.FORWARD_MSG,
       args: [
@@ -195,7 +233,7 @@ export class NTQQMsgApi {
         null,
       ],
     }).then().catch(log)
-    return await waiter;
+    return await waiter
   }
 
   static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {

src/ntqqapi/api/user.ts

@@ -6,6 +6,7 @@ import { NTQQWindowApi, NTQQWindows } from './window'
 import { cacheFunc, isQQ998, log, sleep } from '../../common/utils'
 import { wrapperApi } from '@/ntqqapi/native/wrapper'
 import * as https from 'https'
+import { RequestUtil } from '@/common/utils/request'
 
 let userInfoCache: Record<string, User> = {} // uid: User
 
@@ -47,9 +48,12 @@ export class NTQQUserApi {
     return result.profiles.get(uid)
   }
 
-  static async getUserDetailInfo(uid: string, getLevel = false) {
+  static async getUserDetailInfo(uid: string, getLevel = false, withBizInfo = true) {
     // this.getUserInfo(uid);
     let methodName = !isQQ998 ? NTQQApiMethod.USER_DETAIL_INFO : NTQQApiMethod.USER_DETAIL_INFO_WITH_BIZ_INFO
+    if (!withBizInfo) {
+      methodName = NTQQApiMethod.USER_DETAIL_INFO
+    }
     const fetchInfo = async () => {
       const result = await callNTQQApi<{ info: User }>({
         methodName,
@@ -95,7 +99,17 @@ export class NTQQUserApi {
       ],
     })
   }
-
+  static async getQzoneCookies() {
+    const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + selfInfo.uin + '&clientkey=' + (await this.getClientKey()).clientKey + '&u1=https%3A%2F%2Fuser.qzone.qq.com%2F' + selfInfo.uin + '%2Finfocenter&keyindex=19%27'
+    let cookies: { [key: string]: string; } = {};
+    try {
+      cookies = await RequestUtil.HttpsGetCookies(requestUrl);
+    } catch (e: any) {
+      log('获取QZone Cookies失败', e)
+      cookies = {}
+    }
+    return cookies;
+  }
   static async getSkey(): Promise<string> {
     const clientKeyData = await this.getClientKey()
     if (clientKeyData.result !== 0) {
@@ -103,33 +117,19 @@ export class NTQQUserApi {
     }
     const url = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + selfInfo.uin
       + '&clientkey=' + clientKeyData.clientKey
-      + '&u1=https%3A%2F%2Fh5.qzone.qq.com%2Fqqnt%2Fqzoneinpcqq%2Ffriend%3Frefresh%3D0%26clientuin%3D0%26darkMode%3D0&keyindex=' + clientKeyData.keyIndex
-
-    return new Promise((resolve, reject) => {
-      const req = https.get(url, (res) => {
-        const rawCookies = res.headers['set-cookie']
-        const cookies = {}
-        rawCookies.forEach(cookie => {
-          // 使用正则表达式匹配 cookie 名称和值
-          const regex = /([^=;]+)=([^;]*)/
-          const match = regex.exec(cookie)
-          if (match) {
-            cookies[match[1].trim()] = match[2].trim()
-          }
-        })
-        resolve(cookies['skey'])
-      })
-      req.on('error', e => {
-        reject(e)
-      });
-      req.end();
-    });
+      + '&u1=https%3A%2F%2Fh5.qzone.qq.com%2Fqqnt%2Fqzoneinpcqq%2Ffriend%3Frefresh%3D0%26clientuin%3D0%26darkMode%3D0&keyindex=' + clientKeyData.keyIndex;
+    return (await RequestUtil.HttpsGetCookies(url))?.skey;
   }
 
   @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);
+    const pskey = (await this.getPSkey([domain])).get(domain);
     if (!pskey || !skey) {
       throw new Error('获取Cookies失败')
     }

src/ntqqapi/hook.ts

@@ -22,6 +22,7 @@ import { NTQQGroupApi } from './api/group'
 import { log } from '@/common/utils'
 import { isNumeric, sleep } from '@/common/utils'
 import { OB11Constructor } from '../onebot11/constructor'
+import { OB11GroupCardEvent } from '../onebot11/event/notice/OB11GroupCardEvent'
 
 export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
@@ -324,207 +325,222 @@ async function processGroupEvent(payload: { groupList: Group[] }) {
   }
 }
 
-// 群列表变动
-registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
-  // updateType 3是群列表变动，2是群成员变动
-  // log("群列表变动", payload.updateType, payload.groupList)
-  if (payload.updateType != 2) {
-    updateGroups(payload.groupList).then()
-  } else {
-    if (process.platform == 'win32') {
-      processGroupEvent(payload).then()
-    }
-  }
-})
-registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS_STORE, (payload) => {
-  // updateType 3是群列表变动，2是群成员变动
-  // log("群列表变动", payload.updateType, payload.groupList)
-  if (payload.updateType != 2) {
-    updateGroups(payload.groupList).then()
-  } else {
-    if (process.platform != 'win32') {
-      processGroupEvent(payload).then()
-    }
-  }
-})
+export async function startHook() {
 
-registerReceiveHook<{
-  groupCode: string
-  dataSource: number
-  members: Set<GroupMember>
-}>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
-  const groupCode = payload.groupCode
-  const members = Array.from(payload.members.values())
-  // log("群成员信息变动", groupCode, members)
-  for (const member of members) {
-    const existMember = await getGroupMember(groupCode, member.uin)
-    if (existMember) {
-      Object.assign(existMember, member)
+// 群列表变动
+  registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
+    // updateType 3是群列表变动，2是群成员变动
+    // log("群列表变动", payload.updateType, payload.groupList)
+    if (payload.updateType != 2) {
+      updateGroups(payload.groupList).then()
     }
-  }
-  // const existGroup = groups.find(g => g.groupCode == groupCode);
-  // if (existGroup) {
-  //     log("对比群成员", existGroup.members, members)
-  //     for (const member of members) {
-  //         const existMember = existGroup.members.find(m => m.uin == member.uin);
-  //         if (existMember) {
-  //             log("对比群名片", existMember.cardName, member.cardName)
-  //             if (existMember.cardName != member.cardName) {
-  //                 postOB11Event(new OB11GroupCardEvent(parseInt(existGroup.groupCode), parseInt(member.uin), member.cardName, existMember.cardName));
-  //             }
-  //             Object.assign(existMember, member);
-  //         }
-  //     }
-  // }
-})
+    else {
+      if (process.platform == 'win32') {
+        processGroupEvent(payload).then()
+      }
+    }
+  })
+  registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS_STORE, (payload) => {
+    // updateType 3是群列表变动，2是群成员变动
+    // log("群列表变动", payload.updateType, payload.groupList)
+    if (payload.updateType != 2) {
+      updateGroups(payload.groupList).then()
+    }
+    else {
+      if (process.platform != 'win32') {
+        processGroupEvent(payload).then()
+      }
+    }
+  })
+
+  registerReceiveHook<{
+    groupCode: string
+    dataSource: number
+    members: Set<GroupMember>
+  }>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
+    const groupCode = payload.groupCode
+    const members = Array.from(payload.members.values())
+    // log("群成员信息变动", groupCode, members)
+    for (const member of members) {
+      const existMember = await getGroupMember(groupCode, member.uin)
+      if (existMember) {
+        if (member.cardName != existMember.cardName) {
+          log('群成员名片变动', `${groupCode}: ${existMember.uin}`, existMember.cardName, '->', member.cardName)
+          postOb11Event(
+            new OB11GroupCardEvent(parseInt(groupCode), parseInt(member.uin), member.cardName, existMember.cardName),
+          )
+        }
+        Object.assign(existMember, member)
+      }
+    }
+    // const existGroup = groups.find(g => g.groupCode == groupCode);
+    // if (existGroup) {
+    //     log("对比群成员", existGroup.members, members)
+    //     for (const member of members) {
+    //         const existMember = existGroup.members.find(m => m.uin == member.uin);
+    //         if (existMember) {
+    //             log("对比群名片", existMember.cardName, member.cardName)
+    //             if (existMember.cardName != member.cardName) {
+    //                 postOB11Event(new OB11GroupCardEvent(parseInt(existGroup.groupCode), parseInt(member.uin), member.cardName, existMember.cardName));
+    //             }
+    //             Object.assign(existMember, member);
+    //         }
+    //     }
+    // }
+  })
 
 // 好友列表变动
-registerReceiveHook<{
-  data:CategoryFriend[]
-}>(ReceiveCmdS.FRIENDS, (payload) => {
-  rawFriends.length = 0;
-  rawFriends.push(...payload.data);
-  for (const fData of payload.data) {
-    const _friends = fData.buddyList
-    for (let friend of _friends) {
-      NTQQMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend }).then()
-      let existFriend = friends.find((f) => f.uin == friend.uin)
-      if (!existFriend) {
-        friends.push(friend)
-      } else {
-        Object.assign(existFriend, friend)
+  registerReceiveHook<{
+    data: CategoryFriend[]
+  }>(ReceiveCmdS.FRIENDS, (payload) => {
+    rawFriends.length = 0;
+    rawFriends.push(...payload.data);
+    for (const fData of payload.data) {
+      const _friends = fData.buddyList
+      for (let friend of _friends) {
+        NTQQMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend }).then()
+        let existFriend = friends.find((f) => f.uin == friend.uin)
+        if (!existFriend) {
+          friends.push(friend)
+        }
+        else {
+          Object.assign(existFriend, friend)
+        }
       }
     }
-  }
-})
+  })
 
-registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
-  // 保存一下uid
-  for (const message of payload.msgList) {
-    const uid = message.senderUid
-    const uin = message.senderUin
-    if (uid && uin) {
-      if (message.chatType === ChatType.temp) {
-        dbUtil.getReceivedTempUinMap().then((receivedTempUinMap) => {
-          if (!receivedTempUinMap[uin]) {
-            receivedTempUinMap[uin] = uid
-            dbUtil.setReceivedTempUinMap(receivedTempUinMap)
-          }
-        })
-      }
-      uidMaps[uid] = uin
-    }
-  }
-
-  // 自动清理新消息文件
-  const { autoDeleteFile } = getConfigUtil().getConfig()
-  if (!autoDeleteFile) {
-    return
-  }
-  for (const message of payload.msgList) {
-    // log("收到新消息，push到历史记录", message.msgId)
-    // dbUtil.addMsg(message).then()
-    // 清理文件
-
-    for (const msgElement of message.elements) {
-      setTimeout(() => {
-        const picPath = msgElement.picElement?.sourcePath
-        const picThumbPath = [...msgElement.picElement?.thumbPath.values()]
-        const pttPath = msgElement.pttElement?.filePath
-        const filePath = msgElement.fileElement?.filePath
-        const videoPath = msgElement.videoElement?.filePath
-        const videoThumbPath: string[] = [...msgElement.videoElement?.thumbPath.values()]
-        const pathList = [picPath, ...picThumbPath, pttPath, filePath, videoPath, ...videoThumbPath]
-        if (msgElement.picElement) {
-          pathList.push(...Object.values(msgElement.picElement.thumbPath))
-        }
-        const aioOpGrayTipElement = msgElement.grayTipElement?.aioOpGrayTipElement
-        if (aioOpGrayTipElement) {
-          tempGroupCodeMap[aioOpGrayTipElement.peerUid] = aioOpGrayTipElement.fromGrpCodeOfTmpChat
-        }
-
-        // log("需要清理的文件", pathList);
-        for (const path of pathList) {
-          if (path) {
-            fs.unlink(picPath, () => {
-              log('删除文件成功', path)
-            })
-          }
-        }
-      }, getConfigUtil().getConfig().autoDeleteFileSecond * 1000)
-    }
-  }
-})
-
-registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({ msgRecord }) => {
-  const message = msgRecord
-  const peerUid = message.peerUid
-  // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
-  // log("收到自己发送成功的消息", message.msgId, message.msgSeq);
-  dbUtil.addMsg(message).then()
-  const sendCallback = sendMessagePool[peerUid]
-  if (sendCallback) {
-    try {
-      sendCallback(message)
-    } catch (e) {
-      log('receive self msg error', e.stack)
-    }
-  }
-})
-
-registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
-  selfInfo.online = info.info.status !== 20
-})
-
-let activatedPeerUids: string[] = []
-registerReceiveHook<{
-  changedRecentContactLists: {
-    listType: number
-    sortedContactList: string[]
-    changedList: {
-      id: string // peerUid
-      chatType: ChatType
-    }[]
-  }[]
-}>(ReceiveCmdS.RECENT_CONTACT, async (payload) => {
-  for (const recentContact of payload.changedRecentContactLists) {
-    for (const changedContact of recentContact.changedList) {
-      if (activatedPeerUids.includes(changedContact.id)) continue
-      activatedPeerUids.push(changedContact.id)
-      const peer = { peerUid: changedContact.id, chatType: changedContact.chatType }
-      if (changedContact.chatType === ChatType.temp) {
-        log('收到临时会话消息', peer)
-        NTQQMsgApi.activateChatAndGetHistory(peer).then(() => {
-          NTQQMsgApi.getMsgHistory(peer, '', 20).then(({ msgList }) => {
-            let lastTempMsg = msgList.pop()
-            log('激活窗口之前的第一条临时会话消息:', lastTempMsg)
-            if (Date.now() / 1000 - parseInt(lastTempMsg.msgTime) < 5) {
-              OB11Constructor.message(lastTempMsg).then((r) => postOb11Event(r))
+  registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
+    // 保存一下uid
+    for (const message of payload.msgList) {
+      const uid = message.senderUid
+      const uin = message.senderUin
+      if (uid && uin) {
+        if (message.chatType === ChatType.temp) {
+          dbUtil.getReceivedTempUinMap().then((receivedTempUinMap) => {
+            if (!receivedTempUinMap[uin]) {
+              receivedTempUinMap[uin] = uid
+              dbUtil.setReceivedTempUinMap(receivedTempUinMap)
             }
           })
-        })
-      } else {
-        NTQQMsgApi.activateChat(peer).then()
+        }
+        uidMaps[uid] = uin
       }
     }
-  }
-})
 
-registerCallHook(NTQQApiMethod.DELETE_ACTIVE_CHAT, async (payload) => {
-  const peerUid = payload[0] as string
-  log('激活的聊天窗口被删除，准备重新激活', peerUid)
-  let chatType = ChatType.friend
-  if (isNumeric(peerUid)) {
-    chatType = ChatType.group
-  } else {
-    // 检查是否好友
-    if (!(await getFriend(peerUid))) {
-      chatType = ChatType.temp
+    // 自动清理新消息文件
+    const { autoDeleteFile } = getConfigUtil().getConfig()
+    if (!autoDeleteFile) {
+      return
+    }
+    for (const message of payload.msgList) {
+      // log("收到新消息，push到历史记录", message.msgId)
+      // dbUtil.addMsg(message).then()
+      // 清理文件
+
+      for (const msgElement of message.elements) {
+        setTimeout(() => {
+          const picPath = msgElement.picElement?.sourcePath
+          const picThumbPath = [...msgElement.picElement?.thumbPath.values()]
+          const pttPath = msgElement.pttElement?.filePath
+          const filePath = msgElement.fileElement?.filePath
+          const videoPath = msgElement.videoElement?.filePath
+          const videoThumbPath: string[] = [...msgElement.videoElement?.thumbPath.values()]
+          const pathList = [picPath, ...picThumbPath, pttPath, filePath, videoPath, ...videoThumbPath]
+          if (msgElement.picElement) {
+            pathList.push(...Object.values(msgElement.picElement.thumbPath))
+          }
+          const aioOpGrayTipElement = msgElement.grayTipElement?.aioOpGrayTipElement
+          if (aioOpGrayTipElement) {
+            tempGroupCodeMap[aioOpGrayTipElement.peerUid] = aioOpGrayTipElement.fromGrpCodeOfTmpChat
+          }
+
+          // log("需要清理的文件", pathList);
+          for (const path of pathList) {
+            if (path) {
+              fs.unlink(picPath, () => {
+                log('删除文件成功', path)
+              })
+            }
+          }
+        }, getConfigUtil().getConfig().autoDeleteFileSecond * 1000)
+      }
     }
-  }
-  const peer = { peerUid, chatType }
-  await sleep(1000)
-  NTQQMsgApi.activateChat(peer).then((r) => {
-    log('重新激活聊天窗口', peer, { result: r.result, errMsg: r.errMsg })
   })
-})
+
+  registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({ msgRecord }) => {
+    const message = msgRecord
+    const peerUid = message.peerUid
+    // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
+    // log("收到自己发送成功的消息", message.msgId, message.msgSeq);
+    dbUtil.addMsg(message).then()
+    const sendCallback = sendMessagePool[peerUid]
+    if (sendCallback) {
+      try {
+        sendCallback(message)
+      } catch (e) {
+        log('receive self msg error', e.stack)
+      }
+    }
+  })
+
+  registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
+    selfInfo.online = info.info.status !== 20
+  })
+
+  let activatedPeerUids: string[] = []
+  registerReceiveHook<{
+    changedRecentContactLists: {
+      listType: number
+      sortedContactList: string[]
+      changedList: {
+        id: string // peerUid
+        chatType: ChatType
+      }[]
+    }[]
+  }>(ReceiveCmdS.RECENT_CONTACT, async (payload) => {
+    for (const recentContact of payload.changedRecentContactLists) {
+      for (const changedContact of recentContact.changedList) {
+        if (activatedPeerUids.includes(changedContact.id)) continue
+        activatedPeerUids.push(changedContact.id)
+        const peer = { peerUid: changedContact.id, chatType: changedContact.chatType }
+        if (changedContact.chatType === ChatType.temp) {
+          log('收到临时会话消息', peer)
+          NTQQMsgApi.activateChatAndGetHistory(peer).then(() => {
+            NTQQMsgApi.getMsgHistory(peer, '', 20).then(({ msgList }) => {
+              let lastTempMsg = msgList.pop()
+              log('激活窗口之前的第一条临时会话消息:', lastTempMsg)
+              if (Date.now() / 1000 - parseInt(lastTempMsg.msgTime) < 5) {
+                OB11Constructor.message(lastTempMsg).then((r) => postOb11Event(r))
+              }
+            })
+          })
+        }
+        else {
+          NTQQMsgApi.activateChat(peer).then()
+        }
+      }
+    }
+  })
+
+  registerCallHook(NTQQApiMethod.DELETE_ACTIVE_CHAT, async (payload) => {
+    const peerUid = payload[0] as string
+    log('激活的聊天窗口被删除，准备重新激活', peerUid)
+    let chatType = ChatType.friend
+    if (isNumeric(peerUid)) {
+      chatType = ChatType.group
+    }
+    else {
+      // 检查是否好友
+      if (!(await getFriend(peerUid))) {
+        chatType = ChatType.temp
+      }
+    }
+    const peer = { peerUid, chatType }
+    await sleep(1000)
+    NTQQMsgApi.activateChat(peer).then((r) => {
+      log('重新激活聊天窗口', peer, { result: r.result, errMsg: r.errMsg })
+    })
+  })
+
+}

src/ntqqapi/ntcall.ts

@@ -27,13 +27,17 @@ export enum NTQQApiMethod {
   HISTORY_MSG = 'nodeIKernelMsgService/getMsgsIncludeSelf',
   GET_MULTI_MSG = 'nodeIKernelMsgService/getMultiMsg',
   DELETE_ACTIVE_CHAT = 'nodeIKernelMsgService/deleteActiveChatByUid',
+  ENTER_OR_EXIT_AIO = 'nodeIKernelMsgService/enterOrExitAio',
 
   LIKE_FRIEND = 'nodeIKernelProfileLikeService/setBuddyProfileLike',
   SELF_INFO = 'fetchAuthData',
   FRIENDS = 'nodeIKernelBuddyService/getBuddyList',
+
   GROUPS = 'nodeIKernelGroupService/getGroupList',
   GROUP_MEMBER_SCENE = 'nodeIKernelGroupService/createMemberListScene',
   GROUP_MEMBERS = 'nodeIKernelGroupService/getNextMemberList',
+  GROUP_MEMBERS_INFO = 'nodeIKernelGroupService/getMemberInfo',
+
   USER_INFO = 'nodeIKernelProfileService/getUserSimpleInfo',
   USER_DETAIL_INFO = 'nodeIKernelProfileService/getUserDetailInfo',
   USER_DETAIL_INFO_WITH_BIZ_INFO = 'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
@@ -65,6 +69,10 @@ export enum NTQQApiMethod {
   PUBLISH_GROUP_BULLETIN = 'nodeIKernelGroupService/publishGroupBulletinBulletin',
   SET_GROUP_NAME = 'nodeIKernelGroupService/modifyGroupName',
   SET_GROUP_TITLE = 'nodeIKernelGroupService/modifyMemberSpecialTitle',
+  ACTIVATE_MEMBER_LIST_CHANGE = 'nodeIKernelGroupListener/onMemberListChange',
+  ACTIVATE_MEMBER_INFO_CHANGE = 'nodeIKernelGroupListener/onMemberInfoChange',
+  GET_MSG_BOX_INFO = 'nodeIKernelMsgService/getABatchOfContactMsgBoxInfo',
+  GET_GROUP_ALL_INFO = 'nodeIKernelGroupService/getGroupAllInfo',
 
   CACHE_SET_SILENCE = 'nodeIKernelStorageCleanService/setSilentScan',
   CACHE_ADD_SCANNED_PATH = 'nodeIKernelStorageCleanService/addCacheScanedPaths',
@@ -99,7 +107,7 @@ interface NTQQApiParams {
   channel?: NTQQApiChannel
   classNameIsRegister?: boolean
   args?: unknown[]
-  cbCmd?: ReceiveCmd | null
+  cbCmd?: ReceiveCmd | ReceiveCmd[] | null
   cmdCB?: (payload: any) => boolean
   afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
   timeoutSecond?: number
@@ -139,7 +147,8 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
         success = true
         resolve(r)
       }
-    } else {
+    }
+    else {
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
         const hookId = registerReceiveHook<ReturnType>(cbCmd, (payload) => {
@@ -150,7 +159,8 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
               success = true
               resolve(payload)
             }
-          } else {
+          }
+          else {
             removeReceiveHook(hookId)
             success = true
             resolve(payload)
@@ -162,7 +172,8 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
         log(`${methodName} callback`, result)
         if (result?.result == 0 || result === undefined) {
           afterFirstCmd && secondCallback()
-        } else {
+        }
+        else {
           success = true
           reject(`ntqq api call failed, ${result.errMsg}`)
         }
@@ -180,7 +191,8 @@ export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
       channel,
       {
         sender: {
-          send: (..._args: unknown[]) => {},
+          send: (..._args: unknown[]) => {
+          },
         },
       },
       { type: 'request', callbackId: uuid, eventName },

src/ntqqapi/types/notify.ts

@@ -1,6 +1,7 @@
 export enum GroupNotifyTypes {
   INVITE_ME = 1,
   INVITED_JOIN = 4, // 有人接受了邀请入群
+  JOIN_REQUEST_BY_INVITED = 5,  // 有人邀请了别人入群
   JOIN_REQUEST = 7,
   ADMIN_SET = 8,
   KICK_MEMBER = 9,

src/onebot11/action/index.ts

@@ -46,7 +46,7 @@ import GetFile from './file/GetFile'
 import { GoCQHTTGetForwardMsgAction } from './go-cqhttp/GetForwardMsg'
 import { GetCookies } from './user/GetCookie'
 import { SetMsgEmojiLike } from './msg/SetMsgEmojiLike'
-import { ForwardFriendSingleMsg, ForwardSingleGroupMsg } from './msg/ForwardSingleMsg'
+import { ForwardFriendSingleMsg, ForwardGroupSingleMsg } from './msg/ForwardSingleMsg'
 import { GetGroupEssence } from './group/GetGroupEssence'
 import { GetGroupHonorInfo } from './group/GetGroupHonorInfo'
 import { GoCQHTTHandleQuickOperation } from './go-cqhttp/QuickOperation'
@@ -91,7 +91,7 @@ export const actionHandlers = [
   new GetCookies(),
   new SetMsgEmojiLike(),
   new ForwardFriendSingleMsg(),
-  new ForwardSingleGroupMsg(),
+  new ForwardGroupSingleMsg(),
   //以下为go-cqhttp api
   new GetGroupEssence(),
   new GetGroupHonorInfo(),

src/onebot11/action/msg/ForwardSingleMsg.ts

@@ -43,6 +43,6 @@ export class ForwardFriendSingleMsg extends ForwardSingleMsg {
   actionName = ActionName.ForwardFriendSingleMsg
 }
 
-export class ForwardSingleGroupMsg extends ForwardSingleMsg {
+export class ForwardGroupSingleMsg extends ForwardSingleMsg {
   actionName = ActionName.ForwardGroupSingleMsg
 }

src/onebot11/action/msg/SendMsg.ts

@@ -327,7 +327,7 @@ export async function sendMsg(
     }
   }
   log('发送消息总大小', totalSize, 'bytes')
-  let timeout = ((totalSize / 1024 / 512) * 1000) + 5000  // 512kb/s
+  let timeout = ((totalSize / 1024 / 100) * 1000) + 5000  // 100kb/s
   log('设置消息超时时间', timeout)
   const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, timeout)
   log('消息发送结果', returnMsg)

src/onebot11/action/quick-operation.ts

@@ -10,6 +10,7 @@ import { ChatType, Group, GroupRequestOperateTypes } from '@/ntqqapi/types'
 import { getGroup, getUidByUin } from '@/common/data'
 import { convertMessage2List, createSendElements, sendMsg } from './msg/SendMsg'
 import { isNull, log } from '@/common/utils'
+import { getConfigUtil } from '@/common/config'
 
 
 interface QuickOperationPrivateMessage {
@@ -49,8 +50,8 @@ export async function handleQuickOperation(context: QuickOperationEvent, quickAc
     handleMsg(context as OB11Message, quickAction).then().catch(log)
   }
   if (context.post_type === 'request') {
-    const friendRequest = context as OB11FriendRequestEvent;
-    const groupRequest = context as OB11GroupRequestEvent;
+    const friendRequest = context as OB11FriendRequestEvent
+    const groupRequest = context as OB11GroupRequestEvent
     if ((friendRequest).request_type === 'friend') {
       handleFriendRequest(friendRequest, quickAction).then().catch(log)
     }
@@ -64,6 +65,7 @@ async function handleMsg(msg: OB11Message, quickAction: QuickOperationPrivateMes
   msg = msg as OB11Message
   const rawMessage = await dbUtil.getMsgByShortId(msg.message_id)
   const reply = quickAction.reply
+  const ob11Config = getConfigUtil().getConfig().ob11
   let peer: Peer = {
     chatType: ChatType.friend,
     peerUid: msg.user_id.toString(),
@@ -80,14 +82,15 @@ async function handleMsg(msg: OB11Message, quickAction: QuickOperationPrivateMes
   }
   if (reply) {
     let group: Group = null
-    let replyMessage: OB11MessageData[] = [
-      {
+    let replyMessage: OB11MessageData[] = []
+    if (ob11Config.enableQOAutoQuote) {
+      replyMessage.push({
         type: OB11MessageDataType.reply,
         data: {
           id: msg.message_id.toString(),
         },
-      }
-    ]
+      })
+    }
 
     if (msg.message_type == 'group') {
       group = await getGroup(msg.group_id.toString())

src/onebot11/action/user/GetCookie.ts

@@ -1,17 +1,16 @@
-import BaseAction from '../BaseAction'
-import { NTQQUserApi } from '../../../ntqqapi/api'
-import { groups } from '../../../common/data'
-import { ActionName } from '../types'
-
-interface Payload {
-  domain: string
-}
-
-export class GetCookies extends BaseAction<Payload, { cookies: string; bkn: string }> {
-  actionName = ActionName.GetCookies
-
-  protected async _handle(payload: Payload) {
-    const domain = payload.domain || 'qun.qq.com'
-    return NTQQUserApi.getCookies(domain);
-  }
-}
+import BaseAction from '../BaseAction'
+import { NTQQUserApi } from '@/ntqqapi/api'
+import { ActionName } from '../types'
+
+interface Payload {
+  domain: string
+}
+
+export class GetCookies extends BaseAction<Payload, { cookies: string; bkn: string }> {
+  actionName = ActionName.GetCookies
+
+  protected async _handle(payload: Payload) {
+    const domain = payload.domain || 'qun.qq.com'
+    return NTQQUserApi.getCookies(domain);
+  }
+}

src/onebot11/event/request/OB11GroupRequest.ts

@@ -5,6 +5,7 @@ export class OB11GroupRequestEvent extends OB11GroupNoticeEvent {
   post_type = EventType.REQUEST
   request_type: 'group' = 'group'
   sub_type: 'add' | 'invite' = 'add'
+  invitor_id: number | undefined = undefined
   comment: string
   flag: string
 }

src/renderer/index.ts

@@ -171,6 +171,11 @@ async function onSettingWindowCreated(view: Element) {
           `<div class="q-input" style="width:210px;"><input class="q-input__inner" data-config-key="musicSignUrl" type="text" value="${config.musicSignUrl}" placeholder="未设置" /></div>`,
           'config-musicSignUrl',
         ),
+        SettingItem(
+          '快速操作回复自动引用原消息',
+          null,
+          SettingSwitch('ob11.enableQOAutoQuote', config.ob11.enableQOAutoQuote, { 'control-display-id': 'config-ob11-enableQOAutoQuote' }),
+        ),
         SettingItem('', null, SettingButton('保存', 'config-ob11-save', 'primary')),
       ]),
       SettingList([

src/version.ts

@@ -1 +1 @@
-export const version = '3.26.1'
+export const version = '3.26.5'