llonebot-dist 7.12.9 → 7.12.11

package/llbot.js

@@ -11240,8 +11240,12 @@ var OB11Entities;
 			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(msg.senderUin), Number(operatorUin), shortId);
+			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(senderUin), Number(operatorUin), shortId);
 		} else return new OB11FriendRecallNoticeEvent(+msg.senderUin, shortId);
 	}
 	_OB11Entities.recallEvent = recallEvent;
@@ -11385,7 +11389,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$2 = "7.12.9";
+var version$2 = "7.12.11";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -18112,8 +18116,12 @@ async function createSendElements(ctx, messageData, peer, ignoreTypes = []) {
 						if (isAdmin && remainAtAllCount > 0) sendElements.push(SendElement.at(atQQ, atQQ, AtType.All, "@全体成员"));
 					} else if (peer.chatType === ChatType.Group) {
 						const uid = await ctx.ntUserApi.getUidByUin(atQQ, peer.peerUid);
-						let display = "";
+						let display;
 						if (segment.data.name) display = `@${segment.data.name}`;
+						else {
+							const info = await ctx.ntGroupApi.getGroupMember(peer.peerUid, uid);
+							display = `@${info.cardName || info.nick}`;
+						}
 						sendElements.push(SendElement.at(atQQ, uid, AtType.One, display));
 					}
 				}
@@ -26411,8 +26419,15 @@ var SendGroupAiRecord = class extends BaseAction {
 		chat_type: lib_default$1.union([Number, String]).default(1)
 	});
 	async _handle(payload) {
-		await this.ctx.pmhq.getGroupGenerateAiRecord(+payload.group_id, payload.character, payload.text, +payload.chat_type);
-		return { message_id: 0 };
+		const targetMsgRandom = (await this.ctx.pmhq.getGroupGenerateAiRecord(+payload.group_id, payload.character, payload.text, +payload.chat_type)).msgRandom.toString();
+		const { promise, resolve } = Promise.withResolvers();
+		const dispose = this.ctx.on("nt/message-created", (msg) => {
+			if (msg.msgRandom === targetMsgRandom) {
+				dispose();
+				resolve({ message_id: this.ctx.store.createMsgShortId(msg) });
+			}
+		});
+		return promise;
 	}
 };
 //#endregion
