llonebot-dist 8.0.2 → 8.0.3

package/llbot.js

@@ -11267,7 +11267,7 @@ var Msg;
 				toUid: ProtoField(4, "string")
 			}, "optional"),
 			trans0X211: ProtoField(15, {
-				toUin: ProtoField(1, "uint64", "optional"),
+				toUin: ProtoField(1, "uint32", "optional"),
 				ccCmd: ProtoField(2, "uint32", "optional"),
 				uid: ProtoField(8, "string", "optional")
 			}, "optional")
@@ -12992,7 +12992,7 @@ var Oidb;
 		clientWording: ProtoField(3, "string")
 	});
 	_Oidb.FetchProfileLikeReq = ProtoMessage.of({
-		targetUid: ProtoField(1, "string"),
+		selfUid: ProtoField(1, "string"),
 		field2: ProtoField(2, "uint32"),
 		direction: ProtoField(3, "uint32"),
 		field4: ProtoField(4, "uint32"),
@@ -13003,11 +13003,24 @@ var Oidb;
 	_Oidb.FetchProfileLikeResp = ProtoMessage.of({ body: ProtoField(1, {
 		targetUid: ProtoField(1, "string"),
 		field2: ProtoField(2, "uint32"),
-		detail: ProtoField(3, {
-			field1: ProtoField(1, "uint32"),
-			field2: ProtoField(2, "uint32"),
-			nextStart: ProtoField(3, "uint32"),
-			users: ProtoField(4, {
+		favoriteInfo: ProtoField(3, { users: ProtoField(4, {
+			uid: ProtoField(1, "string"),
+			src: ProtoField(2, "uint32"),
+			latestTime: ProtoField(3, "uint32"),
+			count: ProtoField(4, "uint32"),
+			giftCount: ProtoField(5, "uint32"),
+			customId: ProtoField(6, "uint32"),
+			lastCharged: ProtoField(8, "uint32"),
+			bTodayVotedCnt: ProtoField(22, "uint32"),
+			nick: ProtoField(101, "string"),
+			gender: ProtoField(102, "uint32"),
+			age: ProtoField(103, "uint32"),
+			isvip: ProtoField(105, "bool"),
+			isSvip: ProtoField(106, "bool")
+		}, "repeated") }),
+		voteInfo: ProtoField(4, {
+			totalCount: ProtoField(1, "uint32"),
+			users: ProtoField(5, {
 				uid: ProtoField(1, "string"),
 				src: ProtoField(2, "uint32"),
 				latestTime: ProtoField(3, "uint32"),
@@ -13022,8 +13035,10 @@ var Oidb;
 				isvip: ProtoField(105, "bool"),
 				isSvip: ProtoField(106, "bool")
 			}, "repeated")
-		}, "optional")
+		})
 	}) });
+	_Oidb.FetchProfileLikeCountReq = ProtoMessage.of({ uid: ProtoField(1, "string") });
+	_Oidb.FetchProfileLikeCountResp = ProtoMessage.of({ body: ProtoField(1, { voteInfo: ProtoField(4, { totalCount: ProtoField(1, "uint32") }) }) });
 	_Oidb.RenameGroupFileReq = ProtoMessage.of({ rename: ProtoField(5, {
 		groupCode: ProtoField(1, "uint32"),
 		busId: ProtoField(3, "uint32"),
@@ -17432,6 +17447,7 @@ function parseElements(elems) {
 					replyMsgSeq: elem.srcMsg.attr.ntMsgSeq ?? elem.srcMsg.origSeqs[0],
 					replyMsgTime: elem.srcMsg.time,
 					senderUin: elem.srcMsg.senderUin,
+					senderUid: elem.srcMsg.attr.senderUid,
 					replyMsgClientSeq: elem.srcMsg.attr.ntMsgSeq ? elem.srcMsg.origSeqs[0] : 0
 				}
 			});
@@ -18956,7 +18972,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$3 = "8.0.2";
+var version$3 = "8.0.3";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -21548,12 +21564,13 @@ var SendElement;
 		};
 	}
 	_SendElement.at = at;
-	function reply(msgSeq, senderUin, msgTime, clientSeq, srcMsg) {
+	function reply(msgSeq, senderUin, senderUid, msgTime, clientSeq, srcMsg) {
 		return {
 			elementType: ElementType.Reply,
 			replyElement: {
 				replyMsgSeq: msgSeq,
 				senderUin,
+				senderUid,
 				replyMsgTime: msgTime,
 				replyMsgClientSeq: clientSeq,
 				srcMsg
@@ -21730,6 +21747,19 @@ var SendElement;
 		};
 	}
 	_SendElement.forward = forward;
+	async function file(ctx, filePath, fileName) {
+		const fileSize = (await stat(filePath)).size;
+		if (fileSize === 0) throw new Error("文件异常，大小为 0");
+		return {
+			elementType: ElementType.File,
+			fileElement: {
+				fileName,
+				filePath,
+				fileSize
+			}
+		};
+	}
+	_SendElement.file = file;
 })(SendElement || (SendElement = {}));
 //#endregion
 //#region src/common/utils/misc.ts
@@ -21915,7 +21945,7 @@ async function transformOutgoingSegments(ctx, messageData, peer, isInsideForward
 						const { msgByteList } = await ctx.ntMsgApi.getSingleMsg(info.peer, info.msgSeq);
 						srcMsg = msgByteList[0];
 					}
-					sendElements.push(SendElement.reply(msg.msgSeq, +msg.senderUin, +msg.msgTime, msg.clientSeq, srcMsg));
+					sendElements.push(SendElement.reply(msg.msgSeq, msg.senderUin, msg.senderUid, msg.msgTime, msg.clientSeq, srcMsg));
 				}
 			}
 			break;
@@ -22059,16 +22089,24 @@ async function transformOutgoingSegments(ctx, messageData, peer, isInsideForward
 				sendElements.push(SendElement.ark(content));
 			}
 			break;
-		case OB11MessageDataType.Node: {
-			const inner = await transformOutgoingSegments(ctx, segment.data.content ? message2List(segment.data.content) : [], peer, true);
-			deleteAfterSentFiles.push(...inner.deleteAfterSentFiles);
-			nodes.push({
-				senderUin: Number(segment.data.uin ?? segment.data.user_id ?? selfInfo.uin),
-				senderName: segment.data.name ?? segment.data.nickname ?? selfInfo.nick,
-				elements: inner.sendElements,
-				msgTime: segment.data.time ? +segment.data.time : void 0
-			});
-		}
+		case OB11MessageDataType.Node:
+			{
+				const inner = await transformOutgoingSegments(ctx, segment.data.content ? message2List(segment.data.content) : [], peer, true);
+				deleteAfterSentFiles.push(...inner.deleteAfterSentFiles);
+				nodes.push({
+					senderUin: Number(segment.data.uin ?? segment.data.user_id ?? selfInfo.uin),
+					senderName: segment.data.name ?? segment.data.nickname ?? selfInfo.nick,
+					elements: inner.sendElements,
+					msgTime: segment.data.time ? +segment.data.time : void 0
+				});
+			}
+			break;
+		case OB11MessageDataType.File:
+			{
+				const { path, fileName } = await handleOb11RichMedia(ctx, segment, deleteAfterSentFiles);
+				sendElements.push(await SendElement.file(ctx, path, fileName));
+			}
+			break;
 	}
 	if (nodes.length > 0) sendElements.push(SendElement.forward(nodes));
 	return {
@@ -26115,6 +26153,7 @@ var ActionName = /* @__PURE__ */ function(ActionName) {
 	ActionName["SetInputStatus"] = "set_input_status";
 	ActionName["GetGroupAlbumMediaList"] = "get_group_album_media_list";
 	ActionName["GetGroupSignedList"] = "get_group_signed_list";
+	ActionName["GetProfileLikeCount"] = "get_profile_like_count";
 	ActionName["SendLike"] = "send_like";
 	ActionName["GetLoginInfo"] = "get_login_info";
 	ActionName["GetFriendList"] = "get_friend_list";
@@ -26554,6 +26593,7 @@ var GetStrangerInfo = class extends BaseAction {
 			birthday_day: info.birthdayDay,
 			labels: info.labels,
 			is_vip: info.isVip,
+			is_svip: info.isSvip,
 			is_years_vip: info.isYearsVip,
 			vip_level: info.vipLevel,
 			remark: info.remark
@@ -31267,12 +31307,14 @@ var GetProfileLikeMe = class extends BaseAction {
 		count: lib_default$1.union([Number, String]).default(20)
 	});
 	async _handle(payload) {
-		const ret = await this.ctx.ntUserApi.getProfileLikeMe(selfInfo.uid, +payload.count);
-		const users = ret.body.detail?.users ?? [];
-		for (const item of users) Object.assign(item, { uin: await this.ctx.ntUserApi.getUinByUid(item.uid) });
+		const users = (await this.ctx.ntUserApi.getProfileLikeMe(selfInfo.uid, +payload.count)).body.voteInfo.users ?? [];
+		for (const item of users) Object.assign(item, {
+			uin: await this.ctx.ntUserApi.getUinByUid(item.uid),
+			isFriend: await this.ctx.ntFriendApi.isFriend(item.uid)
+		});
 		return {
 			users,
-			nextStart: ret.body.detail?.nextStart ?? 0
+			nextStart: 0
 		};
 	}
 };
@@ -31784,12 +31826,14 @@ var GetProfileLike = class extends BaseAction {
 		count: lib_default$1.union([Number, String]).default(20)
 	});
 	async _handle(payload) {
-		const ret = await this.ctx.ntUserApi.getProfileLike(selfInfo.uid, +payload.count);
-		const users = ret.body.detail?.users ?? [];
-		for (const item of users) Object.assign(item, { uin: await this.ctx.ntUserApi.getUinByUid(item.uid) });
+		const users = (await this.ctx.ntUserApi.getProfileLike(selfInfo.uid, +payload.count)).body.favoriteInfo.users ?? [];
+		for (const item of users) Object.assign(item, {
+			uin: await this.ctx.ntUserApi.getUinByUid(item.uid),
+			isFriend: await this.ctx.ntFriendApi.isFriend(item.uid)
+		});
 		return {
 			users,
-			nextStart: ret.body.detail?.nextStart ?? 0
+			nextStart: 0
 		};
 	}
 };
