chore: version 3.26.3

快速操作回复自动引用原消息开关

README.md

@@ -1,4 +1,4 @@
-# LLOneBot API
+# LLOneBot
 
 LiteLoaderQQNT插件，使你的NTQQ支持OneBot11协议进行QQ机器人开发
 

manifest.json

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

src/common/config.ts

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

src/common/types.ts

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

src/common/utils/QQBasicInfo.ts

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

src/main/main.ts

@@ -142,7 +142,8 @@ function onLoad() {
             .catch((e) => {
               log('保存设置失败', e.stack)
             })
-        } else {
+        }
+        else {
         }
       })
       .catch((err) => {
@@ -169,12 +170,8 @@ function onLoad() {
 
       OB11Constructor.message(message)
         .then((msg) => {
-          if (debug) {
-            msg.raw = message
-          } else {
-            if (msg.message.length === 0) {
-              return
-            }
+          if (!debug && msg.message.length === 0) {
+            return
           }
           const isSelfMsg = msg.user_id.toString() == selfInfo.uin
           if (isSelfMsg && !reportSelfMessage) {
@@ -210,7 +207,8 @@ function onLoad() {
         let pokeEvent: OB11FriendPokeEvent | OB11GroupPokeEvent
         if (isGroup) {
           pokeEvent = new OB11GroupPokeEvent(parseInt(id))
-        } else {
+        }
+        else {
           pokeEvent = new OB11FriendPokeEvent(parseInt(id))
         }
         postOb11Event(pokeEvent)
@@ -323,10 +321,12 @@ function onLoad() {
                   : 'set'
                 // member1.role = notify.type == GroupNotifyTypes.ADMIN_SET ? GroupMemberRole.admin : GroupMemberRole.normal;
                 postOb11Event(groupAdminNoticeEvent, true)
-              } else {
+              }
+              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)
@@ -348,31 +348,49 @@ function onLoad() {
               } 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 = ''
-              try {
-                requestQQ = (await NTQQUserApi.getUserDetailInfo(notify.user1.uid)).uin
-              } catch (e) {
-                log('获取加群人QQ号失败', e)
+              let requestQQ = uidMaps[notify.user1.uid]
+              if (!requestQQ) {
+                try {
+                  requestQQ = (await NTQQUserApi.getUserDetailInfo(notify.user1.uid)).uin
+                } catch (e) {
+                  log('获取加群人QQ号失败', e)
+                }
               }
               groupRequestEvent.user_id = parseInt(requestQQ) || 0
               groupRequestEvent.sub_type = 'add'
               groupRequestEvent.comment = notify.postscript
               groupRequestEvent.flag = notify.seq
+              if (notify.type == GroupNotifyTypes.JOIN_REQUEST_BY_INVITED) {
+                // groupRequestEvent.sub_type = 'invite'
+                let invitorQQ = uidMaps[notify.user2.uid]
+                if (!invitorQQ) {
+                  try {
+                    let invitor = (await NTQQUserApi.getUserDetailInfo(notify.user2.uid))
+                    groupRequestEvent.invitor_id = parseInt(invitor.uin)
+                  } catch (e) {
+                    groupRequestEvent.invitor_id = 0
+                    log('获取邀请人QQ号失败', e)
+                  }
+                }
+              }
               postOb11Event(groupRequestEvent)
-            } else if (notify.type == GroupNotifyTypes.INVITE_ME) {
+            }
+            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)
             }
@@ -380,7 +398,8 @@ function onLoad() {
             log('解析群通知失败', e.stack.toString())
           }
         }
-      } else if (payload.doubt) {
+      }
+      else if (payload.doubt) {
         // 可能有群管理员变动
       }
     })
@@ -418,7 +437,13 @@ function onLoad() {
       }
     })
     startReceiveHook().then()
-    NTQQGroupApi.getGroups(true).then()
+    NTQQGroupApi.getGroups(true).then(groups=> {
+        for (let group of groups) {
+        }
+      }
+    ).catch(log)
+    NTQQGroupApi.activateMemberInfoChange().then().catch(log)
+    NTQQGroupApi.activateMemberListChange().then().catch(log)
     const config = getConfigUtil().getConfig()
     if (config.ob11.enableHttp) {
       ob11HTTPServer.start(config.ob11.httpPort)
@@ -473,7 +498,8 @@ function onLoad() {
 
       getUserNick().then()
       start().then()
-    } else {
+    }
+    else {
       setTimeout(init, 1000)
     }
   }

src/ntqqapi/api/group.ts

@@ -7,6 +7,33 @@ import { log } from '../../common/utils/log'
 import { NTQQWindowApi, NTQQWindows } from './window'
 
 export class NTQQGroupApi {
+
+  static async activateMemberListChange(){
+    return await callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.ACTIVATE_MEMBER_LIST_CHANGE,
+      classNameIsRegister: true,
+      args: [],
+    })
+  }
+  static async activateMemberInfoChange(){
+    return await callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.ACTIVATE_MEMBER_INFO_CHANGE,
+      classNameIsRegister: true,
+      args: [],
+    })
+  }
+  static async getGroupAllInfo(groupCode: string, source: number=4){
+    return await callNTQQApi<GeneralCallResult & Group>({
+      methodName: NTQQApiMethod.GET_GROUP_ALL_INFO,
+      args: [
+        {
+          groupCode,
+          source
+        },
+        null,
+      ],
+    })
+  }
   static async getGroups(forced = false) {
     let cbCmd = ReceiveCmdS.GROUPS
     if (process.platform != 'win32') {
@@ -58,6 +85,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 +198,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 +210,8 @@ export class NTQQGroupApi {
         null,
       ],
     })
