koishi-plugin-bilibili-notify 3.3.1-alpha.0 → 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({})])]),
@@ -81,6 +81,7 @@ const BAConfigSchema = koishi.Schema.object({
 		liveAtAll: koishi.Schema.boolean().default(true).description("直播At全体"),
 		liveGuardBuy: koishi.Schema.boolean().default(false).description("上舰消息"),
 		wordcloud: koishi.Schema.boolean().default(true).description("弹幕词云"),
+		liveSummary: koishi.Schema.boolean().default(true).description("直播总结"),
 		platform: koishi.Schema.string().required().description("平台名"),
 		target: koishi.Schema.string().required().description("群号/频道号")
 	})).role("table").description("输入订阅信息，自定义订阅内容； 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
@@ -191,7 +192,7 @@ let PushType = /* @__PURE__ */ function(PushType$1) {
 	PushType$1[PushType$1["DynamicAtAll"] = 2] = "DynamicAtAll";
 	PushType$1[PushType$1["StartBroadcasting"] = 3] = "StartBroadcasting";
 	PushType$1[PushType$1["LiveGuardBuy"] = 4] = "LiveGuardBuy";
-	PushType$1[PushType$1["WordCloud"] = 5] = "WordCloud";
+	PushType$1[PushType$1["WordCloudAndLiveSummary"] = 5] = "WordCloudAndLiveSummary";
 	return PushType$1;
 }({});
 const PushTypeMsg = {
@@ -200,7 +201,7 @@ const PushTypeMsg = {
 	[PushType.DynamicAtAll]: "动态推送+At全体",
 	[PushType.StartBroadcasting]: "开播推送",
 	[PushType.LiveGuardBuy]: "上舰推送",
-	[PushType.WordCloud]: "弹幕词云推送"
+	[PushType.WordCloudAndLiveSummary]: "弹幕词云和直播总结推送"
 };
 
 //#endregion
@@ -363,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);
@@ -473,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
 				});
@@ -611,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],
@@ -619,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 () => {
@@ -642,7 +644,10 @@ 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 "验证不成功！";
-			return "验证成功！请重启插件";
+			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("验证成功！请重启插件");
 		});
 	}
 	async init(config) {
@@ -658,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);
-		} else this.logger.info("插件初始化完毕！");
+		}
+	}
+	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;
@@ -696,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,
@@ -710,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) => {
@@ -721,6 +738,7 @@ var ComRegister = class {
 				liveAtAll: s.liveAtAll,
 				liveGuardBuy: s.liveGuardBuy,
 				wordcloud: s.wordcloud,
+				liveSummary: s.liveSummary,
 				bot: null
 			}));
 			const target = [{
@@ -731,11 +749,10 @@ var ComRegister = class {
 				uid: s.uid,
 				dynamic: s.dynamic,
 				live: s.live,
-				wordcloud: s.wordcloud,
 				target,
-				card: { enable: false },
-				liveMsg: { enable: false },
-				liveSummary: { enable: false }
+				customCardStyle: { enable: false },
+				customLiveMsg: { enable: false },
+				customLiveSummary: { enable: false }
 			};
 		});
 		return subs;
@@ -791,12 +808,12 @@ var ComRegister = class {
 				customLiveEnd: this.config.customLiveEnd || "",
 				liveSummary: this.config.liveSummary.join("\n") || ""
 			};
