Merge pull request #756 from LLOneBot/dev

chore: update version to 7.12.11

Author: idranme

doc/更新日志.txt

@@ -1,3 +1,9 @@
+V7.12.11
+更新时间 2026-05-03
+
+* OneBot 修复 send_group_ai_record API 返回无效的 message_id
+
+=================
 V7.12.10
 更新时间 2026-04-30
 

package-dist.json

@@ -1 +1 @@
-{"name":"llonebot-dist","version":"7.12.10","type":"module","description":"","main":"llbot.js","author":"linyuchen","repository":{"type":"git","url":"https://github.com/LLOneBot/LuckyLilliaBot"}}
+{"name":"llonebot-dist","version":"7.12.11","type":"module","description":"","main":"llbot.js","author":"linyuchen","repository":{"type":"git","url":"https://github.com/LLOneBot/LuckyLilliaBot"}}

src/main/pmhq/mixins/message.ts

@@ -63,15 +63,17 @@ export function MessageMixin<T extends new (...args: any[]) => PMHQBase>(Base: T
     }
 
     async getGroupGenerateAiRecord(groupId: number, character: string, text: string, chatType: number) {
+      const msgRandom = randomBytes(4).readUInt32BE(0)
       const body = Oidb.GetGroupGenerateAiRecordReq.encode({
         groupId,
         voiceId: character,
         text,
         chatType,
-        clientMsgInfo: { msgRandom: randomBytes(4).readUInt32BE(0) },
+        clientMsgInfo: { msgRandom },
       })
       const data = Oidb.Base.encode({ command: 0x929b, subCommand: 0, body })
       await this.httpSendPB('OidbSvcTrpcTcp.0x929b_0', data)
+      return { msgRandom }
     }
   }
 }

src/ntqqapi/services/NodeIKernelMsgService.ts

@@ -168,4 +168,20 @@ export interface NodeIKernelMsgService {
   setContactLocalTop(peer: Peer, isTop: boolean): Promise<GeneralCallResult>
 
   sendShowInputStatusReq(chatType: ChatType, eventType: number, toUid: string): Promise<GeneralCallResult>
+
+  clickInlineKeyboardButton(inlineKeyboardClickInfo: {
+    guildId: string
+    dmFlag: number
+    peerId: string
+    chatType: ChatType
+    botAppid: string
+    msgSeq: string
+    buttonId: string
+    callback_data: string
+  }): Promise<GeneralCallResult & {
+    status: number
+    promptText: string
+    promptType: number
+    promptIcon: number
+  }>
 }

src/onebot11/action/llbot/msg/SendGroupAiRecord.ts

@@ -22,7 +22,16 @@ export class SendGroupAiRecord extends BaseAction<Payload, Response> {
   })
 
   async _handle(payload: Payload) {
-    await this.ctx.pmhq.getGroupGenerateAiRecord(+payload.group_id, payload.character, payload.text, +payload.chat_type)
-    return { message_id: 0 }
+    const res = await this.ctx.pmhq.getGroupGenerateAiRecord(+payload.group_id, payload.character, payload.text, +payload.chat_type)
+    const targetMsgRandom = res.msgRandom.toString()
+    const { promise, resolve } = Promise.withResolvers<Response>()
+    const dispose = this.ctx.on('nt/message-created', (msg) => {
+      if (msg.msgRandom === targetMsgRandom) {
+        dispose()
+        const shortId = this.ctx.store.createMsgShortId(msg)
+        resolve({ message_id: shortId })
+      }
+    })
+    return promise
   }
 }

src/onebot11/entities.ts

@@ -274,12 +274,16 @@ export namespace OB11Entities {
       } else {
         operatorUin = await ctx.ntUserApi.getUinByUid(revokeElement.operatorUid)
       }
-      if (msg.senderUin === '0' || !msg.senderUin) {
-        ctx.logger.warn(`发生异常 senderUin: ${msg.senderUin}`)
+      let senderUin = msg.senderUin
+      if (msg.senderUin === '0') {
+        senderUin = await ctx.ntUserApi.getUinByUid(revokeElement.origMsgSenderUid)
+        if (revokeElement.operatorUid === revokeElement.origMsgSenderUid) {
+          operatorUin = senderUin
+        }
       }
       return new OB11GroupRecallNoticeEvent(
         Number(msg.peerUid),
-        Number(msg.senderUin),
+        Number(senderUin),
         Number(operatorUin),
         shortId,
       )

src/version.ts

@@ -1 +1 @@
-export const version = '7.12.10'
+export const version = '7.12.11'