llonebot-dist 7.12.7 → 7.12.9

package/llbot.js

@@ -11385,7 +11385,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$2 = "7.12.7";
+var version$2 = "7.12.9";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -21901,20 +21901,22 @@ var GetGroupMemberInfo$1 = class extends BaseAction {
 		let info;
 		try {
 			info = await this.ctx.ntUserApi.getUserDetailInfoWithBizInfo(member.uid);
-			this.ctx.logger.info("getUserDetailInfoWithBizInfo");
 		} catch (e) {
 			try {
 				info = (await this.ctx.ntUserApi.fetchUserDetailInfo(member.uid)).detail.get(member.uid);
-				this.ctx.logger.info("fetchUserDetailInfo");
 			} catch (e) {}
 		}
-		if (info) {
-			this.ctx.logger.info(info.simpleInfo.baseInfo);
+		if (info?.commonExt) {
 			ret.sex = OB11Entities.sex(info.simpleInfo.baseInfo.sex);
-			ret.qq_level = info.commonExt?.qqLevel && calcQQLevel(info.commonExt.qqLevel) || 0;
-			ret.age = info.simpleInfo.baseInfo.age ?? 0;
+			ret.qq_level = calcQQLevel(info.commonExt.qqLevel);
+			ret.age = info.simpleInfo.baseInfo.age;
+			if (ret.qq_level === 0) ret.qq_level = (await this.ctx.pmhq.fetchUserInfo(+payload.user_id)).level;
+		} else {
+			const info = await this.ctx.pmhq.fetchUserInfo(+payload.user_id);
+			ret.sex = OB11Entities.sex(info.sex);
+			ret.qq_level = info.level;
+			ret.age = info.age;
 		}
-		if (ret.qq_level === 0) ret.qq_level = (await this.ctx.pmhq.fetchUserInfo(+payload.user_id)).level;
 		return ret;
 	}
 };
@@ -23853,6 +23855,18 @@ var Msg;
 var Misc;
 (function(_Misc) {
 	_Misc.UserInfoLabel = ProtoMessage.of({ labels: ProtoField(1, { content: ProtoField(4, "string") }, "repeated") });
+	_Misc.UserInfoBusiness = ProtoMessage.of({ body: ProtoField(3, {
+		msg: ProtoField(1, "string"),
+		lists: ProtoField(3, {
+			type: ProtoField(1, "uint32"),
+			field2: ProtoField(2, "uint32"),
+			isYear: ProtoField(3, "uint32"),
+			level: ProtoField(4, "uint32"),
+			isPro: ProtoField(5, "uint32"),
+			icon1: ProtoField(6, "string"),
+			icon2: ProtoField(7, "string")
+		}, "repeated")
+	}) });
 })(Misc || (Misc = {}));
 //#endregion
 //#region src/onebot11/helper/createMultiMessage.ts
@@ -24494,7 +24508,11 @@ var GetStrangerInfo = class extends BaseAction {
 			birthday_year: info.birthdayYear,
 			birthday_month: info.birthdayMonth,
 			birthday_day: info.birthdayDay,
-			labels: info.labels
+			labels: info.labels,
+			is_vip: info.isVip,
+			is_years_vip: info.isYearsVip,
+			vip_level: info.vipLevel,
+			remark: info.remark
 		};
 	}
 };
@@ -43461,22 +43479,19 @@ var SystemApi = [
 		});
 	}),
 	defineApi("get_user_profile", GetUserProfileInput, GetUserProfileOutput, async (ctx, payload) => {
-		const userInfo = await ctx.ntUserApi.getUserDetailInfoByUin(payload.user_id.toString());
-		if (userInfo.result !== 0) return Failed(-500, userInfo.errMsg);
-		const profile = {
-			nickname: userInfo.detail.simpleInfo.coreInfo.nick,
-			qid: userInfo.detail.simpleInfo.baseInfo.qid,
-			age: userInfo.detail.simpleInfo.baseInfo.age,
-			sex: transformGender(userInfo.detail.simpleInfo.baseInfo.sex),
-			remark: userInfo.detail.simpleInfo.coreInfo.remark,
-			bio: userInfo.detail.simpleInfo.baseInfo.longNick,
-			level: userInfo.detail.commonExt?.qqLevel ? userInfo.detail.commonExt.qqLevel.penguinNum * 256 + userInfo.detail.commonExt.qqLevel.crownNum * 64 + userInfo.detail.commonExt.qqLevel.sunNum * 16 + userInfo.detail.commonExt.qqLevel.moonNum * 4 + userInfo.detail.commonExt.qqLevel.starNum : 0,
-			country: userInfo.detail.commonExt?.country || "",
-			city: userInfo.detail.commonExt?.city || "",
-			school: userInfo.detail.commonExt?.college || ""
-		};
-		if (profile.level === 0) profile.level = (await ctx.pmhq.fetchUserInfo(payload.user_id)).level;
-		return Ok(profile);
+		const info = await ctx.pmhq.fetchUserInfo(payload.user_id);
+		return Ok({
+			nickname: info.nick,
+			qid: info.qid,
+			age: info.age,
+			sex: transformGender(info.sex),
+			remark: info.remark,
+			bio: info.longNick,
+			level: info.level,
+			country: info.country,
+			city: info.city,
+			school: info.school
+		});
 	}),
 	defineApi("get_friend_list", GetFriendListInput, GetFriendListOutput, async (ctx) => {
 		const friends = await ctx.ntFriendApi.getBuddyList();
@@ -70336,12 +70351,15 @@ function UserMixin(Base) {
 				uin,
 				keys: [
 					{ key: 102 },
+					{ key: 103 },
 					{ key: 104 },
 					{ key: 105 },
+					{ key: 107 },
 					{ key: 20002 },
 					{ key: 20003 },
 					{ key: 20009 },
 					{ key: 20020 },
+					{ key: 20021 },
 					{ key: 20026 },
 					{ key: 20031 },
 					{ key: 20037 },
@@ -70359,6 +70377,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;
 			return {
 				uin: info.body.uin,
 				nick: bytes[20002]?.toString() ?? "",
@@ -70373,7 +70392,12 @@ function UserMixin(Base) {
 				birthdayYear: bytes[20031]?.[0] << 8 | bytes[20031]?.[1],
 				birthdayMonth: bytes[20031]?.[2] ?? 0,
 				birthdayDay: bytes[20031]?.[3] ?? 0,
-				labels: bytes[104] ? Misc.UserInfoLabel.decode(bytes[104]).labels.map((e) => e.content) : []
+				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
 			};
 		}
 		async fetchUserLoginDays(uin) {