-			if (sub.liveMsg.enable) {
-				liveMsg.customLiveStart = sub.liveMsg.customLiveStart || this.config.customLiveStart;
-				liveMsg.customLive = sub.liveMsg.customLive || this.config.customLive;
-				liveMsg.customLiveEnd = sub.liveMsg.customLiveEnd || this.config.customLiveEnd;
+			if (sub.customLiveMsg.enable) {
+				liveMsg.customLiveStart = sub.customLiveMsg.customLiveStart || this.config.customLiveStart;
+				liveMsg.customLive = sub.customLiveMsg.customLive || this.config.customLive;
+				liveMsg.customLiveEnd = sub.customLiveMsg.customLiveEnd || this.config.customLiveEnd;
 			}
-			if (sub.liveSummary.enable) liveMsg.liveSummary = sub.liveSummary.liveSummary || this.config.liveSummary.join("\n");
+			if (sub.customLiveSummary.enable) liveMsg.liveSummary = sub.customLiveSummary.liveSummary || this.config.liveSummary.join("\n");
 			this.liveMsgManager.set(sub.uid, liveMsg);
 			const dynamicArr = [];
 			const dynamicAtAllArr = [];
@@ -804,6 +821,7 @@ var ComRegister = class {
 			const liveAtAllArr = [];
 			const liveGuardBuyArr = [];
 			const wordcloudArr = [];
+			const liveSummaryArr = [];
 			for (const platform of sub.target) for (const channel of platform.channelArr) {
 				const target = `${platform.platform}:${channel.channelId}`;
 				if (channel.dynamic) dynamicArr.push(target);
@@ -812,12 +830,14 @@ var ComRegister = class {
 				if (channel.liveAtAll) liveAtAllArr.push(target);
 				if (channel.liveGuardBuy) liveGuardBuyArr.push(target);
 				if (channel.wordcloud) wordcloudArr.push(target);
+				if (channel.liveSummary) liveSummaryArr.push(target);
 			}
 			this.pushArrMap.set(sub.uid, {
 				dynamicArr,
 				dynamicAtAllArr,
 				liveArr,
 				liveAtAllArr,
+				liveSummaryArr,
 				liveGuardBuyArr,
 				wordcloudArr
 			});
@@ -879,15 +899,37 @@ var ComRegister = class {
 			}, 1);
 			this.logger.info(`成功推送上舰消息：${success.length}条`);
 		}
-		if (type === PushType.WordCloud && record.wordcloudArr?.length >= 1) {
-			this.logger.info(record.wordcloudArr);
+		if (type === PushType.WordCloudAndLiveSummary) {
 			const wordcloudArr = structuredClone(record.wordcloudArr);
-			const success = await withRetry(async () => {
-				return await this.ctx.broadcast(wordcloudArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content }));
-			}, 1);
-			this.logger.info(`成功推送词云消息：${success.length}条`);
+			const liveSummaryArr = structuredClone(record.liveSummaryArr);
+			const wordcloudAndLiveSummaryArr = wordcloudArr.filter((item) => liveSummaryArr.includes(item));
+			const wordcloudOnlyArr = wordcloudArr.filter((item) => !liveSummaryArr.includes(item));
+			const liveSummaryOnlyArr = liveSummaryArr.filter((item) => !wordcloudArr.includes(item));
+			if (wordcloudAndLiveSummaryArr.length > 0) {
+				this.logger.info("词云和直播总结");
+				this.logger.info(wordcloudAndLiveSummaryArr);
+				const success = await withRetry(async () => {
+					return await this.ctx.broadcast(wordcloudAndLiveSummaryArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsxs)("message", { children: [content[0], content[1]] }));
+				}, 1);
+				this.logger.info(`成功推送词云和直播总结消息：${success.length}条`);
+			}
+			if (wordcloudOnlyArr.length > 0) {
+				this.logger.info("词云");
+				this.logger.info(wordcloudOnlyArr);
+				const success = await withRetry(async () => {
+					return await this.ctx.broadcast(wordcloudOnlyArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content[0] }));
+				}, 1);
+				this.logger.info(`成功推送词云消息：${success.length}条`);
+			}
+			if (liveSummaryOnlyArr.length > 0) {
+				this.logger.info("直播总结");
+				this.logger.info(liveSummaryOnlyArr);
+				const success = await withRetry(async () => {
+					return await this.ctx.broadcast(liveSummaryOnlyArr, /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: content[1] }));
+				}, 1);
+				this.logger.info(`成功推送直播总结消息：${success.length}条`);
+			}
 		}
