koishi-plugin-bilibili-notify 3.2.5-alpha.5 → 3.2.5-alpha.6

package/lib/index.js

@@ -517,6 +517,12 @@ let PushType = /* @__PURE__ */ function(PushType$1) {
 	PushType$1[PushType$1["LiveGuardBuy"] = 3] = "LiveGuardBuy";
 	return PushType$1;
 }({});
+const PushTypeMsg = {
+	[PushType.Live]: "直播推送",
+	[PushType.Dynamic]: "动态推送",
+	[PushType.StartBroadcasting]: "开播推送",
+	[PushType.LiveGuardBuy]: "上舰推送"
+};
 
 //#endregion
 //#region src/comRegister.tsx
@@ -546,6 +552,7 @@ var ComRegister = class {
 	subManager = [];
 	dynamicTimelineManager = /* @__PURE__ */ new Map();
 	liveStatusManager = /* @__PURE__ */ new Map();
+	pushRecord = {};
 	loginDBData;
 	privateBot;
 	dynamicJob;
@@ -721,6 +728,7 @@ var ComRegister = class {
 			}
 		}
 		this.initManager();
+		this.initPushRecord(this.subManager);
 		this.checkIfDynamicDetectIsNeeded();
 		this.checkIfLiveDetectIsNeeded();
 		this.updateSubNotifier();
@@ -789,72 +797,60 @@ var ComRegister = class {
 			await this.sendPrivateMsg(`发送群组ID:${channelId}消息失败，请查看日志`);
 		});
 	}
-	getGroupsThatMeetCriteria(targets, type) {
-		const pushArr = [];
-		if (type === PushType.StartBroadcasting) {
+	initPushRecord(subs) {
+		const pushRecord = {};
+		for (const sub of subs) {
 			const atAllArr = [];
-			for (const target of targets) for (const channel of target.channelArr) {
-				if (channel.atAll && channel.dynamic) {
-					atAllArr.push(`${target.platform}:${channel.channelId}`);
-					continue;
-				}
-				if (channel.dynamic) pushArr.push(`${target.platform}:${channel.channelId}`);
-			}
-			return [pushArr, atAllArr];
-		}
-		if (type === PushType.Live) {
-			for (const target of targets) for (const channel of target.channelArr) if (channel.live) pushArr.push(`${target.platform}:${channel.channelId}`);
-			return [pushArr];
+			const dynamicArr = [];
+			const liveArr = [];
+			const liveGuardBuyArr = [];
+			for (const platform of sub.target) for (const channel of platform.channelArr) {
+				if (channel.atAll) atAllArr.push(`${platform.platform}:${channel.channelId}`);
+				if (channel.dynamic) dynamicArr.push(`${platform.platform}:${channel.channelId}`);
+				if (channel.live) liveArr.push(`${platform.platform}:${channel.channelId}`);
+				if (channel.liveGuardBuy) liveGuardBuyArr.push(`${platform.platform}:${channel.channelId}`);
+			}
+			pushRecord[sub.uid] = {
+				atAllArr,
+				dynamicArr,
+				liveArr,
+				liveGuardBuyArr
+			};
 		}
-		if (type === PushType.Dynamic) {
-			for (const target of targets) for (const channel of target.channelArr) if (channel.dynamic) pushArr.push(`${target.platform}:${channel.channelId}`);
-			return [pushArr];
+		this.pushRecord = pushRecord;
+		this.logger.info("初始化推送群组/频道信息：");
+		this.logger.info(this.pushRecord);
+	}
+	async broadcastToTargets(uid, content, type) {
+		this.logger.info(`本次推送对象：${uid}，推送类型：${PushTypeMsg[type]}`);
+		const record = this.pushRecord[uid];
+		this.logger.info("本次推送目标：");
+		this.logger.info(record);
+		if (type === PushType.StartBroadcasting && record.atAllArr?.length >= 1) {
+			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 })] }));
+			}, 1);
+			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
 		}
