koishi-plugin-bilibili-notify 3.3.1-alpha.1 → 3.3.1-rc.0

package/lib/index.js

@@ -64,7 +64,7 @@ const BAConfigSchema = koishi.Schema.object({
 			"satori",
 			"chronocat",
 			"lark"
-		]).description("请选择您的私人机器人平台，目前支持QQ、QQ群、OneBot、Discord、RedBot、Telegram、Satori、ChronoCat、Lark。从2.0版本开始，只能在一个平台下使用本插件"),
+		]).description("请选择您的私人机器人平台"),
 		masterAccount: koishi.Schema.string().role("secret").required().description("主人账号，在Q群使用可直接使用QQ号，若在其他平台使用，请使用inspect插件获取自身ID"),
 		masterAccountGuildId: koishi.Schema.string().role("secret").description("主人账号所在的群组ID，只有在QQ频道、Discord这样的环境才需要填写，请使用inspect插件获取群组ID")
 	}), koishi.Schema.object({})])]),
@@ -364,17 +364,18 @@ var ComRegister = class {
 	rebootCount = 0;
 	subNotifier;
 	ctx;
-	subManager = [];
-	dynamicTimelineManager = new Map();
-	liveStatusManager = new Map();
-	liveMsgManager = new Map();
-	pushArrMap = new Map();
+	subManager;
+	dynamicTimelineManager;
+	liveStatusManager;
+	liveMsgManager;
+	pushArrMap;
 	loginDBData;
 	privateBot;
 	dynamicJob;
 	liveJob;
 	_jieba = __node_rs_jieba.Jieba.withDict(__node_rs_jieba_dict.dict);
 	stopwords;
+	reciveSubTimes = 0;
 	constructor(ctx, config) {
 		this.ctx = ctx;
 		this.init(config);
@@ -474,16 +475,16 @@ var ComRegister = class {
 		biliCom.subcommand(".ll").usage("展示当前正在直播的订阅对象").example("bili ll").action(async () => {
 			const { data: { live_users } } = await ctx["bilibili-notify-api"].getTheUserWhoIsLiveStreaming();
 			const subLiveUsers = [];
-			for (const sub of this.subManager) {
+			for (const [uid, sub] of this.subManager) {
 				let onLive = false;
 				if (live_users.items) {
-					for (const user of live_users.items) if (user.mid.toString() === sub.uid && sub.live) {
+					for (const user of live_users.items) if (user.mid.toString() === uid && sub.live) {
 						onLive = true;
 						break;
 					}
 				}
 				subLiveUsers.push({
-					uid: Number.parseInt(sub.uid),
+					uid: Number.parseInt(uid),
 					uname: sub.uname,
 					onLive
 				});
@@ -612,7 +613,7 @@ var ComRegister = class {
 				["初中", 4],
 				["毕业", 4]
 			];
-			await session.send(/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: koishi.h.image(await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(words, "词云测试"), "image/jpg") }));
+			const img = koishi.h.image(await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(words, "词云测试"), "image/jpg");
 			const top5DanmakuMaker = [
 				["张三", 60],
 				["李四", 48],
@@ -620,8 +621,8 @@ var ComRegister = class {
 				["赵六", 27],
 				["田七", 25]
 			];
-			const danmakerRankMsg = this.config.liveSummary.join("\n").replace("-dmc", "114").replace("-mdn", "特工").replace("-dca", "514").replace("-un1", `${top5DanmakuMaker[0][0]}`).replace("-dc1", `${top5DanmakuMaker[0][1]}`).replace("-un2", `${top5DanmakuMaker[1][0]}`).replace("-dc2", `${top5DanmakuMaker[1][1]}`).replace("-un3", `${top5DanmakuMaker[2][0]}`).replace("-dc3", `${top5DanmakuMaker[2][1]}`).replace("-un4", `${top5DanmakuMaker[3][0]}`).replace("-dc4", `${top5DanmakuMaker[3][1]}`).replace("-un5", `${top5DanmakuMaker[4][0]}`).replace("-dc5", `${top5DanmakuMaker[4][1]}`).replaceAll("\\n", "\n");
-			await session.send(danmakerRankMsg);
+			const summary = this.config.liveSummary.join("\n").replace("-dmc", "114").replace("-mdn", "特工").replace("-dca", "514").replace("-un1", `${top5DanmakuMaker[0][0]}`).replace("-dc1", `${top5DanmakuMaker[0][1]}`).replace("-un2", `${top5DanmakuMaker[1][0]}`).replace("-dc2", `${top5DanmakuMaker[1][1]}`).replace("-un3", `${top5DanmakuMaker[2][0]}`).replace("-dc3", `${top5DanmakuMaker[2][1]}`).replace("-un4", `${top5DanmakuMaker[3][0]}`).replace("-dc4", `${top5DanmakuMaker[3][1]}`).replace("-un5", `${top5DanmakuMaker[4][0]}`).replace("-dc5", `${top5DanmakuMaker[4][1]}`).replaceAll("\\n", "\n");
+			await session.send(/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [img, summary] }));
 		});
 		biliCom.subcommand(".cap").action(async ({ session }) => {
 			const { code: userInfoCode, data: userInfoData } = await withRetry(async () => {
@@ -643,7 +644,9 @@ var ComRegister = class {
 			const seccode = `${validate}|jordan`;
 			const { data: validateCaptchaData } = await ctx["bilibili-notify-api"].validateCaptcha(data.geetest.challenge, data.token, validate, seccode);
 			if (validateCaptchaData?.is_valid !== 1) return "验证不成功！";
-			await ctx["bilibili-notify-api"].getUserInfo("114514", validateCaptchaData.grisk_id);
+			await this.ctx.sleep(10 * 1e3);
+			const { code: validCode, data: validData } = await ctx["bilibili-notify-api"].getUserInfo("114514", validateCaptchaData.grisk_id);
+			if (validCode === -352 && validData.v_voucher) return "验证不成功！";
 			await session.send("验证成功！请重启插件");
 		});
 	}
@@ -660,25 +663,30 @@ var ComRegister = class {
 			return;
 		}
 		this.mergeStopWords(config.wordcloudStopWords);
-		if (config.advancedSub) {
-			this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
-				await this.initAsyncPart(subs);
-			});
-			this.ctx.emit("bilibili-notify/ready-to-recive");
-		} else if (config.subs && config.subs.length > 0) {
+		this.registeringForEvents();
+		if (config.advancedSub) this.ctx.emit("bilibili-notify/ready-to-recive");
+		else if (config.subs && config.subs.length > 0) {
 			const subs = this.configSubsToSubscription(config.subs);
 			await this.initAsyncPart(subs);
 		}
+	}
+	registeringForEvents() {
 		this.ctx.on("dispose", () => {
 			if (this.loginTimer) this.loginTimer();
 			if (this.dynamicJob) this.dynamicJob.stop();
 			if (this.liveJob) this.liveJob.stop();
 		});
+		this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
+			if (this.reciveSubTimes >= 1) await this.ctx["bilibili-notify"].restartPlugin();
+			else await this.initAsyncPart(subs);
+			this.reciveSubTimes++;
+		});
 	}
 	async initAsyncPart(subs) {
-		const { code, msg } = await this.loadSubFromConfig(subs);
+		this.initAllManager();
+		const { code, message } = await this.loadSubFromConfig(subs);
 		if (code !== 0) {
-			this.logger.error(msg);
+			this.logger.error(message);
 			this.logger.error("订阅对象加载失败，插件初始化失败！");
 			await this.sendPrivateMsg("订阅对象加载失败，插件初始化失败！");
 			return;
@@ -698,9 +706,9 @@ var ComRegister = class {
 		this.stopwords = new Set([...stop_words_default, ...additionalStopWords]);
 	}
 	initManager() {
-		for (const sub of this.subManager) {
-			if (sub.dynamic) this.dynamicTimelineManager.set(sub.uid, Math.floor(luxon.DateTime.now().toSeconds()));
-			if (sub.live) this.liveStatusManager.set(sub.uid, {
+		for (const [uid, sub] of this.subManager) {
+			if (sub.dynamic) this.dynamicTimelineManager.set(uid, Math.floor(luxon.DateTime.now().toSeconds()));
+			if (sub.live) this.liveStatusManager.set(uid, {
 				roomId: sub.roomId,
 				live: false,
 				liveRoomInfo: void 0,
@@ -712,6 +720,13 @@ var ComRegister = class {
 			});
 		}
 	}
+	initAllManager() {
+		this.subManager = new Map();
+		this.dynamicTimelineManager = new Map();
+		this.liveStatusManager = new Map();
+		this.liveMsgManager = new Map();
+		this.pushArrMap = new Map();
+	}
 	configSubsToSubscription(sub) {
 		const subs = {};
 		sub.forEach((s) => {
@@ -958,21 +973,21 @@ var ComRegister = class {
 				if (this.dynamicTimelineManager.has(uid)) {
 					const timeline = this.dynamicTimelineManager.get(uid);
 					if (timeline < postTime) {
-						const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+						const sub = this.subManager.get(uid);
 						const buffer = await withRetry(async () => {
 							return await this.ctx["bilibili-notify-generate-img"].generateDynamicImg(item, sub.customCardStyle.enable ? sub.customCardStyle : void 0);
 						}, 1).catch(async (e) => {
 							if (e.message === "直播开播动态，不做处理") return;
 							if (e.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e.message}`);
@@ -986,7 +1001,7 @@ var ComRegister = class {
 						} else dUrl = `${name$2}发布了新视频：https:${item.modules.module_dynamic.major.archive.jump_url}`;
 						else dUrl = `${name$2}发布了一条动态：https://t.bilibili.com/${item.id_str}`;
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(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;
@@ -998,7 +1013,7 @@ var ComRegister = class {
 											alt: "动态图片"
 										}, pic.url))
 									});
-									await this.broadcastToTargets(sub.uid, picsMsg, PushType.Dynamic);
+									await this.broadcastToTargets(uid, picsMsg, PushType.Dynamic);
 								}
 							}
 						}
@@ -1062,22 +1077,22 @@ var ComRegister = class {
 					this.logger.info(`上次推送时间线：${luxon.DateTime.fromSeconds(timeline).toFormat("yyyy-MM-dd HH:mm:ss")}`);
 					if (timeline < postTime) {
 						this.logger.info("需要推送该条动态，开始推送...");
-						const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+						const sub = this.subManager.get(uid);
 						this.logger.info("开始渲染推送卡片...");
 						const buffer = await withRetry(async () => {
 							return await this.ctx["bilibili-notify-generate-img"].generateDynamicImg(item, sub.customCardStyle.enable ? sub.customCardStyle : void 0);
 						}, 1).catch(async (e) => {
 							if (e.message === "直播开播动态，不做处理") return;
 							if (e.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e.message}`);
@@ -1096,7 +1111,7 @@ var ComRegister = class {
 							this.logger.info("动态链接生成成功！");
 						}
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [koishi.h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(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") {
@@ -1109,7 +1124,7 @@ var ComRegister = class {
 											alt: "动态图片"
 										}, pic.url))
 									});
-									await this.broadcastToTargets(sub.uid, picsMsg, PushType.Dynamic);
+									await this.broadcastToTargets(uid, picsMsg, PushType.Dynamic);
 								}
 							}
 							this.logger.info("动态中的图片发送完毕！");
@@ -1198,13 +1213,12 @@ var ComRegister = class {
 			this.logger.info(top90Words);
 			this.logger.info("正在准备生成弹幕词云");
 			const buffer = await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(top90Words, masterInfo.username);
-			const img = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: koishi.h.image(buffer, "image/jpeg") });
+			const img = koishi.h.image(buffer, "image/jpeg");
 			this.logger.info("开始构建弹幕发送排行榜消息");
 			const danmakuMakerCount = Object.keys(danmakuMakerRecord).length;
 			const danmakuCount = Object.values(danmakuMakerRecord).reduce((sum, val) => sum + val, 0);
 			const top5DanmakuMaker = Object.entries(danmakuMakerRecord).sort((a, b) => b[1] - a[1]).slice(0, 5);
-			const danmakuMakerMsg = customLiveSummary.replace("-dmc", `${danmakuMakerCount}`).replace("-mdn", `${masterInfo.medalName}`).replace("-dca", `${danmakuCount}`).replace("-un1", `${top5DanmakuMaker[0][0]}`).replace("-dc1", `${top5DanmakuMaker[0][1]}`).replace("-un2", `${top5DanmakuMaker[1][0]}`).replace("-dc2", `${top5DanmakuMaker[1][1]}`).replace("-un3", `${top5DanmakuMaker[2][0]}`).replace("-dc3", `${top5DanmakuMaker[2][1]}`).replace("-un4", `${top5DanmakuMaker[3][0]}`).replace("-dc4", `${top5DanmakuMaker[3][1]}`).replace("-un5", `${top5DanmakuMaker[4][0]}`).replace("-dc5", `${top5DanmakuMaker[4][1]}`).replaceAll("\\n", "\n");
-			const summary = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: danmakuMakerMsg });
+			const summary = customLiveSummary.replace("-dmc", `${danmakuMakerCount}`).replace("-mdn", `${masterInfo.medalName}`).replace("-dca", `${danmakuCount}`).replace("-un1", `${top5DanmakuMaker[0][0]}`).replace("-dc1", `${top5DanmakuMaker[0][1]}`).replace("-un2", `${top5DanmakuMaker[1][0]}`).replace("-dc2", `${top5DanmakuMaker[1][1]}`).replace("-un3", `${top5DanmakuMaker[2][0]}`).replace("-dc3", `${top5DanmakuMaker[2][1]}`).replace("-un4", `${top5DanmakuMaker[3][0]}`).replace("-dc4", `${top5DanmakuMaker[3][1]}`).replace("-un5", `${top5DanmakuMaker[4][0]}`).replace("-dc5", `${top5DanmakuMaker[4][1]}`).replaceAll("\\n", "\n");
 			await this.broadcastToTargets(sub.uid, [img, summary], PushType.WordCloudAndLiveSummary);
 			Object.keys(danmakuWeightRecord).forEach((key) => delete danmakuWeightRecord[key]);
 			Object.keys(danmakuMakerRecord).forEach((key) => delete danmakuMakerRecord[key]);
@@ -1366,7 +1380,7 @@ var ComRegister = class {
 			const uid = item.uid.toString();
 			const liveStatus = this.liveStatusManager.get(uid);
 			const liveMsgObj = this.liveMsgManager.get(uid);
-			const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+			const sub = this.subManager.get(uid);
 			if (item.live_status === 1) {
 				liveStatus.live = true;
 				await useMasterAndLiveRoomInfo(LiveType.FirstLiveBroadcast, liveStatus);
@@ -1379,7 +1393,7 @@ var ComRegister = class {
 					liveRoomInfo: liveStatus.liveRoomInfo,
 					masterInfo: liveStatus.masterInfo,
 					cardStyle: sub.customCardStyle
-				}, sub.uid, liveMsg);
+				}, uid, liveMsg);
 			}
 		}
 		const handler = async () => {
@@ -1388,7 +1402,7 @@ var ComRegister = class {
 				const uid = item.uid.toString();
 				const liveStatus = this.liveStatusManager.get(uid);
 				const liveMsgObj = this.liveMsgManager.get(uid);
-				const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+				const sub = this.subManager.get(uid);
 				if (!sub) return;
 				switch (item.live_status) {
 					case 0:
@@ -1412,7 +1426,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.customCardStyle
-							}, sub.uid, liveEndMsg);
+							}, uid, liveEndMsg);
 							liveStatus.live = false;
 						}
 						break;
@@ -1431,7 +1445,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.customCardStyle
-							}, sub.uid, liveStartMsg);
+							}, uid, liveStartMsg);
 							liveStatus.live = true;
 						}
 						if (liveStatus.live === true) {
@@ -1452,7 +1466,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.customCardStyle
-							}, sub.uid, liveMsg);
+							}, uid, liveMsg);
 							liveStatus.push = 0;
 						}
 						break;
@@ -1465,7 +1479,7 @@ var ComRegister = class {
 	}
 	subShow() {
 		let table = "";
-		for (const sub of this.subManager) table += `UID:${sub.uid}  ${sub.dynamic ? "已订阅动态" : ""}  ${sub.live ? "已订阅直播" : ""}\n`;
+		for (const [uid, sub] of this.subManager) table += `UID:${uid}  ${sub.dynamic ? "已订阅动态" : ""}  ${sub.live ? "已订阅直播" : ""}\n`;
 		return table ? table : "没有订阅任何UP";
 	}
 	updateSubNotifier() {
@@ -1500,22 +1514,22 @@ var ComRegister = class {
 						this.ctx.database.set("loginBili", 1, { dynamic_group_id: this.loginDBData.dynamic_group_id });
 						return {
 							code: 0,
-							msg: "分组已存在"
+							message: "分组已存在"
 						};
 					}
 				} else if (createGroupData.code !== 0) return {
 					code: createGroupData.code,
-					msg: createGroupData.message
+					message: createGroupData.message
 				};
 				this.ctx.database.set("loginBili", 1, { dynamic_group_id: createGroupData.data.tagid.toString() });
 				return {
 					code: createGroupData.code,
-					msg: createGroupData.message
+					message: createGroupData.message
 				};
 			}
 			return {
 				code: 0,
-				msg: "分组已存在"
+				message: "分组已存在"
 			};
 		};
 		const resp = await checkGroupIsReady();
@@ -1531,93 +1545,105 @@ var ComRegister = class {
 				}
 				return {
 					code: relationGroupDetailData.code,
-					msg: relationGroupDetailData.message,
+					message: relationGroupDetailData.message,
 					data: void 0
 				};
 			}
 			return {
 				code: 0,
-				msg: "获取分组明细成功",
+				message: "获取分组明细成功",
 				data: relationGroupDetailData.data
 			};
 		};
-		const { code, msg, data } = await getGroupDetailData();
+		const { code, message, data } = await getGroupDetailData();
 		if (code !== 0) return {
 			code,
-			msg
+			message
 		};
 		for (const user of data) if (user.mid === mid) return {
 			code: 0,
-			msg: "订阅对象已存在于分组中"
+			message: "订阅对象已存在于分组中"
 		};
 		const subUserData = await this.ctx["bilibili-notify-api"].follow(mid);
 		const subUserMatchPattern = {
 			[-101]: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号未登录，请使用指令bili login登录后再进行订阅操作"
+					message: "账号未登录，请使用指令bili login登录后再进行订阅操作"
 				};
 			},
 			[-102]: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号被封停，无法进行订阅操作"
+					message: "账号被封停，无法进行订阅操作"
 				};
 			},
 			22002: () => {
 				return {
 					code: subUserData.code,
-					msg: "因对方隐私设置，无法进行订阅操作"
+					message: "因对方隐私设置，无法进行订阅操作"
 				};
 			},
 			22003: () => {
 				return {
 					code: subUserData.code,
-					msg: "你已将对方拉黑，无法进行订阅操作"
+					message: "你已将对方拉黑，无法进行订阅操作"
 				};
 			},
 			22013: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号已注销，无法进行订阅操作"
+					message: "账号已注销，无法进行订阅操作"
 				};
 			},
 			40061: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号不存在，请检查uid输入是否正确或用户是否存在"
+					message: "账号不存在，请检查uid输入是否正确或用户是否存在"
 				};
 			},
 			22001: () => {
 				return {
 					code: 0,
-					msg: "订阅对象为自己，无需添加到分组"
+					message: "订阅对象为自己，无需添加到分组"
 				};
 			},
 			22014: async () => {
 				const copyUserToGroupData = await this.ctx["bilibili-notify-api"].copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
 				if (copyUserToGroupData.code !== 0) return {
 					code: copyUserToGroupData.code,
-					msg: "添加订阅对象到分组失败，请稍后重试"
+					message: "添加订阅对象到分组失败，请稍后重试"
 				};
 				return {
 					code: 0,
-					msg: "订阅对象添加成功"
+					message: "订阅对象添加成功"
+				};
+			},
+			22015: async () => {
+				return {
+					code: subUserData.code,
+					message: subUserData.message
 				};
 			},
 			0: async () => {
 				const copyUserToGroupData = await this.ctx["bilibili-notify-api"].copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
 				if (copyUserToGroupData.code !== 0) return {
 					code: copyUserToGroupData.code,
-					msg: "添加订阅对象到分组失败，请稍后重试"
+					message: "添加订阅对象到分组失败，请稍后重试"
 				};
 				return {
 					code: 0,
-					msg: "订阅对象添加成功"
+					message: "订阅对象添加成功"
 				};
 			}
 		};
-		return await subUserMatchPattern[subUserData.code]();
+		const subUserExecute = subUserMatchPattern[subUserData.code] || (() => {
+			return {
+				code: subUserData.code,
+				message: subUserData.message
+			};
+		});
+		return await subUserExecute();
 	}
 	async loadSubFromConfig(subs) {
 		this.preInitConfig(subs);
@@ -1625,11 +1651,8 @@ var ComRegister = class {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
 			const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
 				const data = await this.ctx["bilibili-notify-api"].getUserInfo(sub.uid);
-				return {
-					code: 0,
-					data
-				};
-			}).then((content) => content.data).catch((e) => {
+				return data;
+			}).catch((e) => {
 				this.logger.error(`loadSubFromConfig() getUserInfo() 发生了错误，错误为：${e.message}`);
 				return {
 					code: -1,
@@ -1641,12 +1664,12 @@ var ComRegister = class {
 				await this.sendPrivateMsg("账号被风控，请使用指令 bili cap 进行风控验证");
 				return {
 					code: userInfoCode,
-					msg: userInfoMsg
+					message: userInfoMsg
 				};
 			}
 			if (userInfoCode !== 0) return {
 				code: userInfoCode,
-				msg: userInfoMsg
+				message: userInfoMsg
 			};
 			if (this.config.liveDetectType === "WS" && sub.live) {
 				if (!userInfoData.live_room) {
@@ -1657,8 +1680,7 @@ var ComRegister = class {
 			}
 			const subInfo = await this.subUserInBili(sub.uid);
 			if (subInfo.code !== 0) return subInfo;
-			this.subManager.push({
-				uid: sub.uid,
+			this.subManager.set(sub.uid, {
 				uname: userInfoData.name,
 				roomId: sub.live ? userInfoData.live_room.roomid : "",
 				target: sub.target,
@@ -1677,7 +1699,7 @@ var ComRegister = class {
 		}
 		return {
 			code: 0,
-			msg: "订阅加载完毕！"
+			message: "订阅加载完毕！"
 		};
 	}
 	checkIfDynamicDetectIsNeeded() {

package/lib/index.mjs

@@ -45,7 +45,7 @@ const BAConfigSchema = Schema.object({
 			"satori",
 			"chronocat",
 			"lark"
-		]).description("请选择您的私人机器人平台，目前支持QQ、QQ群、OneBot、Discord、RedBot、Telegram、Satori、ChronoCat、Lark。从2.0版本开始，只能在一个平台下使用本插件"),
+		]).description("请选择您的私人机器人平台"),
 		masterAccount: Schema.string().role("secret").required().description("主人账号，在Q群使用可直接使用QQ号，若在其他平台使用，请使用inspect插件获取自身ID"),
 		masterAccountGuildId: Schema.string().role("secret").description("主人账号所在的群组ID，只有在QQ频道、Discord这样的环境才需要填写，请使用inspect插件获取群组ID")
 	}), Schema.object({})])]),
@@ -345,17 +345,18 @@ var ComRegister = class {
 	rebootCount = 0;
 	subNotifier;
 	ctx;
-	subManager = [];
-	dynamicTimelineManager = new Map();
-	liveStatusManager = new Map();
-	liveMsgManager = new Map();
-	pushArrMap = new Map();
+	subManager;
+	dynamicTimelineManager;
+	liveStatusManager;
+	liveMsgManager;
+	pushArrMap;
 	loginDBData;
 	privateBot;
 	dynamicJob;
 	liveJob;
 	_jieba = Jieba.withDict(dict);
 	stopwords;
+	reciveSubTimes = 0;
 	constructor(ctx, config) {
 		this.ctx = ctx;
 		this.init(config);
@@ -455,16 +456,16 @@ var ComRegister = class {
 		biliCom.subcommand(".ll").usage("展示当前正在直播的订阅对象").example("bili ll").action(async () => {
 			const { data: { live_users } } = await ctx["bilibili-notify-api"].getTheUserWhoIsLiveStreaming();
 			const subLiveUsers = [];
-			for (const sub of this.subManager) {
+			for (const [uid, sub] of this.subManager) {
 				let onLive = false;
 				if (live_users.items) {
-					for (const user of live_users.items) if (user.mid.toString() === sub.uid && sub.live) {
+					for (const user of live_users.items) if (user.mid.toString() === uid && sub.live) {
 						onLive = true;
 						break;
 					}
 				}
 				subLiveUsers.push({
-					uid: Number.parseInt(sub.uid),
+					uid: Number.parseInt(uid),
 					uname: sub.uname,
 					onLive
 				});
@@ -593,7 +594,7 @@ var ComRegister = class {
 				["初中", 4],
 				["毕业", 4]
 			];
-			await session.send(/* @__PURE__ */ jsx("message", { children: h.image(await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(words, "词云测试"), "image/jpg") }));
+			const img = h.image(await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(words, "词云测试"), "image/jpg");
 			const top5DanmakuMaker = [
 				["张三", 60],
 				["李四", 48],
@@ -601,8 +602,8 @@ var ComRegister = class {
 				["赵六", 27],
 				["田七", 25]
 			];
-			const danmakerRankMsg = this.config.liveSummary.join("\n").replace("-dmc", "114").replace("-mdn", "特工").replace("-dca", "514").replace("-un1", `${top5DanmakuMaker[0][0]}`).replace("-dc1", `${top5DanmakuMaker[0][1]}`).replace("-un2", `${top5DanmakuMaker[1][0]}`).replace("-dc2", `${top5DanmakuMaker[1][1]}`).replace("-un3", `${top5DanmakuMaker[2][0]}`).replace("-dc3", `${top5DanmakuMaker[2][1]}`).replace("-un4", `${top5DanmakuMaker[3][0]}`).replace("-dc4", `${top5DanmakuMaker[3][1]}`).replace("-un5", `${top5DanmakuMaker[4][0]}`).replace("-dc5", `${top5DanmakuMaker[4][1]}`).replaceAll("\\n", "\n");
-			await session.send(danmakerRankMsg);
+			const summary = this.config.liveSummary.join("\n").replace("-dmc", "114").replace("-mdn", "特工").replace("-dca", "514").replace("-un1", `${top5DanmakuMaker[0][0]}`).replace("-dc1", `${top5DanmakuMaker[0][1]}`).replace("-un2", `${top5DanmakuMaker[1][0]}`).replace("-dc2", `${top5DanmakuMaker[1][1]}`).replace("-un3", `${top5DanmakuMaker[2][0]}`).replace("-dc3", `${top5DanmakuMaker[2][1]}`).replace("-un4", `${top5DanmakuMaker[3][0]}`).replace("-dc4", `${top5DanmakuMaker[3][1]}`).replace("-un5", `${top5DanmakuMaker[4][0]}`).replace("-dc5", `${top5DanmakuMaker[4][1]}`).replaceAll("\\n", "\n");
+			await session.send(/* @__PURE__ */ jsxs("message", { children: [img, summary] }));
 		});
 		biliCom.subcommand(".cap").action(async ({ session }) => {
 			const { code: userInfoCode, data: userInfoData } = await withRetry(async () => {
@@ -624,7 +625,9 @@ var ComRegister = class {
 			const seccode = `${validate}|jordan`;
 			const { data: validateCaptchaData } = await ctx["bilibili-notify-api"].validateCaptcha(data.geetest.challenge, data.token, validate, seccode);
 			if (validateCaptchaData?.is_valid !== 1) return "验证不成功！";
-			await ctx["bilibili-notify-api"].getUserInfo("114514", validateCaptchaData.grisk_id);
+			await this.ctx.sleep(10 * 1e3);
+			const { code: validCode, data: validData } = await ctx["bilibili-notify-api"].getUserInfo("114514", validateCaptchaData.grisk_id);
+			if (validCode === -352 && validData.v_voucher) return "验证不成功！";
 			await session.send("验证成功！请重启插件");
 		});
 	}
@@ -641,25 +644,30 @@ var ComRegister = class {
 			return;
 		}
 		this.mergeStopWords(config.wordcloudStopWords);
-		if (config.advancedSub) {
-			this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
-				await this.initAsyncPart(subs);
-			});
-			this.ctx.emit("bilibili-notify/ready-to-recive");
-		} else if (config.subs && config.subs.length > 0) {
+		this.registeringForEvents();
+		if (config.advancedSub) this.ctx.emit("bilibili-notify/ready-to-recive");
+		else if (config.subs && config.subs.length > 0) {
 			const subs = this.configSubsToSubscription(config.subs);
 			await this.initAsyncPart(subs);
 		}
+	}
+	registeringForEvents() {
 		this.ctx.on("dispose", () => {
 			if (this.loginTimer) this.loginTimer();
 			if (this.dynamicJob) this.dynamicJob.stop();
 			if (this.liveJob) this.liveJob.stop();
 		});
+		this.ctx.on("bilibili-notify/advanced-sub", async (subs) => {
+			if (this.reciveSubTimes >= 1) await this.ctx["bilibili-notify"].restartPlugin();
+			else await this.initAsyncPart(subs);
+			this.reciveSubTimes++;
+		});
 	}
 	async initAsyncPart(subs) {
-		const { code, msg } = await this.loadSubFromConfig(subs);
+		this.initAllManager();
+		const { code, message } = await this.loadSubFromConfig(subs);
 		if (code !== 0) {
-			this.logger.error(msg);
+			this.logger.error(message);
 			this.logger.error("订阅对象加载失败，插件初始化失败！");
 			await this.sendPrivateMsg("订阅对象加载失败，插件初始化失败！");
 			return;
@@ -679,9 +687,9 @@ var ComRegister = class {
 		this.stopwords = new Set([...stop_words_default, ...additionalStopWords]);
 	}
 	initManager() {
-		for (const sub of this.subManager) {
-			if (sub.dynamic) this.dynamicTimelineManager.set(sub.uid, Math.floor(DateTime.now().toSeconds()));
-			if (sub.live) this.liveStatusManager.set(sub.uid, {
+		for (const [uid, sub] of this.subManager) {
+			if (sub.dynamic) this.dynamicTimelineManager.set(uid, Math.floor(DateTime.now().toSeconds()));
+			if (sub.live) this.liveStatusManager.set(uid, {
 				roomId: sub.roomId,
 				live: false,
 				liveRoomInfo: void 0,
@@ -693,6 +701,13 @@ var ComRegister = class {
 			});
 		}
 	}
+	initAllManager() {
+		this.subManager = new Map();
+		this.dynamicTimelineManager = new Map();
+		this.liveStatusManager = new Map();
+		this.liveMsgManager = new Map();
+		this.pushArrMap = new Map();
+	}
 	configSubsToSubscription(sub) {
 		const subs = {};
 		sub.forEach((s) => {
@@ -939,21 +954,21 @@ var ComRegister = class {
 				if (this.dynamicTimelineManager.has(uid)) {
 					const timeline = this.dynamicTimelineManager.get(uid);
 					if (timeline < postTime) {
-						const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+						const sub = this.subManager.get(uid);
 						const buffer = await withRetry(async () => {
 							return await this.ctx["bilibili-notify-generate-img"].generateDynamicImg(item, sub.customCardStyle.enable ? sub.customCardStyle : void 0);
 						}, 1).catch(async (e) => {
 							if (e.message === "直播开播动态，不做处理") return;
 							if (e.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e.message}`);
@@ -967,7 +982,7 @@ var ComRegister = class {
 						} else dUrl = `${name$2}发布了新视频：https:${item.modules.module_dynamic.major.archive.jump_url}`;
 						else dUrl = `${name$2}发布了一条动态：https://t.bilibili.com/${item.id_str}`;
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(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;
@@ -979,7 +994,7 @@ var ComRegister = class {
 											alt: "动态图片"
 										}, pic.url))
 									});
-									await this.broadcastToTargets(sub.uid, picsMsg, PushType.Dynamic);
+									await this.broadcastToTargets(uid, picsMsg, PushType.Dynamic);
 								}
 							}
 						}
@@ -1043,22 +1058,22 @@ var ComRegister = class {
 					this.logger.info(`上次推送时间线：${DateTime.fromSeconds(timeline).toFormat("yyyy-MM-dd HH:mm:ss")}`);
 					if (timeline < postTime) {
 						this.logger.info("需要推送该条动态，开始推送...");
-						const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+						const sub = this.subManager.get(uid);
 						this.logger.info("开始渲染推送卡片...");
 						const buffer = await withRetry(async () => {
 							return await this.ctx["bilibili-notify-generate-img"].generateDynamicImg(item, sub.customCardStyle.enable ? sub.customCardStyle : void 0);
 						}, 1).catch(async (e) => {
 							if (e.message === "直播开播动态，不做处理") return;
 							if (e.message === "出现关键词，屏蔽该动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "发布了一条含有屏蔽关键字的动态"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽转发动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "转发了一条动态，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							if (e.message === "已屏蔽专栏动态") {
-								if (this.config.filter.notify) await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
+								if (this.config.filter.notify) await this.broadcastToTargets(uid, /* @__PURE__ */ jsxs("message", { children: [name$2, "投稿了一条专栏，已屏蔽"] }), PushType.Dynamic);
 								return;
 							}
 							this.logger.error(`dynamicDetect generateDynamicImg() 推送卡片发送失败，原因：${e.message}`);
@@ -1077,7 +1092,7 @@ var ComRegister = class {
 							this.logger.info("动态链接生成成功！");
 						}
 						this.logger.info("推送动态中...");
-						await this.broadcastToTargets(sub.uid, /* @__PURE__ */ jsxs("message", { children: [h.image(buffer, "image/jpeg"), dUrl] }), PushType.Dynamic);
+						await this.broadcastToTargets(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") {
@@ -1090,7 +1105,7 @@ var ComRegister = class {
 											alt: "动态图片"
 										}, pic.url))
 									});
-									await this.broadcastToTargets(sub.uid, picsMsg, PushType.Dynamic);
+									await this.broadcastToTargets(uid, picsMsg, PushType.Dynamic);
 								}
 							}
 							this.logger.info("动态中的图片发送完毕！");
@@ -1179,13 +1194,12 @@ var ComRegister = class {
 			this.logger.info(top90Words);
 			this.logger.info("正在准备生成弹幕词云");
 			const buffer = await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(top90Words, masterInfo.username);
-			const img = /* @__PURE__ */ jsx("message", { children: h.image(buffer, "image/jpeg") });
+			const img = h.image(buffer, "image/jpeg");
 			this.logger.info("开始构建弹幕发送排行榜消息");
 			const danmakuMakerCount = Object.keys(danmakuMakerRecord).length;
 			const danmakuCount = Object.values(danmakuMakerRecord).reduce((sum, val) => sum + val, 0);
 			const top5DanmakuMaker = Object.entries(danmakuMakerRecord).sort((a, b) => b[1] - a[1]).slice(0, 5);
-			const danmakuMakerMsg = customLiveSummary.replace("-dmc", `${danmakuMakerCount}`).replace("-mdn", `${masterInfo.medalName}`).replace("-dca", `${danmakuCount}`).replace("-un1", `${top5DanmakuMaker[0][0]}`).replace("-dc1", `${top5DanmakuMaker[0][1]}`).replace("-un2", `${top5DanmakuMaker[1][0]}`).replace("-dc2", `${top5DanmakuMaker[1][1]}`).replace("-un3", `${top5DanmakuMaker[2][0]}`).replace("-dc3", `${top5DanmakuMaker[2][1]}`).replace("-un4", `${top5DanmakuMaker[3][0]}`).replace("-dc4", `${top5DanmakuMaker[3][1]}`).replace("-un5", `${top5DanmakuMaker[4][0]}`).replace("-dc5", `${top5DanmakuMaker[4][1]}`).replaceAll("\\n", "\n");
-			const summary = /* @__PURE__ */ jsx("message", { children: danmakuMakerMsg });
+			const summary = customLiveSummary.replace("-dmc", `${danmakuMakerCount}`).replace("-mdn", `${masterInfo.medalName}`).replace("-dca", `${danmakuCount}`).replace("-un1", `${top5DanmakuMaker[0][0]}`).replace("-dc1", `${top5DanmakuMaker[0][1]}`).replace("-un2", `${top5DanmakuMaker[1][0]}`).replace("-dc2", `${top5DanmakuMaker[1][1]}`).replace("-un3", `${top5DanmakuMaker[2][0]}`).replace("-dc3", `${top5DanmakuMaker[2][1]}`).replace("-un4", `${top5DanmakuMaker[3][0]}`).replace("-dc4", `${top5DanmakuMaker[3][1]}`).replace("-un5", `${top5DanmakuMaker[4][0]}`).replace("-dc5", `${top5DanmakuMaker[4][1]}`).replaceAll("\\n", "\n");
 			await this.broadcastToTargets(sub.uid, [img, summary], PushType.WordCloudAndLiveSummary);
 			Object.keys(danmakuWeightRecord).forEach((key) => delete danmakuWeightRecord[key]);
 			Object.keys(danmakuMakerRecord).forEach((key) => delete danmakuMakerRecord[key]);
@@ -1347,7 +1361,7 @@ var ComRegister = class {
 			const uid = item.uid.toString();
 			const liveStatus = this.liveStatusManager.get(uid);
 			const liveMsgObj = this.liveMsgManager.get(uid);
-			const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+			const sub = this.subManager.get(uid);
 			if (item.live_status === 1) {
 				liveStatus.live = true;
 				await useMasterAndLiveRoomInfo(LiveType.FirstLiveBroadcast, liveStatus);
@@ -1360,7 +1374,7 @@ var ComRegister = class {
 					liveRoomInfo: liveStatus.liveRoomInfo,
 					masterInfo: liveStatus.masterInfo,
 					cardStyle: sub.customCardStyle
-				}, sub.uid, liveMsg);
+				}, uid, liveMsg);
 			}
 		}
 		const handler = async () => {
@@ -1369,7 +1383,7 @@ var ComRegister = class {
 				const uid = item.uid.toString();
 				const liveStatus = this.liveStatusManager.get(uid);
 				const liveMsgObj = this.liveMsgManager.get(uid);
-				const sub = this.subManager.find((sub$1) => sub$1.uid === uid);
+				const sub = this.subManager.get(uid);
 				if (!sub) return;
 				switch (item.live_status) {
 					case 0:
@@ -1393,7 +1407,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.customCardStyle
-							}, sub.uid, liveEndMsg);
+							}, uid, liveEndMsg);
 							liveStatus.live = false;
 						}
 						break;
@@ -1412,7 +1426,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.customCardStyle
-							}, sub.uid, liveStartMsg);
+							}, uid, liveStartMsg);
 							liveStatus.live = true;
 						}
 						if (liveStatus.live === true) {
@@ -1433,7 +1447,7 @@ var ComRegister = class {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
 								cardStyle: sub.customCardStyle
-							}, sub.uid, liveMsg);
+							}, uid, liveMsg);
 							liveStatus.push = 0;
 						}
 						break;