@@ -32618,6 +32662,17 @@ var GetGroupSignedList = class extends BaseAction {
 	}
 };
 //#endregion
+//#region src/onebot11/action/llbot/user/GetProfileLikeCount.ts
+var GetProfileLikeCount = class extends BaseAction {
+	actionName = ActionName.GetProfileLikeCount;
+	payloadSchema = lib_default$1.object({ user_id: lib_default$1.union([Number, String]).required() });
+	async _handle(payload) {
+		const uid = await this.ctx.ntUserApi.getUidByUin(+payload.user_id);
+		if (!uid) throw new Error("无法获取用户信息");
+		return { count: (await this.ctx.ntUserApi.getProfileLikeCount(uid)).body.voteInfo.totalCount };
+	}
+};
+//#endregion
 //#region src/onebot11/action/index.ts
 function initActionMap(adapter) {
 	const actionHandlers = [
@@ -32675,6 +32730,7 @@ function initActionMap(adapter) {
 		new SetInputStatus(adapter),
 		new GetGroupAlbumMediaList(adapter),
 		new GetGroupSignedList(adapter),
+		new GetProfileLikeCount(adapter),
 		new SendLike(adapter),
 		new GetMsg(adapter),
 		new GetLoginInfo$1(adapter),
@@ -34441,7 +34497,7 @@ var MessageEncoder = class {
 				const { msgList } = await this.ctx.ntMsgApi.getSingleMsg(this.peer, msgSeq);
 				source = msgList[0];
 			}
-			if (source) this.elements.push(SendElement.reply(source.msgSeq, source.senderUin, source.msgTime, source.clientSeq));
+			if (source) this.elements.push(SendElement.reply(source.msgSeq, source.senderUin, source.senderUid, source.msgTime, source.clientSeq));
 		} else if (type === "face") this.elements.push(SendElement.face(+attrs.id, +attrs.type));
 		else if (type === "author") Object.assign(this.stack[0].author, attrs);
 		else if (type === "llonebot:market-face") this.elements.push(SendElement.mface(+attrs.emojiPackageId, attrs.emojiId, attrs.key, attrs.summary));
@@ -50050,7 +50106,7 @@ async function transformOutgoingMessage(ctx, segments, peerUid, isGroup, isInsid
 				const { msgByteList } = await ctx.ntMsgApi.getSingleMsg(peer, segment.data.message_seq);
 				srcMsg = msgByteList[0];
 			}
-			elements.push(SendElement.reply(segment.data.message_seq, +msg.senderUin, +msg.msgTime, msg.clientSeq, srcMsg));
+			elements.push(SendElement.reply(segment.data.message_seq, msg.senderUin, msg.senderUid, msg.msgTime, msg.clientSeq, srcMsg));
 		} else if (segment.type === "image") {
 			const imageBuffer = await resolveMilkyUri(segment.data.uri);
 			const tempPath = path.join(TEMP_DIR, `image-${randomUUID()}`);
@@ -55429,6 +55485,7 @@ var NTFileApi = class extends Service {
 		}
 		return {
 			fileId: result.fileId,
+			fileSize: result.fileSize,
 			fileMd5: result.md5.toString("hex")
 		};
 	}
@@ -56043,6 +56100,7 @@ var MessageBuilding = class MessageBuilding {
 	chatType;
 	peerUid;
 	nestedForwardTrace;
+	content;
 	constructor(ctx, elements, chatType, peerUid, nestedForwardTrace = /* @__PURE__ */ new Map()) {
 		this.ctx = ctx;
 		this.inputElems = elements;
@@ -56167,22 +56225,31 @@ var MessageBuilding = class MessageBuilding {
 			origSeqs: [replyElement.replyMsgClientSeq || replyElement.replyMsgSeq],
 			senderUin: replyElement.senderUin,
 			time: replyElement.replyMsgTime,
-			attr: { ntMsgSeq: replyElement.replyMsgClientSeq ? replyElement.replyMsgSeq : void 0 },
+			attr: {
+				senderUid: replyElement.senderUid,
+				ntMsgSeq: replyElement.replyMsgClientSeq ? replyElement.replyMsgSeq : void 0
+			},
 			srcMsg: replyElement.srcMsg
 		} });
-		const attr6Buf = Buffer.alloc(20);
-		attr6Buf.writeUInt16BE(1, 0);
-		attr6Buf.writeUInt16BE(0, 2);
-		attr6Buf.writeUInt16BE(1, 4);
-		attr6Buf.writeUInt8(0, 6);
-		attr6Buf.writeUInt32BE(replyElement.senderUin, 7);
-		attr6Buf.writeUInt16BE(0, 11);
-		const pbReserve = Msg.TextResvAttr.encode({ atMemberUin: 0 });
-		this.outputElems.push({ text: {
-			str: "@",
-			attr6Buf,
-			pbReserve
-		} }, { text: { str: " " } });
+		if (this.chatType === ChatType.Group) {
+			const attr6Buf = Buffer.alloc(20);
+			attr6Buf.writeUInt16BE(1, 0);
+			attr6Buf.writeUInt16BE(0, 2);
+			attr6Buf.writeUInt16BE(1, 4);
+			attr6Buf.writeUInt8(0, 6);
+			attr6Buf.writeUInt32BE(replyElement.senderUin, 7);
+			attr6Buf.writeUInt16BE(0, 11);
+			const pbReserve = Msg.TextResvAttr.encode({
+				atType: 2,
+				atMemberUin: 0,
+				atMemberUid: replyElement.senderUid
+			});
+			this.outputElems.push({ text: {
+				str: "@",
+				attr6Buf,
+				pbReserve
+			} }, { text: { str: " " } });
+		}
 	}
 	async [ElementType.Pic](data) {
 		const { picElement: p } = data;
@@ -56242,7 +56309,7 @@ var MessageBuilding = class MessageBuilding {
 				}, "");
 				preview.push(`${node.senderName}: ${content}`);
 			}
