chore: v3.27.2

Merge pull request #294 from cnxysoft/dev
修复戳一戳
2024-11-22 01:56:33 +00:00 · 2024-07-16 21:43:50 +08:00 · 2024-07-16 21:38:17 +08:00 · 2024-07-16 21:21:50 +08:00 · 2024-07-16 21:01:19 +08:00 · 2024-07-13 16:25:00 +08:00
43 changed files with 1307 additions and 821 deletions
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# LLOneBot API
+# LLOneBot

 LiteLoaderQQNT插件，使你的NTQQ支持OneBot11协议进行QQ机器人开发

--- a/manifest.json
+++ b/manifest.json
@@ -1,10 +1,10 @@
 {
  "manifest_version": 4,
  "type": "extension",
-  "name": "LLOneBot v3.24.4",
+  "name": "LLOneBot v3.27.2",
  "slug": "LLOneBot",
-  "description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发, 不支持商店在线更新",
-  "version": "3.24.4",
+  "description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发",
+  "version": "3.27.2",
  "icon": "./icon.jpg",
  "authors": [
    {
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
    "file-type": "^19.0.0",
    "fluent-ffmpeg": "^2.1.2",
    "level": "^8.0.1",
-    "silk-wasm": "^3.3.4",
+    "silk-wasm": "^3.6.0",
    "utf-8-validate": "^6.0.3",
    "uuid": "^9.0.1",
    "ws": "^8.16.0"
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -40,8 +40,10 @@ export class ConfigUtil {
      enableWsReverse: false,
      messagePostFormat: 'array',
      enableHttpHeart: false,
+      enableQOAutoQuote: false
    }
    let defaultConfig: Config = {
+      enableLLOB: true,
      ob11: ob11Default,
      heartInterval: 60000,
      token: '',
--- a/src/common/data.ts
+++ b/src/common/data.ts
@@ -1,4 +1,12 @@
-import { type Friend, type FriendRequest, type Group, type GroupMember, type SelfInfo } from '../ntqqapi/types'
+import {
+  CategoryFriend,
+  type Friend,
+  type FriendRequest,
+  type Group,
+  type GroupMember,
+  type SelfInfo,
+  User,
+} from '../ntqqapi/types'
 import { type FileCache, type LLOneBotError } from './types'
 import { NTQQGroupApi } from '../ntqqapi/api/group'
 import { log } from './utils/log'
@@ -14,8 +22,8 @@ export const selfInfo: SelfInfo = {
 }
 export const WebGroupData = {
  GroupData: new Map<string, Array<WebApiGroupMember>>(),
-  GroupTime: new Map<string, number>()
-};
+  GroupTime: new Map<string, number>(),
+}
 export let groups: Group[] = []
 export let friends: Friend[] = []
 export let friendRequests: Map<number, FriendRequest> = new Map<number, FriendRequest>()
@@ -53,7 +61,8 @@ export async function getGroup(qq: string): Promise<Group | undefined> {
      if (group) {
        groups.push(group)
      }
-    } catch (e) {}
+    } catch (e) {
+    }
  }
  return group
 }
@@ -111,3 +120,5 @@ export function getUidByUin(uin: string) {
 }

 export let tempGroupCodeMap: Record<string, string> = {} // peerUid => 群号