@@ -1446,7 +1460,7 @@ var ComRegister = class {
 	}
 	subShow() {
 		let table = "";
-		for (const sub of this.subManager) table += `UID:${sub.uid}  ${sub.dynamic ? "已订阅动态" : ""}  ${sub.live ? "已订阅直播" : ""}\n`;
+		for (const [uid, sub] of this.subManager) table += `UID:${uid}  ${sub.dynamic ? "已订阅动态" : ""}  ${sub.live ? "已订阅直播" : ""}\n`;
 		return table ? table : "没有订阅任何UP";
 	}
 	updateSubNotifier() {
@@ -1481,22 +1495,22 @@ var ComRegister = class {
 						this.ctx.database.set("loginBili", 1, { dynamic_group_id: this.loginDBData.dynamic_group_id });
 						return {
 							code: 0,
-							msg: "分组已存在"
+							message: "分组已存在"
 						};
 					}
 				} else if (createGroupData.code !== 0) return {
 					code: createGroupData.code,
-					msg: createGroupData.message
+					message: createGroupData.message
 				};
 				this.ctx.database.set("loginBili", 1, { dynamic_group_id: createGroupData.data.tagid.toString() });
 				return {
 					code: createGroupData.code,
-					msg: createGroupData.message
+					message: createGroupData.message
 				};
 			}
 			return {
 				code: 0,
-				msg: "分组已存在"
+				message: "分组已存在"
 			};
 		};
 		const resp = await checkGroupIsReady();
