koishi-plugin-bilibili-notify 3.2.5-alpha.8 → 3.2.5

package/lib/index.d.mts

@@ -45,6 +45,7 @@ interface Config {
   }>;
   dynamic: {};
   dynamicUrl: boolean;
+  dynamicCron: string;
   dynamicVideoUrlToBV: boolean;
   pushImgsInDynamic: boolean;
   live: {};

package/lib/index.d.ts

@@ -45,6 +45,7 @@ interface Config {
   }>;
   dynamic: {};
   dynamicUrl: boolean;
+  dynamicCron: string;
   dynamicVideoUrlToBV: boolean;
   pushImgsInDynamic: boolean;
   live: {};

package/lib/index.js

@@ -552,7 +552,7 @@ var ComRegister = class {
 	subManager = [];
 	dynamicTimelineManager = /* @__PURE__ */ new Map();
 	liveStatusManager = /* @__PURE__ */ new Map();
-	pushRecord = {};
+	pushArrMap = /* @__PURE__ */ new Map();
 	loginDBData;
 	privateBot;
 	dynamicJob;
@@ -797,7 +797,6 @@ var ComRegister = class {
 		});
 	}
 	initPushRecord(subs) {
-		const pushRecord = {};
 		for (const sub of subs) {
 			const atAllArr = [];
 			const dynamicArr = [];
@@ -809,20 +808,18 @@ var ComRegister = class {
 				if (channel.live) liveArr.push(`${platform.platform}:${channel.channelId}`);
 				if (channel.liveGuardBuy) liveGuardBuyArr.push(`${platform.platform}:${channel.channelId}`);
 			}
-			pushRecord[sub.uid] = {
+			this.pushArrMap.set(sub.uid, {
 				atAllArr,
 				dynamicArr,
 				liveArr,
 				liveGuardBuyArr
-			};
+			});
 		}
-		this.pushRecord = pushRecord;
 		this.logger.info("初始化推送群组/频道信息：");
-		this.logger.info(this.pushRecord);
+		this.logger.info(this.pushArrMap);
 	}
 	checkAllBotsAreReady() {
-		const bot = this.ctx.bots.some((bot$1) => !bot$1.isActive);
-		return !bot;
+		return !this.ctx.bots.some((bot) => bot.status !== koishi.Universal.Status.ONLINE);
 	}
 	async broadcastToTargets(uid, content, type, retry = 3e3) {
 		if (!this.checkAllBotsAreReady()) {
@@ -833,33 +830,37 @@ var ComRegister = class {
 			return;
 		}
 		this.logger.info(`本次推送对象：${uid}，推送类型：${PushTypeMsg[type]}`);
-		const record = this.pushRecord[uid];
+		const record = this.pushArrMap.get(uid);
 		this.logger.info("本次推送目标：");
 		if (type === PushType.StartBroadcasting && record.atAllArr?.length >= 1) {
 			this.logger.info(record.atAllArr);
+			const atAllArr = structuredClone(record.atAllArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.atAllArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("at", { type: "all" }), /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content })] }));
+				return await this.ctx.broadcast(atAllArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("at", { type: "all" }) }));
 			}, 1);
 			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
 		}
 		if (type === PushType.Dynamic && record.dynamicArr?.length >= 1) {
 			this.logger.info(record.dynamicArr);
+			const dynamicArr = structuredClone(record.dynamicArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.dynamicArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
+				return await this.ctx.broadcast(dynamicArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
 			}, 1);
 			this.logger.info(`成功推送动态消息群组/频道：${success}`);
 		}
 		if ((type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length >= 1) {
 			this.logger.info(record.liveArr);
+			const liveArr = structuredClone(record.liveArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.liveArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
+				return await this.ctx.broadcast(liveArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
 			}, 1);
 			this.logger.info(`成功推送直播消息群组/频道：${success}`);
 		}
 		if (type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length >= 1) {
 			this.logger.info(record.liveGuardBuyArr);
+			const liveGuardBuyArr = structuredClone(record.liveGuardBuyArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.liveGuardBuyArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
+				return await this.ctx.broadcast(liveGuardBuyArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
 			}, 1);
 			this.logger.info(`成功推送上舰消息群组/频道：${success}`);
 		}
@@ -913,15 +914,15 @@ var ComRegister = class {
 						}, 1).catch(async (e$1) => {
 							if (e$1.message === "直播开播动态，不做处理") return;
 							if (e$1.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -935,7 +936,7 @@ var ComRegister = class {
 						} else dUrl = `${name$3}发布了新视频：https:${item.modules.module_dynamic.major.archive.jump_url}`;
 						else dUrl = `${name$3}发布了一条动态：https://t.bilibili.com/${item.id_str}`;
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)(__satorijs_element_jsx_runtime.Fragment, { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
 								const pics = item.modules?.module_dynamic?.major?.opus?.pics;
@@ -1018,15 +1019,15 @@ var ComRegister = class {
 						}, 1).catch(async (e$1) => {
 							if (e$1.message === "直播开播动态，不做处理") return;
 							if (e$1.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$3, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -1045,7 +1046,7 @@ var ComRegister = class {
 							this.logger.info("动态链接生成成功！");
 						}
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)(__satorijs_element_jsx_runtime.Fragment, { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							this.logger.info("需要发送动态中的图片，开始发送...");
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
@@ -1117,7 +1118,7 @@ var ComRegister = class {
 			this.logger.error(`liveDetect generateLiveImg() 推送卡片生成失败，原因：${e$1.message}`);
 		});
 		if (!buffer) return await this.sendPrivateMsgAndStopService();
-		const msg = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)(__satorijs_element_jsx_runtime.Fragment, { children: [koishi.h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] });
+		const msg = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] });
 		return await this.broadcastToTargets(uid, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
 	}
 	async liveDetectWithListener(roomId, uid, cardStyle) {
@@ -1182,7 +1183,15 @@ var ComRegister = class {
 				watchedNum = body.text_small;
 			},
 			onGuardBuy: ({ body }) => {
-				const content = `[${masterInfo.username}的直播间]「${body.user.uname}」加入了大航海（${body.gift_name}）`;
+				const content = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [
+					"【",
+					masterInfo.username,
+					"的直播间】",
+					body.user.uname,
+					"加入了大航海（",
+					body.gift_name,
+					"）"
+				] });
 				this.broadcastToTargets(uid, content, PushType.LiveGuardBuy);
 			},
 			onLiveStart: async () => {
@@ -1585,7 +1594,7 @@ var ComRegister = class {
 		}
 	}
 	enableDynamicDetect() {
-		this.dynamicJob = new cron.CronJob("*/2 * * * *", this.config.dynamicDebugMode ? this.debug_dynamicDetect() : this.dynamicDetect());
+		this.dynamicJob = new cron.CronJob(this.config.dynamicCron, this.config.dynamicDebugMode ? this.debug_dynamicDetect() : this.dynamicDetect());
 		this.logger.info("动态监测已开启");
 		this.dynamicJob.start();
 	}
@@ -1641,6 +1650,7 @@ var ComRegister = class {
 		customLive: koishi.Schema.string(),
 		customLiveEnd: koishi.Schema.string().required(),
 		dynamicUrl: koishi.Schema.boolean().required(),
+		dynamicCron: koishi.Schema.string().required(),
 		dynamicVideoUrlToBV: koishi.Schema.boolean().required(),
 		filter: koishi.Schema.object({
 			enable: koishi.Schema.boolean(),
@@ -58057,7 +58067,7 @@ var require_helpers$1 = __commonJS$1({ "node_modules/socks/build/common/helpers.
 	}
 	function ipv4ToInt32(ip) {
 		const address = new ip_address_1$1.Address4(ip);
-		return address.toArray().reduce((acc, part) => (acc << 8) + part, 0);
+		return address.toArray().reduce((acc, part) => (acc << 8) + part, 0) >>> 0;
 	}
 	exports.ipv4ToInt32 = ipv4ToInt32;
 	function int32ToIpv4(int32) {
@@ -95032,6 +95042,7 @@ var ServerManager = class extends koishi.Service {
 				customLive: globalConfig.customLive,
 				customLiveEnd: globalConfig.customLiveEnd,
 				dynamicUrl: globalConfig.dynamicUrl,
+				dynamicCron: globalConfig.dynamicCron,
 				dynamicVideoUrlToBV: globalConfig.dynamicVideoUrlToBV,
 				filter: globalConfig.filter,
 				dynamicDebugMode: globalConfig.dynamicDebugMode
@@ -95129,6 +95140,7 @@ const Config = koishi.Schema.object({
 	}).collapse()).collapse().description("输入订阅信息，自定义订阅内容； uid: 订阅用户UID，dynamic: 是否需要订阅动态，live: 是否需要订阅直播"),
 	dynamic: koishi.Schema.object({}).description("动态推送设置"),
 	dynamicUrl: koishi.Schema.boolean().default(false).description("发送动态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！"),
+	dynamicCron: koishi.Schema.string().default("*/2 * * * *").description("动态监测时间，请填入cron表达式，请勿填入过短时间"),
 	dynamicVideoUrlToBV: koishi.Schema.boolean().default(false).description("如果推送的动态是视频动态，且开启了发送链接选项，开启此选项则会将链接转换为BV号以便其他用途"),
 	pushImgsInDynamic: koishi.Schema.boolean().default(false).description("是否推送动态中的图片，默认不开启。开启后会单独推送动态中的图片，该功能容易导致QQ风控"),
 	live: koishi.Schema.object({}).description("直播推送设置"),

package/lib/index.mjs

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { Schema, Service, h, isNullable, remove } from "koishi";
+import { Schema, Service, Universal, h, isNullable, remove } from "koishi";
 import { resolve } from "path";
 import QRCode from "qrcode";
 import { CronJob } from "cron";
@@ -554,7 +554,7 @@ var ComRegister = class {
 	subManager = [];
 	dynamicTimelineManager = /* @__PURE__ */ new Map();
 	liveStatusManager = /* @__PURE__ */ new Map();
-	pushRecord = {};
+	pushArrMap = /* @__PURE__ */ new Map();
 	loginDBData;
 	privateBot;
 	dynamicJob;
@@ -799,7 +799,6 @@ var ComRegister = class {
 		});
 	}
 	initPushRecord(subs) {
-		const pushRecord = {};
 		for (const sub of subs) {
 			const atAllArr = [];
 			const dynamicArr = [];
@@ -811,20 +810,18 @@ var ComRegister = class {
 				if (channel.live) liveArr.push(`${platform.platform}:${channel.channelId}`);
 				if (channel.liveGuardBuy) liveGuardBuyArr.push(`${platform.platform}:${channel.channelId}`);
 			}
-			pushRecord[sub.uid] = {
+			this.pushArrMap.set(sub.uid, {
 				atAllArr,
 				dynamicArr,
 				liveArr,
 				liveGuardBuyArr
-			};
+			});
 		}
-		this.pushRecord = pushRecord;
 		this.logger.info("初始化推送群组/频道信息：");
-		this.logger.info(this.pushRecord);
+		this.logger.info(this.pushArrMap);
 	}
 	checkAllBotsAreReady() {
-		const bot = this.ctx.bots.some((bot$1) => !bot$1.isActive);
-		return !bot;
+		return !this.ctx.bots.some((bot) => bot.status !== Universal.Status.ONLINE);
 	}
 	async broadcastToTargets(uid, content, type, retry = 3e3) {
 		if (!this.checkAllBotsAreReady()) {
@@ -835,33 +832,37 @@ var ComRegister = class {
 			return;
 		}
 		this.logger.info(`本次推送对象：${uid}，推送类型：${PushTypeMsg[type]}`);
-		const record = this.pushRecord[uid];
+		const record = this.pushArrMap.get(uid);
 		this.logger.info("本次推送目标：");
 		if (type === PushType.StartBroadcasting && record.atAllArr?.length >= 1) {
 			this.logger.info(record.atAllArr);
+			const atAllArr = structuredClone(record.atAllArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.atAllArr, /* @__PURE__ */ jsxs("message", { children: [/* @__PURE__ */ jsx("at", { type: "all" }), /* @__PURE__ */ jsx("message", { children: content })] }));
+				return await this.ctx.broadcast(atAllArr, /* @__PURE__ */ jsx("message", { children: /* @__PURE__ */ jsx("at", { type: "all" }) }));
 			}, 1);
 			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
 		}
 		if (type === PushType.Dynamic && record.dynamicArr?.length >= 1) {
 			this.logger.info(record.dynamicArr);
+			const dynamicArr = structuredClone(record.dynamicArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.dynamicArr, /* @__PURE__ */ jsx("message", { children: content }));
+				return await this.ctx.broadcast(dynamicArr, /* @__PURE__ */ jsx("message", { children: content }));
 			}, 1);
 			this.logger.info(`成功推送动态消息群组/频道：${success}`);
 		}
 		if ((type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length >= 1) {
 			this.logger.info(record.liveArr);
+			const liveArr = structuredClone(record.liveArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.liveArr, /* @__PURE__ */ jsx("message", { children: content }));
+				return await this.ctx.broadcast(liveArr, /* @__PURE__ */ jsx("message", { children: content }));
 			}, 1);
 			this.logger.info(`成功推送直播消息群组/频道：${success}`);
 		}
 		if (type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length >= 1) {
 			this.logger.info(record.liveGuardBuyArr);
+			const liveGuardBuyArr = structuredClone(record.liveGuardBuyArr);
 			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(record.liveGuardBuyArr, /* @__PURE__ */ jsx("message", { children: content }));
+				return await this.ctx.broadcast(liveGuardBuyArr, /* @__PURE__ */ jsx("message", { children: content }));
 			}, 1);
 			this.logger.info(`成功推送上舰消息群组/频道：${success}`);
 		}
