Merge pull request #743 from LLOneBot/dev

chore: update version to 7.12.4

Author: idranme

doc/更新日志.txt

@@ -1,3 +1,11 @@
+V7.12.4
+更新时间 2026-04-25
+
+* OneBot 修复发送合并转发包含 `reply` 消息段时可能无法查看合并转发内消息
+* OneBot 修复 get_stranger_info API 偶现报错
+* Milky 修复临时会话没有上报消息撤回事件
+
+=================
 V7.12.3
 更新时间 2026-04-24
 

package-dist.json

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

package.json

@@ -31,15 +31,15 @@
     "compare-versions": "^6.1.1",
     "cordis": "^4.0.0-rc.3",
     "cosmokit": "^1.8.1",
-    "fast-xml-parser": "^5.7.1",
+    "fast-xml-parser": "^5.7.2",
     "file-type": "^22.0.1",
     "fluent-ffmpeg": "^2.1.3",
     "get-port": "^7.2.0",
-    "hono": "^4.12.14",
+    "hono": "^4.12.15",
     "image-size": "^2.0.2",
     "json5": "^2.2.3",
     "minato": "^4.0.1",
-    "nodemailer": "^8.0.5",
+    "nodemailer": "^8.0.6",
     "qrcode": "^1.5.4",
     "schemastery": "^3.18.0",
     "sift": "^17.1.3",
@@ -56,9 +56,9 @@
     "ts-case-convert": "^2.1.0",
     "tsx": "^4.21.0",
     "typescript": "^6.0.3",
-    "vite": "^8.0.9",
+    "vite": "^8.0.10",
     "vite-plugin-cp": "^6.0.3",
-    "vitest": "^4.1.4"
+    "vitest": "^4.1.5"
   },
   "packageManager": "yarn@4.14.1"
 }

src/main/pmhq/mixins/user.ts

@@ -40,7 +40,7 @@ export function UserMixin<T extends new (...args: any[]) => PMHQBase>(Base: T) {
         qid: bytes[27394]?.toString() ?? '',
         level: numbers[105],
         regTime: numbers[20026] ?? 0,
-        longNick: bytes[102].toString(),
+        longNick: bytes[102]?.toString() ?? '',
         city: bytes[20020]?.toString() ?? '',
         country: bytes[20003]?.toString() ?? '',
         birthdayYear: (bytes[20031]?.[0] << 8) | bytes[20031]?.[1],

src/milky/adapter.ts

@@ -22,6 +22,7 @@ import {
   transformPrivateMessageEvent,
   transformOlpushEvent,
   transformTempMessageCreated,
+  transformTempMessageDeleted,
 } from './transform/event'
 import { ChatType } from '@/ntqqapi/types'
 import { noop } from 'cosmokit'
@@ -165,6 +166,11 @@ export class MilkyAdapter extends Service {
         if (eventData) {
           this.emitEvent('message_recall', eventData)
         }
+      } else if (message.chatType === ChatType.TempC2CFromGroup) {
+        const eventData = await transformTempMessageDeleted(this.ctx, message)
+        if (eventData) {
+          this.emitEvent('message_recall', eventData)
+        }
       }
     })
 

src/milky/transform/event.ts

@@ -75,6 +75,29 @@ export async function transformTempMessageCreated(
   }
 }
 
+/**
+ * Transform NTQQ message-deleted event to Milky message_recall event (temp)
+ */
+export async function transformTempMessageDeleted(
+  ctx: Context,
+  message: RawMessage
+): Promise<MilkyEventTypes['message_recall'] | null> {
+  try {
+    const revokeElement = message.elements[0].grayTipElement!.revokeElement!
+    return {
+      message_scene: 'temp',
+      peer_id: Number(message.peerUin),
+      message_seq: Number(message.msgSeq),
+      sender_id: Number(message.senderUin),
+      operator_id: Number(message.senderUin),
+      display_suffix: revokeElement.wording,
+    }
+  } catch (error) {
+    ctx.logger.error('Failed to transform temp message deleted event:', error)
+    return null
+  }
+}
+
 /**
  * Transform NTQQ message-deleted event to Milky message_recall event (private)
  */
@@ -89,7 +112,7 @@ export async function transformPrivateMessageDeleted(
       peer_id: Number(message.peerUin),
       message_seq: Number(message.msgSeq),
       sender_id: Number(message.senderUin),
-      operator_id: Number(await ctx.ntUserApi.getUinByUid(revokeElement.operatorUid)),
+      operator_id: Number(message.senderUin),
       display_suffix: revokeElement.wording,
     }
   } catch (error) {
@@ -107,12 +130,18 @@ export async function transformGroupMessageDeleted(
 ): Promise<MilkyEventTypes['message_recall'] | null> {
   try {
     const revokeElement = message.elements[0].grayTipElement!.revokeElement!
+    let operatorUin
+    if (revokeElement.operatorUid === revokeElement.origMsgSenderUid) {
+      operatorUin = message.senderUin
+    } else {
+      operatorUin = await ctx.ntUserApi.getUinByUid(revokeElement.operatorUid)
+    }
     return {
       message_scene: 'group',
       peer_id: Number(message.peerUin),
       message_seq: Number(message.msgSeq),
       sender_id: Number(message.senderUin),
-      operator_id: Number(await ctx.ntUserApi.getUinByUid(revokeElement.operatorUid)),
+      operator_id: Number(operatorUin),
       display_suffix: revokeElement.wording,
     }
   } catch (error) {

src/ntqqapi/types/msg.ts

@@ -396,7 +396,8 @@ export enum FaceIndex {
 }
 
 export enum FaceType {
-  Normal = 1, // 普通小黄脸表情
+  Old = 1, // 普通小黄脸表情
+  Normal = 2, // 常规表情
   Super = 3, // 超级表情
   Poke = 5  // 戳一戳，窗口抖动那种，私聊才有
 }

src/onebot11/connect/ws.ts

@@ -78,7 +78,7 @@ class OB11WebSocket {
       if (emitEvent && socket.readyState === WebSocket.OPEN) {
         socket.send(JSON.stringify(event))
         const eventName = event.getSummaryEventName()
-        this.ctx.logger.info('WebSocket 事件上报', socket.url ?? '', eventName)
+        this.ctx.logger.info('WebSocket 事件上报', eventName)
       }
     })
   }
@@ -116,7 +116,7 @@ class OB11WebSocket {
     }
     socket.send(JSON.stringify(data))
     if ('post_type' in data) {
-      this.ctx.logger.info('WebSocket 事件上报', socket.url ?? '', data.post_type)
+      this.ctx.logger.info('WebSocket 事件上报', data.post_type)
     }
   }
 