@@ -1512,93 +1526,105 @@ var ComRegister = class {
 				}
 				return {
 					code: relationGroupDetailData.code,
-					msg: relationGroupDetailData.message,
+					message: relationGroupDetailData.message,
 					data: void 0
 				};
 			}
 			return {
 				code: 0,
-				msg: "获取分组明细成功",
+				message: "获取分组明细成功",
 				data: relationGroupDetailData.data
 			};
 		};
-		const { code, msg, data } = await getGroupDetailData();
+		const { code, message, data } = await getGroupDetailData();
 		if (code !== 0) return {
 			code,
-			msg
+			message
 		};
 		for (const user of data) if (user.mid === mid) return {
 			code: 0,
-			msg: "订阅对象已存在于分组中"
+			message: "订阅对象已存在于分组中"
 		};
 		const subUserData = await this.ctx["bilibili-notify-api"].follow(mid);
 		const subUserMatchPattern = {
 			[-101]: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号未登录，请使用指令bili login登录后再进行订阅操作"
+					message: "账号未登录，请使用指令bili login登录后再进行订阅操作"
 				};
 			},
 			[-102]: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号被封停，无法进行订阅操作"
+					message: "账号被封停，无法进行订阅操作"
 				};
 			},
 			22002: () => {
 				return {
 					code: subUserData.code,
-					msg: "因对方隐私设置，无法进行订阅操作"
+					message: "因对方隐私设置，无法进行订阅操作"
 				};
 			},
 			22003: () => {
 				return {
 					code: subUserData.code,
-					msg: "你已将对方拉黑，无法进行订阅操作"
+					message: "你已将对方拉黑，无法进行订阅操作"
 				};
 			},
 			22013: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号已注销，无法进行订阅操作"