@@ -915,15 +916,15 @@ var ComRegister = class {
 						}, 1).catch(async (e$1) => {
 							if (e$1.message === "直播开播动态，不做处理") return;
 							if (e$1.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -937,7 +938,7 @@ var ComRegister = class {
 						} else dUrl = `${name$3}发布了新视频：https:${item.modules.module_dynamic.major.archive.jump_url}`;
 						else dUrl = `${name$3}发布了一条动态：https://t.bilibili.com/${item.id_str}`;
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs(Fragment, { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
 								const pics = item.modules?.module_dynamic?.major?.opus?.pics;
@@ -1020,15 +1021,15 @@ var ComRegister = class {
 						}, 1).catch(async (e$1) => {
 							if (e$1.message === "直播开播动态，不做处理") return;
 							if (e$1.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$3, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -1047,7 +1048,7 @@ var ComRegister = class {
 							this.logger.info("动态链接生成成功！");
 						}
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs(Fragment, { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							this.logger.info("需要发送动态中的图片，开始发送...");
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
@@ -1119,7 +1120,7 @@ var ComRegister = class {
 			this.logger.error(`liveDetect generateLiveImg() 推送卡片生成失败，原因：${e$1.message}`);
 		});
 		if (!buffer) return await this.sendPrivateMsgAndStopService();
-		const msg = /* @__PURE__ */ jsxs(Fragment, { children: [h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] });
+		const msg = /* @__PURE__ */ jsxs("message", { children: [h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] });
 		return await this.broadcastToTargets(uid, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
 	}
 	async liveDetectWithListener(roomId, uid, cardStyle) {
@@ -1184,7 +1185,15 @@ var ComRegister = class {
 				watchedNum = body.text_small;
 			},
 			onGuardBuy: ({ body }) => {
-				const content = `[${masterInfo.username}的直播间]「${body.user.uname}」加入了大航海（${body.gift_name}）`;
+				const content = /* @__PURE__ */ jsxs("message", { children: [
+					"【",
+					masterInfo.username,
+					"的直播间】",
+					body.user.uname,
+					"加入了大航海（",
+					body.gift_name,
+					"）"
+				] });
 				this.broadcastToTargets(uid, content, PushType.LiveGuardBuy);
 			},
 			onLiveStart: async () => {
@@ -1587,7 +1596,7 @@ var ComRegister = class {
 		}
 	}
 	enableDynamicDetect() {
-		this.dynamicJob = new CronJob("*/2 * * * *", this.config.dynamicDebugMode ? this.debug_dynamicDetect() : this.dynamicDetect());
+		this.dynamicJob = new CronJob(this.config.dynamicCron, this.config.dynamicDebugMode ? this.debug_dynamicDetect() : this.dynamicDetect());
 		this.logger.info("动态监测已开启");
 		this.dynamicJob.start();
 	}
@@ -1643,6 +1652,7 @@ var ComRegister = class {
 		customLive: Schema.string(),
 		customLiveEnd: Schema.string().required(),
 		dynamicUrl: Schema.boolean().required(),
+		dynamicCron: Schema.string().required(),
 		dynamicVideoUrlToBV: Schema.boolean().required(),
 		filter: Schema.object({
 			enable: Schema.boolean(),
@@ -58059,7 +58069,7 @@ var require_helpers$1 = __commonJS$1({ "node_modules/socks/build/common/helpers.
 	}
 	function ipv4ToInt32(ip) {
 		const address = new ip_address_1$1.Address4(ip);
-		return address.toArray().reduce((acc, part) => (acc << 8) + part, 0);
+		return address.toArray().reduce((acc, part) => (acc << 8) + part, 0) >>> 0;
 	}
 	exports.ipv4ToInt32 = ipv4ToInt32;
 	function int32ToIpv4(int32) {
@@ -95034,6 +95044,7 @@ var ServerManager = class extends Service {
 				customLive: globalConfig.customLive,
 				customLiveEnd: globalConfig.customLiveEnd,
 				dynamicUrl: globalConfig.dynamicUrl,
+				dynamicCron: globalConfig.dynamicCron,
 				dynamicVideoUrlToBV: globalConfig.dynamicVideoUrlToBV,
 				filter: globalConfig.filter,
 				dynamicDebugMode: globalConfig.dynamicDebugMode
@@ -95131,6 +95142,7 @@ const Config = Schema.object({
 	}).collapse()).collapse().description("输入订阅信息，自定义订阅内容； uid: 订阅用户UID，dynamic: 是否需要订阅动态，live: 是否需要订阅直播"),
 	dynamic: Schema.object({}).description("动态推送设置"),
 	dynamicUrl: Schema.boolean().default(false).description("发送动态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！"),
+	dynamicCron: Schema.string().default("*/2 * * * *").description("动态监测时间，请填入cron表达式，请勿填入过短时间"),
 	dynamicVideoUrlToBV: Schema.boolean().default(false).description("如果推送的动态是视频动态，且开启了发送链接选项，开启此选项则会将链接转换为BV号以便其他用途"),
 	pushImgsInDynamic: Schema.boolean().default(false).description("是否推送动态中的图片，默认不开启。开启后会单独推送动态中的图片，该功能容易导致QQ风控"),
 	live: Schema.object({}).description("直播推送设置"),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.5-alpha.8",
+  "version": "3.2.5",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -48,7 +48,7 @@
     "tough-cookie": "^5.1.2"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.9.4",
+    "@biomejs/biome": "^1.9.4",
     "@koishijs/cache": "^2.1.0",
     "@koishijs/client": "^5.30.8",
     "@koishijs/plugin-help": "^2.4.5",

package/readme.md

@@ -287,6 +287,13 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.2.5-alpha.6 测试版本
 > - ver 3.2.5-alpha.7 测试版本
 > - ver 3.2.5-alpha.8 测试版本
+> - ver 3.2.5-alpha.9 测试版本
+> - ver 3.2.5-alpha.10 测试版本
+> - ver 3.2.5-alpha.11 测试版本
+> - ver 3.2.5-alpha.12 测试版本
+> - ver 3.2.5-alpha.13 测试版本
+
+- ver 3.2.5 重构：消息推送逻辑； 新增：选项 `dynamicCron`；
 
 ## 交流群