@@ -28540,7 +28555,12 @@ var MessageEncoder = class {
 			if (attrs.type === "all") this.elements.push(SendElement.at("", "", AtType.All, "@全体成员"));
 			else {
 				const uid = await this.ctx.ntUserApi.getUidByUin(attrs.id, this.peer.peerUid);
-				const display = attrs.name ? "@" + attrs.name : "";
+				let display;
+				if (attrs.name) display = `@${attrs.name}`;
+				else {
+					const info = await this.ctx.ntGroupApi.getGroupMember(this.peer.peerUid, uid);
+					display = `@${info.cardName || info.nick}`;
+				}
 				this.elements.push(SendElement.at(attrs.id, uid, AtType.One, display));
 			}
 		} else if (type === "a") {
@@ -43687,7 +43707,8 @@ async function transformOutgoingMessage(ctx, segments, peerUid, isGroup = false)
 		else if (segment.type === "mention" && isGroup) {
 			const memberUin = segment.data.user_id.toString();
 			const memberUid = await ctx.ntUserApi.getUidByUin(memberUin, peerUid);
-			elements.push(SendElement.at(memberUin, memberUid, AtType.One, ""));
+			const info = await ctx.ntGroupApi.getGroupMember(peerUid, memberUid);
+			elements.push(SendElement.at(memberUin, memberUid, AtType.One, `@${info.cardName || info.nick}`));
 		} else if (segment.type === "mention_all" && isGroup) elements.push(SendElement.at("", "", AtType.All, "@全体成员"));
 		else if (segment.type === "face") elements.push(SendElement.face(+segment.data.face_id, segment.data.is_large ? 3 : void 0));
 		else if (segment.type === "reply") {
@@ -53760,7 +53781,7 @@ var NTQQMsgApi = class extends Service {
 				chatInfo: peer,
 				filterMsgType: [],
 				filterSendersUid,
-				filterMsgToTime: filterMsgTime,
+				filterMsgToTime: String(filterMsgTime + 1),
 				filterMsgFromTime: filterMsgTime,
 				isReverseOrder: true,
 				isIncludeCurrent: true,
@@ -54040,7 +54061,7 @@ var NTQQUserApi = class extends Service {
 		const funcs = [async () => {
 			return (await this.ctx.pmhq.invoke("nodeIKernelUixConvertService/getUin", [[uid]])).uinInfo.get(uid);
 		}, async () => {
-			return (await this.fetchUserDetailInfo(uid)).detail.get(uid)?.uin;
+			return (await this.getUserSimpleInfo(uid)).uin;
 		}];
 		for (const f of funcs) try {
 			const result = await f();
@@ -54050,6 +54071,7 @@ var NTQQUserApi = class extends Service {
 		}
 		return "";
 	}
+	/** 始终会从服务器拉取 */
 	async fetchUserDetailInfo(uid) {
 		return await this.ctx.pmhq.invoke("nodeIKernelProfileService/fetchUserDetailInfo", [
 			"BuddyProfileStore",
@@ -54064,12 +54086,14 @@ var NTQQUserApi = class extends Service {
 			resultCb: (payload) => payload.simpleInfo.uid === uid
 		});
 	}
+	/** 无缓存时会从服务器拉取 */
 	async getUserSimpleInfo(uid, force = true) {
 		return (await this.ctx.pmhq.invoke("nodeIKernelProfileService/getUserSimpleInfo", [force, [uid]], {
 			resultCmd: ReceiveCmdS.USER_INFO,
 			resultCb: (payload) => payload.has(uid)
 		})).get(uid);
 	}
+	/** 无缓存时会获取不到用户信息 */
 	async getCoreAndBaseInfo(uids) {
 		return await this.ctx.pmhq.invoke("nodeIKernelProfileService/getCoreAndBaseInfo", ["nodeStore", uids]);
 	}
@@ -70326,12 +70350,13 @@ function MessageMixin(Base) {
 			return Oidb.FetchAiCharacterListResp.decode(oidbRespBody);
 		}
 		async getGroupGenerateAiRecord(groupId, character, text, chatType) {
+			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: 37531,
@@ -70339,6 +70364,7 @@ function MessageMixin(Base) {
 				body
 			});
 			await this.httpSendPB("OidbSvcTrpcTcp.0x929b_0", data);
+			return { msgRandom };
 		}
 	};
 }
@@ -70377,7 +70403,7 @@ function UserMixin(Base) {
 			const info = Oidb.FetchUserInfoResp.decode(oidbRespBody);
 			const numbers = Object.fromEntries(info.body.properties.numberProperties.map((p) => [p.key, p.value]));
 			const bytes = Object.fromEntries(info.body.properties.bytesProperties.map((p) => [p.key, p.value]));
-			const business = bytes[107] ? Misc.UserInfoBusiness.decode(bytes[107]) : void 0;
+			const vipInfo = (bytes[107] ? Misc.UserInfoBusiness.decode(bytes[107]) : void 0)?.body.lists.find((e) => e.type === 1);
 			return {
 				uin: info.body.uin,
 				nick: bytes[20002]?.toString() ?? "",
@@ -70395,9 +70421,9 @@ function UserMixin(Base) {
 				labels: bytes[104] ? Misc.UserInfoLabel.decode(bytes[104]).labels.map((e) => e.content) : [],
 				school: bytes[20021]?.toString() ?? "",
 				remark: bytes[103]?.toString() ?? "",
-				isVip: !!business?.body.lists[0],
-				isYearsVip: !!business?.body.lists[0]?.isYear,
-				vipLevel: business?.body.lists[0]?.level ?? 0
+				isVip: !!vipInfo,
+				isYearsVip: !!vipInfo?.isYear,
+				vipLevel: vipInfo?.level ?? 0
 			};
 		}
 		async fetchUserLoginDays(uin) {