-			const elems = await new MessageBuilding(this.ctx, node.elements, this.chatType, this.peerUid, this.nestedForwardTrace).build();
+			const { elems, content } = await new MessageBuilding(this.ctx, node.elements, this.chatType, this.peerUid, this.nestedForwardTrace).build();
 			messages.push({
 				routingHead: {
 					fromUin: node.senderUin,
@@ -56269,7 +56336,10 @@ var MessageBuilding = class MessageBuilding {
 						avatar: ""
 					}
 				},
-				body: { richText: { elems } }
+				body: {
+					richText: { elems },
+					msgContent: content
+				}
 			});
 			seq++;
 		}
@@ -56312,9 +56382,53 @@ var MessageBuilding = class MessageBuilding {
 		});
 		this.outputElems.push({ lightApp: { data: Buffer.concat([Buffer.from([1]), deflateSync(Buffer.from(content, "utf-8"))]) } });
 	}
+	async [ElementType.File](data) {
+		const fileName = data.fileElement.fileName;
+		if (this.chatType === ChatType.Group) {
+			const uploaded = await this.ctx.ntFileApi.uploadGroupFile(+this.peerUid, data.fileElement.filePath, fileName);
+			const extra = Msg.GroupFileExtra.encode({
+				field1: 6,
+				fileName,
+				inner: { info: {
+					busId: 102,
+					fileId: uploaded.fileId,
+					fileSize: uploaded.fileSize,
+					fileName,
+					fileMd5: uploaded.fileMd5
+				} }
+			});
+			const lenBuf = Buffer.alloc(2);
+			lenBuf.writeUInt16BE(extra.length);
+			this.outputElems.push({ transElemInfo: {
+				elemType: 24,
+				elemValue: Buffer.concat([
+					Buffer.from([1]),
+					lenBuf,
+					extra
+				])
+			} });
+		} else {
+			const uploaded = await this.ctx.ntFileApi.uploadPrivateFile(this.peerUid, data.fileElement.filePath, fileName);
+			const extra = Msg.FileExtra.encode({ file: {
+				fileType: 0,
+				fileUuid: uploaded.fileId,
+				fileMd5: uploaded.file10MMd5,
+				fileName,
+				fileSize: uploaded.fileSize,
+				subCmd: 1,
+				dangerLevel: 0,
+				expireTime: Math.floor(Date.now() / 1e3 + 10080 * 60),
+				fileIdCrcMedia: uploaded.crcMedia
+			} });
+			this.content = extra;
+		}
+	}
 	async build() {
 		for (const element of this.inputElems) await this[element.elementType].call(this, element);
-		return this.outputElems;
+		return {
+			elems: this.outputElems,
+			content: this.content
+		};
 	}
 };
 //#endregion