-		if (type === PushType.LiveGuardBuy) {
-			for (const target of targets) for (const channel of target.channelArr) if (channel.liveGuardBuy) pushArr.push(`${target.platform}:${channel.channelId}`);
-			return [pushArr];
+		if (type === PushType.Dynamic && record.dynamicArr?.length >= 1) {
+			const success = await withRetry(async () => {
+				return await this.ctx.broadcast(record.dynamicArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
+			}, 1);
+			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
 		}
-	}
-	async broadcastToTargets(targets, content, type) {
-		if (targets.length !== 1 || targets[0].channelArr.length !== 1) {
-			const [pushArr, atAllArr] = this.getGroupsThatMeetCriteria(targets, type);
-			this.logger.info(`推送消息到 ${pushArr.length} 个目标频道，目标频道为：${pushArr.join(", ")}`);
-			if (type === PushType.StartBroadcasting && atAllArr?.length >= 1) {
-				await withRetry(async () => {
-					await this.ctx.broadcast(atAllArr, koishi.h.at("all"));
-				}, 1);
-				await withRetry(async () => {
-					await this.ctx.broadcast(atAllArr, content);
-				}, 1);
-			}
-			if (pushArr?.length >= 1) await withRetry(async () => {
-				await this.ctx.broadcast(pushArr, content);
+		if ((type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length >= 1) {
+			const success = await withRetry(async () => {
+				return await this.ctx.broadcast(record.liveArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
 			}, 1);
-			return;
+			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
 		}
-		const targetChannel = targets[0].channelArr[0];
-		const bot = this.getBot(targets[0].platform, targetChannel.bot);
-		if (!bot || !bot.isActive) {
-			this.sendPrivateMsg("未找到对应bot实例，本次消息推送取消！");
-			this.logger.warn("未找到对应bot实例，本次消息推送取消！");
-			return;
+		if (type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length >= 1) {
+			const success = await withRetry(async () => {
+				return await this.ctx.broadcast(record.liveGuardBuyArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
+			}, 1);
+			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
 		}
-		const pushTypePatternMatching = {
-			[PushType.Live]: async () => {
-				if (targetChannel.live) await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
-			},
-			[PushType.Dynamic]: async () => {
-				if (targetChannel.dynamic) await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
-			},
-			[PushType.StartBroadcasting]: async () => {
-				if (targetChannel.live) await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
-				if (targetChannel.atAll) await this.sendMessageWithRetry(bot, targetChannel.channelId, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("at", { type: "all" }));
-			},
-			[PushType.LiveGuardBuy]: async () => {
-				if (targetChannel.liveGuardBuy) await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
-			}
-		};
-		await pushTypePatternMatching[type]();
+		return;
 	}
 	dynamicDetect() {
 		const handler = async () => {
@@ -904,15 +900,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.target, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.target, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.target, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -926,7 +922,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.target, /* @__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)(__satorijs_element_jsx_runtime.Fragment, { 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;
@@ -938,7 +934,7 @@ var ComRegister = class {
 											alt: "动态图片"
 										}, pic.url))
 									});
-									await this.broadcastToTargets(sub.target, picsMsg, PushType.Dynamic);
+									await this.broadcastToTargets(sub.uid, picsMsg, PushType.Dynamic);
 								}
 							}
 						}
@@ -1009,15 +1005,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.target, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.target, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.target, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -1036,7 +1032,7 @@ var ComRegister = class {
 							this.logger.info("动态链接生成成功！");
 						}
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.target, /* @__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)(__satorijs_element_jsx_runtime.Fragment, { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							this.logger.info("需要发送动态中的图片，开始发送...");
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
@@ -1049,7 +1045,7 @@ var ComRegister = class {
 											alt: "动态图片"
 										}, pic.url))
 									});
-									await this.broadcastToTargets(sub.target, picsMsg, PushType.Dynamic);
+									await this.broadcastToTargets(sub.uid, picsMsg, PushType.Dynamic);
 								}
 							}
 							this.logger.info("动态中的图片发送完毕！");
@@ -1101,7 +1097,7 @@ var ComRegister = class {
 		if (!data$1) return await this.sendPrivateMsgAndStopService();
 		return data$1;
 	}
-	async sendLiveNotifyCard(liveType, followerDisplay, liveInfo, target, liveNotifyMsg) {
+	async sendLiveNotifyCard(liveType, followerDisplay, liveInfo, uid, liveNotifyMsg) {
 		const buffer = await withRetry(async () => {
 			return await this.ctx.gi.generateLiveImg(liveInfo.liveRoomInfo, liveInfo.masterInfo.username, liveInfo.masterInfo.userface, followerDisplay, liveType, liveInfo.cardStyle.enable ? liveInfo.cardStyle : void 0);
 		}, 1).catch((e$1) => {
@@ -1109,25 +1105,16 @@ var ComRegister = class {
 		});
 		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 || ""] });
-		return await this.broadcastToTargets(target, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
+		return await this.broadcastToTargets(uid, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
 	}
-	async liveDetectWithListener(roomId, target, cardStyle) {
+	async liveDetectWithListener(roomId, uid, cardStyle) {
 		let liveTime;
 		let pushAtTimeTimer;
 		const currentLiveDanmakuArr = [];
 		let liveStatus = false;
-		let channelArrLen = 0;
 		let liveRoomInfo;
 		let masterInfo;
 		let watchedNum;
-		const liveGuardBuyPushTargetArr = target.map((channel) => {
-			const liveGuardBuyArr = channel.channelArr.filter((channelId) => channelId.liveGuardBuy);
-			channelArrLen += liveGuardBuyArr.length;
-			return {
-				channelArr: liveGuardBuyArr,
-				platform: channel.platform
-			};
-		});
 		const pushAtTimeFunc = async () => {
 			if (!await useMasterAndLiveRoomInfo(LiveType.LiveBroadcast)) {
 				await this.sendPrivateMsg("获取直播间信息失败，推送直播卡片失败！");
@@ -1146,7 +1133,7 @@ var ComRegister = class {
 				liveRoomInfo,
 				masterInfo,
 				cardStyle
-			}, target, liveMsg);
+			}, uid, liveMsg);
 		};
 		const useMasterAndLiveRoomInfo = async (liveType) => {
 			let flag = true;
@@ -1183,7 +1170,7 @@ var ComRegister = class {
 			},
 			onGuardBuy: ({ body }) => {
 				const content = `[${masterInfo.username}的直播间]「${body.user.uname}」加入了大航海（${body.gift_name}）`;
-				channelArrLen > 0 && this.broadcastToTargets(liveGuardBuyPushTargetArr, content, PushType.LiveGuardBuy);
+				this.broadcastToTargets(uid, content, PushType.LiveGuardBuy);
 			},
 			onLiveStart: async () => {
 				if (liveStatus) return;
@@ -1200,7 +1187,7 @@ var ComRegister = class {
 					liveRoomInfo,
 					masterInfo,
 					cardStyle
-				}, target, liveStartMsg);
+				}, uid, liveStartMsg);
 				if (!pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			},
 			onLiveEnd: async () => {
@@ -1220,7 +1207,7 @@ var ComRegister = class {
 					liveRoomInfo,
 					masterInfo,
 					cardStyle
-				}, target, liveEndMsg);
+				}, uid, liveEndMsg);
 				pushAtTimeTimer();
 				pushAtTimeTimer = null;
 			}
@@ -1235,7 +1222,7 @@ var ComRegister = class {
 				liveRoomInfo,
 				masterInfo,
 				cardStyle
-			}, target, liveMsg);
+			}, uid, liveMsg);
 			if (!pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			liveStatus = true;
 		}
@@ -1286,7 +1273,7 @@ var ComRegister = class {
 					liveRoomInfo: liveStatus.liveRoomInfo,
 					masterInfo: liveStatus.masterInfo,
 					cardStyle: sub.card
-				}, sub.target, liveMsg);
+				}, sub.uid, liveMsg);
 			}
 		}
 		const handler = async () => {
@@ -1318,7 +1305,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.card
-							}, sub.target, liveEndMsg);
+							}, sub.uid, liveEndMsg);
 							liveStatus.live = false;
 						}
 						break;
@@ -1337,7 +1324,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.card
-							}, sub.target, liveStartMsg);
+							}, sub.uid, liveStartMsg);
 							liveStatus.live = true;
 						}
 						if (liveStatus.live === true) {
@@ -1358,7 +1345,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.card
-							}, sub.target, liveMsg);
+							}, sub.uid, liveMsg);
 							liveStatus.push = 0;
 						}
 						break;
@@ -1550,7 +1537,7 @@ var ComRegister = class {
 					sub.live = false;
 					this.logger.warn(`UID:${sub.uid} 用户没有开通直播间，无法订阅直播！`);
 				}
-				if (sub.live) await this.liveDetectWithListener(userInfoData.live_room.roomid, sub.target, sub.card);
+				if (sub.live) await this.liveDetectWithListener(userInfoData.live_room.roomid, sub.uid, sub.card);
 			}
 			const subInfo = await this.subUserInBili(sub.uid);
 			if (subInfo.code !== 0) return subInfo;

package/lib/index.mjs

@@ -519,6 +519,12 @@ let PushType = /* @__PURE__ */ function(PushType$1) {
 	PushType$1[PushType$1["LiveGuardBuy"] = 3] = "LiveGuardBuy";
 	return PushType$1;
 }({});
+const PushTypeMsg = {
+	[PushType.Live]: "直播推送",
+	[PushType.Dynamic]: "动态推送",
+	[PushType.StartBroadcasting]: "开播推送",
+	[PushType.LiveGuardBuy]: "上舰推送"
+};
 
 //#endregion
 //#region src/comRegister.tsx
@@ -548,6 +554,7 @@ var ComRegister = class {
 	subManager = [];
 	dynamicTimelineManager = /* @__PURE__ */ new Map();
 	liveStatusManager = /* @__PURE__ */ new Map();
+	pushRecord = {};
 	loginDBData;
 	privateBot;
 	dynamicJob;
@@ -723,6 +730,7 @@ var ComRegister = class {
 			}
 		}
 		this.initManager();
+		this.initPushRecord(this.subManager);
 		this.checkIfDynamicDetectIsNeeded();
 		this.checkIfLiveDetectIsNeeded();
 		this.updateSubNotifier();
@@ -791,72 +799,60 @@ var ComRegister = class {
 			await this.sendPrivateMsg(`发送群组ID:${channelId}消息失败，请查看日志`);
 		});
 	}
-	getGroupsThatMeetCriteria(targets, type) {
-		const pushArr = [];
-		if (type === PushType.StartBroadcasting) {
+	initPushRecord(subs) {
+		const pushRecord = {};
+		for (const sub of subs) {
 			const atAllArr = [];
-			for (const target of targets) for (const channel of target.channelArr) {
-				if (channel.atAll && channel.dynamic) {
-					atAllArr.push(`${target.platform}:${channel.channelId}`);
-					continue;
-				}
-				if (channel.dynamic) pushArr.push(`${target.platform}:${channel.channelId}`);
-			}
-			return [pushArr, atAllArr];
-		}
-		if (type === PushType.Live) {
-			for (const target of targets) for (const channel of target.channelArr) if (channel.live) pushArr.push(`${target.platform}:${channel.channelId}`);
-			return [pushArr];
+			const dynamicArr = [];
+			const liveArr = [];
+			const liveGuardBuyArr = [];
+			for (const platform of sub.target) for (const channel of platform.channelArr) {
+				if (channel.atAll) atAllArr.push(`${platform.platform}:${channel.channelId}`);
+				if (channel.dynamic) dynamicArr.push(`${platform.platform}:${channel.channelId}`);
+				if (channel.live) liveArr.push(`${platform.platform}:${channel.channelId}`);
+				if (channel.liveGuardBuy) liveGuardBuyArr.push(`${platform.platform}:${channel.channelId}`);
+			}
+			pushRecord[sub.uid] = {
+				atAllArr,
+				dynamicArr,
+				liveArr,
+				liveGuardBuyArr
+			};
 		}
-		if (type === PushType.Dynamic) {
-			for (const target of targets) for (const channel of target.channelArr) if (channel.dynamic) pushArr.push(`${target.platform}:${channel.channelId}`);
-			return [pushArr];
+		this.pushRecord = pushRecord;
+		this.logger.info("初始化推送群组/频道信息：");
+		this.logger.info(this.pushRecord);
+	}
+	async broadcastToTargets(uid, content, type) {
+		this.logger.info(`本次推送对象：${uid}，推送类型：${PushTypeMsg[type]}`);
+		const record = this.pushRecord[uid];
+		this.logger.info("本次推送目标：");
+		this.logger.info(record);
+		if (type === PushType.StartBroadcasting && record.atAllArr?.length >= 1) {
+			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 })] }));
+			}, 1);
+			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
 		}
-		if (type === PushType.LiveGuardBuy) {
-			for (const target of targets) for (const channel of target.channelArr) if (channel.liveGuardBuy) pushArr.push(`${target.platform}:${channel.channelId}`);
-			return [pushArr];
+		if (type === PushType.Dynamic && record.dynamicArr?.length >= 1) {
+			const success = await withRetry(async () => {
+				return await this.ctx.broadcast(record.dynamicArr, /* @__PURE__ */ jsx("message", { children: content }));
+			}, 1);
+			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
 		}
-	}
-	async broadcastToTargets(targets, content, type) {
-		if (targets.length !== 1 || targets[0].channelArr.length !== 1) {
-			const [pushArr, atAllArr] = this.getGroupsThatMeetCriteria(targets, type);
-			this.logger.info(`推送消息到 ${pushArr.length} 个目标频道，目标频道为：${pushArr.join(", ")}`);
-			if (type === PushType.StartBroadcasting && atAllArr?.length >= 1) {
-				await withRetry(async () => {
-					await this.ctx.broadcast(atAllArr, h.at("all"));
-				}, 1);
-				await withRetry(async () => {
-					await this.ctx.broadcast(atAllArr, content);
-				}, 1);
-			}
-			if (pushArr?.length >= 1) await withRetry(async () => {
-				await this.ctx.broadcast(pushArr, content);
+		if ((type === PushType.Live || type === PushType.StartBroadcasting) && record.liveArr?.length >= 1) {
+			const success = await withRetry(async () => {
+				return await this.ctx.broadcast(record.liveArr, /* @__PURE__ */ jsx("message", { children: content }));
 			}, 1);
-			return;
+			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
 		}
-		const targetChannel = targets[0].channelArr[0];
-		const bot = this.getBot(targets[0].platform, targetChannel.bot);
-		if (!bot || !bot.isActive) {
-			this.sendPrivateMsg("未找到对应bot实例，本次消息推送取消！");
-			this.logger.warn("未找到对应bot实例，本次消息推送取消！");
-			return;
+		if (type === PushType.LiveGuardBuy && record.liveGuardBuyArr?.length >= 1) {
+			const success = await withRetry(async () => {
+				return await this.ctx.broadcast(record.liveGuardBuyArr, /* @__PURE__ */ jsx("message", { children: content }));
+			}, 1);
+			this.logger.info(`成功推送全体成员消息群组/频道：${success}`);
 		}
-		const pushTypePatternMatching = {
-			[PushType.Live]: async () => {
-				if (targetChannel.live) await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
-			},
-			[PushType.Dynamic]: async () => {
-				if (targetChannel.dynamic) await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
-			},
-			[PushType.StartBroadcasting]: async () => {
-				if (targetChannel.live) await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
-				if (targetChannel.atAll) await this.sendMessageWithRetry(bot, targetChannel.channelId, /* @__PURE__ */ jsx("at", { type: "all" }));
-			},
-			[PushType.LiveGuardBuy]: async () => {
-				if (targetChannel.liveGuardBuy) await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
-			}
-		};
-		await pushTypePatternMatching[type]();
+		return;
 	}
 	dynamicDetect() {
 		const handler = async () => {
@@ -906,15 +902,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.target, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.target, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.target, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -928,7 +924,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.target, /* @__PURE__ */ jsxs(Fragment, { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs(Fragment, { 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;
@@ -940,7 +936,7 @@ var ComRegister = class {
 											alt: "动态图片"
 										}, pic.url))
 									});
-									await this.broadcastToTargets(sub.target, picsMsg, PushType.Dynamic);
+									await this.broadcastToTargets(sub.uid, picsMsg, PushType.Dynamic);
 								}
 							}
 						}
@@ -1011,15 +1007,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.target, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}发布了一条含有屏蔽关键字的动态`, PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.target, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}转发了一条动态，已屏蔽`, PushType.Dynamic);
 								return;
 							}
 							if (e$1.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.target, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, `${name$3}投稿了一条专栏，已屏蔽`, PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e$1.message}`);
@@ -1038,7 +1034,7 @@ var ComRegister = class {
 							this.logger.info("动态链接生成成功！");
 						}
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.target, /* @__PURE__ */ jsxs(Fragment, { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs(Fragment, { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
 						if (this.config.pushImgsInDynamic) {
 							this.logger.info("需要发送动态中的图片，开始发送...");
 							if (item.type === "DYNAMIC_TYPE_DRAW") {
@@ -1051,7 +1047,7 @@ var ComRegister = class {
 											alt: "动态图片"
 										}, pic.url))
 									});
-									await this.broadcastToTargets(sub.target, picsMsg, PushType.Dynamic);
+									await this.broadcastToTargets(sub.uid, picsMsg, PushType.Dynamic);
 								}
 							}
 							this.logger.info("动态中的图片发送完毕！");
@@ -1103,7 +1099,7 @@ var ComRegister = class {
 		if (!data$1) return await this.sendPrivateMsgAndStopService();
 		return data$1;
 	}
-	async sendLiveNotifyCard(liveType, followerDisplay, liveInfo, target, liveNotifyMsg) {
+	async sendLiveNotifyCard(liveType, followerDisplay, liveInfo, uid, liveNotifyMsg) {
 		const buffer = await withRetry(async () => {
 			return await this.ctx.gi.generateLiveImg(liveInfo.liveRoomInfo, liveInfo.masterInfo.username, liveInfo.masterInfo.userface, followerDisplay, liveType, liveInfo.cardStyle.enable ? liveInfo.cardStyle : void 0);
 		}, 1).catch((e$1) => {
@@ -1111,25 +1107,16 @@ var ComRegister = class {
 		});
 		if (!buffer) return await this.sendPrivateMsgAndStopService();
 		const msg = /* @__PURE__ */ jsxs(Fragment, { children: [h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] });
-		return await this.broadcastToTargets(target, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
+		return await this.broadcastToTargets(uid, msg, liveType === LiveType.StartBroadcasting ? PushType.StartBroadcasting : PushType.Live);
 	}
-	async liveDetectWithListener(roomId, target, cardStyle) {
+	async liveDetectWithListener(roomId, uid, cardStyle) {
 		let liveTime;
 		let pushAtTimeTimer;
 		const currentLiveDanmakuArr = [];
 		let liveStatus = false;
-		let channelArrLen = 0;
 		let liveRoomInfo;
 		let masterInfo;
 		let watchedNum;
-		const liveGuardBuyPushTargetArr = target.map((channel) => {
-			const liveGuardBuyArr = channel.channelArr.filter((channelId) => channelId.liveGuardBuy);
-			channelArrLen += liveGuardBuyArr.length;
-			return {
-				channelArr: liveGuardBuyArr,
-				platform: channel.platform
-			};
-		});
 		const pushAtTimeFunc = async () => {
 			if (!await useMasterAndLiveRoomInfo(LiveType.LiveBroadcast)) {
 				await this.sendPrivateMsg("获取直播间信息失败，推送直播卡片失败！");
@@ -1148,7 +1135,7 @@ var ComRegister = class {
 				liveRoomInfo,
 				masterInfo,
 				cardStyle
-			}, target, liveMsg);
+			}, uid, liveMsg);
 		};
 		const useMasterAndLiveRoomInfo = async (liveType) => {
 			let flag = true;
@@ -1185,7 +1172,7 @@ var ComRegister = class {
 			},
 			onGuardBuy: ({ body }) => {
 				const content = `[${masterInfo.username}的直播间]「${body.user.uname}」加入了大航海（${body.gift_name}）`;
-				channelArrLen > 0 && this.broadcastToTargets(liveGuardBuyPushTargetArr, content, PushType.LiveGuardBuy);
+				this.broadcastToTargets(uid, content, PushType.LiveGuardBuy);
 			},
 			onLiveStart: async () => {
 				if (liveStatus) return;
@@ -1202,7 +1189,7 @@ var ComRegister = class {
 					liveRoomInfo,
 					masterInfo,
 					cardStyle
-				}, target, liveStartMsg);
+				}, uid, liveStartMsg);
 				if (!pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			},
 			onLiveEnd: async () => {
@@ -1222,7 +1209,7 @@ var ComRegister = class {
 					liveRoomInfo,
 					masterInfo,
 					cardStyle
-				}, target, liveEndMsg);
+				}, uid, liveEndMsg);
 				pushAtTimeTimer();
 				pushAtTimeTimer = null;
 			}
@@ -1237,7 +1224,7 @@ var ComRegister = class {
 				liveRoomInfo,
 				masterInfo,
 				cardStyle
-			}, target, liveMsg);
+			}, uid, liveMsg);
 			if (!pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			liveStatus = true;
 		}
@@ -1288,7 +1275,7 @@ var ComRegister = class {
 					liveRoomInfo: liveStatus.liveRoomInfo,
 					masterInfo: liveStatus.masterInfo,
 					cardStyle: sub.card
-				}, sub.target, liveMsg);
+				}, sub.uid, liveMsg);
 			}
 		}
 		const handler = async () => {
@@ -1320,7 +1307,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.card
-							}, sub.target, liveEndMsg);
+							}, sub.uid, liveEndMsg);
 							liveStatus.live = false;
 						}
 						break;
@@ -1339,7 +1326,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.card
-							}, sub.target, liveStartMsg);
+							}, sub.uid, liveStartMsg);
 							liveStatus.live = true;
 						}
 						if (liveStatus.live === true) {
@@ -1360,7 +1347,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.card
-							}, sub.target, liveMsg);
+							}, sub.uid, liveMsg);
 							liveStatus.push = 0;
 						}
 						break;
@@ -1552,7 +1539,7 @@ var ComRegister = class {
 					sub.live = false;
 					this.logger.warn(`UID:${sub.uid} 用户没有开通直播间，无法订阅直播！`);
 				}
-				if (sub.live) await this.liveDetectWithListener(userInfoData.live_room.roomid, sub.target, sub.card);
+				if (sub.live) await this.liveDetectWithListener(userInfoData.live_room.roomid, sub.uid, sub.card);
 			}
 			const subInfo = await this.subUserInBili(sub.uid);
 			if (subInfo.code !== 0) return subInfo;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.5-alpha.5",
+  "version": "3.2.5-alpha.6",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],