+
+export let rawFriends: CategoryFriend[] = []
--- a/src/common/types.ts
+++ b/src/common/types.ts
@@ -10,12 +10,14 @@ export interface OB11Config {
  enableWsReverse?: boolean
  messagePostFormat?: 'array' | 'string'
  enableHttpHeart?: boolean
+  enableQOAutoQuote: boolean  // 快速操作回复自动引用原消息
 }
 export interface CheckVersion {
  result: boolean
  version: string
 }
 export interface Config {
+  enableLLOB: boolean
  ob11: OB11Config
  token?: string
  heartInterval?: number // ms
@@ -45,5 +47,6 @@ export interface FileCache {
  fileUuid?: string
  url?: string
  msgId?: string
+  elementId: string
  downloadFunc?: () => Promise<void>
 }
--- a/src/common/utils/QQBasicInfo.ts
+++ b/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'
--- a/src/common/utils/audio.ts
+++ b/src/common/utils/audio.ts
@@ -1,9 +1,9 @@
 import fs from 'fs'
-import { encode, getDuration, getWavFileInfo, isWav } from 'silk-wasm'
 import fsPromise from 'fs/promises'
+import { decode, encode, getDuration, getWavFileInfo, isWav, isSilk } from 'silk-wasm'
 import { log } from './log'
 import path from 'node:path'
-import { DATA_DIR, TEMP_DIR } from './index'
+import { TEMP_DIR } from './index'
 import { v4 as uuidv4 } from 'uuid'
 import { getConfigUtil } from '../config'
 import { spawn } from 'node:child_process'
@@ -60,10 +60,11 @@ export async function encodeSilk(filePath: string) {
  // }

  try {
+    const file = await fsPromise.readFile(filePath)
    const pttPath = path.join(TEMP_DIR, uuidv4())
-    if (getFileHeader(filePath) !== '02232153494c4b') {
+    if (!isSilk(file)) {
      log(`语音文件${filePath}需要转换成silk`)
-      const _isWav = await isWavFile(filePath)
+      const _isWav = isWav(file)
      const pcmPath = pttPath + '.pcm'
      let sampleRate = 0
      const convert = () => {
@@ -79,7 +80,8 @@ export async function encodeSilk(filePath: string) {
            if (code == null || EXIT_CODES.includes(code)) {
              sampleRate = 24000
              const data = fs.readFileSync(pcmPath)
-              fs.unlink(pcmPath, (err) => {})
+              fs.unlink(pcmPath, (err) => {
+              })
              return resolve(data)
            }
            log(`FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`)
@@ -91,7 +93,7 @@ export async function encodeSilk(filePath: string) {
      if (!_isWav) {
        input = await convert()
      } else {
-        input = fs.readFileSync(filePath)
+        input = file
        const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000]
        const { fmt } = getWavFileInfo(input)
        // log(`wav文件信息`, fmt)
@@ -108,7 +110,7 @@ export async function encodeSilk(filePath: string) {
        duration: silk.duration / 1000,
      }
    } else {
-      const silk = fs.readFileSync(filePath)
+      const silk = file
      let duration = 0
      try {
        duration = getDuration(silk) / 1000
@@ -128,3 +130,41 @@ export async function encodeSilk(filePath: string) {
    return {}
  }
 }
+
+export async function decodeSilk(inputFilePath: string, outFormat: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac' = 'mp3') {
+  const silkArrayBuffer = await fsPromise.readFile(inputFilePath)
+  const data = (await decode(silkArrayBuffer, 24000)).data
+  const fileName = path.join(TEMP_DIR, path.basename(inputFilePath))
+  const outPCMPath = fileName + '.pcm'
+  const outFilePath = fileName + '.' + outFormat
+  await fsPromise.writeFile(outPCMPath, data)
+  const convert = () => {
+    return new Promise<string>((resolve, reject) => {
+      const ffmpegPath = getConfigUtil().getConfig().ffmpeg || process.env.FFMPEG_PATH || 'ffmpeg'
+      const cp = spawn(ffmpegPath, [
+        '-y',
+        '-f', 's16le',  // PCM format
+        '-ar', '24000', // Sample rate
+        '-ac', '1',     // Number of audio channels
+        '-i', outPCMPath,
+        outFilePath,
+      ])
+      cp.on('error', (err) => {
+        log(`FFmpeg处理转换出错: `, err.message)
+        return reject(err)
+      })
+      cp.on('exit', (code, signal) => {
+        const EXIT_CODES = [0, 255]
+        if (code == null || EXIT_CODES.includes(code)) {
+          fs.unlink(outPCMPath, (err) => {
+          })
+          return resolve(outFilePath)
+        }
+        const exitErr = `FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`
+        log(exitErr)
+        reject(Error(`FFmpeg处理转换失败,${exitErr}`))
+      })
+    })
+  }
+  return convert()
+}
--- a/src/common/utils/request.ts
+++ b/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>());
+  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 {
-          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值
+              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);
      });
    });
  }
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -13,7 +13,7 @@ import {
  CHANNEL_UPDATE,
 } from '../common/channels'
 import { ob11WebsocketServer } from '../onebot11/server/ws/WebsocketServer'
-import { DATA_DIR } from '../common/utils'
+import { DATA_DIR, qqPkgInfo } from '../common/utils'
 import {
  friendRequests,
  getFriend,
@@ -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,
@@ -38,7 +38,7 @@ import {
 import { httpHeart, ob11HTTPServer } from '../onebot11/server/http'
 import { OB11FriendRecallNoticeEvent } from '../onebot11/event/notice/OB11FriendRecallNoticeEvent'
 import { OB11GroupRecallNoticeEvent } from '../onebot11/event/notice/OB11GroupRecallNoticeEvent'
-import { postOB11Event } from '../onebot11/server/postOB11Event'
+import { postOb11Event } from '../onebot11/server/post-ob11-event'
 import { ob11ReverseWebsockets } from '../onebot11/server/ws/ReverseWebsocket'
 import { OB11GroupAdminNoticeEvent } from '../onebot11/event/notice/OB11GroupAdminNoticeEvent'
 import { OB11GroupRequestEvent } from '../onebot11/event/request/OB11GroupRequest'
@@ -56,6 +56,7 @@ import { getConfigUtil } from '../common/config'
 import { checkFfmpeg } from '../common/utils/video'
 import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '../onebot11/event/notice/OB11GroupDecreaseEvent'
 import '../ntqqapi/native/wrapper'
+import { sentMessages } from '@/ntqqapi/api'

 let running = false

@@ -142,7 +143,8 @@ function onLoad() {
            .catch((e) => {
              log('保存设置失败', e.stack)
            })
-        } else {
+        }
+        else {
        }
      })
      .catch((err) => {
@@ -169,13 +171,9 @@ function onLoad() {

      OB11Constructor.message(message)
        .then((msg) => {
-          if (debug) {
-            msg.raw = message
-          } else {
-            if (msg.message.length === 0) {
+          if (!debug && msg.message.length === 0) {
            return
          }
-          }
          const isSelfMsg = msg.user_id.toString() == selfInfo.uin
          if (isSelfMsg && !reportSelfMessage) {
            return
@@ -183,39 +181,47 @@ function onLoad() {
          if (isSelfMsg) {
            msg.target_id = parseInt(message.peerUin)
          }
-          postOB11Event(msg)
+          postOb11Event(msg)
          // log("post msg", msg)
        })
        .catch((e) => log('constructMessage error: ', e.stack.toString()))
      OB11Constructor.GroupEvent(message).then((groupEvent) => {
        if (groupEvent) {
          // log("post group event", groupEvent);
-          postOB11Event(groupEvent)
+          postOb11Event(groupEvent)
        }
      })
-      OB11Constructor.FriendAddEvent(message).then((friendAddEvent) => {
-        if (friendAddEvent) {
-          // log("post friend add event", friendAddEvent);
-          postOB11Event(friendAddEvent)
+      OB11Constructor.PrivateEvent(message).then((privateEvent) => {
+        log(message)
+        if (privateEvent) {
+          // log("post private event", privateEvent);
+          postOb11Event(privateEvent)
        }
      })
    }
  }

  async function startReceiveHook() {
+    startHook().then()
    if (getConfigUtil().getConfig().enablePoke) {
+      if ( qqPkgInfo.buildVersion > '23873'){
+        log(`当前版本${qqPkgInfo.buildVersion}不支持发送戳一戳模块`)
+      }
+      else {
        crychic.loadNode()
        crychic.registerPokeHandler((id, isGroup) => {
          log(`收到戳一戳消息了！是否群聊：${isGroup}，id:${id}`)
          let pokeEvent: OB11FriendPokeEvent | OB11GroupPokeEvent
          if (isGroup) {
            pokeEvent = new OB11GroupPokeEvent(parseInt(id))
-        } else {
+          }
+          else {
            pokeEvent = new OB11FriendPokeEvent(parseInt(id))
          }
-        postOB11Event(pokeEvent)
+          postOb11Event(pokeEvent)
        })
      }
+    }
    registerReceiveHook<{
      msgList: Array<RawMessage>
    }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], async (payload) => {
@@ -228,6 +234,10 @@ function onLoad() {
    const recallMsgIds: string[] = [] // 避免重复上报
    registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.UPDATE_MSG], async (payload) => {
      for (const message of payload.msgList) {
+        const sentMessage = sentMessages[message.msgId]
+        if (sentMessage){
+          Object.assign(sentMessage, message)
+        }
        log('message update', message.msgId, message)
        if (message.recallTime != '0') {
          if (recallMsgIds.includes(message.msgId)) {
@@ -244,7 +254,7 @@ function onLoad() {
          OB11Constructor.RecallEvent(message).then((recallEvent) => {
            if (recallEvent) {
              log('post recall event', recallEvent)
-              postOB11Event(recallEvent)
+              postOb11Event(recallEvent)
            }
          })
          // 不让入库覆盖原来消息，不然就获取不到撤回的消息内容了
@@ -322,11 +332,13 @@ function onLoad() {
                  ? 'unset'
                  : 'set'
                // member1.role = notify.type == GroupNotifyTypes.ADMIN_SET ? GroupMemberRole.admin : GroupMemberRole.normal;
-                postOB11Event(groupAdminNoticeEvent, true)
-              } else {
+                postOb11Event(groupAdminNoticeEvent, true)
+              }
+              else {
                log('获取群通知的成员信息失败', notify, getGroup(notify.group.groupCode))
              }
-            } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT || notify.type == GroupNotifyTypes.KICK_MEMBER) {
+            }
+            else if (notify.type == GroupNotifyTypes.MEMBER_EXIT || notify.type == GroupNotifyTypes.KICK_MEMBER) {
              log('有成员退出通知', notify)
              try {
                const member1 = await NTQQUserApi.getUserDetailInfo(notify.user1.uid)
@@ -344,43 +356,62 @@ function onLoad() {
                  parseInt(operatorId),
                  subType,
                )
-                postOB11Event(groupDecreaseEvent, true)
+                postOb11Event(groupDecreaseEvent, true)
              } catch (e) {
                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 = ''
+              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
-              postOB11Event(groupRequestEvent)
-            } else if (notify.type == GroupNotifyTypes.INVITE_ME) {
+              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)
+              postOb11Event(groupInviteEvent)
            }
          } catch (e) {
            log('解析群通知失败', e.stack.toString())
          }
        }
-      } else if (payload.doubt) {
+      }
+      else if (payload.doubt) {
        // 可能有群管理员变动
      }
    })
@@ -400,7 +431,7 @@ function onLoad() {
          }
          friendRequestEvent.flag = flag
          friendRequestEvent.comment = req.extWords
-          postOB11Event(friendRequestEvent)
+          postOb11Event(friendRequestEvent)
        }
      }
    })
@@ -410,6 +441,11 @@ function onLoad() {

  async function start() {
    log('llonebot pid', process.pid)
+    const config = getConfigUtil().getConfig()
+    if (!config.enableLLOB){
+      log('LLOneBot 开关设置为关闭，不启动LLOneBot')
+      return
+    }
    llonebotError.otherError = ''
    startTime = Date.now()
    dbUtil.getReceivedTempUinMap().then((m) => {
@@ -417,9 +453,33 @@ function onLoad() {
        uidMaps[value] = key
      }
    })
+    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()
-    NTQQGroupApi.getGroups(true).then()
-    const config = getConfigUtil().getConfig()
+    }
+
+
    if (config.ob11.enableHttp) {
      ob11HTTPServer.start(config.ob11.httpPort)
    }
@@ -473,7 +533,8 @@ function onLoad() {

      getUserNick().then()
      start().then()
-    } else {
+    }
+    else {
      setTimeout(init, 1000)
    }
  }
--- a/src/ntqqapi/api/file.ts
+++ b/src/ntqqapi/api/file.ts
@@ -10,15 +10,23 @@ import {
  ElementType,
  IMAGE_HTTP_HOST,
  IMAGE_HTTP_HOST_NT, PicElement,
-  RawMessage,
 } from '../types'
 import path from 'path'
 import fs from 'fs'
 import { ReceiveCmdS } from '../hook'
 import { log } from '@/common/utils'
 import { rkeyManager } from '@/ntqqapi/api/rkey'
+import { wrapperApi } from '@/ntqqapi/native/wrapper'
+import { Peer } from '@/ntqqapi/api/msg'

 export class NTQQFileApi {
+  static async getVideoUrl(peer: Peer, msgId: string, elementId: string): Promise<string> {
+    return (await wrapperApi.NodeIQQNTWrapperSession.getRichMediaService().getVideoPlayUrlV2(peer,
+      msgId,
+      elementId,
+      0,
+      { downSourceType: 1, triggerType: 1 })).urlResult?.domainUrl[0]?.url;
+  }
  static async getFileType(filePath: string) {
    return await callNTQQApi<{ ext: string }>({
      className: NTQQApiClass.FS_API,
--- a/src/ntqqapi/api/group.ts
+++ b/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 getGroups(forced = false) {
-    let cbCmd = ReceiveCmdS.GROUPS
-    if (process.platform != 'win32') {
-      cbCmd = ReceiveCmdS.GROUPS_STORE
+
+  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
+    // }
    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>({
--- a/src/ntqqapi/api/msg.ts
+++ b/src/ntqqapi/api/msg.ts
@@ -7,7 +7,9 @@ import { log } from '../../common/utils/log'
 import { sleep } from '../../common/utils/helper'
 import { isQQ998 } from '../../common/utils'

-export let sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {} // peerUid: callbackFunnc
+export let sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {} // peerUid: callbackFunc
+
+export let sentMessages: Record<string, RawMessage> = {}  // msgId: RawMessage

 export interface Peer {
  chatType: ChatType
@@ -15,7 +17,78 @@ export interface Peer {
  guildId?: ''
 }

+async function sendWaiter(peer: Peer, waitComplete = true, timeout: number = 10000) {
+  // 等待上一个相同的peer发送完
+  const peerUid = peer.peerUid
+  let checkLastSendUsingTime = 0
+  const waitLastSend = async () => {
+    if (checkLastSendUsingTime > timeout) {
+      throw '发送超时'
+    }
+    let lastSending = sendMessagePool[peer.peerUid]
+    if (lastSending) {
+      // log("有正在发送的消息，等待中...")
+      await sleep(500)
+      checkLastSendUsingTime += 500
+      return await waitLastSend()
+    }
+    else {
+      return
+    }
+  }
+  await waitLastSend()
+
+  let sentMessage: RawMessage = null
+  sendMessagePool[peerUid] = async (rawMessage: RawMessage) => {
+    delete sendMessagePool[peerUid]
+    sentMessage = rawMessage
+    sentMessages[rawMessage.msgId] = rawMessage
+  }
+
+  let checkSendCompleteUsingTime = 0
+  const checkSendComplete = async (): Promise<RawMessage> => {
+    if (sentMessage) {
+      if (waitComplete) {
+        if (sentMessage.sendStatus == 2) {
+          delete sentMessages[sentMessage.msgId]
+          return sentMessage
+        }
+      }
+      else {
+        delete sentMessages[sentMessage.msgId]
+        return sentMessage
+      }
+      // log(`给${peerUid}发送消息成功`)
+    }
+    checkSendCompleteUsingTime += 500
+    if (checkSendCompleteUsingTime > timeout) {
+      throw '发送超时'
+    }
+    await sleep(500)
+    return await 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
@@ -35,6 +108,7 @@ export class NTQQMsgApi {
      ],
    })
  }
+
  static async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
    return await callNTQQApi<GeneralCallResult & { msgList: RawMessage[] }>({
      methodName: NTQQApiMethod.GET_MULTI_MSG,
@@ -49,6 +123,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);
@@ -57,6 +145,7 @@ export class NTQQMsgApi {
      args: [{ peer, cnt: 20 }, null],
    })
  }
+
  static async activateChatAndGetHistory(peer: Peer) {
    // await this.fetchRecentContact();
    // await sleep(500);
@@ -66,6 +155,7 @@ export class NTQQMsgApi {
      args: [{ peer, cnt: 20 }, null],
    })
  }
+
  static async getMsgHistory(peer: Peer, msgId: string, count: number) {
    // 消息时间从旧到新
    return await callNTQQApi<GeneralCallResult & { msgList: RawMessage[] }>({
@@ -81,6 +171,7 @@ export class NTQQMsgApi {
      ],
    })
  }
+
  static async fetchRecentContact() {
    await callNTQQApi({
      methodName: NTQQApiMethod.RECENT_CONTACT,
@@ -116,52 +207,7 @@ export class NTQQMsgApi {
  }

  static async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
-    const peerUid = peer.peerUid
-
-    // 等待上一个相同的peer发送完
-    let checkLastSendUsingTime = 0
-    const waitLastSend = async () => {
-      if (checkLastSendUsingTime > timeout) {
-        throw '发送超时'
-      }
-      let lastSending = sendMessagePool[peer.peerUid]
-      if (lastSending) {
-        // log("有正在发送的消息，等待中...")
-        await sleep(500)
-        checkLastSendUsingTime += 500
-        return await waitLastSend()
-      } else {
-        return
-      }
-    }
-    await waitLastSend()
-
-    let sentMessage: RawMessage = null
-    sendMessagePool[peerUid] = async (rawMessage: RawMessage) => {
-      delete sendMessagePool[peerUid]
-      sentMessage = rawMessage
-    }
-
-    let checkSendCompleteUsingTime = 0
-    const checkSendComplete = async (): Promise<RawMessage> => {
-      if (sentMessage) {
-        if (waitComplete) {
-          if ((await dbUtil.getMsgByLongId(sentMessage.msgId)).sendStatus == 2) {
-            return sentMessage
-          }
-        } else {
-          return sentMessage
-        }
-        // log(`给${peerUid}发送消息成功`)
-      }
-      checkSendCompleteUsingTime += 500
-      if (checkSendCompleteUsingTime > timeout) {
-        throw '发送超时'
-      }
-      await sleep(500)
-      return await checkSendComplete()
-    }
-
+    const waiter = sendWaiter(peer, waitComplete, timeout)
    callNTQQApi({
      methodName: NTQQApiMethod.SEND_MSG,
      args: [
@@ -174,11 +220,12 @@ export class NTQQMsgApi {
        null,
      ],
    }).then()
-    return await checkSendComplete()
+    return await waiter
  }

  static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-    return await callNTQQApi<GeneralCallResult>({
+    const waiter = sendWaiter(destPeer, true, 10000)
+    callNTQQApi<GeneralCallResult>({
      methodName: NTQQApiMethod.FORWARD_MSG,
      args: [
        {
@@ -190,7 +237,8 @@ export class NTQQMsgApi {
        },
        null,
      ],
-    })
+    }).then().catch(log)
+    return await waiter
  }

  static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
--- a/src/ntqqapi/api/user.ts
+++ b/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,31 +117,17 @@ 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);
    if (!pskey || !skey) {
--- a/src/ntqqapi/constructor.ts
+++ b/src/ntqqapi/constructor.ts
@@ -76,6 +76,10 @@ export class SendMsgElementConstructor {
    if (fileSize === 0) {
      throw '文件异常，大小为0'
    }
+    const maxMB = 30;
+    if (fileSize > 1024 * 1024 * 30){
+      throw `图片过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`
+    }
    const imageSize = await NTQQFileApi.getImageSize(picPath)
    const picElement = {
      md5HexStr: md5,
@@ -131,6 +135,10 @@ export class SendMsgElementConstructor {
    if (fileSize === 0) {
      throw '文件异常，大小为0'
    }
+    const maxMB = 100;
+    if (fileSize > 1024 * 1024 * maxMB) {
+      throw `视频过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`
+    }
    const pathLib = require('path')
    let thumbDir = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`)
    thumbDir = pathLib.dirname(thumbDir)
--- a/src/ntqqapi/hook.ts
+++ b/src/ntqqapi/hook.ts
@@ -1,27 +1,28 @@
 import { BrowserWindow } from 'electron'
 import { NTQQApiClass, NTQQApiMethod } from './ntcall'
 import { NTQQMsgApi, sendMessagePool } from './api/msg'
-import { ChatType, Group, GroupMember, GroupMemberRole, RawMessage, User } from './types'
+import { CategoryFriend, ChatType, Group, GroupMember, GroupMemberRole, RawMessage, User } from './types'
 import {
  deleteGroup,
  friends,
  getFriend,
  getGroupMember,
-  groups,
+  groups, rawFriends,
  selfInfo,
  tempGroupCodeMap,
  uidMaps,
-} from '../common/data'
+} from '@/common/data'
 import { OB11GroupDecreaseEvent } from '../onebot11/event/notice/OB11GroupDecreaseEvent'
 import { v4 as uuidv4 } from 'uuid'
-import { postOB11Event } from '../onebot11/server/postOB11Event'
-import { getConfigUtil, HOOK_LOG } from '../common/config'
+import { postOb11Event } from '../onebot11/server/post-ob11-event'
+import { getConfigUtil, HOOK_LOG } from '@/common/config'
 import fs from 'fs'
-import { dbUtil } from '../common/db'
+import { dbUtil } from '@/common/db'
 import { NTQQGroupApi } from './api/group'
-import { log } from '../common/utils/log'
-import { isNumeric, sleep } from '../common/utils/helper'
+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> = {}

@@ -299,7 +300,7 @@ async function processGroupEvent(payload: { groupList: Group[] }) {
          }
          for (const member of oldMembers) {
            if (!newMembersSet.has(member.uin) && member.uin != selfInfo.uin) {
-              postOB11Event(
+              postOb11Event(
                new OB11GroupDecreaseEvent(
                  parseInt(group.groupCode),
                  parseInt(member.uin),
@@ -324,13 +325,16 @@ async function processGroupEvent(payload: { groupList: Group[] }) {
  }
 }

+export async function startHook() {
+
 // 群列表变动
  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 {
+    }
+    else {
      if (process.platform == 'win32') {
        processGroupEvent(payload).then()
      }
@@ -341,7 +345,8 @@ registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROU
    // log("群列表变动", payload.updateType, payload.groupList)
    if (payload.updateType != 2) {
      updateGroups(payload.groupList).then()
-  } else {
+    }
+    else {
      if (process.platform != 'win32') {
        processGroupEvent(payload).then()
      }
@@ -359,6 +364,12 @@ registerReceiveHook<{
    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)
      }
    }
@@ -380,8 +391,10 @@ registerReceiveHook<{

 // 好友列表变动
  registerReceiveHook<{
-  data: { categoryId: number; categroyName: string; categroyMbCount: number; buddyList: User[] }[]
+    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) {
@@ -389,7 +402,8 @@ registerReceiveHook<{
        let existFriend = friends.find((f) => f.uin == friend.uin)
        if (!existFriend) {
          friends.push(friend)
-      } else {
+        }
+        else {
          Object.assign(existFriend, friend)
        }
      }
@@ -497,11 +511,12 @@ registerReceiveHook<{
              let lastTempMsg = msgList.pop()
              log('激活窗口之前的第一条临时会话消息:', lastTempMsg)
              if (Date.now() / 1000 - parseInt(lastTempMsg.msgTime) < 5) {
-              OB11Constructor.message(lastTempMsg).then((r) => postOB11Event(r))
+                OB11Constructor.message(lastTempMsg).then((r) => postOb11Event(r))
              }
            })
          })
-      } else {
+        }
+        else {
          NTQQMsgApi.activateChat(peer).then()
        }
      }
@@ -514,7 +529,8 @@ registerCallHook(NTQQApiMethod.DELETE_ACTIVE_CHAT, async (payload) => {
    let chatType = ChatType.friend
    if (isNumeric(peerUid)) {
      chatType = ChatType.group
-  } else {
+    }
+    else {
      // 检查是否好友
      if (!(await getFriend(peerUid))) {
        chatType = ChatType.temp
@@ -526,3 +542,5 @@ registerCallHook(NTQQApiMethod.DELETE_ACTIVE_CHAT, async (payload) => {
      log('重新激活聊天窗口', peer, { result: r.result, errMsg: r.errMsg })
    })
  })
+
+}
--- a/src/ntqqapi/ntcall.ts
+++ b/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 },
--- a/src/ntqqapi/types/msg.ts
+++ b/src/ntqqapi/types/msg.ts
@@ -188,6 +188,7 @@ export const IMAGE_HTTP_HOST = 'https://gchat.qpic.cn'
 export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn'

 export interface PicElement {
+  picSubType: PicSubType
  picType: PicType  // 有这玩意儿吗
  originImageUrl: string // http url, 没有host，host是https://gchat.qpic.cn/, 带download参数的是https://multimedia.nt.qq.com.cn
  originImageMd5?: string
@@ -226,6 +227,7 @@ export interface GrayTipElement {
    content: string
  }
  jsonGrayTipElement: {
+    busiId: number
    jsonStr: string
  }
 }
--- a/src/ntqqapi/types/notify.ts
+++ b/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,
--- a/src/ntqqapi/types/user.ts
+++ b/src/ntqqapi/types/user.ts
@@ -10,6 +10,7 @@ export interface QQLevel {
  moonNum: number
  starNum: number
 }
+
 export interface User {
  uid: string // 加密的字符串
  uin: string // QQ号
@@ -72,4 +73,12 @@ export interface SelfInfo extends User {
  online?: boolean
 }

-export interface Friend extends User {}
+export interface Friend extends User {
+}
+
+export interface CategoryFriend {
+  categoryId: number;
+  categroyName: string;
+  categroyMbCount: number;
+  buddyList: User[]
+}
--- a/src/onebot11/action/file/GetFile.ts
+++ b/src/onebot11/action/file/GetFile.ts
@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction'
 import fs from 'fs/promises'
 import { dbUtil } from '@/common/db'
 import { getConfigUtil } from '@/common/config'
-import { log, sleep, uri2local } from '@/common/utils'
+import { checkFileReceived, log, sleep, uri2local } from '@/common/utils'
 import { NTQQFileApi } from '@/ntqqapi/api'
 import { ActionName } from '../types'
 import { FileElement, RawMessage, VideoElement } from '@/ntqqapi/types'
@@ -21,13 +21,12 @@ export interface GetFileResponse {
 }

 export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
-  private getElement(msg: RawMessage): { id: string; element: VideoElement | FileElement } {
-    let element = msg.elements.find((e) => e.fileElement)
+  private getElement(msg: RawMessage, elementId: string): VideoElement | FileElement {
+    let element = msg.elements.find((e) => e.elementId === elementId)
    if (!element) {
-      element = msg.elements.find((e) => e.videoElement)
-      return { id: element.elementId, element: element.videoElement }
+      throw new Error('element not found')
    }
-    return { id: element.elementId, element: element.fileElement }
+    return element.fileElement
  }
  private async download(cache: FileCache, file: string) {
    log('需要调用 NTQQ 下载文件api')
@@ -35,24 +34,25 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
      let msg = await dbUtil.getMsgByLongId(cache.msgId)
      if (msg) {
        log('找到了文件 msg', msg)
-        let element = this.getElement(msg)
+        let element = this.getElement(msg, cache.elementId)
        log('找到了文件 element', element)
        // 构建下载函数
-        await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid, element.id, '', '', true)
-        await sleep(1000)
+        await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid, cache.elementId, '', '', true)
+        // 等待文件下载完成
        msg = await dbUtil.getMsgByLongId(cache.msgId)
        log('下载完成后的msg', msg)
-        cache.filePath = this.getElement(msg).element.filePath
+        cache.filePath = this.getElement(msg, cache.elementId).filePath
+        await checkFileReceived(cache.filePath, 10 * 1000)
        dbUtil.addFileCache(file, cache).then()
      }
    }
  }
  protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
-    const cache = await dbUtil.getFileCache(payload.file)
-    const { autoDeleteFile, enableLocalFile2Url, autoDeleteFileSecond } = getConfigUtil().getConfig()
+    let cache = await dbUtil.getFileCache(payload.file)
    if (!cache) {
      throw new Error('file not found')
    }
+    const { autoDeleteFile, enableLocalFile2Url, autoDeleteFileSecond } = getConfigUtil().getConfig()
    if (cache.downloadFunc) {
      await cache.downloadFunc()
    }
--- a/src/onebot11/action/file/GetRecord.ts
+++ b/src/onebot11/action/file/GetRecord.ts
@@ -1,5 +1,9 @@
 import { GetFileBase, GetFilePayload, GetFileResponse } from './GetFile'
 import { ActionName } from '../types'
+import {decodeSilk} from "@/common/utils/audio";
+import { getConfigUtil } from '@/common/config'
+import path from 'node:path'
+import fs from 'node:fs'

 interface Payload extends GetFilePayload {
  out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
@@ -9,7 +13,13 @@ export default class GetRecord extends GetFileBase {
  actionName = ActionName.GetRecord

  protected async _handle(payload: Payload): Promise<GetFileResponse> {
-    let res = super._handle(payload)
+    let res = await super._handle(payload)
+    res.file = await decodeSilk(res.file, payload.out_format)
+    res.file_name = path.basename(res.file)
+    res.file_size = fs.statSync(res.file).size.toString()
+    if (getConfigUtil().getConfig().enableLocalFile2Url){
+      res.base64 = fs.readFileSync(res.file, 'base64')
+    }
    return res
  }
 }
--- a/src/onebot11/action/go-cqhttp/GetForwardMsg.ts
+++ b/src/onebot11/action/go-cqhttp/GetForwardMsg.ts
@@ -6,7 +6,8 @@ import { OB11Constructor } from '../../constructor'
 import { ActionName } from '../types'

 interface Payload {
-  message_id: string // long msg id
+  message_id: string // long msg id，gocq
+  id?: string // long msg id, onebot11
 }

 interface Response {
@@ -16,7 +17,11 @@ interface Response {
 export class GoCQHTTGetForwardMsgAction extends BaseAction<Payload, any> {
  actionName = ActionName.GoCQHTTP_GetForwardMsg
  protected async _handle(payload: Payload): Promise<any> {
-    const rootMsg = await dbUtil.getMsgByLongId(payload.message_id)
+    const message_id = payload.id || payload.message_id
+    if (!message_id) {
+      throw Error('message_id不能为空')
+    }
+    const rootMsg = await dbUtil.getMsgByLongId(message_id)
    if (!rootMsg) {
      throw Error('msg not found')
    }
--- a/src/onebot11/action/go-cqhttp/QuickOperation.ts
+++ b/src/onebot11/action/go-cqhttp/QuickOperation.ts
@@ -0,0 +1,17 @@
+import BaseAction from '../BaseAction'
+import { handleQuickOperation, QuickOperation, QuickOperationEvent } from '../quick-operation'
+import { log } from '@/common/utils'
+import { ActionName } from '../types'
+
+interface Payload{
+  context: QuickOperationEvent,
+  operation: QuickOperation
+}
+
+export class GoCQHTTHandleQuickOperation extends BaseAction<Payload, null>{
+  actionName = ActionName.GoCQHTTP_HandleQuickOperation
+  protected async _handle(payload: Payload): Promise<null> {
+    handleQuickOperation(payload.context, payload.operation).then().catch(log);
+    return null
+  }
+}
--- a/src/onebot11/action/index.ts
+++ b/src/onebot11/action/index.ts
@@ -1,6 +1,6 @@
 import GetMsg from './msg/GetMsg'
 import GetLoginInfo from './system/GetLoginInfo'
-import GetFriendList from './user/GetFriendList'
+import { GetFriendList, GetFriendWithCategory} from './user/GetFriendList'
 import GetGroupList from './group/GetGroupList'
 import GetGroupInfo from './group/GetGroupInfo'
 import GetGroupMemberList from './group/GetGroupMemberList'
@@ -46,9 +46,10 @@ 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'

 export const actionHandlers = [
  new GetFile(),
@@ -57,6 +58,7 @@ export const actionHandlers = [
  new SetConfigAction(),
  new GetGroupAddRequest(),
  new SetQQAvatar(),
+  new GetFriendWithCategory(),
  // onebot11
  new SendLike(),
  new GetMsg(),
@@ -89,7 +91,7 @@ export const actionHandlers = [
  new GetCookies(),
  new SetMsgEmojiLike(),
  new ForwardFriendSingleMsg(),
-  new ForwardSingleGroupMsg(),
+  new ForwardGroupSingleMsg(),
  //以下为go-cqhttp api
  new GetGroupEssence(),
  new GetGroupHonorInfo(),
@@ -104,6 +106,7 @@ export const actionHandlers = [
  new GoCQHTTPUploadPrivateFile(),
  new GoCQHTTPGetGroupMsgHistory(),
  new GoCQHTTGetForwardMsgAction(),
+  new GoCQHTTHandleQuickOperation()
 ]

 function initActionMap() {
--- a/src/onebot11/action/msg/ForwardSingleMsg.ts
+++ b/src/onebot11/action/msg/ForwardSingleMsg.ts
@@ -11,7 +11,11 @@ interface Payload {
  user_id?: number
 }

-class ForwardSingleMsg extends BaseAction<Payload, null> {
+interface Response {
+  message_id: number
+}
+
+class ForwardSingleMsg extends BaseAction<Payload, Response> {
  protected async getTargetPeer(payload: Payload): Promise<Peer> {
    if (payload.user_id) {
      return { chatType: ChatType.friend, peerUid: getUidByUin(payload.user_id.toString()) }
@@ -19,10 +23,10 @@ class ForwardSingleMsg extends BaseAction<Payload, null> {
    return { chatType: ChatType.group, peerUid: payload.group_id.toString() }
  }

-  protected async _handle(payload: Payload): Promise<null> {
+  protected async _handle(payload: Payload): Promise<Response> {
    const msg = await dbUtil.getMsgByShortId(payload.message_id)
    const peer = await this.getTargetPeer(payload)
-    await NTQQMsgApi.forwardMsg(
+    const sentMsg = await NTQQMsgApi.forwardMsg(
      {
        chatType: msg.chatType,
        peerUid: msg.peerUid,
@@ -30,7 +34,8 @@ class ForwardSingleMsg extends BaseAction<Payload, null> {
      peer,
      [msg.msgId],
    )
-    return null
+    const ob11MsgId = await dbUtil.addMsg(sentMsg)
+    return {message_id: ob11MsgId}
  }
 }

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

-export class ForwardSingleGroupMsg extends ForwardSingleMsg {
+export class ForwardGroupSingleMsg extends ForwardSingleMsg {
  actionName = ActionName.ForwardGroupSingleMsg
 }
--- a/src/onebot11/action/msg/SendMsg.ts
+++ b/src/onebot11/action/msg/SendMsg.ts
@@ -50,22 +50,28 @@ function checkSendMessage(sendMsgList: OB11MessageData[]) {
      let data = msg['data']
      if (type === 'text' && !data['text']) {
        return 400
-      } else if (['image', 'voice', 'record'].includes(type)) {
+      }
+      else if (['image', 'voice', 'record'].includes(type)) {
        if (!data['file']) {
          return 400
-        } else {
+        }
+        else {
          if (checkUri(data['file'])) {
            return 200
-          } else {
+          }
+          else {
            return 400
          }
        }
-      } else if (type === 'at' && !data['qq']) {
-        return 400
-      } else if (type === 'reply' && !data['id']) {
+      }
+      else if (type === 'at' && !data['qq']) {
        return 400
      }
-    } else {
+      else if (type === 'reply' && !data['id']) {
+        return 400
+      }
+    }
+    else {
      return 400
    }
  }
@@ -87,10 +93,12 @@ export function convertMessage2List(message: OB11MessageMixType, autoEscape = fa
          },
        },
      ]
-    } else {
+    }
+    else {
      message = decodeCQCode(message.toString())
    }
-  } else if (!Array.isArray(message)) {
+  }
+  else if (!Array.isArray(message)) {
    message = [message]
  }
  return message
@@ -108,16 +116,14 @@ export async function createSendElements(
      continue
    }
    switch (sendMsg.type) {
-      case OB11MessageDataType.text:
-        {
+      case OB11MessageDataType.text: {
        const text = sendMsg.data?.text
        if (text) {
          sendElements.push(SendMsgElementConstructor.text(sendMsg.data!.text))
        }
      }
        break
-      case OB11MessageDataType.at:
-        {
+      case OB11MessageDataType.at: {
        if (!target) {
          continue
        }
@@ -136,12 +142,14 @@ export async function createSendElements(
                log(`群${groupCode}剩余at全体次数`, remainAtAllCount)
                const self = await getGroupMember((target as Group)?.groupCode, selfInfo.uin)
                isAdmin = self.role === GroupMemberRole.admin || self.role === GroupMemberRole.owner
-                } catch (e) {}
+              } catch (e) {
+              }
            }
            if (isAdmin && remainAtAllCount > 0) {
              sendElements.push(SendMsgElementConstructor.at(atQQ, atQQ, AtType.atAll, '全体成员'))
            }
-            } else {
+          }
+          else {
            // const atMember = group?.members.find(m => m.uin == atQQ)
            const atMember = await getGroupMember((target as Group)?.groupCode, atQQ)
            if (atMember) {
@@ -153,8 +161,7 @@ export async function createSendElements(
        }
      }
        break
-      case OB11MessageDataType.reply:
-        {
+      case OB11MessageDataType.reply: {
        let replyMsgId = sendMsg.data.id
        if (replyMsgId) {
          const replyMsg = await dbUtil.getMsgByShortId(parseInt(replyMsgId))
@@ -171,16 +178,14 @@ export async function createSendElements(
        }
      }
        break
-      case OB11MessageDataType.face:
-        {
+      case OB11MessageDataType.face: {
        const faceId = sendMsg.data?.id
        if (faceId) {
          sendElements.push(SendMsgElementConstructor.face(parseInt(faceId)))
        }
      }
        break
-      case OB11MessageDataType.mface:
-        {
+      case OB11MessageDataType.mface: {
        sendElements.push(
          SendMsgElementConstructor.mface(
            sendMsg.data.emoji_package_id,
@@ -194,8 +199,7 @@ export async function createSendElements(
      case OB11MessageDataType.image:
      case OB11MessageDataType.file:
      case OB11MessageDataType.video:
-      case OB11MessageDataType.voice:
-        {
+      case OB11MessageDataType.voice: {
        const data = (sendMsg as OB11MessageFile).data
        let file = data.file
        const payloadFileName = data?.name
@@ -204,10 +208,12 @@ export async function createSendElements(
          if (cache) {
            if (fs.existsSync(cache.filePath)) {
              file = 'file://' + cache.filePath
-              } else if (cache.downloadFunc) {
+            }
+            else if (cache.downloadFunc) {
              await cache.downloadFunc()
              file = cache.filePath
-              } else if (cache.url) {
+            }
+            else if (cache.url) {
              file = cache.url
            }
            log('找到文件缓存', file)
@@ -224,7 +230,8 @@ export async function createSendElements(
            if (sendMsg.type === OB11MessageDataType.file) {
              log('发送文件', path, payloadFileName || fileName)
              sendElements.push(await SendMsgElementConstructor.file(path, payloadFileName || fileName))
-              } else if (sendMsg.type === OB11MessageDataType.video) {
+            }
+            else if (sendMsg.type === OB11MessageDataType.video) {
              log('发送视频', path, payloadFileName || fileName)
              let thumb = sendMsg.data?.thumb
              if (thumb) {
@@ -234,9 +241,11 @@ export async function createSendElements(
                }
              }
              sendElements.push(await SendMsgElementConstructor.video(path, payloadFileName || fileName, thumb))
-              } else if (sendMsg.type === OB11MessageDataType.voice) {
+            }
+            else if (sendMsg.type === OB11MessageDataType.voice) {
              sendElements.push(await SendMsgElementConstructor.ptt(path))
-              } else if (sendMsg.type === OB11MessageDataType.image) {
+            }
+            else if (sendMsg.type === OB11MessageDataType.image) {
              sendElements.push(
                await SendMsgElementConstructor.pic(
                  path,
@@ -249,18 +258,17 @@ export async function createSendElements(
        }
      }
        break
-      case OB11MessageDataType.json:
-        {
+      case OB11MessageDataType.json: {
        sendElements.push(SendMsgElementConstructor.ark(sendMsg.data.data))
      }
        break
-      case OB11MessageDataType.poke:
-        {
+      case OB11MessageDataType.poke: {
        let qq = sendMsg.data?.qq || sendMsg.data?.id
        if (qq) {
          if ('groupCode' in target) {
            crychic.sendGroupPoke(target.groupCode, qq.toString())
-            } else {
+          }
+          else {
            if (!qq) {
              qq = parseInt(target.uin)
            }
@@ -270,14 +278,12 @@ export async function createSendElements(
        }
      }
        break
-      case OB11MessageDataType.dice:
-        {
+      case OB11MessageDataType.dice: {
        const resultId = sendMsg.data?.result
        sendElements.push(SendMsgElementConstructor.dice(resultId))
      }
        break
-      case OB11MessageDataType.RPS:
-        {
+      case OB11MessageDataType.RPS: {
        const resultId = sendMsg.data?.result
        sendElements.push(SendMsgElementConstructor.rps(resultId))
      }
@@ -300,10 +306,34 @@ export async function sendMsg(
  if (!sendElements.length) {
    throw '消息体无法解析，请检查是否发送了不支持的消息类型'
  }
-  const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, 20000)
+  // 计算发送的文件大小
+  let totalSize = 0
+  for (const fileElement of sendElements) {
+    try {
+      if (fileElement.elementType === ElementType.PTT) {
+        totalSize += fs.statSync(fileElement.pttElement.filePath).size
+      }
+      if (fileElement.elementType === ElementType.FILE) {
+        totalSize += fs.statSync(fileElement.fileElement.filePath).size
+      }
+      if (fileElement.elementType === ElementType.VIDEO) {
+        totalSize += fs.statSync(fileElement.videoElement.filePath).size
+      }
+      if (fileElement.elementType === ElementType.PIC) {
+        totalSize += fs.statSync(fileElement.picElement.sourcePath).size
+      }
+    } catch (e) {
+      log('文件大小计算失败', e, fileElement)
+    }
+  }
+  log('发送消息总大小', totalSize, 'bytes')
+  let timeout = ((totalSize / 1024 / 100) * 1000) + 5000  // 100kb/s
+  log('设置消息超时时间', timeout)
+  const returnMsg = await NTQQMsgApi.sendMsg(peer, sendElements, waitComplete, timeout)
  log('消息发送结果', returnMsg)
  returnMsg.msgShortId = await dbUtil.addMsg(returnMsg)
-  deleteAfterSentFiles.map((f) => fs.unlink(f, () => {}))
+  deleteAfterSentFiles.map((f) => fs.unlink(f, () => {
+  }))
  return returnMsg
 }

@@ -402,7 +432,8 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
      } catch (e) {
        throw '发送转发消息失败 ' + e.toString()
      }
-    } else if (this.getSpecialMsgNum(messages, OB11MessageDataType.music)) {
+    }
+    else if (this.getSpecialMsgNum(messages, OB11MessageDataType.music)) {
      const music = messages[0] as OB11MessageMusic
      if (music) {
        const { musicSignUrl } = getConfigUtil().getConfig()
@@ -459,7 +490,8 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
      }
    }
    const returnMsg = await sendMsg(peer, sendElements, deleteAfterSentFiles)
-    deleteAfterSentFiles.map((f) => fs.unlink(f, () => {}))
+    deleteAfterSentFiles.map((f) => fs.unlink(f, () => {
+    }))
    return { message_id: returnMsg.msgShortId }
  }

@@ -562,7 +594,8 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
            await sleep(500)
            log('转发节点生成成功', nodeMsg.msgId)
          }
-          deleteAfterSentFiles.map((f) => fs.unlink(f, () => {}))
+          deleteAfterSentFiles.map((f) => fs.unlink(f, () => {
+          }))
        } catch (e) {
          log('生成转发消息节点失败', e)
        }
--- a/src/onebot11/action/quick-operation.ts
+++ b/src/onebot11/action/quick-operation.ts
@@ -0,0 +1,149 @@
+// handle quick action, create at 2024-5-18 10:54:39 by linyuchen
+
+
+import { OB11Message, OB11MessageAt, OB11MessageData, OB11MessageDataType } from '../types'
+import { OB11FriendRequestEvent } from '../event/request/OB11FriendRequest'
+import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest'
+import { dbUtil } from '@/common/db'
+import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, Peer } from '@/ntqqapi/api'
+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 {
+  reply?: string
+  auto_escape?: boolean
+}
+
+interface QuickOperationGroupMessage extends QuickOperationPrivateMessage {
+  // 回复群消息
+  at_sender?: boolean
+  delete?: boolean
+  kick?: boolean
+  ban?: boolean
+  ban_duration?: number
+  //
+}
+
+interface QuickOperationFriendRequest {
+  approve?: boolean
+  remark?: string
+}
+
+interface QuickOperationGroupRequest {
+  approve?: boolean
+  reason?: string
+}
+
+export type QuickOperation = QuickOperationPrivateMessage &
+  QuickOperationGroupMessage &
+  QuickOperationFriendRequest &
+  QuickOperationGroupRequest
+
+export type QuickOperationEvent = OB11Message | OB11FriendRequestEvent | OB11GroupRequestEvent;
+
+export async function handleQuickOperation(context: QuickOperationEvent, quickAction: QuickOperation) {
+  if (context.post_type === 'message') {
+    handleMsg(context as OB11Message, quickAction).then().catch(log)
+  }
+  if (context.post_type === 'request') {
+    const friendRequest = context as OB11FriendRequestEvent
+    const groupRequest = context as OB11GroupRequestEvent
+    if ((friendRequest).request_type === 'friend') {
+      handleFriendRequest(friendRequest, quickAction).then().catch(log)
+    }
+    else if (groupRequest.request_type === 'group') {
+      handleGroupRequest(groupRequest, quickAction).then().catch(log)
+    }
+  }
+}
+
+async function handleMsg(msg: OB11Message, quickAction: QuickOperationPrivateMessage | QuickOperationGroupMessage) {
+  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(),
+  }
+  if (msg.message_type == 'private') {
+    peer.peerUid = getUidByUin(msg.user_id.toString())
+    if (msg.sub_type === 'group') {
+      peer.chatType = ChatType.temp
+    }
+  }
+  else {
+    peer.chatType = ChatType.group
+    peer.peerUid = msg.group_id.toString()
+  }
+  if (reply) {
+    let group: Group = null
+    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())
+      if ((quickAction as QuickOperationGroupMessage).at_sender) {
+        replyMessage.push({
+          type: 'at',
+          data: {
+            qq: msg.user_id.toString(),
+          },
+        } as OB11MessageAt)
+      }
+    }
+    replyMessage = replyMessage.concat(convertMessage2List(reply, quickAction.auto_escape))
+    const { sendElements, deleteAfterSentFiles } = await createSendElements(replyMessage, group)
+    log(`发送消息给`, peer, sendElements)
+    sendMsg(peer, sendElements, deleteAfterSentFiles, false).then().catch(log)
+  }
+  if (msg.message_type === 'group') {
+    const groupMsgQuickAction = quickAction as QuickOperationGroupMessage
+    // handle group msg
+    if (groupMsgQuickAction.delete) {
+      NTQQMsgApi.recallMsg(peer, [rawMessage.msgId]).then().catch(log)
+    }
+    if (groupMsgQuickAction.kick) {
+      NTQQGroupApi.kickMember(peer.peerUid, [rawMessage.senderUid]).then().catch(log)
+    }
+    if (groupMsgQuickAction.ban) {
+      NTQQGroupApi.banMember(peer.peerUid, [
+        {
+          uid: rawMessage.senderUid,
+          timeStamp: groupMsgQuickAction.ban_duration || 60 * 30,
+        },
+      ]).then().catch(log)
+    }
+  }
+}
+
+async function handleFriendRequest(request: OB11FriendRequestEvent,
+                                   quickAction: QuickOperationFriendRequest) {
+  if (!isNull(quickAction.approve)) {
+    // todo: set remark
+    NTQQFriendApi.handleFriendRequest(request.flag, quickAction.approve).then().catch(log)
+  }
+}
+
+
+async function handleGroupRequest(request: OB11GroupRequestEvent,
+                                  quickAction: QuickOperationGroupRequest) {
+  if (!isNull(quickAction.approve)) {
+    NTQQGroupApi.handleGroupRequest(
+      request.flag,
+      quickAction.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
+      quickAction.reason,
+    ).then().catch(log)
+  }
+}
--- a/src/onebot11/action/types.ts
+++ b/src/onebot11/action/types.ts
@@ -21,6 +21,7 @@ export enum ActionName {
  SetConfig = 'set_config',
  Debug = 'llonebot_debug',
  GetFile = 'get_file',
+  GetFriendsWithCategory = 'get_friends_with_category',
  // onebot 11
  SendLike = 'send_like',
  GetLoginInfo = 'get_login_info',
@@ -67,5 +68,6 @@ export enum ActionName {
  GoCQHTTP_GetGroupMsgHistory = 'get_group_msg_history',
  GoCQHTTP_GetForwardMsg = 'get_forward_msg',
  GoCQHTTP_GetEssenceMsg = "get_essence_msg_list",
+  GoCQHTTP_HandleQuickOperation = ".handle_quick_operation",
  GetGroupHonorInfo = "get_group_honor_info",
 }
--- a/src/onebot11/action/user/GetCookie.ts
+++ b/src/onebot11/action/user/GetCookie.ts
@@ -1,6 +1,5 @@
 import BaseAction from '../BaseAction'
-import { NTQQUserApi } from '../../../ntqqapi/api'
-import { groups } from '../../../common/data'
+import { NTQQUserApi } from '@/ntqqapi/api'
 import { ActionName } from '../types'

 interface Payload {
--- a/src/onebot11/action/user/GetFriendList.ts
+++ b/src/onebot11/action/user/GetFriendList.ts
@@ -1,16 +1,16 @@
 import { OB11User } from '../../types'
 import { OB11Constructor } from '../../constructor'
-import { friends } from '../../../common/data'
+import { friends, rawFriends } from '@/common/data'
 import BaseAction from '../BaseAction'
 import { ActionName } from '../types'
-import { NTQQFriendApi } from '../../../ntqqapi/api'
-import { log } from '../../../common/utils'
+import { NTQQFriendApi } from '@/ntqqapi/api'
+import { CategoryFriend } from '@/ntqqapi/types'

 interface Payload {
  no_cache: boolean | string
 }

-class GetFriendList extends BaseAction<Payload, OB11User[]> {
+export class GetFriendList extends BaseAction<Payload, OB11User[]> {
  actionName = ActionName.GetFriendList

  protected async _handle(payload: Payload) {
@@ -26,4 +26,11 @@ class GetFriendList extends BaseAction<Payload, OB11User[]> {
  }
 }

-export default GetFriendList
+
+export class GetFriendWithCategory extends BaseAction<void, Array<CategoryFriend>> {
+  actionName = ActionName.GetFriendsWithCategory;
+
+  protected async _handle(payload: void) {
+    return rawFriends;
+  }
+}
--- a/src/onebot11/constructor.ts
+++ b/src/onebot11/constructor.ts
@@ -24,7 +24,7 @@ import {
  User,
  VideoElement,
 } from '../ntqqapi/types'
-import { deleteGroup, getFriend, getGroupMember, selfInfo, tempGroupCodeMap } from '../common/data'
+import { deleteGroup, getFriend, getGroupMember, selfInfo, tempGroupCodeMap, uidMaps } from '../common/data'
 import { EventType } from './event/OB11BaseEvent'
 import { encodeCQCode } from './cqcode'
 import { dbUtil } from '../common/db'
@@ -47,6 +47,8 @@ import { mFaceCache } from '../ntqqapi/constructor'
 import { OB11FriendAddNoticeEvent } from './event/notice/OB11FriendAddNoticeEvent'
 import { OB11FriendRecallNoticeEvent } from './event/notice/OB11FriendRecallNoticeEvent'
 import { OB11GroupRecallNoticeEvent } from './event/notice/OB11GroupRecallNoticeEvent'
+import { OB11FriendPokeEvent, OB11GroupPokeEvent } from './event/notice/OB11PokeEvent'
+import { OB11BaseNoticeEvent } from './event/notice/OB11BaseNoticeEvent';

 let lastRKeyUpdateTime = 0

@@ -55,6 +57,7 @@ export class OB11Constructor {
    let config = getConfigUtil().getConfig()
    const {
      enableLocalFile2Url,
+      debug,
      ob11: { messagePostFormat },
    } = config
    const message_type = msg.chatType == ChatType.group ? 'group' : 'private'
@@ -78,8 +81,11 @@ export class OB11Constructor {
      message_format: messagePostFormat === 'string' ? 'string' : 'array',
      post_type: selfInfo.uin == msg.senderUin ? EventType.MESSAGE_SENT : EventType.MESSAGE,
    }
+    if (debug) {
+      resMsg.raw = msg
+    }
    if (msg.chatType == ChatType.group) {
-      resMsg.sub_type = 'normal' // 这里go-cqhttp是group，而onebot11标准是normal, 蛋疼
+      resMsg.sub_type = 'normal'
      resMsg.group_id = parseInt(msg.peerUin)
      const member = await getGroupMember(msg.peerUin, msg.senderUin)
      if (member) {
@@ -155,21 +161,24 @@ export class OB11Constructor {
      else if (element.picElement) {
        message_data['type'] = 'image'
        // message_data["data"]["file"] = element.picElement.sourcePath
-        let fileName = element.picElement.fileName;
-        const sourcePath = element.picElement.sourcePath;
-        if (element.picElement.picType === PicType.gif && !fileName.endsWith('.gif')){
-          fileName += ".gif";
+        let fileName = element.picElement.fileName
+        const sourcePath = element.picElement.sourcePath
+        const isGif = element.picElement.picType === PicType.gif
+        if (isGif && !fileName.endsWith('.gif')) {
+          fileName += '.gif'
        }
        message_data['data']['file'] = fileName
+        message_data['data']['subType'] = element.picElement.picSubType
        // message_data["data"]["path"] = element.picElement.sourcePath
        // let currentRKey = "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"

-        message_data['data']['url'] = await NTQQFileApi.getImageUrl(element.picElement, msg.chatType);
+        message_data['data']['url'] = await NTQQFileApi.getImageUrl(element.picElement, msg.chatType)
        // message_data["data"]["file_id"] = element.picElement.fileUuid
        message_data['data']['file_size'] = element.picElement.fileSize
        dbUtil
          .addFileCache(fileName, {
            fileName,
+            elementId: element.elementId,
            filePath: sourcePath,
            fileSize: element.picElement.fileSize.toString(),
            url: message_data['data']['url'],
@@ -183,9 +192,7 @@ export class OB11Constructor {
                element.picElement.sourcePath,
              )
            },
-          })
-          .then()
-        // 不在自动下载图片
+          }).then()
      }
      else if (element.videoElement || element.fileElement) {
        const videoOrFileElement = element.videoElement || element.fileElement
@@ -195,9 +202,17 @@ export class OB11Constructor {
        message_data['data']['path'] = videoOrFileElement.filePath
        message_data['data']['file_id'] = videoOrFileElement.fileUuid
        message_data['data']['file_size'] = videoOrFileElement.fileSize
+        if (element.videoElement) {
+          message_data['data']['url'] = await NTQQFileApi.getVideoUrl({
+              chatType: msg.chatType,
+              peerUid: msg.peerUid,
+            }, msg.msgId, element.elementId,
+          )
+        }
        dbUtil
          .addFileCache(videoOrFileElement.fileUuid, {
            msgId: msg.msgId,
+            elementId: element.elementId,
            fileName: videoOrFileElement.fileName,
            filePath: videoOrFileElement.filePath,
            fileSize: videoOrFileElement.fileSize,
@@ -225,6 +240,7 @@ export class OB11Constructor {
        message_data['data']['file_size'] = element.pttElement.fileSize
        dbUtil
          .addFileCache(element.pttElement.fileName, {
+            elementId: element.elementId,
            fileName: element.pttElement.fileName,
            filePath: element.pttElement.filePath,
            fileSize: element.pttElement.fileSize,
@@ -283,7 +299,7 @@ export class OB11Constructor {
      if (message_data.type !== 'unknown' && message_data.data) {
        const cqCode = encodeCQCode(message_data)
        if (messagePostFormat === 'string') {
-          ;(resMsg.message as string) += cqCode
+          (resMsg.message as string) += cqCode
        }
        else (resMsg.message as OB11MessageData[]).push(message_data)

@@ -294,6 +310,35 @@ export class OB11Constructor {
    return resMsg
  }

+  static async PrivateEvent(msg: RawMessage): Promise<OB11BaseNoticeEvent> {
+    if (msg.chatType !== ChatType.friend) {
+      return;
+    }
+    for (const element of msg.elements) {
+      if (element.grayTipElement) {
+        if (element.grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE) {
+          const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr);
+          if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
+            //判断业务类型
+            //Poke事件
+            let pokedetail: any[] = json.items;
+            //筛选item带有uid的元素
+            pokedetail = pokedetail.filter(item => item.uid);
+            if (pokedetail.length == 2) {
+              return new OB11FriendPokeEvent(parseInt((uidMaps[pokedetail[0].uid])!), parseInt((uidMaps[pokedetail[1].uid])));
+            }
+          }
+          //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
+        }
+      }
+    }
+    // 好友增加事件
+    if (msg.msgType === 5 && msg.subMsgType === 12) {
+      const event = new OB11FriendAddNoticeEvent(parseInt(msg.peerUin))
+      return event
+    }
+  }
+
  static async GroupEvent(msg: RawMessage): Promise<OB11GroupNoticeEvent> {
    if (msg.chatType !== ChatType.group) {
      return
@@ -478,6 +523,16 @@ export class OB11Constructor {
          }

          * */
+          if (grayTipElement.jsonGrayTipElement.busiId == 1061) {
+            //判断业务类型
+            //Poke事件
+            let pokedetail: any[] = json.items;
+            //筛选item带有uid的元素
+            pokedetail = pokedetail.filter(item => item.uid);
+            if (pokedetail.length == 2) {
+              return new OB11GroupPokeEvent(parseInt(msg.peerUid), parseInt((uidMaps[pokedetail[0].uid])!), parseInt((uidMaps[pokedetail[1].uid])));
+            }
+          }
          const memberUin = json.items[1].param[0]
          const title = json.items[3].txt
          log('收到群成员新头衔消息', json)
@@ -490,17 +545,6 @@ export class OB11Constructor {
    }
  }

-  static async FriendAddEvent(msg: RawMessage): Promise<OB11FriendAddNoticeEvent | undefined> {
-    if (msg.chatType !== ChatType.friend) {
-      return
-    }
-    if (msg.msgType === 5 && msg.subMsgType === 12) {
-      const event = new OB11FriendAddNoticeEvent(parseInt(msg.peerUin))
-      return event
-    }
-    return
-  }
-
  static async RecallEvent(
    msg: RawMessage,
  ): Promise<OB11FriendRecallNoticeEvent | OB11GroupRecallNoticeEvent | undefined> {
--- a/src/onebot11/cqcode.ts
+++ b/src/onebot11/cqcode.ts
@@ -50,6 +50,7 @@ export function encodeCQCode(data: OB11MessageData) {
  }

  const CQCodeEscape = (text: string) => {
+    text = text.toString()
    return text.replace(/\&/g, '&amp;').replace(/\[/g, '&#91;').replace(/\]/g, '&#93;').replace(/,/g, '&#44;')
  }

--- a/src/onebot11/event/notice/OB11PokeEvent.ts
+++ b/src/onebot11/event/notice/OB11PokeEvent.ts
@@ -10,21 +10,20 @@ class OB11PokeEvent extends OB11BaseNoticeEvent {
 }

 export class OB11FriendPokeEvent extends OB11PokeEvent {
-  sender_id: number
-  constructor(user_id: number) {
-    super()
-    this.user_id = user_id
-    this.sender_id = user_id
+  constructor(user_id: number, target_id: number) {
+    super();
+    this.target_id = target_id;
+    this.user_id = user_id;
  }
 }

 export class OB11GroupPokeEvent extends OB11PokeEvent {
  group_id: number

-  constructor(group_id: number, user_id: number = 0) {
+  constructor(group_id: number, user_id: number = 0, target_id: number = 0) {
    super()
    this.group_id = group_id
-    this.target_id = user_id
+    this.target_id = target_id
    this.user_id = user_id
  }
 }
--- a/src/onebot11/event/request/OB11GroupRequest.ts
+++ b/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
 }
--- a/src/onebot11/server/http.ts
+++ b/src/onebot11/server/http.ts
@@ -3,7 +3,7 @@ import { OB11Response } from '../action/OB11Response'
 import { HttpServerBase } from '@/common/server/http'
 import { actionHandlers, actionMap } from '../action'
 import { getConfigUtil } from '@/common/config'
-import { postOB11Event } from './postOB11Event'
+import { postOb11Event } from './post-ob11-event'
 import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent'
 import { selfInfo } from '@/common/data'

@@ -40,7 +40,7 @@ class HTTPHeart {
    }
    this.intervalId = setInterval(() => {
      // ws的心跳是ws自己维护的
-      postOB11Event(new OB11HeartbeatEvent(selfInfo.online, true, heartInterval), false, false)
+      postOb11Event(new OB11HeartbeatEvent(selfInfo.online, true, heartInterval), false, false)
    }, heartInterval)
  }

--- a/src/onebot11/server/post-ob11-event.ts
+++ b/src/onebot11/server/post-ob11-event.ts
@@ -0,0 +1,81 @@
+import { OB11Message } from '../types'
+import { selfInfo } from '@/common/data'
+import { OB11BaseMetaEvent } from '../event/meta/OB11BaseMetaEvent'
+import { OB11BaseNoticeEvent } from '../event/notice/OB11BaseNoticeEvent'
+import { WebSocket as WebSocketClass } from 'ws'
+import { wsReply } from './ws/reply'
+import { log } from '@/common/utils'
+import { getConfigUtil } from '@/common/config'
+import crypto from 'crypto'
+import { handleQuickOperation, QuickOperationEvent } from '../action/quick-operation'
+
+export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent
+
+const eventWSList: WebSocketClass[] = []
+
+export function registerWsEventSender(ws: WebSocketClass) {
+  eventWSList.push(ws)
+}
+
+export function unregisterWsEventSender(ws: WebSocketClass) {
+  let index = eventWSList.indexOf(ws)
+  if (index !== -1) {
+    eventWSList.splice(index, 1)
+  }
+}
+
+export function postWsEvent(event: PostEventType) {
+  for (const ws of eventWSList) {
+    new Promise(() => {
+      wsReply(ws, event)
+    }).then().catch(log)
+  }
+}
+
+export function postOb11Event(msg: PostEventType, reportSelf = false, postWs = true) {
+  const config = getConfigUtil().getConfig()
+  // 判断msg是否是event
+  if (!config.reportSelfMessage && !reportSelf) {
+    if (msg.post_type === 'message' && (msg as OB11Message).user_id.toString() == selfInfo.uin) {
+      return
+    }
+  }
+  if (config.ob11.enableHttpPost) {
+    const msgStr = JSON.stringify(msg)
+    const hmac = crypto.createHmac('sha1', config.ob11.httpSecret)
+    hmac.update(msgStr)
+    const sig = hmac.digest('hex')
+    let headers = {
+      'Content-Type': 'application/json',
+      'x-self-id': selfInfo.uin,
+    }
+    if (config.ob11.httpSecret) {
+      headers['x-signature'] = 'sha1=' + sig
+    }
+    for (const host of config.ob11.httpHosts) {
+      fetch(host, {
+        method: 'POST',
+        headers,
+        body: msgStr,
+      }).then(
+        async (res) => {
+          log(`新消息事件HTTP上报成功: ${host} `, msgStr)
+          try {
+            const resJson = await res.json()
+            log(`新消息事件HTTP上报返回快速操作: `, JSON.stringify(resJson))
+            handleQuickOperation(msg as QuickOperationEvent, resJson).then().catch(log);
+          } catch (e) {
+            log(`新消息事件HTTP上报没有返回快速操作，不需要处理`)
+            return
+          }
+        },
+        (err: any) => {
+          log(`新消息事件HTTP上报失败: ${host} `, err, msg)
+        },
+      ).catch(log)
+    }
+  }
+  if (postWs) {
+    postWsEvent(msg)
+  }
+}
--- a/src/onebot11/server/postOB11Event.ts
+++ b/src/onebot11/server/postOB11Event.ts
@@ -1,185 +0,0 @@
-import { OB11Message, OB11MessageAt, OB11MessageData } from '../types'
-import { getFriend, getGroup, getUidByUin, selfInfo } from '../../common/data'
-import { OB11BaseMetaEvent } from '../event/meta/OB11BaseMetaEvent'
-import { OB11BaseNoticeEvent } from '../event/notice/OB11BaseNoticeEvent'
-import { WebSocket as WebSocketClass } from 'ws'
-import { wsReply } from './ws/reply'
-import { log } from '../../common/utils/log'
-import { getConfigUtil } from '../../common/config'
-import crypto from 'crypto'
-import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, Peer } from '../../ntqqapi/api'
-import { ChatType, Group, GroupRequestOperateTypes } from '../../ntqqapi/types'
-import { convertMessage2List, createSendElements, sendMsg } from '../action/msg/SendMsg'
-import { dbUtil } from '../../common/db'
-import { OB11FriendRequestEvent } from '../event/request/OB11FriendRequest'
-import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest'
-import { isNull } from '../../common/utils'
-
-export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent
-
-interface QuickActionPrivateMessage {
-  reply?: string
-  auto_escape?: boolean
-}
-
-interface QuickActionGroupMessage extends QuickActionPrivateMessage {
-  // 回复群消息
-  at_sender?: boolean
-  delete?: boolean
-  kick?: boolean
-  ban?: boolean
-  ban_duration?: number
-  //
-}
-
-interface QuickActionFriendRequest {
-  approve?: boolean
-  remark?: string
-}
-
-interface QuickActionGroupRequest {
-  approve?: boolean
-  reason?: string
-}
-
-type QuickAction = QuickActionPrivateMessage &
-  QuickActionGroupMessage &
-  QuickActionFriendRequest &
-  QuickActionGroupRequest
-
-const eventWSList: WebSocketClass[] = []
-
-export function registerWsEventSender(ws: WebSocketClass) {
-  eventWSList.push(ws)
-}
-
-export function unregisterWsEventSender(ws: WebSocketClass) {
-  let index = eventWSList.indexOf(ws)
-  if (index !== -1) {
-    eventWSList.splice(index, 1)
-  }
-}
-
-export function postWsEvent(event: PostEventType) {
-  for (const ws of eventWSList) {
-    new Promise(() => {
-      wsReply(ws, event)
-    }).then()
-  }
-}
-
-export function postOB11Event(msg: PostEventType, reportSelf = false, postWs = true) {
-  const config = getConfigUtil().getConfig()
-  // 判断msg是否是event
-  if (!config.reportSelfMessage && !reportSelf) {
-    if (msg.post_type === 'message' && (msg as OB11Message).user_id.toString() == selfInfo.uin) {
-      return
-    }
-  }
-  if (config.ob11.enableHttpPost) {
-    const msgStr = JSON.stringify(msg)
-    const hmac = crypto.createHmac('sha1', config.ob11.httpSecret)
-    hmac.update(msgStr)
-    const sig = hmac.digest('hex')
-    let headers = {
-      'Content-Type': 'application/json',
-      'x-self-id': selfInfo.uin,
-    }
-    if (config.ob11.httpSecret) {
-      headers['x-signature'] = 'sha1=' + sig
-    }
-    for (const host of config.ob11.httpHosts) {
-      fetch(host, {
-        method: 'POST',
-        headers,
-        body: msgStr,
-      }).then(
-        async (res) => {
-          log(`新消息事件HTTP上报成功: ${host} `, msgStr)
-          // todo: 处理不够优雅，应该使用高级泛型进行QuickAction类型识别
-          let resJson: QuickAction
-          try {
-            resJson = await res.json()
-            log(`新消息事件HTTP上报返回快速操作: `, JSON.stringify(resJson))
-          } catch (e) {
-            log(`新消息事件HTTP上报没有返回快速操作，不需要处理`)
-            return
-          }
-          if (msg.post_type === 'message') {
-            msg = msg as OB11Message
-            const rawMessage = await dbUtil.getMsgByShortId(msg.message_id)
-            resJson = resJson as QuickActionPrivateMessage | QuickActionGroupMessage
-            const reply = resJson.reply
-            let peer: Peer = {
-              chatType: ChatType.friend,
-              peerUid: msg.user_id.toString(),
-            }
-            if (msg.message_type == 'private') {
-              peer.peerUid = getUidByUin(msg.user_id.toString())
-              if (msg.sub_type === 'group') {
-                peer.chatType = ChatType.temp
-              }
-            } else {
-              peer.chatType = ChatType.group
-              peer.peerUid = msg.group_id.toString()
-            }
-            if (reply) {
-              let group: Group = null
-              let replyMessage: OB11MessageData[] = []
-
-              if (msg.message_type == 'group') {
-                group = await getGroup(msg.group_id.toString())
-                if ((resJson as QuickActionGroupMessage).at_sender) {
-                  replyMessage.push({
-                    type: 'at',
-                    data: {
-                      qq: msg.user_id.toString(),
-                    },
-                  } as OB11MessageAt)
-                }
-              }
-              replyMessage = replyMessage.concat(convertMessage2List(reply, resJson.auto_escape))
-              const { sendElements, deleteAfterSentFiles } = await createSendElements(replyMessage, group)
-              log(`发送消息给`, peer, sendElements)
-              sendMsg(peer, sendElements, deleteAfterSentFiles, false).then()
-            } else if (resJson.delete) {
-              NTQQMsgApi.recallMsg(peer, [rawMessage.msgId]).then()
-            } else if (resJson.kick) {
-              NTQQGroupApi.kickMember(peer.peerUid, [rawMessage.senderUid]).then()
-            } else if (resJson.ban) {
-              NTQQGroupApi.banMember(peer.peerUid, [
-                {
-                  uid: rawMessage.senderUid,
-                  timeStamp: resJson.ban_duration || 60 * 30,
-                },
-              ]).then()
-            }
-          } else if (msg.post_type === 'request') {
-            if ((msg as OB11FriendRequestEvent).request_type === 'friend') {
-              resJson = resJson as QuickActionFriendRequest
-              if (!isNull(resJson.approve)) {
-                // todo: set remark
-                NTQQFriendApi.handleFriendRequest((msg as OB11FriendRequestEvent).flag, resJson.approve).then()
-              }
-            } else if ((msg as OB11GroupRequestEvent).request_type === 'group') {
-              resJson = resJson as QuickActionGroupRequest
-              if (!isNull(resJson.approve)) {
-                NTQQGroupApi.handleGroupRequest(
-                  (msg as OB11FriendRequestEvent).flag,
-                  resJson.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
-                  resJson.reason,
-                ).then()
-              }
-            }
-          }
-        },
-        (err: any) => {
-          log(`新消息事件HTTP上报失败: ${host} `, err, msg)
-        },
-      )
-    }
-  }
-  if (postWs) {
-    postWsEvent(msg)
-  }
-}
--- a/src/onebot11/server/ws/ReverseWebsocket.ts
+++ b/src/onebot11/server/ws/ReverseWebsocket.ts
@@ -4,12 +4,13 @@ import { ActionName } from '../../action/types'
 import { OB11Response } from '../../action/OB11Response'
 import BaseAction from '../../action/BaseAction'
 import { actionMap } from '../../action'
-import { postWsEvent, registerWsEventSender, unregisterWsEventSender } from '../postOB11Event'
+import { postWsEvent, registerWsEventSender, unregisterWsEventSender } from '../post-ob11-event'
 import { wsReply } from './reply'
 import { WebSocket as WebSocketClass } from 'ws'
 import { OB11HeartbeatEvent } from '../../event/meta/OB11HeartbeatEvent'
 import { log } from '../../../common/utils/log'
 import { getConfigUtil } from '../../../common/config'
+import { version } from '../../../version'

 export let rwsList: ReverseWebsocket[] = []

@@ -85,6 +86,7 @@ export class ReverseWebsocket {
        'X-Self-ID': selfInfo.uin,
        Authorization: `Bearer ${token}`,
        'x-client-role': 'Universal', // koishi-adapter-onebot 需要这个字段
+        'User-Agent': `LLOneBot/${version}`,
      },
    })
    registerWsEventSender(this.websocket)
--- a/src/onebot11/server/ws/WebsocketServer.ts
+++ b/src/onebot11/server/ws/WebsocketServer.ts
@@ -1,7 +1,7 @@
 import { WebSocket } from 'ws'
 import { actionMap } from '../../action'
 import { OB11Response } from '../../action/OB11Response'
-import { postWsEvent, registerWsEventSender, unregisterWsEventSender } from '../postOB11Event'
+import { postWsEvent, registerWsEventSender, unregisterWsEventSender } from '../post-ob11-event'
 import { ActionName } from '../../action/types'
 import BaseAction from '../../action/BaseAction'
 import { LifeCycleSubType, OB11LifeCycleEvent } from '../../event/meta/OB11LifeCycleEvent'
@@ -27,6 +27,7 @@ class OB11WebsocketServer extends WebsocketServerBase {
    }
    try {
      let handleResult = await action.websocketHandle(params, echo)
+      handleResult.echo = echo
      wsReply(wsClient, handleResult)
    } catch (e) {
      wsReply(wsClient, OB11Response.error(`api处理出错:${e.stack}`, 1200, echo))
--- a/src/onebot11/server/ws/reply.ts
+++ b/src/onebot11/server/ws/reply.ts
@@ -1,6 +1,6 @@
 import { WebSocket as WebSocketClass } from 'ws'
 import { OB11Response } from '../../action/OB11Response'
-import { PostEventType } from '../postOB11Event'
+import { PostEventType } from '../post-ob11-event'
 import { log } from '../../../common/utils/log'
 import { isNull } from '../../../common/utils/helper'

--- a/src/renderer/index.ts
+++ b/src/renderer/index.ts
@@ -62,6 +62,13 @@ async function onSettingWindowCreated(view: Element) {
          SettingButton('请稍候', 'llonebot-update-button', 'secondary'),
        ),
      ]),
+      SettingList([
+          SettingItem(
+            '是否启用 LLOneBot, 重启QQ后生效',
+            null,
+            SettingSwitch('enableLLOB', config.enableLLOB, { 'control-display-id': 'config-enableLLOB' }),
+          )]
+      ),
      SettingList([
        SettingItem(
          '启用 HTTP 服务',
@@ -171,6 +178,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([
--- a/src/version.ts
+++ b/src/version.ts
@@ -1 +1 @@
-export const version = '3.24.4'
+export const version = '3.27.2'
Author	SHA1	Message	Date
linyuchen	bc4511e175	chore: v3.27.2	2024-07-16 21:43:50 +08:00
linyuchen	f191103f99	Merge pull request #294 from cnxysoft/dev 修复戳一戳	2024-07-16 21:38:17 +08:00
linyuchen	408463f63b	Merge branch 'dev' into dev	2024-07-16 21:21:50 +08:00
Alen	fb96c4272e	修复戳一戳取缔FriendAddEvent，并入Private Event处理	2024-07-16 21:01:19 +08:00
linyuchen	1dd468e2ff	fix: #290	2024-07-13 16:25:00 +08:00
linyuchen	2a1aa8c649	feat: image subType	2024-07-13 14:26:23 +08:00
linyuchen	1633734e08	Merge branch 'dev'	2024-07-13 14:09:45 +08:00
linyuchen	dff92e6f27	chore: version 3.27.0 feat: support poke feat: LLOneBot global switch	2024-07-13 14:09:03 +08:00
linyuchen	dba5e30d5d	doc: plugin description	2024-07-10 13:48:05 +08:00
linyuchen	2d04ab2e72	fix: crychic crash	2024-07-10 13:47:44 +08:00
linyuchen	1a015ac8d3	Merge pull request #262 from LLOneBot/dev get_record 支持 out_format 进行转码，和其他小修复	2024-06-21 17:39:53 +08:00
linyuchen	6390620ddd	chore: version 3.26.7	2024-06-21 17:33:48 +08:00
linyuchen	0d19005dc3	refactor: remove duplicate import	2024-06-21 17:28:17 +08:00
linyuchen	c6479dd2c4	Merge remote-tracking branch 'origin/dev' into dev	2024-06-21 16:21:15 +08:00
linyuchen	8871331b7c	🐛 fix: ws echo #261	2024-06-21 16:20:59 +08:00
linyuchen	e01148b86a	🐛 fix: ws echo	2024-06-21 16:20:26 +08:00
linyuchen	2f87e3818e	Merge pull request #260 from idranme/main perf: audio	2024-06-21 10:36:29 +08:00
linyuchen	2c8a594c38	Merge branch 'dev' into main	2024-06-21 10:36:14 +08:00
idranme	1508dab7fe	perf: audio	2024-06-18 19:15:56 +00:00
linyuchen	958b21e47e	fix: wait get_file download complete	2024-06-17 17:41:23 +08:00
linyuchen	781c3311ae	fix: get_file cache not found	2024-06-17 16:20:37 +08:00
linyuchen	52850d172e	feat: decode silk	2024-06-17 16:05:38 +08:00
linyuchen	52a065542e	chore: v3.26.6	2024-06-10 14:38:20 +08:00
linyuchen	fd10469685	feat: video url	2024-06-10 14:35:00 +08:00
linyuchen	a2ee75b113	refactor: sent msg status waiter	2024-06-09 15:27:33 +08:00
linyuchen	0f7f243b98	Merge pull request #250 from Bluefissure/reverse-ws-ua feat: add ua to reverse websocket headers	2024-06-06 17:35:21 +08:00
Bluefissure	97d7996a50	fix: add version to ua	2024-06-06 08:53:37 +00:00
Bluefissure	b658d164f9	feat: add ua to reverse websocket headers	2024-06-06 08:48:18 +00:00
linyuchen	f150ae478b	chore: v3.26.5	2024-06-01 20:19:05 +08:00
linyuchen	d1f68553f1	fix: 加载卡顿，群成员名片变动	2024-06-01 20:18:38 +08:00
linyuchen	f47f0800de	Merge remote-tracking branch 'origin/main'	2024-05-29 16:56:08 +08:00
linyuchen	b7ddefc950	fix: QZone cookies	2024-05-29 16:38:22 +08:00
linyuchen	25b3325a44	fix: comment	2024-05-29 16:28:46 +08:00
linyuchen	c281b87bab	merge main	2024-05-29 16:27:06 +08:00
linyuchen	c0946ddda2	chore: version 3.26.4	2024-05-29 16:26:04 +08:00
linyuchen	1128cf679c	refactor: send file timeout	2024-05-29 16:25:42 +08:00
linyuchen	ff65a42350	Merge pull request #242 from LLOneBot/dev feat: support qzone cookies	2024-05-29 16:24:32 +08:00
手瓜一十雪	c459587dcd	refactor: get cookies	2024-05-29 12:03:35 +08:00
手瓜一十雪	6f8ea9677f	feat: support qzone cookies	2024-05-28 17:14:24 +08:00
手瓜一十雪	38197527fa	Merge branch 'main' into dev	2024-05-28 17:11:13 +08:00
手瓜一十雪	21b2bd2c8e	feat: cookies	2024-05-28 17:11:07 +08:00
linyuchen	25158eee55	chore: version 3.26.3	2024-05-28 16:41:28 +08:00
linyuchen	1aa804f255	chore: version 3.26.3	2024-05-28 16:41:22 +08:00
linyuchen	fbe101339d	fix: #237	2024-05-28 16:40:51 +08:00
linyuchen	a4aeb8171d	fix: QQ package.json on macOS	2024-05-28 15:42:22 +08:00
linyuchen	27f98a459c	fix: member info change on version 24108	2024-05-28 15:31:59 +08:00
linyuchen	e6b0eaa46d	Merge pull request #235 from LLOneBot/dev 快速操作回复自动引用原消息开关	2024-05-24 17:14:54 +08:00
linyuchen	f336317a33	chore: version 3.26.2	2024-05-24 17:12:35 +08:00
linyuchen	17b44cc0fa	refactor: #226 Quick operation reply automatically quotes the original message switch	2024-05-24 17:10:41 +08:00
linyuchen	debe3a8597	chore: version 3.26.1	2024-05-24 08:54:23 +08:00
linyuchen	f36c5e849f	Merge pull request #234 from LLOneBot/dev fix: #215 get_forward_msg params missing id(onebot11)	2024-05-24 08:52:34 +08:00
linyuchen	abbd6797c4	fix: #215 get_forward_msg params missing id(onebot11)	2024-05-24 08:50:22 +08:00
linyuchen	fdb7784a7d	Merge pull request #233 from LLOneBot/dev [Feature] OneBot11消息构造添加raw字段，单条转发消息接口返回message_id	2024-05-24 08:40:44 +08:00
linyuchen	92b49015b0	feat: Forward single msg return message_id	2024-05-24 08:36:42 +08:00
linyuchen	1765ffff7b	style: format	2024-05-24 08:15:08 +08:00
linyuchen	3024316b5b	feat: #232 /get_msg, /get_group_msg_history add raw message	2024-05-24 08:11:38 +08:00
linyuchen	9a0d89bfbf	Update README.md	2024-05-19 07:52:12 +08:00
linyuchen	807ef3b700	Merge pull request #228 from LLOneBot/dev feat: Quick operation reply auto quote original message	2024-05-18 16:53:37 +08:00
linyuchen	948f10d4e3	feat: Quick operation reply auto quote original message	2024-05-18 16:51:34 +08:00
linyuchen	0f99b5cb87	Merge pull request #227 from LLOneBot/dev fix: Send msg timeout minimum	2024-05-18 16:36:30 +08:00
linyuchen	6413b0ff82	fix: Send msg timeout minimum	2024-05-18 16:34:12 +08:00
linyuchen	39713d8e11	Merge branch 'main' into dev	2024-05-18 16:31:22 +08:00
linyuchen	739a497af6	chore: v3.26.0	2024-05-18 13:16:45 +08:00
linyuchen	de2fe9b0aa	Merge pull request #225 from LLOneBot/dev Feature: #209，New API get_friends_with_category	2024-05-18 13:11:30 +08:00
linyuchen	44448895a0	feat: 209	2024-05-18 13:09:45 +08:00
linyuchen	cfd9097769	feat: 209	2024-05-18 13:08:44 +08:00
linyuchen	627042fd25	Merge pull request #224 from LLOneBot/dev Fix: #219，发送视频图片进行文件大小判断，超时时间根据文件大小（512kb/s）动态调整	2024-05-18 12:53:42 +08:00
linyuchen	b51ce24d0c	fix: #219	2024-05-18 12:50:11 +08:00
linyuchen	fc0881eccc	Merge pull request #223 from LLOneBot/dev fix: #218	2024-05-18 12:13:23 +08:00
linyuchen	6b8509d2b2	fix: #218	2024-05-18 12:12:16 +08:00
linyuchen	cf1d67a5cf	Merge pull request #222 from LLOneBot/dev Feature: websocket .handle_quick_operation	2024-05-18 11:47:56 +08:00
linyuchen	473ebd25b8	fix: promise catch	2024-05-18 11:46:51 +08:00
linyuchen	d4427cfff4	feat: .handle_quick_operation of websocket	2024-05-18 11:45:42 +08:00
linyuchen	9d2e9786cc	chore: v3.25.0	2024-05-15 23:03:19 +08:00
linyuchen	9968f714c7	chore: v3.25.0	2024-05-15 23:03:04 +08:00