-		return;
 	}
 	dynamicDetect() {
 		const handler = async () => {
@@ -931,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.card.enable ? sub.card : void 0);
+							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}`);
@@ -959,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;
@@ -971,7 +1013,7 @@ var ComRegister = class {
 											alt: "动态图片"
 										}, pic.url))
 									});
-									await this.broadcastToTargets(sub.uid, picsMsg, PushType.Dynamic);
+									await this.broadcastToTargets(uid, picsMsg, PushType.Dynamic);
 								}
 							}
 						}
@@ -1035,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.card.enable ? sub.card : void 0);
+							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}`);
@@ -1069,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") {
@@ -1082,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("动态中的图片发送完毕！");
@@ -1163,7 +1205,7 @@ var ComRegister = class {
 		let masterInfo;
 		let watchedNum;
 		const liveMsgObj = this.liveMsgManager.get(sub.uid);
-		const sendDanmakuWordCloud = async (liveSummary) => {
+		const sendDanmakuWordCloudAndLiveSummary = async (customLiveSummary) => {
 			this.logger.info("开始制作弹幕词云");
 			this.logger.info("正在获取前90热词");
 			const top90Words = Object.entries(danmakuWeightRecord).sort((a, b) => b[1] - a[1]).slice(0, 90);
@@ -1171,15 +1213,13 @@ var ComRegister = class {
 			this.logger.info(top90Words);
 			this.logger.info("正在准备生成弹幕词云");
 			const buffer = await this.ctx["bilibili-notify-generate-img"].generateWordCloudImg(top90Words, masterInfo.username);
-			this.logger.info("弹幕词云生成完成，正在准备发送词云图片");
-			await this.broadcastToTargets(sub.uid, koishi.h.image(buffer, "image/jpeg"), PushType.Live);
-			this.logger.info("词云图片发送完毕！");
+			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 = liveSummary.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, danmakuMakerMsg, PushType.WordCloud);
+			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]);
 		};
@@ -1200,7 +1240,7 @@ var ComRegister = class {
 			await this.sendLiveNotifyCard(LiveType.LiveBroadcast, watched, {
 				liveRoomInfo,
 				masterInfo,
-				cardStyle: sub.card
+				cardStyle: sub.customCardStyle
 			}, sub.uid, liveMsg);
 		};
 		const useMasterAndLiveRoomInfo = async (liveType) => {
@@ -1264,7 +1304,7 @@ var ComRegister = class {
 				await this.sendLiveNotifyCard(LiveType.StartBroadcasting, follower, {
 					liveRoomInfo,
 					masterInfo,
-					cardStyle: sub.card
+					cardStyle: sub.customCardStyle
 				}, sub.uid, liveStartMsg);
 				if (this.config.pushTime !== 0 && !pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			},
@@ -1284,11 +1324,11 @@ var ComRegister = class {
 				await this.sendLiveNotifyCard(LiveType.StopBroadcast, followerChange, {
 					liveRoomInfo,
 					masterInfo,
-					cardStyle: sub.card
+					cardStyle: sub.customCardStyle
 				}, sub.uid, liveEndMsg);
 				pushAtTimeTimer();
 				pushAtTimeTimer = null;
-				if (sub.wordcloud) await sendDanmakuWordCloud(liveMsgObj.liveSummary);
+				await sendDanmakuWordCloudAndLiveSummary(liveMsgObj.liveSummary);
 			}
 		};
 		await this.ctx["bilibili-notify-live"].startLiveRoomListener(roomId, handler);
@@ -1300,7 +1340,7 @@ var ComRegister = class {
 			if (this.config.restartPush) await this.sendLiveNotifyCard(LiveType.LiveBroadcast, watched, {
 				liveRoomInfo,
 				masterInfo,
-				cardStyle: sub.card
+				cardStyle: sub.customCardStyle
 			}, sub.uid, liveMsg);
 			if (this.config.pushTime !== 0 && !pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			liveStatus = true;
@@ -1340,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);
@@ -1352,8 +1392,8 @@ var ComRegister = class {
 				await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
 					liveRoomInfo: liveStatus.liveRoomInfo,
 					masterInfo: liveStatus.masterInfo,
-					cardStyle: sub.card
-				}, sub.uid, liveMsg);
+					cardStyle: sub.customCardStyle
+				}, uid, liveMsg);
 			}
 		}
 		const handler = async () => {
@@ -1362,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:
@@ -1385,8 +1425,8 @@ var ComRegister = class {
 							await this.sendLiveNotifyCard(LiveType.StopBroadcast, followerChange, {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
-								cardStyle: sub.card
-							}, sub.uid, liveEndMsg);
+								cardStyle: sub.customCardStyle
+							}, uid, liveEndMsg);
 							liveStatus.live = false;
 						}
 						break;