src/onebot11/entities.ts

@@ -268,15 +268,19 @@ export namespace OB11Entities {
   ): Promise<OB11FriendRecallNoticeEvent | OB11GroupRecallNoticeEvent> {
     const revokeElement = msg.elements[0].grayTipElement!.revokeElement!
     if (msg.chatType === ChatType.Group) {
-      const operator = await ctx.ntGroupApi.getGroupMember(msg.peerUid, revokeElement.operatorUid)
-      let uin = msg.senderUin
-      if (uin === '0' || !uin) {
-        uin = await ctx.ntUserApi.getUinByUid(revokeElement.origMsgSenderUid)
+      let operatorUin
+      if (revokeElement.operatorUid === revokeElement.origMsgSenderUid) {
+        operatorUin = msg.senderUin
+      } else {
+        operatorUin = await ctx.ntUserApi.getUinByUid(revokeElement.operatorUid)
+      }
+      if (msg.senderUin === '0' || !msg.senderUin) {
+        ctx.logger.warn(`发生异常 senderUin: ${msg.senderUin}`)
       }
       return new OB11GroupRecallNoticeEvent(
         Number(msg.peerUid),
-        Number(uin),
-        Number(operator.uin || msg.senderUin),
+        Number(msg.senderUin),
+        Number(operatorUin),
         shortId,
       )
     }

src/onebot11/helper/createMultiMessage.ts

@@ -3,7 +3,7 @@ import { OB11MessageData, OB11MessageDataType, OB11MessageNode } from '../types'
 import { Msg, Media } from '@/ntqqapi/proto'
 import { handleOb11RichMedia, message2List } from './createMessage'
 import { selfInfo } from '@/common/globalVars'
-import { ChatType, ElementType, Peer, RichMediaUploadCompleteNotify } from '@/ntqqapi/types'
+import { ChatType, ElementType, FaceType, Peer, RichMediaUploadCompleteNotify } from '@/ntqqapi/types'
 import { deflateSync } from 'node:zlib'
 import faceConfig from '@/ntqqapi/helper/face_config.json'
 import { InferProtoModelInput } from '@saltify/typeproto'
@@ -16,7 +16,7 @@ import { isNonNullable } from 'cosmokit'
 const MAX_FORWARD_DEPTH = 3
 
 export class MessageEncoder {
-  static support = ['text', 'face', 'image', 'forward', 'node', 'video', 'file', 'at']
+  static support = ['text', 'face', 'image', 'forward', 'node', 'video', 'file', 'at', 'reply']
   results: InferProtoModelInput<typeof Msg.Message>[]
   children: InferProtoModelInput<typeof Msg.Elem>[]
   content?: Buffer
@@ -414,6 +414,68 @@ export class MessageEncoder {
         }
       })
       this.preview += str
+    } else if (type === OB11MessageDataType.Reply) {
+      const msgInfo = await this.ctx.store.getMsgInfoByShortId(+data.id)
+      if (!msgInfo) {
+        throw new Error(`消息 ${data.id} 不存在`)
+      }
+      const res = await this.ctx.ntMsgApi.getMsgsByMsgId(msgInfo.peer, [msgInfo.msgId])
+      if (res.msgList.length === 0) {
+        throw new Error(`无法获取消息 ${data.id} 的内容`)
+      }
+      const msg = res.msgList[0]
+      const elems: InferProtoModelInput<typeof Msg.Elem>[] = []
+      for (const element of msg.elements) {
+        if (element.elementType === ElementType.Text) {
+          elems.push({
+            text: {
+              str: element.textElement!.content
+            }
+          })
+        } else if (element.elementType === ElementType.Pic) {
+          elems.push({
+            text: {
+              str: element.picElement!.summary
+            }
+          })
+        } else if (element.elementType === ElementType.Video) {
+          elems.push({
+            text: {
+              str: '[视频]'
+            }
+          })
+        } else if (element.elementType === ElementType.Face) {
+          const { faceType, faceIndex, faceText } = element.faceElement!
+          if (faceType === FaceType.Old || faceType === FaceType.Normal) {
+            elems.push({
+              face: {
+                index: faceIndex
+              }
+            })
+          } else {
+            elems.push({
+              text: {
+                str: faceText
+              }
+            })
+          }
+        } else if (element.elementType === ElementType.File) {
+          elems.push({
+            text: {
+              str: '[文件]'
+            }
+          })
+        }
+      }
+      this.children.push({
+        srcMsg: {
+          origSeqs: [+msg.msgSeq],
+          senderUin: +msg.senderUin,
+          time: +msg.msgTime,
+          elems: elems.map(e => Msg.Elem.encode(e)),
+          toUin: 0
+        }
+      })
     }
   }