llonebot-dist 7.8.4 → 7.9.0

package/llbot.js

@@ -4083,7 +4083,7 @@ var Msg;
       }),
       msgContent: ProtoField(2, "bytes"),
       msgEncryptContent: ProtoField(3, "bytes")
-    })
+    }, "optional")
   });
   Msg2.PbMultiMsgItem = ProtoMessage.of({
     fileName: ProtoField(1, "string"),
@@ -7207,7 +7207,7 @@ class WebUITokenUtil {
 }
 const webuiTokenUtil = new WebUITokenUtil(path__default.join(DATA_DIR, "webui_token.txt"));
 const logFileName = `llbot-${(/* @__PURE__ */ new Date()).toLocaleString("zh-CN")}.log`.replace(/\//g, "-").replace(/:/g, "-");
-const version$3 = "7.8.4";
+const version$3 = "7.9.0";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
@@ -30205,7 +30205,7 @@ let GetGroupInfo$1 = class GetGroupInfo extends BaseAction {
       remark_name: groupDetail.remarkName,
       avatar_url: `https://p.qlogo.cn/gh/${groupDetail.groupCode}/${groupDetail.groupCode}/0`,
       // 以下是非 OneBot 11 标准字段
-      owner_id: +groupDetail.ownerUin,
+      owner_id: +groupDetail.ownerUin || +await this.ctx.ntUserApi.getUinByUid(groupDetail.ownerUid),
       // 群主 QQ 号
       is_top: groupDetail.isTop,
       // 是否置顶群聊
@@ -33788,7 +33788,10 @@ class OneBot11Adapter extends Service2 {
     });
     this.ctx.on("nt/system-message-created", async (input) => {
       const sysMsg = Msg.Message.decode(input);
-      const { msgType, subType } = sysMsg.contentHead ?? {};
+      if (!sysMsg.body) {
+        return;
+      }
+      const { msgType, subType } = sysMsg.contentHead;
       if (msgType === 528 && subType === 39) {
         const tip = Notify.ProfileLike.decode(sysMsg.body.msgContent);
         if (tip.msgType !== 0 || tip.subType !== 203) return;
@@ -33961,7 +33964,7 @@ class OneBot11Adapter extends Service2 {
           if (!pushMsg.message.body) {
             return null;
           }
-          const { msgType, subType } = pushMsg.message?.contentHead ?? {};
+          const { msgType, subType } = pushMsg.message.contentHead;
           if (msgType === 732 && subType === 16) {
             const notify = Msg.NotifyMessageBody.decode(pushMsg.message.body.msgContent.subarray(7));
             if (notify.field13 === 35) {
@@ -35714,6 +35717,64 @@ async function parseFriendRequest(bot, input) {
     }
   });
 }
+async function parseReactionAdded(bot, input, time2) {
+  const { info, target } = input.reaction.data.body;
+  const peer = {
+    chatType: ChatType.Group,
+    peerUid: input.groupCode.toString(),
+    guildId: ""
+  };
+  const targetMsg = await bot.ctx.ntMsgApi.getMsgsBySeqAndCount(peer, target.sequence.toString(), 1, true, true);
+  if (targetMsg.msgList.length === 0) {
+    bot.ctx.logger.error("解析群表情回应失败：未找到消息");
+    return;
+  }
+  const user = await bot.ctx.ntUserApi.getUserSimpleInfo(info.operatorUid);
+  const groupAll = await bot.ctx.ntGroupApi.getGroupAllInfo(input.groupCode.toString());
+  return bot.event("reaction-added", {
+    message: {
+      id: targetMsg.msgList[0].msgId,
+      content: info.code,
+      timestamp: time2 * 1e3
+    },
+    user: decodeUser(user.coreInfo),
+    channel: {
+      id: groupAll.groupCode,
+      name: groupAll.groupName,
+      type: Channel.Type.TEXT
+    },
+    guild: decodeGuild(groupAll)
+  });
+}
+async function parseReactionRemoved(bot, input, time2) {
+  const { info, target } = input.reaction.data.body;
+  const peer = {
+    chatType: ChatType.Group,
+    peerUid: input.groupCode.toString(),
+    guildId: ""
+  };
+  const targetMsg = await bot.ctx.ntMsgApi.getMsgsBySeqAndCount(peer, target.sequence.toString(), 1, true, true);
+  if (targetMsg.msgList.length === 0) {
+    bot.ctx.logger.error("解析群表情回应失败：未找到消息");
+    return;
+  }
+  const user = await bot.ctx.ntUserApi.getUserSimpleInfo(info.operatorUid);
+  const groupAll = await bot.ctx.ntGroupApi.getGroupAllInfo(input.groupCode.toString());
+  return bot.event("reaction-removed", {
+    message: {
+      id: targetMsg.msgList[0].msgId,
+      content: info.code,
+      timestamp: time2 * 1e3
+    },
+    user: decodeUser(user.coreInfo),
+    channel: {
+      id: groupAll.groupCode,
+      name: groupAll.groupName,
+      type: Channel.Type.TEXT
+    },
+    guild: decodeGuild(groupAll)
+  });
+}
 class SatoriAdapter extends Service2 {
   constructor(ctx, config2) {
     super(ctx, "satori", true);
@@ -35732,7 +35793,8 @@ class SatoriAdapter extends Service2 {
     "ntGroupApi",
     "ntUserApi",
     "ntWebApi",
-    "store"
+    "store",
+    "app"
   ];
   selfId;
   server;
@@ -35817,6 +35879,31 @@ class SatoriAdapter extends Service2 {
         this.server.dispatch(event);
       }
     });
+    this.ctx.app.pmhq.addResListener(async (data) => {
+      if (data.type === "recv" && data.data.cmd === "trpc.msg.olpush.OlPushService.MsgPush") {
+        const pushMsg = Msg.PushMsg.decode(Buffer.from(data.data.pb, "hex"));
+        if (!pushMsg.message.body) {
+          return;
+        }
+        const { msgTime, msgType, subType } = pushMsg.message.contentHead;
+        if (msgType === 732 && subType === 16) {
+          const notify = Msg.NotifyMessageBody.decode(pushMsg.message.body.msgContent.subarray(7));
+          if (notify.field13 === 35) {
+            if (notify.reaction.data.body.info.type === 1) {
+              const event = await parseReactionAdded(this, notify, msgTime).catch((e) => this.ctx.logger.error(e));
+              if (event) {
+                this.server.dispatch(event);
+              }
+            } else {
+              const event = await parseReactionRemoved(this, notify, msgTime).catch((e) => this.ctx.logger.error(e));
+              if (event) {
+                this.server.dispatch(event);
+              }
+            }
+          }
+        }
+      }
+    });
   }
   event(type2, data) {
     const sn = ++this._eventSeq;
@@ -49535,7 +49622,7 @@ class MilkyHttpHandler {
     this.app.use(express.json({ limit: "1024mb" }));
     if (this.config.accessToken) {
       this.app.use(`${this.config.prefix}/api`, (req, res, next) => {
-        if (req.headers["content-type"] !== "application/json") {
+        if (!req.headers["content-type"]?.includes("application/json")) {
           this.ctx.logger.warn(
             "MilkyHttp",
             `${req.ip} -> ${req.path} (Content-Type not application/json)`
@@ -49953,7 +50040,10 @@ const IncomingSegment = discriminatedUnion("type", [
   }).describe("文本消息段"),
   object({
     type: literal("mention"),
-    data: object({ user_id: ZUin.describe("提及的 QQ 号") })
+    data: object({
+      user_id: ZUin.describe("提及的 QQ 号"),
+      name: ZString.describe("去掉 `@` 前缀的提及的名称")
+    })
   }).describe("提及消息段"),
   object({
     type: literal("mention_all"),
@@ -49968,7 +50058,15 @@ const IncomingSegment = discriminatedUnion("type", [
   }).describe("表情消息段"),
   object({
     type: literal("reply"),
-    data: object({ message_seq: ZInt64.describe("被引用的消息序列号") })
+    data: object({
+      message_seq: ZInt64.describe("被引用的消息序列号"),
+      sender_id: ZUin.describe("被引用的消息发送者 QQ 号"),
+      sender_name: ZString.nullish().describe("被引用的消息发送者名称，仅在合并转发中能够获取"),
+      time: ZInt64.describe("被引用的消息的 Unix 时间戳（秒）"),
+      get segments() {
+        return array(lazy(() => IncomingSegment)).describe("被引用的消息内容");
+      }
+    })
   }).describe("回复消息段"),
   object({
     type: literal("image"),
@@ -50033,8 +50131,12 @@ const IncomingSegment = discriminatedUnion("type", [
       xml_payload: ZString.describe("XML 数据")
     })
   }).describe("XML 消息段")
-]).describe("接收消息段");
+]).catch({
+  type: "text",
+  data: { text: "[unknown]" }
+}).describe("接收消息段");
 const IncomingForwardedMessage = object({
+  message_seq: ZInt64.describe("消息序列号"),
   sender_name: ZString.describe("发送者名称"),
   avatar_url: ZString.describe("发送者头像 URL"),
   time: ZInt64.describe("消息 Unix 时间戳（秒）"),
@@ -50081,10 +50183,20 @@ const OutgoingSegment = discriminatedUnion("type", [
   }).describe("视频消息段"),
   object({
     type: literal("forward"),
-    data: object({ get messages() {
-      return array(lazy(() => OutgoingForwardedMessage)).describe("合并转发消息段");
-    } })
-  }).describe("合并转发消息段")
+    data: object({
+      get messages() {
+        return array(lazy(() => OutgoingForwardedMessage)).describe("合并转发消息内容");
+      },
+      title: ZString.nullish().describe("合并转发标题"),
+      preview: array(ZString).min(1).max(4).nullish().describe("合并转发预览文本，若提供，至少 1 条，至多 4 条"),
+      summary: ZString.nullish().describe("合并转发摘要"),
+      prompt: ZString.nullish().describe("合并转发的预览外显文本，仅对移动端 QQ 有效")
+    })
+  }).describe("合并转发消息段"),
+  object({
+    type: literal("light_app"),
+    data: object({ json_payload: ZString.describe("小程序 JSON 数据") })
+  }).describe("小程序消息段")
 ]).describe("发送消息段");
 const OutgoingForwardedMessage = object({
   user_id: ZUin.describe("发送者 QQ 号"),
@@ -50145,6 +50257,15 @@ const MessageRecallEvent = object({
   operator_id: ZUin.describe("操作者 QQ 号"),
   display_suffix: ZString.describe("撤回提示的后缀文本")
 });
+const PeerPinChangeEvent = object({
+  message_scene: _enum([
+    "friend",
+    "group",
+    "temp"
+  ]).describe("发生改变的会话的消息场景"),
+  peer_id: ZUin.describe("发生改变的好友 QQ 号或群号"),
+  is_pinned: ZBoolean.describe("是否被置顶, `false` 表示取消置顶")
+});
 const FriendRequestEvent = object({
   initiator_id: ZUin.describe("申请好友的用户 QQ 号"),
   initiator_uid: ZString.describe("用户 UID"),
@@ -50265,6 +50386,12 @@ discriminatedUnion("event_type", [
     self_id: ZUin.describe("机器人 QQ 号"),
     data: MessageRecallEvent
   }).describe("消息撤回事件"),
+  object({
+    event_type: literal("peer_pin_change"),
+    time: ZInt64.describe("事件 Unix 时间戳（秒）"),
+    self_id: ZUin.describe("机器人 QQ 号"),
+    data: PeerPinChangeEvent
+  }).describe("会话置顶变更事件"),
   object({
     event_type: literal("friend_request"),
     time: ZInt64.describe("事件 Unix 时间戳（秒）"),
@@ -50362,7 +50489,7 @@ discriminatedUnion("event_type", [
     data: GroupFileUploadEvent
   }).describe("群文件上传事件")
 ]).describe("事件");
-var version$1 = "1.1.0";
+var version$1 = "1.2.0-rc.1";
 const milkyPackageVersion = version$1;
 const milkyVersion = milkyPackageVersion.split(".").slice(0, 2).join(".");
 const CachedApiBase = object({ no_cache: ZBooleanWithDefault(false).describe("是否强制不使用缓存") });
@@ -50419,6 +50546,19 @@ const GetGroupMemberInfoInput = object({
   user_id: ZUin.describe("群成员 QQ 号")
 }).extend(CachedApiBase.shape);
 const GetGroupMemberInfoOutput = object({ member: lazy(() => GroupMemberEntity).describe("群成员信息") });
+const GetPeerPinsOutput = object({
+  friends: array(lazy(() => FriendEntity)).describe("置顶的好友列表"),
+  groups: array(lazy(() => GroupEntity)).describe("置顶的群列表")
+});
+const SetPeerPinInput = object({
+  message_scene: _enum([
+    "friend",
+    "group",
+    "temp"
+  ]).describe("要设置的会话的消息场景"),
+  peer_id: ZUin.describe("要设置的好友 QQ 号或群号"),
+  is_pinned: ZBooleanWithDefault(true).describe("是否置顶, `false` 表示取消置顶")
+});
 const SetAvatarInput = object({ uri: ZString.describe("头像文件 URI，支持 `file://` `http(s)://` `base64://` 三种格式") });
 const SetNicknameInput = object({ new_nickname: ZString.describe("新昵称") });
 const SetBioInput = object({ new_bio: ZString.describe("新个性签名") });
@@ -50503,6 +50643,7 @@ const RejectFriendRequestInput = object({
   is_filtered: ZBooleanWithDefault(false).describe("是否是被过滤的请求"),
   reason: ZString.nullish().describe("拒绝理由")
 });
+const ZRobustArray = (element) => z.array(element.catch(null)).transform((val) => val.filter((item) => item !== null));
 const SetGroupNameInput = object({
   group_id: ZUin.describe("群号"),
   new_group_name: ZString.describe("新群名称")
@@ -50569,7 +50710,8 @@ const QuitGroupInput = object({ group_id: ZUin.describe("群号") });
 const SendGroupMessageReactionInput = object({
   group_id: ZUin.describe("群号"),
   message_seq: ZInt64.describe("要回应的消息序列号"),
-  reaction: ZString.describe("表情 ID"),
+  reaction: ZString.describe("发送的回应的表情 ID"),
+  reaction_type: _enum(["face", "emoji"]).default("face").describe("发送的回应类型"),
   is_add: ZBooleanWithDefault(true).describe("是否添加表情，`false` 表示取消")
 });
 const SendGroupNudgeInput = object({
@@ -50582,7 +50724,7 @@ const GetGroupNotificationsInput = object({
   limit: ZInt32WithDefault(20).describe("获取的最大通知数量")
 });
 const GetGroupNotificationsOutput = object({
-  notifications: array(lazy(() => GroupNotification)).describe("获取到的群通知（notification_seq 降序排列），序列号不一定连续"),
+  notifications: ZRobustArray(GroupNotification).describe("获取到的群通知（notification_seq 降序排列），序列号不一定连续"),
   next_notification_seq: ZInt64.nullish().describe("下一页起始通知序列号")
 });
 const AcceptGroupRequestInput = object({
@@ -50729,7 +50871,7 @@ const GetImplInfo = defineApi(
       impl_version: version$3,
       qq_protocol_version: deviceInfo.buildVer,
       qq_protocol_type: transformProtocolOsType(deviceInfo.devType),
-      milky_version: "1.1"
+      milky_version: "1.2"
     });
   }
 );
@@ -50766,10 +50908,14 @@ const GetFriendList2 = defineApi(
   GetFriendListOutput,
   async (ctx, payload) => {
     const friends = await ctx.ntFriendApi.getBuddyList();
+    const category = /* @__PURE__ */ new Map();
     const friendList = [];
     for (const friend of friends) {
-      const category = await ctx.ntFriendApi.getCategoryById(friend.baseInfo.categoryId);
-      friendList.push(transformFriend(friend, category));
+      const { categoryId } = friend.baseInfo;
+      if (!category.has(categoryId)) {
+        category.set(categoryId, await ctx.ntFriendApi.getCategoryById(categoryId));
+      }
+      friendList.push(transformFriend(friend, category.get(categoryId)));
     }
     return Ok({
       friends: friendList
@@ -50881,6 +51027,65 @@ const GetGroupMemberInfo2 = defineApi(
     });
   }
 );
+const GetPeerPins = defineApi(
+  "get_peer_pins",
+  z.object({}),
+  GetPeerPinsOutput,
+  async (ctx, payload) => {
+    const friends = await ctx.ntFriendApi.getBuddyList();
+    const category = /* @__PURE__ */ new Map();
+    const groups = await ctx.ntGroupApi.getGroups();
+    return Ok({
+      friends: await Promise.all(
+        friends.filter((e) => e.relationFlags?.topTime !== "0").map(async (e) => {
+          const { categoryId } = e.baseInfo;
+          if (!category.has(categoryId)) {
+            category.set(categoryId, await ctx.ntFriendApi.getCategoryById(categoryId));
+          }
+          return transformFriend(e, category.get(categoryId));
+        })
+      ),
+      groups: groups.filter((e) => e.isTop).map((e) => {
+        return {
+          group_id: +e.groupCode,
+          group_name: e.groupName,
+          member_count: e.memberCount,
+          max_member_count: e.maxMember
+        };
+      })
+    });
+  }
+);
+const SetPeerPin = defineApi(
+  "set_peer_pin",
+  SetPeerPinInput,
+  z.object({}),
+  async (ctx, payload) => {
+    if (payload.message_scene === "friend") {
+      const uid = await ctx.ntUserApi.getUidByUin(payload.peer_id.toString());
+      const result = await ctx.ntFriendApi.setTop(uid, payload.is_pinned);
+      if (result.result !== 0) {
+        return Failed(-500, result.errMsg);
+      }
+    } else if (payload.message_scene === "group") {
+      const result = await ctx.ntGroupApi.setTop(payload.peer_id.toString(), payload.is_pinned);
+      if (result.result !== 0) {
+        return Failed(-500, result.errMsg);
+      }
+    } else if (payload.message_scene === "temp") {
+      const uid = await ctx.ntUserApi.getUidByUin(payload.peer_id.toString());
+      const result = await ctx.ntMsgApi.setContactLocalTop({
+        chatType: ChatType.TempC2CFromGroup,
+        peerUid: uid,
+        guildId: ""
+      }, payload.is_pinned);
+      if (result.result !== 0) {
+        return Failed(-500, result.errMsg);
+      }
+    }
+    return Ok({});
+  }
+);
 const SetAvatar = defineApi(
   "set_avatar",
   SetAvatarInput,
@@ -51008,6 +51213,8 @@ const SystemApi = [
   GetGroupInfo2,
   GetGroupMemberList2,
   GetGroupMemberInfo2,
+  GetPeerPins,
+  SetPeerPin,
   SetAvatar,
   SetNickname,
   SetBio,
@@ -51071,6 +51278,9 @@ async function transformOutgoingMessage(ctx, segments, peerUid, isGroup = false)
         const videoElement = await SendElement.video(ctx, tempPath, thumbTempPath);
         elements.push(videoElement);
         deleteAfterSentFiles.push(tempPath);
+      } else if (segment.type === "light_app") {
+        const arkElement = SendElement.ark(segment.data.json_payload);
+        elements.push(arkElement);
       }
     } catch (error2) {
       ctx.logger.error("MilkyTransform", `Failed to transform segment ${segment.type}: ${error2}`);
@@ -51081,9 +51291,9 @@ async function transformOutgoingMessage(ctx, segments, peerUid, isGroup = false)
     deleteAfterSentFiles
   };
 }
-async function transformOutgoingForwardMessages(ctx, messages, peer) {
+async function transformOutgoingForwardMessages(ctx, messages, peer, options) {
   const encoder = new ForwardMessageEncoder(ctx, peer);
-  return await encoder.generate(messages);
+  return await encoder.generate(messages, options);
 }
 class ForwardMessageEncoder {
   constructor(ctx, peer) {
@@ -51289,7 +51499,12 @@ class ForwardMessageEncoder {
         unlink(tempPath).catch((e) => {
         });
       } else if (type2 === "forward") {
-        const innerRaw = await this.generate(data.messages);
+        const innerRaw = await this.generate(data.messages, {
+          title: data.title,
+          preview: data.preview,
+          summary: data.summary,
+          prompt: data.prompt
+        });
         this.innerRaws.push(innerRaw);
         const resid = await this.ctx.app.pmhq.uploadForward(this.peer, innerRaw.multiMsgItems);
         this.children.push(this.packForwardMessage(resid, innerRaw.uuid, innerRaw));
@@ -51327,7 +51542,7 @@ class ForwardMessageEncoder {
       await this.visit(item);
     }
   }
-  async generate(content) {
+  async generate(content, options) {
     await this.render(content);
     const msg = this.results;
     const tsum = this.tsum;
@@ -51353,10 +51568,10 @@ class ForwardMessageEncoder {
     return {
       multiMsgItems,
       tsum,
-      source: this.isGroup ? "群聊的聊天记录" : "聊天记录",
-      summary: `查看${tsum}条转发消息`,
-      news,
-      prompt: "[聊天记录]",
+      source: options?.title ?? (this.isGroup ? "群聊的聊天记录" : "聊天记录"),
+      summary: options?.summary ?? `查看${tsum}条转发消息`,
+      news: options?.preview?.map((e) => ({ text: e })) ?? news,
+      prompt: options?.prompt ?? "[聊天记录]",
       uuid: crypto.randomUUID()
     };
   }
@@ -52923,7 +53138,8 @@ async function transformIncomingSegments(ctx, message) {
           segments.push({
             type: "mention",
             data: {
-              user_id: +element.textElement.atUid
+              user_id: +element.textElement.atUid,
+              name: element.textElement.content.slice(1)
             }
           });
         } else if (element.textElement?.content) {
@@ -52948,7 +53164,10 @@ async function transformIncomingSegments(ctx, message) {
         segments.push({
           type: "reply",
           data: {
-            message_seq: +element.replyElement.replayMsgSeq
+            message_seq: +element.replyElement.replayMsgSeq,
+            sender_id: +element.replyElement.senderUid,
+            time: +element.replyElement.replyMsgTime,
+            segments: await transformIncomingSegments(ctx, message.records[0])
           }
         });
         break;
@@ -53042,88 +53261,98 @@ async function transformIncomingSegments(ctx, message) {
 }
 async function transformIncomingForwardedMessage(ctx, message) {
   const { body, contentHead, routingHead } = message;
-  const segments = [];
-  for (const elem of body.richText.elems) {
-    if (elem.text) {
-      segments.push({
-        type: "text",
-        data: {
-          text: elem.text.str
-        }
-      });
-    } else if (elem.commonElem) {
-      const { businessType, serviceType } = elem.commonElem;
-      if (serviceType === 33) {
-        const { faceId } = Msg.QSmallFaceExtra.decode(elem.commonElem.pbElem);
-        segments.push({
-          type: "face",
-          data: {
-            face_id: faceId.toString(),
-            is_large: false
-          }
-        });
-      } else if (serviceType === 48 && (businessType === 10 || businessType === 20)) {
-        const { extBizInfo, msgInfoBody } = Media.MsgInfo.decode(elem.commonElem.pbElem);
-        const { index: index2, pic } = msgInfoBody[0];
-        const rkeyData = await ctx.ntFileApi.rkeyManager.getRkey();
-        const rkey = businessType === 10 ? rkeyData.private_rkey : rkeyData.group_rkey;
-        const url2 = `https://${pic.domain}${pic.urlPath}&spec=0${rkey}`;
-        segments.push({
-          type: "image",
-          data: {
-            resource_id: index2.fileUuid,
-            temp_url: url2,
-            width: index2.info.width,
-            height: index2.info.height,
-            summary: extBizInfo.pic.summary || "[图片]",
-            sub_type: extBizInfo.pic.bizType === 0 ? "normal" : "sticker"
-          }
-        });
-      } else if (serviceType === 48 && (businessType === 11 || businessType === 21)) {
-        const { msgInfoBody } = Media.MsgInfo.decode(elem.commonElem.pbElem);
-        const { index: index2 } = msgInfoBody[0];
-        const url2 = await ctx.ntFileApi.getVideoUrlByPacket(index2.fileUuid, businessType === 21);
+  const transformSegments = async (elems) => {
+    const segments = [];
+    for (const elem of elems) {
+      if (elem.text) {
         segments.push({
-          type: "video",
+          type: "text",
           data: {
-            resource_id: index2.fileUuid,
-            temp_url: url2,
-            width: index2.info.width,
-            height: index2.info.height,
-            duration: index2.info.time
+            text: elem.text.str
           }
         });
-      }
-    } else if (elem.srcMsg) {
-      segments.push({
-        type: "reply",
-        data: {
-          message_seq: elem.srcMsg.origSeqs[0]
+      } else if (elem.commonElem) {
+        const { businessType, serviceType } = elem.commonElem;
+        if (serviceType === 33) {
+          const { faceId } = Msg.QSmallFaceExtra.decode(elem.commonElem.pbElem);
+          segments.push({
+            type: "face",
+            data: {
+              face_id: faceId.toString(),
+              is_large: false
+            }
+          });
+        } else if (serviceType === 48 && (businessType === 10 || businessType === 20)) {
+          const { extBizInfo, msgInfoBody } = Media.MsgInfo.decode(elem.commonElem.pbElem);
+          const { index: index2, pic } = msgInfoBody[0];
+          const rkeyData = await ctx.ntFileApi.rkeyManager.getRkey();
+          const rkey = businessType === 10 ? rkeyData.private_rkey : rkeyData.group_rkey;
+          const url2 = `https://${pic.domain}${pic.urlPath}&spec=0${rkey}`;
+          segments.push({
+            type: "image",
+            data: {
+              resource_id: index2.fileUuid,
+              temp_url: url2,
+              width: index2.info.width,
+              height: index2.info.height,
+              summary: extBizInfo.pic.summary || "[图片]",
+              sub_type: extBizInfo.pic.bizType === 0 ? "normal" : "sticker"
+            }
+          });
+        } else if (serviceType === 48 && (businessType === 11 || businessType === 21)) {
+          const { msgInfoBody } = Media.MsgInfo.decode(elem.commonElem.pbElem);
+          const { index: index2 } = msgInfoBody[0];
+          const url2 = await ctx.ntFileApi.getVideoUrlByPacket(index2.fileUuid, businessType === 21);
+          segments.push({
+            type: "video",
+            data: {
+              resource_id: index2.fileUuid,
+              temp_url: url2,
+              width: index2.info.width,
+              height: index2.info.height,
+              duration: index2.info.time
+            }
+          });
         }
-      });
-    } else if (elem.richMsg && elem.richMsg.serviceId === 35) {
-      const xml = inflateSync(elem.richMsg.template.subarray(1)).toString();
-      const resId = xml.match(/m_resid="([^"]+)"/)?.[1];
-      if (resId) {
-        const parser = new XMLParser();
-        const content = parser.parse(xml);
+      } else if (elem.srcMsg) {
+        const elems2 = elem.srcMsg.elems.map((e) => Msg.Elem.decode(e));
+        const { contentHead: contentHead2, routingHead: routingHead2 } = Msg.Message.decode(elem.srcMsg.srcMsg);
         segments.push({
-          type: "forward",
+          type: "reply",
           data: {
-            forward_id: resId,
-            title: content.msg.item.title[0],
-            preview: content.msg.item.title.slice(1),
-            summary: content.msg.item.summary
+            message_seq: elem.srcMsg.origSeqs[0],
+            sender_id: elem.srcMsg.senderUin,
+            sender_name: contentHead2.msgType === 82 ? routingHead2.group.groupCard : routingHead2.c2c.friendName,
+            time: elem.srcMsg.time,
+            segments: await transformSegments(elems2)
           }
         });
+      } else if (elem.richMsg && elem.richMsg.serviceId === 35) {
+        const xml = inflateSync(elem.richMsg.template.subarray(1)).toString();
+        const resId = xml.match(/m_resid="([^"]+)"/)?.[1];
+        if (resId) {
+          const parser = new XMLParser();
+          const content = parser.parse(xml);
+          segments.push({
+            type: "forward",
+            data: {
+              forward_id: resId,
+              title: content.msg.item.title[0],
+              preview: content.msg.item.title.slice(1),
+              summary: content.msg.item.summary
+            }
+          });
+        }
       }
     }
-  }
+    return segments;
+  };
   return {
+    message_seq: contentHead.msgSeq,
     sender_name: contentHead.msgType === 82 ? routingHead.group.groupCard : routingHead.c2c.friendName,
     avatar_url: contentHead.forward.avatar,
     time: contentHead.msgTime,
-    segments
+    segments: await transformSegments(body.richText.elems)
   };
 }
 const SendPrivateMessage = defineApi(
@@ -53145,13 +53374,21 @@ const SendPrivateMessage = defineApi(
     }
     let result;
     if (payload.message[0].type === "forward") {
+      const forwardData = payload.message[0].data;
       const raw = await transformOutgoingForwardMessages(
         ctx,
-        payload.message[0].data.messages,
-        peer
+        forwardData.messages,
+        peer,
+        {
+          title: forwardData.title,
+          preview: forwardData.preview,
+          summary: forwardData.summary,
+          prompt: forwardData.prompt
+        }
       );
       const resid = await ctx.app.pmhq.uploadForward(peer, raw.multiMsgItems);
       const uuid2 = randomUUID();
+      const prompt = raw.prompt;
       result = await ctx.app.sendMessage(ctx, peer, [{
         elementType: 10,
         elementId: "",
@@ -53165,7 +53402,7 @@ const SendPrivateMessage = defineApi(
               type: "normal",
               width: 300
             },
-            desc: raw.prompt,
+            desc: prompt,
             extra: JSON.stringify({
               filename: uuid2,
               tsum: raw.tsum
@@ -53179,7 +53416,7 @@ const SendPrivateMessage = defineApi(
                 uniseq: uuid2
               }
             },
-            prompt: raw.prompt,
+            prompt,
             ver: "0.0.0.5",
             view: "contact"
           })
@@ -53214,13 +53451,21 @@ const SendGroupMessage = defineApi(
     const peer = { chatType: 2, peerUid: groupCode, guildId: "" };
     let result;
     if (payload.message[0].type === "forward") {
+      const forwardData = payload.message[0].data;
       const raw = await transformOutgoingForwardMessages(
         ctx,
-        payload.message[0].data.messages,
-        peer
+        forwardData.messages,
+        peer,
+        {
+          title: forwardData.title,
+          preview: forwardData.preview,
+          summary: forwardData.summary,
+          prompt: forwardData.prompt
+        }
       );
       const resid = await ctx.app.pmhq.uploadForward(peer, raw.multiMsgItems);
       const uuid2 = randomUUID();
+      const prompt = raw.prompt;
       result = await ctx.app.sendMessage(ctx, peer, [{
         elementType: 10,
         elementId: "",
@@ -53234,7 +53479,7 @@ const SendGroupMessage = defineApi(
               type: "normal",
               width: 300
             },
-            desc: raw.prompt,
+            desc: prompt,
             extra: JSON.stringify({
               filename: uuid2,
               tsum: raw.tsum
@@ -53248,7 +53493,7 @@ const SendGroupMessage = defineApi(
                 uniseq: uuid2
               }
             },
-            prompt: raw.prompt,
+            prompt,
             ver: "0.0.0.5",
             view: "contact"
           })
@@ -53983,7 +54228,11 @@ const SendGroupMessageReaction = defineApi(
       peer,
       payload.message_seq.toString(),
       payload.reaction,
-      payload.is_add
+      payload.is_add,
+      {
+        face: "1",
+        emoji: "2"
+      }[payload.reaction_type]
     );
     if (result.result !== 0) {
       return Failed(-500, result.errMsg);
@@ -54699,7 +54948,10 @@ async function transformGroupMessageEvent(ctx, message) {
 async function transformSystemMessageEvent(ctx, data) {
   try {
     const sysMsg = Msg.Message.decode(data);
-    const { msgType, subType } = sysMsg.contentHead ?? {};
+    if (!sysMsg.body) {
+      return null;
+    }
+    const { msgType, subType } = sysMsg.contentHead;
     if (msgType === 33) {
       const tip = Notify.GroupMemberChange.decode(sysMsg.body.msgContent);
       if (tip.type !== 130) return null;
@@ -54757,6 +55009,19 @@ async function transformSystemMessageEvent(ctx, data) {
         }
       };
     } else if (msgType === 528 && subType === 39) {
+      const tip = Notify.FriendDeleteOrPinChange.decode(sysMsg.body.msgContent);
+      if (tip.body.type !== 7) return null;
+      const messageScene = tip.body.pinChanged?.body.groupCode ? "group" : "friend";
+      const peerId = messageScene === "group" ? tip.body.pinChanged.body.groupCode : Number(await ctx.ntUserApi.getUinByUid(tip.body.pinChanged.body.uid));
+      const isPinned = tip.body.pinChanged?.body.info.timestamp.length !== 0;
+      return {
+        eventType: "peer_pin_change",
+        data: {
+          message_scene: messageScene,
+          peer_id: peerId,
+          is_pinned: isPinned
+        }
+      };
     }
     return null;
   } catch (error2) {
@@ -54770,7 +55035,7 @@ async function transformOlpushEvent(ctx, data) {
     if (!pushMsg.message.body) {
       return null;
     }
-    const { msgType, subType } = pushMsg.message?.contentHead ?? {};
+    const { msgType, subType } = pushMsg.message.contentHead;
     if (msgType === 732 && subType === 16) {
       const notify = Msg.NotifyMessageBody.decode(pushMsg.message.body.msgContent.subarray(7));
       if (notify.field13 === 35) {
@@ -54907,6 +55172,7 @@ class MilkyAdapter extends Service2 {
       }
     });
     this.ctx.on("nt/message-deleted", async (message) => {
+      if (!message.elements[0].grayTipElement?.revokeElement) return;
       if (message.chatType === ChatType.C2C) {
         const eventData = await transformPrivateMessageDeleted(this.ctx, message);
         if (eventData) {
@@ -59662,8 +59928,8 @@ class NTQQMsgApi extends Service2 {
   getEmojiIdType(emojiId) {
     return emojiId.length > 3 ? "2" : "1";
   }
-  async setEmojiLike(peer, msgSeq, emojiId, setEmoji) {
-    return await invoke(NTMethod.EMOJI_LIKE, [peer, msgSeq, emojiId, this.getEmojiIdType(emojiId), setEmoji]);
+  async setEmojiLike(peer, msgSeq, emojiId, setEmoji, emojiType) {
+    return await invoke(NTMethod.EMOJI_LIKE, [peer, msgSeq, emojiId, emojiType ?? this.getEmojiIdType(emojiId), setEmoji]);
   }
   async getMultiMsg(peer, rootMsgId, parentMsgId) {
     return await invoke(NTMethod.GET_MULTI_MSG, [peer, rootMsgId, parentMsgId]);
@@ -60007,6 +60273,9 @@ class NTQQMsgApi extends Service2 {
   async deleteFavEmoji(emojiIds) {
     return await invoke("nodeIKernelMsgService/deleteFavEmoji", [emojiIds]);
   }
+  async setContactLocalTop(peer, isTop) {
+    return await invoke("nodeIKernelMsgService/setContactLocalTop", [peer, isTop]);
+  }
 }
 class HttpUtil {
   static async getCookies(url2) {