koishi-plugin-bilibili-notify 3.2.9-rc.3 → 3.2.10-alpha.0

package/lib/index.js

@@ -113,8 +113,8 @@ const BAConfigSchema = koishi.Schema.object({
 	pushImgsInDynamic: koishi.Schema.boolean().default(false).description("是否推送动态中的图片，默认不开启。开启后会单独推送动态中的图片，该功能容易导致QQ风控"),
 	live: koishi.Schema.object({}).description("直播推送设置"),
 	liveDetectType: koishi.Schema.union([koishi.Schema.const("WS").description("使用WebSocket连接到B站消息服务器进行直播检测，推荐使用"), koishi.Schema.const("API").description("通过轮询API发送请求监测直播状态，此模式理论可无限订阅，但容易产生其他问题，功能没有WS模式全面").experimental()]).role("radio").default("WS").description("直播检测方式，WS为连接到B站消息服务器，API为通过轮询发送请求监测，默认使用WS检测"),
-	wordcloud: koishi.Schema.boolean().default(false).description("直播结束后，是否生成本场直播弹幕词云"),
-	liveSummary: koishi.Schema.string().default("🔍【弹幕情报站】本场直播数据如下：\\n🧍‍♂️ 总共 -dmc 位特工上线\\n💬 共计 -dca 条弹幕飞驰而过\\n📊 热词云图已生成，快来看看你有没有上榜！\\n\\n👑 本场顶级输出选手：\\n🥇 -un1 - 弹幕输出 -dc1 条\\n🥈 -un2 - 弹幕 -dc2 条，萌力惊人\\n🥉 -un3 - -dc3 条精准狙击\\n\\n🎖️ 特别嘉奖：-un4 & -un5\\n你们的弹幕，我们都记录在案！🕵️‍♀️").description("自定义直播总结语，开启弹幕词云自动发送。变量解释：-dmc代表总弹幕发送人数，-dca代表总弹幕数，-un1到-un5代表弹幕发送条数前五名用户的用户名，-dc1到-dc5代表弹幕发送条数前五名的弹幕发送数量"),
+	wordcloud: koishi.Schema.boolean().default(false).description("直播结束后，是否生成本场直播弹幕词云").experimental(),
+	liveSummary: koishi.Schema.string().default("🔍【弹幕情报站】本场直播数据如下：\\n🧍‍♂️ 总共 -dmc 位-mdn上线\\n💬 共计 -dca 条弹幕飞驰而过\\n📊 热词云图已生成，快来看看你有没有上榜！\\n\\n👑 本场顶级输出选手：\\n🥇 -un1 - 弹幕输出 -dc1 条\\n🥈 -un2 - 弹幕 -dc2 条，萌力惊人\\n🥉 -un3 - -dc3 条精准狙击\\n\\n🎖️ 特别嘉奖：-un4 & -un5\\n你们的弹幕，我们都记录在案！🕵️‍♀️").description("自定义直播总结语，开启弹幕词云自动发送。变量解释：-dmc代表总弹幕发送人数，-mdn代表主播粉丝牌子名，-dca代表总弹幕数，-un1到-un5代表弹幕发送条数前五名用户的用户名，-dc1到-dc5代表弹幕发送条数前五名的弹幕发送数量"),
 	restartPush: koishi.Schema.boolean().default(true).description("插件重启后，如果订阅的主播正在直播，是否进行一次推送，默认开启"),
 	pushTime: koishi.Schema.number().min(0).max(12).step(.5).default(1).description("设定间隔多长时间推送一次直播状态，单位为小时，默认为一小时"),
 	customLiveStart: koishi.Schema.string().default("-name开播啦，当前粉丝数：-follower\\n-link").description("自定义开播提示语，-name代表UP昵称，-follower代表当前粉丝数，-link代表直播间链接（如果使用的是QQ官方机器人，请不要使用），\\n为换行。例如-name开播啦，会发送为xxxUP开播啦"),
@@ -936,9 +936,9 @@ var ComRegister = class {
 		});
 		biliCom.subcommand(".wc").action(async ({ session }) => {
 			const words = [
-				["摆烂", 60],
-				["可以", 42],
-				["可以", 42],
+				["摆烂", 91],
+				["可以", 82],
+				["可以", 72],
 				["可以", 42],
 				["dog", 40],
 				["dog", 40],
@@ -1035,9 +1035,32 @@ var ComRegister = class {
 				["赵六", 27],
 				["田七", 25]
 			];
-			const danmakerRankMsg = this.config.liveSummary.replace("-dmc", "114").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");
+			const danmakerRankMsg = this.config.liveSummary.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);
 		});
+		biliCom.subcommand(".cap").action(async ({ session }) => {
+			const { code: userInfoCode, data: userInfoData } = await withRetry(async () => {
+				const data$2 = await this.ctx.ba.getUserInfo("114514");
+				return {
+					code: 0,
+					data: data$2
+				};
+			}).then((content) => content.data);
+			if (userInfoCode !== -352 || !userInfoData.v_voucher) return "不满足风控条件，不需要执行该命令";
+			const { data: data$1 } = await ctx.ba.v_voucherCaptcha(userInfoData.v_voucher);
+			if (!data$1.geetest) return "当前风控无法通过该验证解除，或许考虑人工申诉？";
+			await session.send("请到该网站进行验证操作：https://kuresaru.github.io/geetest-validator/");
+			await session.send("请手动填入 gt 和 challenge 后点击生成进行验证，验证完成后点击结果，根据提示输入对应validate");
+			await session.send(`gt:${data$1.geetest.gt}`);
+			await session.send(`challenge:${data$1.geetest.challenge}`);
+			await session.send("请输入validate");
+			const validate$1 = await session.prompt();
+			const seccode = `${validate$1}|jordan`;
+			const { data: validateCaptchaData } = await ctx.ba.validateCaptcha(data$1.geetest.challenge, data$1.token, validate$1, seccode);
+			if (validateCaptchaData.is_valid !== 1) return "验证不成功！";
+			ctx.ba.addCookie(`x-bili-gaia-vtoken=${validateCaptchaData.grisk_id}`);
+			return "验证成功！";
+		});
 	}
 	async init(config) {
 		this.logger = this.ctx.logger("cr");
@@ -1444,7 +1467,8 @@ var ComRegister = class {
 			roomId: data$1.room_id,
 			liveOpenFollowerNum,
 			liveEndFollowerNum,
-			liveFollowerChange
+			liveFollowerChange,
+			medalName: data$1.medal_name
 		};
 	}
 	async useLiveRoomInfo(roomId) {
@@ -1486,7 +1510,7 @@ var ComRegister = class {
 		const sendDanmakuWordCloud = async () => {
 			this.logger.info("开始制作弹幕词云");
 			this.logger.info("正在获取前90热词");
-			const top90Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 90).map(([word, weight]) => [word, weight > 60 ? 60 : weight]);
+			const top90Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 90);
 			this.logger.info("弹幕词云前90词及权重：");
 			this.logger.info(top90Words);
 			this.logger.info("正在准备生成弹幕词云");
@@ -1498,7 +1522,7 @@ var ComRegister = class {
 			const danmakuMakerCount = Object.keys(danmakuMakerRecord).length;
 			const danmakuCount = Object.values(danmakuMakerRecord).reduce((sum, val) => sum + val, 0);
 			const top5DanmakuMaker = Object.entries(danmakuMakerRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 5);
-			const danmakuMakerMsg = this.config.liveSummary.replace("-dmc", `${danmakuMakerCount}`).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 danmakuMakerMsg = this.config.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(uid, danmakuMakerMsg, PushType.Live);
 			Object.keys(danmakuWeightRecord).forEach((key) => delete danmakuWeightRecord[key]);
 			Object.keys(danmakuMakerRecord).forEach((key) => delete danmakuMakerRecord[key]);
@@ -1917,7 +1941,7 @@ var ComRegister = class {
 		this.preInitConfig(subs);
 		for (const sub of subs) {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
-			const { code: userInfoCode, msg: userInfoMsg, data: userInfoData } = await withRetry(async () => {
+			const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
 				const data$1 = await this.ctx.ba.getUserInfo(sub.uid);
 				return {
 					code: 0,
@@ -1930,6 +1954,14 @@ var ComRegister = class {
 					message: `加载订阅UID:${sub.uid}失败！`
 				};
 			});
+			if (userInfoCode === -352 && userInfoData.v_voucher) {
+				this.logger.info("账号被风控，请使用指令 bili captcha 进行风控验证");
+				await this.sendPrivateMsg("账号被风控，请使用指令 bili captcha 进行风控验证");
+				return {
+					code: userInfoCode,
+					msg: userInfoMsg
+				};
+			}
 			if (userInfoCode !== 0) return {
 				code: userInfoCode,
 				msg: userInfoMsg
@@ -94942,7 +94974,7 @@ var BiliAPI = class extends koishi.Service {
 			const csrf = this.getCSRF();
 			const ticket = await this.getBiliTicket(csrf);
 			if (ticket.code !== 0) throw new Error(`获取BiliTicket失败: ${ticket.message}`);
-			this.jar.setCookieSync(`bili_ticket=${ticket.data.ticket}; path=/; domain=.bilibili.com`, "https://www.bilibili.com");
+			this.addCookie(`bili_ticket=${ticket.data.ticket}`);
 			this.wbiSign.img_key = ticket.data.nav.img.slice(ticket.data.nav.img.lastIndexOf("/") + 1, ticket.data.nav.img.lastIndexOf("."));
 			this.wbiSign.sub_key = ticket.data.nav.sub.slice(ticket.data.nav.sub.lastIndexOf("/") + 1, ticket.data.nav.sub.lastIndexOf("."));
 		} catch (e$1) {
@@ -95157,6 +95189,9 @@ var BiliAPI = class extends koishi.Service {
 			}
 		}));
 	}
+	addCookie(cookieStr) {
+		this.jar.setCookieSync(`${cookieStr}; path=/; domain=.bilibili.com`, "https://www.bilibili.com");
+	}
 	getCookies() {
 		try {
 			const cookies = this.jar.serializeSync().cookies.map((cookie) => {
@@ -95360,6 +95395,32 @@ var BiliAPI = class extends koishi.Service {
 			case -400: throw new Error("请求错误");
 		}
 	}
+	async v_voucherCaptcha(v_voucher) {
+		const csrf = this.getCSRF();
+		const { data: data$1 } = await this.client.post("https://api.bilibili.com/x/gaia-vgate/v1/register", {
+			csrf,
+			v_voucher
+		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } }).catch((e$1) => {
+			this.logger.error(e$1);
+		});
+		if (data$1.code !== 0) this.logger.error("验证码获取失败！");
+		return { data: data$1.data };
+	}
+	async validateCaptcha(challenge, token, validate$1, seccode) {
+		const csrf = this.getCSRF();
+		const { data: data$1 } = await this.client.post("https://api.bilibili.com/x/gaia-vgate/v1/validate", {
+			csrf,
+			challenge,
+			token,
+			validate: validate$1,
+			seccode
+		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+		if (data$1.code !== 0) {
+			this.logger.info(`验证失败：错误码=${data$1.code}，错误消息:${data$1.message}`);
+			return { data: null };
+		}
+		return { data: data$1.data };
+	}
 };
 (0, import_decorate.default)([Retry({
 	attempts: 3,

package/lib/index.mjs

@@ -115,8 +115,8 @@ const BAConfigSchema = Schema.object({
 	pushImgsInDynamic: Schema.boolean().default(false).description("是否推送动态中的图片，默认不开启。开启后会单独推送动态中的图片，该功能容易导致QQ风控"),
 	live: Schema.object({}).description("直播推送设置"),
 	liveDetectType: Schema.union([Schema.const("WS").description("使用WebSocket连接到B站消息服务器进行直播检测，推荐使用"), Schema.const("API").description("通过轮询API发送请求监测直播状态，此模式理论可无限订阅，但容易产生其他问题，功能没有WS模式全面").experimental()]).role("radio").default("WS").description("直播检测方式，WS为连接到B站消息服务器，API为通过轮询发送请求监测，默认使用WS检测"),
-	wordcloud: Schema.boolean().default(false).description("直播结束后，是否生成本场直播弹幕词云"),
-	liveSummary: Schema.string().default("🔍【弹幕情报站】本场直播数据如下：\\n🧍‍♂️ 总共 -dmc 位特工上线\\n💬 共计 -dca 条弹幕飞驰而过\\n📊 热词云图已生成，快来看看你有没有上榜！\\n\\n👑 本场顶级输出选手：\\n🥇 -un1 - 弹幕输出 -dc1 条\\n🥈 -un2 - 弹幕 -dc2 条，萌力惊人\\n🥉 -un3 - -dc3 条精准狙击\\n\\n🎖️ 特别嘉奖：-un4 & -un5\\n你们的弹幕，我们都记录在案！🕵️‍♀️").description("自定义直播总结语，开启弹幕词云自动发送。变量解释：-dmc代表总弹幕发送人数，-dca代表总弹幕数，-un1到-un5代表弹幕发送条数前五名用户的用户名，-dc1到-dc5代表弹幕发送条数前五名的弹幕发送数量"),
+	wordcloud: Schema.boolean().default(false).description("直播结束后，是否生成本场直播弹幕词云").experimental(),
+	liveSummary: Schema.string().default("🔍【弹幕情报站】本场直播数据如下：\\n🧍‍♂️ 总共 -dmc 位-mdn上线\\n💬 共计 -dca 条弹幕飞驰而过\\n📊 热词云图已生成，快来看看你有没有上榜！\\n\\n👑 本场顶级输出选手：\\n🥇 -un1 - 弹幕输出 -dc1 条\\n🥈 -un2 - 弹幕 -dc2 条，萌力惊人\\n🥉 -un3 - -dc3 条精准狙击\\n\\n🎖️ 特别嘉奖：-un4 & -un5\\n你们的弹幕，我们都记录在案！🕵️‍♀️").description("自定义直播总结语，开启弹幕词云自动发送。变量解释：-dmc代表总弹幕发送人数，-mdn代表主播粉丝牌子名，-dca代表总弹幕数，-un1到-un5代表弹幕发送条数前五名用户的用户名，-dc1到-dc5代表弹幕发送条数前五名的弹幕发送数量"),
 	restartPush: Schema.boolean().default(true).description("插件重启后，如果订阅的主播正在直播，是否进行一次推送，默认开启"),
 	pushTime: Schema.number().min(0).max(12).step(.5).default(1).description("设定间隔多长时间推送一次直播状态，单位为小时，默认为一小时"),
 	customLiveStart: Schema.string().default("-name开播啦，当前粉丝数：-follower\\n-link").description("自定义开播提示语，-name代表UP昵称，-follower代表当前粉丝数，-link代表直播间链接（如果使用的是QQ官方机器人，请不要使用），\\n为换行。例如-name开播啦，会发送为xxxUP开播啦"),
@@ -938,9 +938,9 @@ var ComRegister = class {
 		});
 		biliCom.subcommand(".wc").action(async ({ session }) => {
 			const words = [
-				["摆烂", 60],
-				["可以", 42],
-				["可以", 42],
+				["摆烂", 91],
+				["可以", 82],
+				["可以", 72],
 				["可以", 42],
 				["dog", 40],
 				["dog", 40],
@@ -1037,9 +1037,32 @@ var ComRegister = class {
 				["赵六", 27],
 				["田七", 25]
 			];
-			const danmakerRankMsg = this.config.liveSummary.replace("-dmc", "114").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");
+			const danmakerRankMsg = this.config.liveSummary.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);
 		});
+		biliCom.subcommand(".cap").action(async ({ session }) => {
+			const { code: userInfoCode, data: userInfoData } = await withRetry(async () => {
+				const data$2 = await this.ctx.ba.getUserInfo("114514");
+				return {
+					code: 0,
+					data: data$2
+				};
+			}).then((content) => content.data);
+			if (userInfoCode !== -352 || !userInfoData.v_voucher) return "不满足风控条件，不需要执行该命令";
+			const { data: data$1 } = await ctx.ba.v_voucherCaptcha(userInfoData.v_voucher);
+			if (!data$1.geetest) return "当前风控无法通过该验证解除，或许考虑人工申诉？";
+			await session.send("请到该网站进行验证操作：https://kuresaru.github.io/geetest-validator/");
+			await session.send("请手动填入 gt 和 challenge 后点击生成进行验证，验证完成后点击结果，根据提示输入对应validate");
+			await session.send(`gt:${data$1.geetest.gt}`);
+			await session.send(`challenge:${data$1.geetest.challenge}`);
+			await session.send("请输入validate");
+			const validate$1 = await session.prompt();
+			const seccode = `${validate$1}|jordan`;
+			const { data: validateCaptchaData } = await ctx.ba.validateCaptcha(data$1.geetest.challenge, data$1.token, validate$1, seccode);
+			if (validateCaptchaData.is_valid !== 1) return "验证不成功！";
+			ctx.ba.addCookie(`x-bili-gaia-vtoken=${validateCaptchaData.grisk_id}`);
+			return "验证成功！";
+		});
 	}
 	async init(config) {
 		this.logger = this.ctx.logger("cr");
@@ -1446,7 +1469,8 @@ var ComRegister = class {
 			roomId: data$1.room_id,
 			liveOpenFollowerNum,
 			liveEndFollowerNum,
-			liveFollowerChange
+			liveFollowerChange,
+			medalName: data$1.medal_name
 		};
 	}
 	async useLiveRoomInfo(roomId) {
@@ -1488,7 +1512,7 @@ var ComRegister = class {
 		const sendDanmakuWordCloud = async () => {
 			this.logger.info("开始制作弹幕词云");
 			this.logger.info("正在获取前90热词");
-			const top90Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 90).map(([word, weight]) => [word, weight > 60 ? 60 : weight]);
+			const top90Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 90);
 			this.logger.info("弹幕词云前90词及权重：");
 			this.logger.info(top90Words);
 			this.logger.info("正在准备生成弹幕词云");
@@ -1500,7 +1524,7 @@ var ComRegister = class {
 			const danmakuMakerCount = Object.keys(danmakuMakerRecord).length;
 			const danmakuCount = Object.values(danmakuMakerRecord).reduce((sum, val) => sum + val, 0);
 			const top5DanmakuMaker = Object.entries(danmakuMakerRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 5);
-			const danmakuMakerMsg = this.config.liveSummary.replace("-dmc", `${danmakuMakerCount}`).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 danmakuMakerMsg = this.config.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(uid, danmakuMakerMsg, PushType.Live);
 			Object.keys(danmakuWeightRecord).forEach((key) => delete danmakuWeightRecord[key]);
 			Object.keys(danmakuMakerRecord).forEach((key) => delete danmakuMakerRecord[key]);
@@ -1919,7 +1943,7 @@ var ComRegister = class {
 		this.preInitConfig(subs);
 		for (const sub of subs) {
 			this.logger.info(`加载订阅UID:${sub.uid}中...`);
-			const { code: userInfoCode, msg: userInfoMsg, data: userInfoData } = await withRetry(async () => {
+			const { code: userInfoCode, message: userInfoMsg, data: userInfoData } = await withRetry(async () => {
 				const data$1 = await this.ctx.ba.getUserInfo(sub.uid);
 				return {
 					code: 0,
@@ -1932,6 +1956,14 @@ var ComRegister = class {
 					message: `加载订阅UID:${sub.uid}失败！`
 				};
 			});
+			if (userInfoCode === -352 && userInfoData.v_voucher) {
+				this.logger.info("账号被风控，请使用指令 bili captcha 进行风控验证");
+				await this.sendPrivateMsg("账号被风控，请使用指令 bili captcha 进行风控验证");
+				return {
+					code: userInfoCode,
+					msg: userInfoMsg
+				};
+			}
 			if (userInfoCode !== 0) return {
 				code: userInfoCode,
 				msg: userInfoMsg
@@ -94944,7 +94976,7 @@ var BiliAPI = class extends Service {
 			const csrf = this.getCSRF();
 			const ticket = await this.getBiliTicket(csrf);
 			if (ticket.code !== 0) throw new Error(`获取BiliTicket失败: ${ticket.message}`);
-			this.jar.setCookieSync(`bili_ticket=${ticket.data.ticket}; path=/; domain=.bilibili.com`, "https://www.bilibili.com");
+			this.addCookie(`bili_ticket=${ticket.data.ticket}`);
 			this.wbiSign.img_key = ticket.data.nav.img.slice(ticket.data.nav.img.lastIndexOf("/") + 1, ticket.data.nav.img.lastIndexOf("."));
 			this.wbiSign.sub_key = ticket.data.nav.sub.slice(ticket.data.nav.sub.lastIndexOf("/") + 1, ticket.data.nav.sub.lastIndexOf("."));
 		} catch (e$1) {
@@ -95159,6 +95191,9 @@ var BiliAPI = class extends Service {
 			}
 		}));
 	}
+	addCookie(cookieStr) {
+		this.jar.setCookieSync(`${cookieStr}; path=/; domain=.bilibili.com`, "https://www.bilibili.com");
+	}
 	getCookies() {
 		try {
 			const cookies = this.jar.serializeSync().cookies.map((cookie) => {
@@ -95362,6 +95397,32 @@ var BiliAPI = class extends Service {
 			case -400: throw new Error("请求错误");
 		}
 	}
+	async v_voucherCaptcha(v_voucher) {
+		const csrf = this.getCSRF();
+		const { data: data$1 } = await this.client.post("https://api.bilibili.com/x/gaia-vgate/v1/register", {
+			csrf,
+			v_voucher
+		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } }).catch((e$1) => {
+			this.logger.error(e$1);
+		});
+		if (data$1.code !== 0) this.logger.error("验证码获取失败！");
+		return { data: data$1.data };
+	}
+	async validateCaptcha(challenge, token, validate$1, seccode) {
+		const csrf = this.getCSRF();
+		const { data: data$1 } = await this.client.post("https://api.bilibili.com/x/gaia-vgate/v1/validate", {
+			csrf,
+			challenge,
+			token,
+			validate: validate$1,
+			seccode
+		}, { headers: { "Content-Type": "application/x-www-form-urlencoded" } });
+		if (data$1.code !== 0) {
+			this.logger.info(`验证失败：错误码=${data$1.code}，错误消息:${data$1.message}`);
+			return { data: null };
+		}
+		return { data: data$1.data };
+	}
 };
 (0, import_decorate.default)([Retry({
 	attempts: 3,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.2.9-rc.3",
+  "version": "3.2.10-alpha.0",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -49,7 +49,7 @@
     "tough-cookie": "^5.1.2"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.0.0",
+    "@biomejs/biome": "^2.0.6",
     "@koishijs/cache": "^2.1.0",
     "@koishijs/client": "^5.30.9",
     "@koishijs/plugin-help": "^2.4.5",
@@ -61,7 +61,7 @@
     "@types/md5": "^2.3.5",
     "@types/qrcode": "^1.5.5",
     "@types/tough-cookie": "^4.0.5",
-    "globals": "^16.2.0",
+    "globals": "^16.3.0",
     "koishi": "^4.18.8",
     "koishi-plugin-puppeteer": "^3.9.0",
     "tsdown": "^0.12.9",

package/readme.md

@@ -306,6 +306,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.2.9-rc.1 优化：弹幕词云生成效果；
 > - ver 3.2.9-rc.2 优化：弹幕词云生成效果；
 > - ver 3.2.9-rc.3 优化：弹幕词云生成效果； 新增：直播总结语，开启弹幕词云后自动发送、选项 `liveSummary` 可自定义直播总结语； 修复：一场直播完成后，如果插件中途没有被关闭过，会影响同一位up主下一次直播词云数据；
+> - ver 3.2.9-rc.4 优化：弹幕词云生成效果； 新增：直播总结 `-mdn` 变量，代表主播粉丝牌子名
+> - ver 3.2.10-alpha.0 新增：指令 `bili cap` 在遇到风控时，可以手动验证解除风控； 优化：错误消息提示；
 
 ## 交流群