@@ -56373,7 +56487,7 @@ var NTMsgApi = class extends Service {
 	* 加重试是因为 server 入库 c2c 历史流稍滞后（~50-200ms）。
 	*/
 	async sendMsg(peer, msgElements) {
-		const elems = await new MessageBuilding(this.ctx, msgElements, peer.chatType, peer.peerUid).build();
+		const { elems, content } = await new MessageBuilding(this.ctx, msgElements, peer.chatType, peer.peerUid).build();
 		let chatType = peer.chatType;
 		let groupCode;
 		if (peer.chatType === ChatType.Group) groupCode = +peer.peerUid;
@@ -56385,12 +56499,21 @@ var NTMsgApi = class extends Service {
 		const random = randomBytes(4).readUInt32BE(0);
 		const echoP = peer.chatType === ChatType.Group ? this.waitForSelfEcho(peer, random, 7e3) : null;
 		echoP?.catch(() => {});
+		const fileElem = elems.find((e) => e.transElemInfo?.elemType === 24);
+		if (fileElem) {
+			const buf = fileElem.transElemInfo.elemValue.subarray(3);
+			const extra = Msg.GroupFileExtra.decode(buf);
+			const ret = await this.ctx.qqProtocol.feedGroupFile(groupCode, extra.inner.info.fileId, random);
+			if (ret.feedsInfoRsp.retCode !== 0n) throw new Error(`发送文件失败 (code=${ret.feedsInfoRsp.retCode}): ${ret.feedsInfoRsp.clientWording}`);
+			return await echoP;
+		}
 		const ret = await this.ctx.qqProtocol.sendMessage({
 			chatType,
 			groupCode,
 			toUid: peer.chatType !== ChatType.Group ? peer.peerUid : void 0,
 			elems,
-			random
+			random,
+			content
 		});
 		if (ret.resultCode !== 0) throw new Error(`发送消息失败 (code=${ret.resultCode}): ${ret.errMsg}`);
 		return (echoP ? await echoP : void 0) ?? {
@@ -56743,6 +56866,7 @@ var NTUserApi = class extends Service {
 			school: bytes.get(20021)?.toString() ?? "",
 			remark: bytes.get(103)?.toString() ?? "",
 			isVip: !!vipInfo,
+			isSvip: !!vipInfo?.isPro,
 			isYearsVip: !!vipInfo?.isYear,
 			vipLevel: vipInfo?.level ?? 0
 		};
@@ -56770,6 +56894,7 @@ var NTUserApi = class extends Service {
 			school: bytes.get(20021)?.toString() ?? "",
 			remark: bytes.get(103)?.toString() ?? "",
 			isVip: !!vipInfo,
+			isSvip: !!vipInfo?.isPro,
 			isYearsVip: !!vipInfo?.isYear,
 			vipLevel: vipInfo?.level ?? 0
 		};
@@ -56809,6 +56934,9 @@ var NTUserApi = class extends Service {
 	async getProfileLikeMe(uid, limit = 20) {
 		return await this.ctx.qqProtocol.fetchProfileLikes(uid, 1, limit);
 	}
+	async getProfileLikeCount(uid) {
+		return await this.ctx.qqProtocol.fetchProfileLikeCount(uid);
+	}
 	async modifySelfProfile(profile) {
 		return await this.ctx.qqProtocol.modifySelfProfile({
 			nick: profile.nick,
@@ -59504,6 +59632,7 @@ function createMessagesRoutes(ctx, createPicElement) {
 					replyMsgSeq: Number(item.msgSeq),
 					replyMsgTime: 0,
 					senderUin: Number(item.uin ?? 0),
+					senderUid: item.uid ?? "",
 					replyMsgClientSeq: 0
 				}
 			});
@@ -60116,6 +60245,24 @@ function createProxyRoutes(ctx) {
 			}, 500);
 		}
 	});
+	router.get("/rkey", async (c) => {
+		try {
+			const rkeyData = await ctx.ntFileApi.rkeyManager.getRkey();
+			return c.json({
+				success: true,
+				data: {
+					private_rkey: rkeyData.private_rkey || "",
+					group_rkey: rkeyData.group_rkey || ""
+				}
+			});
+		} catch (e) {
+			ctx.logger.warn("获取 rkey 失败:", e);
+			return c.json({
+				success: false,
+				message: "获取 rkey 失败"
+			}, 500);
+		}
+	});
 	router.get("/audio-proxy", async (c) => {
 		try {
 			const fileUuid = c.req.query("fileUuid");
@@ -73478,17 +73625,22 @@ var DirectProtocolClient = class extends EventEmitter {
 		await this.ensureSignTokenFresh(uin);
 	}
 	/**
-	* sendCommand 前调. 刷新机制暂时禁用 -> 只首拉一次, 拉到后整个进程生命周期不再刷:
+	* sendCommand 前调. 按服务端下发的 TTL 续期:
 	*   1. 没 session / 没 uin -> noop
-	*   2. 从没拉过 (expiresAt undefined) -> 拉一次
-	*   3. 已拉到过 (有 expiresAt, 含 403 软降级的空 token) -> 不刷
+	*   2. 从没拉过 (expiresAt undefined) -> 首拉一次
+	*   3. 有非空 token 且未过期 -> 复用不刷
+	*   4. 有非空 token 但已过期 -> 重新 acquire 续期 (续期失败按 lastFetchAt 限最小重试间隔)
+	*   5. 空 token (403 软降级) -> 不刷, 免得 403 情况每次发包都去重试 acquire
 	* signToken12B/expiresAt 不落盘 (见 session.ts), 每次启动/恢复都从 undefined 起,
 	* 故登录后 tryAcquireSignToken 必首拉一次。in-flight lock 防并发雪崩。
-	* 代价: 12B token 服务端有 TTL, 过期后本地不续 -> sign 失败, 需重启 bot 重新登录。
 	*/
 	async ensureSignTokenFresh(uin) {
 		if (!this.session || !uin || !this.config.authToken) return;
-		if (this.session.signTokenExpiresAt) return;
+		if (this.session.signTokenExpiresAt) {
+			const expired = Date.now() >= this.session.signTokenExpiresAt;
+			if (!this.session.signToken12B || !expired) return;
+			if (Date.now() - this.signTokenLastFetchAt < 3e4) return;
+		}
 		if (this.signTokenRefreshInflight) return;
 		this.signTokenRefreshInflight = (async () => {
 			try {
@@ -77166,7 +77318,11 @@ function MessageMixin(Base) {
 			const random = opts.random ?? randomBytes(4).readUInt32BE(0);
 			const clientSequence = 1e4 + Math.floor(Math.random() * 9e4);
 			const data = Msg.PbSendMsg.encode({
-				routingHead: {
+				routingHead: opts.content ? { trans0X211: {
+					toUin: opts.toUin,
+					ccCmd: 4,
+					uid: opts.toUid
+				} } : {
 					1: { c2c: {
 						toUin: opts.toUin,
 						toUid: opts.toUid
@@ -77183,7 +77339,10 @@ function MessageMixin(Base) {
 					divSeq: 0,
 					autoReply: 0
 				},
-				body: { richText: { elems: opts.elems } },
+				body: {
+					richText: { elems: opts.elems },
+					msgContent: opts.content
+				},
 				clientSequence,
 				random
 			});
@@ -77217,7 +77376,7 @@ function MessageMixin(Base) {
 			} });
 			const data = Msg.PbSendMsg.encode({
 				routingHead: { trans0X211: {
-					toUin: BigInt(opts.toUin),
+					toUin: opts.toUin,
 					ccCmd: 4,
 					uid: opts.toUid
 				} },
@@ -77417,9 +77576,9 @@ function UserMixin(Base) {
 			return Oidb.FetchCookiesResp.decode(decoded.body);
 		}
 		/** 获取赞过我或我赞过的列表。direction: 0=我赞过的, 1=赞过我的。OidbSvcTrpcTcp.0x7ed_13 */
-		async fetchProfileLikes(targetUid, direction, count) {
+		async fetchProfileLikes(selfUid, direction, count) {
 			const body = Oidb.FetchProfileLikeReq.encode({
-				targetUid,
+				selfUid,
 				field2: 1,
 				direction,
 				field4: direction === 0 ? 1 : 0,
@@ -77436,6 +77595,17 @@ function UserMixin(Base) {
 			const decoded = Oidb.Base.decode(Buffer.from(res.pb, "hex"));
 			return Oidb.FetchProfileLikeResp.decode(decoded.body);
 		}
+		async fetchProfileLikeCount(uid) {
+			const body = Oidb.FetchProfileLikeCountReq.encode({ uid });
+			const data = Oidb.Base.encode({
+				command: 2029,
+				subCommand: 12,
+				body
+			});
+			const res = await this.sendPB("OidbSvcTrpcTcp.0x7ed_12", data);
+			const decoded = Oidb.Base.decode(Buffer.from(res.pb, "hex"));
+			return Oidb.FetchProfileLikeCountResp.decode(decoded.body);
+		}
 		/** 修改自己的资料 (OidbSvcTrpcTcp.0x112a_2) */
 		async modifySelfProfile(profile) {
 			const bytesProperties = [];