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

package/lib/index.d.mts

@@ -18,6 +18,7 @@ interface BAConfig {
     liveAtAll: boolean;
     liveGuardBuy: boolean;
     wordcloud: boolean;
+    liveSummary: boolean;
     platform: string;
     target: string;
   }>;
@@ -59,6 +60,7 @@ type Channel = {
   liveAtAll: boolean;
   liveGuardBuy: boolean;
   wordcloud: boolean;
+  liveSummary: boolean;
   bot: string;
 };
 type ChannelArr = Array<Channel>;
@@ -67,20 +69,20 @@ type TargetItem = {
   platform: string;
 };
 type Target = Array<TargetItem>;
-type SubCard = {
+type CustomCardStyle = {
   enable: boolean;
   cardColorStart?: string;
   cardColorEnd?: string;
   cardBasePlateColor?: string;
   cardBasePlateBorder?: string;
 };
-type SubLiveMsg = {
+type CustomLiveMsg = {
   enable: boolean;
   customLiveStart?: string;
   customLive?: string;
   customLiveEnd?: string;
 };
-type SubLiveSummary = {
+type CustomLiveSummary = {
   enable: boolean;
   liveSummary?: string;
 };
@@ -88,11 +90,10 @@ type Subscription = {
   uid: string;
   dynamic: boolean;
   live: boolean;
-  wordcloud: boolean;
   target: Target;
-  card: SubCard;
-  liveMsg: SubLiveMsg;
-  liveSummary: SubLiveSummary;
+  customCardStyle: CustomCardStyle;
+  customLiveMsg: CustomLiveMsg;
+  customLiveSummary: CustomLiveSummary;
 };
 type Subscriptions = Record<string, Subscription>;
 //#endregion

package/lib/index.d.ts

@@ -18,6 +18,7 @@ interface BAConfig {
     liveAtAll: boolean;
     liveGuardBuy: boolean;
     wordcloud: boolean;
+    liveSummary: boolean;
     platform: string;
     target: string;
   }>;
@@ -59,6 +60,7 @@ type Channel = {
   liveAtAll: boolean;
   liveGuardBuy: boolean;
   wordcloud: boolean;
+  liveSummary: boolean;
   bot: string;
 };
 type ChannelArr = Array<Channel>;
@@ -67,20 +69,20 @@ type TargetItem = {
   platform: string;
 };
 type Target = Array<TargetItem>;
-type SubCard = {
+type CustomCardStyle = {
   enable: boolean;
   cardColorStart?: string;
   cardColorEnd?: string;
   cardBasePlateColor?: string;
   cardBasePlateBorder?: string;
 };
-type SubLiveMsg = {
+type CustomLiveMsg = {
   enable: boolean;
   customLiveStart?: string;
   customLive?: string;
   customLiveEnd?: string;
 };
-type SubLiveSummary = {
+type CustomLiveSummary = {
   enable: boolean;
   liveSummary?: string;
 };
@@ -88,11 +90,10 @@ type Subscription = {
   uid: string;
   dynamic: boolean;
   live: boolean;
-  wordcloud: boolean;
   target: Target;
-  card: SubCard;
-  liveMsg: SubLiveMsg;
-  liveSummary: SubLiveSummary;
+  customCardStyle: CustomCardStyle;
+  customLiveMsg: CustomLiveMsg;
+  customLiveSummary: CustomLiveSummary;
 };
 type Subscriptions = Record<string, Subscription>;
 //#endregion

package/lib/index.js

@@ -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
@@ -642,7 +643,8 @@ 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 ctx["bilibili-notify-api"].getUserInfo("114514", validateCaptchaData.grisk_id);
+			await session.send("验证成功！请重启插件");
 		});
 	}
 	async init(config) {
@@ -666,7 +668,7 @@ var ComRegister = class {
 		} else if (config.subs && config.subs.length > 0) {
 			const subs = this.configSubsToSubscription(config.subs);
 			await this.initAsyncPart(subs);
-		} else this.logger.info("插件初始化完毕！");
+		}
 		this.ctx.on("dispose", () => {
 			if (this.loginTimer) this.loginTimer();
 			if (this.dynamicJob) this.dynamicJob.stop();
@@ -721,6 +723,7 @@ var ComRegister = class {
 				liveAtAll: s.liveAtAll,
 				liveGuardBuy: s.liveGuardBuy,
 				wordcloud: s.wordcloud,
+				liveSummary: s.liveSummary,
 				bot: null
 			}));
 			const target = [{
@@ -731,11 +734,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 +793,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 +806,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 +815,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 +884,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 () => {
@@ -933,7 +960,7 @@ var ComRegister = class {
 					if (timeline < postTime) {
 						const sub = this.subManager.find((sub$1) => sub$1.uid === 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 === "出现关键词，屏蔽该动态") {
@@ -1038,7 +1065,7 @@ var ComRegister = class {
 						const sub = this.subManager.find((sub$1) => sub$1.uid === 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 === "出现关键词，屏蔽该动态") {
@@ -1163,7 +1190,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 +1198,14 @@ 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 = /* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: 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 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 });
+			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 +1226,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 +1290,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 +1310,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 +1326,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;
@@ -1352,7 +1378,7 @@ var ComRegister = class {
 				await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
 					liveRoomInfo: liveStatus.liveRoomInfo,
 					masterInfo: liveStatus.masterInfo,
-					cardStyle: sub.card
+					cardStyle: sub.customCardStyle
 				}, sub.uid, liveMsg);
 			}
 		}
@@ -1385,7 +1411,7 @@ var ComRegister = class {
 							await this.sendLiveNotifyCard(LiveType.StopBroadcast, followerChange, {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
-								cardStyle: sub.card
+								cardStyle: sub.customCardStyle
 							}, sub.uid, liveEndMsg);
 							liveStatus.live = false;
 						}
@@ -1404,7 +1430,7 @@ var ComRegister = class {
 							await this.sendLiveNotifyCard(LiveType.StartBroadcasting, follower, {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
-								cardStyle: sub.card
+								cardStyle: sub.customCardStyle
 							}, sub.uid, liveStartMsg);
 							liveStatus.live = true;
 						}
@@ -1425,7 +1451,7 @@ var ComRegister = class {
 							await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
-								cardStyle: sub.card
+								cardStyle: sub.customCardStyle
 							}, sub.uid, liveMsg);
 							liveStatus.push = 0;
 						}
@@ -1611,7 +1637,7 @@ 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,
@@ -1632,16 +1658,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,
 				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()) {
@@ -1692,6 +1717,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 +3646,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 +4020,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 };
 	}
 };

package/lib/index.mjs

@@ -62,6 +62,7 @@ const BAConfigSchema = Schema.object({
 		liveAtAll: Schema.boolean().default(true).description("直播At全体"),
 		liveGuardBuy: Schema.boolean().default(false).description("上舰消息"),
 		wordcloud: Schema.boolean().default(true).description("弹幕词云"),
+		liveSummary: Schema.boolean().default(true).description("直播总结"),
 		platform: Schema.string().required().description("平台名"),
 		target: Schema.string().required().description("群号/频道号")
 	})).role("table").description("输入订阅信息，自定义订阅内容； 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
@@ -172,7 +173,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 = {
@@ -181,7 +182,7 @@ const PushTypeMsg = {
 	[PushType.DynamicAtAll]: "动态推送+At全体",
 	[PushType.StartBroadcasting]: "开播推送",
 	[PushType.LiveGuardBuy]: "上舰推送",
-	[PushType.WordCloud]: "弹幕词云推送"
+	[PushType.WordCloudAndLiveSummary]: "弹幕词云和直播总结推送"
 };
 
 //#endregion
@@ -623,7 +624,8 @@ 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 ctx["bilibili-notify-api"].getUserInfo("114514", validateCaptchaData.grisk_id);
+			await session.send("验证成功！请重启插件");
 		});
 	}
 	async init(config) {
@@ -647,7 +649,7 @@ var ComRegister = class {
 		} else if (config.subs && config.subs.length > 0) {
 			const subs = this.configSubsToSubscription(config.subs);
 			await this.initAsyncPart(subs);
-		} else this.logger.info("插件初始化完毕！");
+		}
 		this.ctx.on("dispose", () => {
 			if (this.loginTimer) this.loginTimer();
 			if (this.dynamicJob) this.dynamicJob.stop();
@@ -702,6 +704,7 @@ var ComRegister = class {
 				liveAtAll: s.liveAtAll,
 				liveGuardBuy: s.liveGuardBuy,
 				wordcloud: s.wordcloud,
+				liveSummary: s.liveSummary,
 				bot: null
 			}));
 			const target = [{
@@ -712,11 +715,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;
@@ -772,12 +774,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 = [];
@@ -785,6 +787,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);
@@ -793,12 +796,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
 			});
@@ -860,15 +865,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__ */ 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__ */ 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__ */ 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__ */ jsx("message", { children: content[1] }));
+				}, 1);
+				this.logger.info(`成功推送直播总结消息：${success.length}条`);
+			}
 		}
-		return;
 	}
 	dynamicDetect() {
 		const handler = async () => {
@@ -914,7 +941,7 @@ var ComRegister = class {
 					if (timeline < postTime) {
 						const sub = this.subManager.find((sub$1) => sub$1.uid === 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 === "出现关键词，屏蔽该动态") {
@@ -1019,7 +1046,7 @@ var ComRegister = class {
 						const sub = this.subManager.find((sub$1) => sub$1.uid === 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 === "出现关键词，屏蔽该动态") {
@@ -1144,7 +1171,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);
@@ -1152,15 +1179,14 @@ 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, h.image(buffer, "image/jpeg"), PushType.Live);
-			this.logger.info("词云图片发送完毕！");
+			const img = /* @__PURE__ */ jsx("message", { children: 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 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 });
+			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]);
 		};
@@ -1181,7 +1207,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) => {
@@ -1245,7 +1271,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);
 			},
@@ -1265,11 +1291,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);
@@ -1281,7 +1307,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;
@@ -1333,7 +1359,7 @@ var ComRegister = class {
 				await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
 					liveRoomInfo: liveStatus.liveRoomInfo,
 					masterInfo: liveStatus.masterInfo,
-					cardStyle: sub.card
+					cardStyle: sub.customCardStyle
 				}, sub.uid, liveMsg);
 			}
 		}
@@ -1366,7 +1392,7 @@ var ComRegister = class {
 							await this.sendLiveNotifyCard(LiveType.StopBroadcast, followerChange, {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
-								cardStyle: sub.card
+								cardStyle: sub.customCardStyle
 							}, sub.uid, liveEndMsg);
 							liveStatus.live = false;
 						}
@@ -1385,7 +1411,7 @@ var ComRegister = class {
 							await this.sendLiveNotifyCard(LiveType.StartBroadcasting, follower, {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
-								cardStyle: sub.card
+								cardStyle: sub.customCardStyle
 							}, sub.uid, liveStartMsg);
 							liveStatus.live = true;
 						}
@@ -1406,7 +1432,7 @@ var ComRegister = class {
 							await this.sendLiveNotifyCard(LiveType.LiveBroadcast, "API", {
 								liveRoomInfo: liveStatus.liveRoomInfo,
 								masterInfo: liveStatus.masterInfo,
-								cardStyle: sub.card
+								cardStyle: sub.customCardStyle
 							}, sub.uid, liveMsg);
 							liveStatus.push = 0;
 						}
@@ -1592,7 +1618,7 @@ 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,
@@ -1613,16 +1639,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,
 				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()) {
@@ -1673,6 +1698,7 @@ var ComRegister = class {
 			liveAtAll: Schema.boolean().default(true).description("直播At全体"),
 			liveGuardBuy: Schema.boolean().default(false).description("上舰消息"),
 			wordcloud: Schema.boolean().default(true).description("弹幕词云"),
+			liveSummary: Schema.boolean().default(true).description("直播总结"),
 			platform: Schema.string().required().description("平台名"),
 			target: Schema.string().required().description("群号/频道号")
 		})).role("table").description("输入订阅信息，自定义订阅内容； 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
@@ -3601,13 +3627,15 @@ var BiliAPI = class extends 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;
 		};
@@ -3973,6 +4001,7 @@ var BiliAPI = class extends 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 };
 	}
 };

package/package.json

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

package/readme.md

@@ -324,8 +324,9 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.2.11-alpha.12 测试版本
 
 > [!NOTE]
-> - 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.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` 风控验证；
 
 ## 交流群