@@ -1404,8 +1444,8 @@ var ComRegister = class {
 							await this.sendLiveNotifyCard(LiveType.StartBroadcasting, follower, {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
-								cardStyle: sub.card
-							}, sub.uid, liveStartMsg);
+								cardStyle: sub.customCardStyle
+							}, uid, liveStartMsg);
 							liveStatus.live = true;
 						}
 						if (liveStatus.live === true) {
@@ -1425,8 +1465,8 @@ var ComRegister = class {
 							await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
-								cardStyle: sub.card
-							}, sub.uid, liveMsg);
+								cardStyle: sub.customCardStyle
+							}, uid, liveMsg);
 							liveStatus.push = 0;
 						}
 						break;
@@ -1439,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() {
@@ -1474,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();
@@ -1505,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);
@@ -1599,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,
@@ -1611,16 +1660,16 @@ var ComRegister = class {
 				};
 			});
 			if (userInfoCode === -352 && userInfoData.v_voucher) {
-				this.logger.info("账号被风控，请使用指令 bili captcha 进行风控验证");
+				this.logger.info("账号被风控，请使用指令 bili cap 进行风控验证");
 				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) {
@@ -1631,17 +1680,15 @@ var ComRegister = class {
 			}
 			const subInfo = await this.subUserInBili(sub.uid);
 			if (subInfo.code !== 0) return subInfo;
-			this.subManager.push({
-				id: +sub.uid,
-				uid: sub.uid,
+			this.subManager.set(sub.uid, {
 				uname: userInfoData.name,
 				roomId: sub.live ? userInfoData.live_room.roomid : "",
 				target: sub.target,
-				platform: "",
 				live: sub.live,
 				dynamic: sub.dynamic,
-				card: sub.card,
-				liveMsg: sub.liveMsg
+				customCardStyle: sub.customCardStyle,
+				customLiveMsg: sub.customLiveMsg,
+				customLiveSummary: sub.customLiveSummary
 			});
 			this.logger.info(`UID:${sub.uid}订阅加载完毕！`);
 			if (sub !== Object.values(subs).pop()) {
@@ -1652,7 +1699,7 @@ var ComRegister = class {
 		}
 		return {
 			code: 0,
-			msg: "订阅加载完毕！"
+			message: "订阅加载完毕！"
 		};
 	}
 	checkIfDynamicDetectIsNeeded() {
@@ -1692,6 +1739,7 @@ var ComRegister = class {
 			liveAtAll: koishi.Schema.boolean().default(true).description("直播At全体"),
 			liveGuardBuy: koishi.Schema.boolean().default(false).description("上舰消息"),
 			wordcloud: koishi.Schema.boolean().default(true).description("弹幕词云"),
+			liveSummary: koishi.Schema.boolean().default(true).description("直播总结"),
 			platform: koishi.Schema.string().required().description("平台名"),
 			target: koishi.Schema.string().required().description("群号/频道号")
 		})).role("table").description("输入订阅信息，自定义订阅内容； 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
@@ -3620,13 +3668,15 @@ var BiliAPI = class extends koishi.Service {
 			retries: 3
 		});
 	}
-	async getUserInfo(mid) {
+	async getUserInfo(mid, grisk_id) {
 		const run = async () => {
 			if (mid === "11783021") {
 				console.log("检测到番剧出差UID，跳过远程用户接口访问");
 				return bangumiTripData;
 			}
-			const wbi = await this.getWbi({ mid });
+			const params = { mid };
+			if (grisk_id) params.grisk_id = grisk_id;
+			const wbi = await this.getWbi(params);
 			const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
 			return data;
 		};
@@ -3992,6 +4042,7 @@ var BiliAPI = class extends koishi.Service {
 			this.logger.info(`验证失败：错误码=${data.code}，错误消息:${data.message}`);
 			return { data: null };
 		}
+		this.addCookie(`x-bili-gaia-vtoken=${data.data.grisk_id}`);
 		return { data: data.data };
 	}
 };