+					message: "账号已注销，无法进行订阅操作"
 				};
 			},
 			40061: () => {
 				return {
 					code: subUserData.code,
-					msg: "账号不存在，请检查uid输入是否正确或用户是否存在"
+					message: "账号不存在，请检查uid输入是否正确或用户是否存在"
 				};
 			},
 			22001: () => {
 				return {
 					code: 0,
-					msg: "订阅对象为自己，无需添加到分组"
+					message: "订阅对象为自己，无需添加到分组"
 				};
 			},
 			22014: async () => {
 				const copyUserToGroupData = await this.ctx["bilibili-notify-api"].copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
 				if (copyUserToGroupData.code !== 0) return {
 					code: copyUserToGroupData.code,
-					msg: "添加订阅对象到分组失败，请稍后重试"
+					message: "添加订阅对象到分组失败，请稍后重试"
 				};
 				return {
 					code: 0,
-					msg: "订阅对象添加成功"
+					message: "订阅对象添加成功"
+				};
+			},
+			22015: async () => {
+				return {
+					code: subUserData.code,
+					message: subUserData.message
 				};
 			},
 			0: async () => {
 				const copyUserToGroupData = await this.ctx["bilibili-notify-api"].copyUserToGroup(mid, this.loginDBData.dynamic_group_id);
 				if (copyUserToGroupData.code !== 0) return {
 					code: copyUserToGroupData.code,
-					msg: "添加订阅对象到分组失败，请稍后重试"
+					message: "添加订阅对象到分组失败，请稍后重试"
 				};
 				return {
 					code: 0,
-					msg: "订阅对象添加成功"
+					message: "订阅对象添加成功"
 				};
 			}
 		};
