llonebot-dist 7.12.5 → 7.12.7

package/llbot.js

@@ -11385,7 +11385,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$2 = "7.12.5";
+var version$2 = "7.12.7";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -21901,13 +21901,15 @@ 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 {
-				const fetchInfo = await this.ctx.ntUserApi.fetchUserDetailInfo(member.uid);
-				if (fetchInfo) info = fetchInfo.detail.get(member.uid);
+				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);
 			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;
@@ -25408,14 +25410,11 @@ var SendGroupNotice = class extends BaseAction {
 		pinned: lib_default$1.union([Boolean, lib_default$1.transform(String, parseBool)]).default(false),
 		confirm_required: lib_default$1.union([Boolean, lib_default$1.transform(String, parseBool)]).default(true),
 		is_show_edit_card: lib_default$1.union([Boolean, lib_default$1.transform(String, parseBool)]).default(false),
-		tip_window: lib_default$1.union([Boolean, lib_default$1.transform(String, parseBool)]).default(false)
+		tip_window: lib_default$1.union([Boolean, lib_default$1.transform(String, parseBool)]).default(false),
+		send_new_member: lib_default$1.union([Boolean, lib_default$1.transform(String, parseBool)]).default(false)
 	});
 	async _handle(payload) {
 		const groupCode = payload.group_id.toString();
-		const pinned = +payload.pinned;
-		const confirmRequired = +payload.confirm_required;
-		const isShowEditCard = +payload.is_show_edit_card;
-		const tipWindowType = +!payload.tip_window;
 		let picInfo;
 		if (payload.image) {
 			const { path, isLocal, success, errMsg } = await uri2local(this.ctx, payload.image, true);
@@ -25425,7 +25424,7 @@ var SendGroupNotice = class extends BaseAction {
 			if (!isLocal) unlink$1(path).catch(noop);
 			picInfo = result.picInfo;
 		}
-		const res = await this.ctx.ntWebApi.publishGroupBulletin(groupCode, payload.content, pinned, 1, isShowEditCard, tipWindowType, confirmRequired, picInfo?.id, picInfo?.width, picInfo?.height);
+		const res = await this.ctx.ntWebApi.publishGroupBulletin(groupCode, payload.content, +payload.pinned, payload.send_new_member ? 20 : 1, +payload.is_show_edit_card, +!payload.tip_window, +payload.confirm_required, picInfo?.id, picInfo?.width, picInfo?.height);
 		if (res.ec !== 0) throw new Error(`设置群公告失败, 错误信息: ${res.em}`);
 		return null;
 	}
@@ -25697,7 +25696,7 @@ var GetGroupNotice = class extends BaseAction {
 	async _handle(payload) {
 		const data = await this.ctx.ntGroupApi.getGroupBulletinList(payload.group_id.toString());
 		const result = [];
-		for (const feed of data.feeds) result.push({
+		for (const feed of [...data.feeds, ...data.inst]) result.push({
 			notice_id: feed.feedId,
 			sender_id: +feed.uin,
 			publish_time: +feed.publishTime,
@@ -25714,9 +25713,12 @@ var GetGroupNotice = class extends BaseAction {
 			settings: {
 				is_show_edit_card: !!feed.settings.isShowEditCard,
 				tip_window: !feed.settings.tipWindowType,
-				confirm_required: !!feed.settings.confirmRequired
+				confirm_required: !!feed.settings.confirmRequired,
+				pinned: !!feed.pinned,
+				send_new_member: feed.type === 20
 			}
 		});
+		if (data.inst.length > 0) return result.sort((a, b) => b.publish_time - a.publish_time);
 		return result;
 	}
 };
@@ -54601,7 +54603,7 @@ var NTQQWebApi = class extends Service {
 			imgWidth: imgWidth?.toString(),
 			imgHeight: imgHeight?.toString()
 		};
-		const res = await fetch("https://web.qun.qq.com/cgi-bin/announce/add_qun_notice", {
+		const res = await fetch(type === 20 ? "https://web.qun.qq.com/cgi-bin/announce/add_qun_instruction" : "https://web.qun.qq.com/cgi-bin/announce/add_qun_notice", {
 			method: "POST",
 			headers: {
 				"Content-Type": "application/x-www-form-urlencoded",