+    NTQQGroupApi.getGroupMembersInfo(groupQQ, [memberUid], true).then().catch(log)
+    return res;
   }
   static async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
     return await callNTQQApi<GeneralCallResult>({

src/ntqqapi/api/msg.ts

@@ -15,7 +15,75 @@ 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
+  }
+
+  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()
+  }
+  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 +103,7 @@ export class NTQQMsgApi {
       ],
     })
   }
+
   static async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
     return await callNTQQApi<GeneralCallResult & { msgList: RawMessage[] }>({
       methodName: NTQQApiMethod.GET_MULTI_MSG,
@@ -49,6 +118,20 @@ export class NTQQMsgApi {
     })
   }
 
+  static async getMsgBoxInfo(peer: Peer) {
+    return await callNTQQApi<GeneralCallResult>({
+      methodName: NTQQApiMethod.GET_MSG_BOX_INFO,
+      args: [
+        {
+          contacts: [
+            peer
+          ],
+        },
+        null,
+      ],
+    })
+  }
+
   static async activateChat(peer: Peer) {
     // await this.fetchRecentContact();
     // await sleep(500);
@@ -57,6 +140,7 @@ export class NTQQMsgApi {
       args: [{ peer, cnt: 20 }, null],
     })
   }
+
   static async activateChatAndGetHistory(peer: Peer) {
     // await this.fetchRecentContact();
     // await sleep(500);
@@ -66,6 +150,7 @@ export class NTQQMsgApi {
       args: [{ peer, cnt: 20 }, null],
     })
   }
+
   static async getMsgHistory(peer: Peer, msgId: string, count: number) {
     // 消息时间从旧到新
     return await callNTQQApi<GeneralCallResult & { msgList: RawMessage[] }>({
@@ -81,6 +166,7 @@ export class NTQQMsgApi {
       ],
     })
   }
+
   static async fetchRecentContact() {
     await callNTQQApi({
       methodName: NTQQApiMethod.RECENT_CONTACT,
@@ -116,52 +202,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 +215,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 +232,8 @@ export class NTQQMsgApi {
         },
         null,
       ],
-    })
+    }).then().catch(log)
+    return await waiter
   }
 
   static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {

src/ntqqapi/api/user.ts

@@ -47,9 +47,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,

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',

src/ntqqapi/types/notify.ts

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

src/onebot11/action/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')
     }

src/onebot11/action/go-cqhttp/QuickOperation.ts

@@ -1,5 +1,5 @@
 import BaseAction from '../BaseAction'
-import { handleQuickOperation, QuickOperation, QuickOperationEvent } from '../../server/quick-operation'
+import { handleQuickOperation, QuickOperation, QuickOperationEvent } from '../quick-operation'
 import { log } from '@/common/utils'
 import { ActionName } from '../types'
 

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

src/onebot11/action/msg/SendMsg.ts

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

src/onebot11/action/quick-operation.ts

@@ -1,15 +1,16 @@
 // handle quick action, create at 2024-5-18 10:54:39 by linyuchen
 
 
-import { OB11Message, OB11MessageAt, OB11MessageData } from '../types'
+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 '../action/msg/SendMsg'
+import { convertMessage2List, createSendElements, sendMsg } from './msg/SendMsg'
 import { isNull, log } from '@/common/utils'
+import { getConfigUtil } from '@/common/config'
 
 
 interface QuickOperationPrivateMessage {
@@ -49,8 +50,8 @@ export async function handleQuickOperation(context: QuickOperationEvent, quickAc
     handleMsg(context as OB11Message, quickAction).then().catch(log)
   }
   if (context.post_type === 'request') {
-    const friendRequest = context as OB11FriendRequestEvent;
-    const groupRequest = context as OB11GroupRequestEvent;
+    const friendRequest = context as OB11FriendRequestEvent
+    const groupRequest = context as OB11GroupRequestEvent
     if ((friendRequest).request_type === 'friend') {
       handleFriendRequest(friendRequest, quickAction).then().catch(log)
     }
@@ -64,6 +65,7 @@ async function handleMsg(msg: OB11Message, quickAction: QuickOperationPrivateMes
   msg = msg as OB11Message
   const rawMessage = await dbUtil.getMsgByShortId(msg.message_id)
   const reply = quickAction.reply
+  const ob11Config = getConfigUtil().getConfig().ob11
   let peer: Peer = {
     chatType: ChatType.friend,
     peerUid: msg.user_id.toString(),
@@ -81,6 +83,14 @@ async function handleMsg(msg: OB11Message, quickAction: QuickOperationPrivateMes
   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())

src/onebot11/constructor.ts

@@ -55,6 +55,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 +79,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,16 +159,16 @@ 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
+        if (element.picElement.picType === PicType.gif && !fileName.endsWith('.gif')) {
+          fileName += '.gif'
         }
         message_data['data']['file'] = fileName
         // 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

src/onebot11/event/request/OB11GroupRequest.ts

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

src/onebot11/server/post-ob11-event.ts

@@ -7,7 +7,7 @@ import { wsReply } from './ws/reply'
 import { log } from '@/common/utils'
 import { getConfigUtil } from '@/common/config'
 import crypto from 'crypto'
-import { handleQuickOperation, QuickOperationEvent } from './quick-operation'
+import { handleQuickOperation, QuickOperationEvent } from '../action/quick-operation'
 
 export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent
 

src/renderer/index.ts

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

src/version.ts

@@ -1 +1 @@
-export const version = '3.26.0'
+export const version = '3.26.3'