-		return await subUserMatchPattern[subUserData.code]();
+		const subUserExecute = subUserMatchPattern[subUserData.code] || (() => {
+			return {
+				code: subUserData.code,
+				message: subUserData.message
+			};
+		});
+		return await subUserExecute();
 	}
 	async loadSubFromConfig(subs) {
 		this.preInitConfig(subs);
@@ -1606,11 +1632,8 @@ var ComRegister = class {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
 			const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
 				const data = await this.ctx["bilibili-notify-api"].getUserInfo(sub.uid);
-				return {
-					code: 0,
-					data
-				};
-			}).then((content) => content.data).catch((e) => {
+				return data;
+			}).catch((e) => {
 				this.logger.error(`loadSubFromConfig() getUserInfo() 发生了错误，错误为：${e.message}`);
 				return {
 					code: -1,
@@ -1622,12 +1645,12 @@ var ComRegister = class {
 				await this.sendPrivateMsg("账号被风控，请使用指令 bili cap 进行风控验证");
 				return {
 					code: userInfoCode,
-					msg: userInfoMsg
+					message: userInfoMsg
 				};
 			}
 			if (userInfoCode !== 0) return {
 				code: userInfoCode,
-				msg: userInfoMsg
+				message: userInfoMsg
 			};
 			if (this.config.liveDetectType === "WS" && sub.live) {
 				if (!userInfoData.live_room) {
@@ -1638,8 +1661,7 @@ var ComRegister = class {
 			}
 			const subInfo = await this.subUserInBili(sub.uid);
 			if (subInfo.code !== 0) return subInfo;
-			this.subManager.push({
-				uid: sub.uid,
+			this.subManager.set(sub.uid, {
 				uname: userInfoData.name,
 				roomId: sub.live ? userInfoData.live_room.roomid : "",
 				target: sub.target,
@@ -1658,7 +1680,7 @@ var ComRegister = class {
 		}
 		return {
 			code: 0,
-			msg: "订阅加载完毕！"
+			message: "订阅加载完毕！"
 		};
 	}
 	checkIfDynamicDetectIsNeeded() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.3.1-alpha.1",
+  "version": "3.3.1-rc.0",
   "main": "./lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/readme.md

@@ -327,6 +327,7 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.3.0-rc.0 优化：将当前版本的订阅配置移到了新插件：`bilibili-notify-advanced-subscription` ，简化当前版本订阅配置； 新增：配置项 `advancedSub` ，开启后可通过下载插件 `bilibili-notify-advanced-subscription` 配置更自定义化的订阅配置、新增动态@全体成员功能；
 > - ver 3.3.1-alpha.0 新增：弹幕词云自定义停用词、UP主弹幕词云开关； 优化：`liveSummary` 排版方式更加直观；
 > - ver 3.3.1-alpha.1 优化：拆分 `wordcloud` 和 `liveSummary`，优化指令 `bili cap` 风控验证；
+> - ver 3.3.1-rc.0 优化：代码结构，部分设置； 修复：启用高级订阅时，多次重载高级订阅插件会产生多个重复订阅；
 
 ## 交流群