koishi-plugin-bilibili-notify 3.2.9-alpha.4 → 3.2.9-rc.0

package/lib/index.d.mts

@@ -34,6 +34,7 @@ interface BAConfig {
   pushImgsInDynamic: boolean;
   live: {};
   liveDetectType: "WS" | "API";
+  wordcloud: boolean;
   restartPush: boolean;
   pushTime: number;
   customLiveStart: string;

package/lib/index.d.ts

@@ -34,6 +34,7 @@ interface BAConfig {
   pushImgsInDynamic: boolean;
   live: {};
   liveDetectType: "WS" | "API";
+  wordcloud: boolean;
   restartPush: boolean;
   pushTime: number;
   customLiveStart: string;

package/lib/index.js

@@ -112,6 +112,7 @@ 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("直播结束后，是否生成本场直播弹幕词云"),
 	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开播啦"),
@@ -847,7 +848,147 @@ var ComRegister = class {
 				["b8n5c", 70],
 				["v3x7w", 163],
 				["t6c4a", 49],
-				["z9u2j", 146]
+				["z9u2j", 146],
+				["k1q8z", 102],
+				["v7n2a", 31],
+				["b4x9p", 176],
+				["w2m5s", 61],
+				["t8j3u", 150],
+				["z5c7l", 84],
+				["h2r8y", 196],
+				["n9d1q", 44],
+				["p6s3e", 123],
+				["f8g2b", 17],
+				["m1v7k", 109],
+				["x4a9w", 72],
+				["c7t2z", 180],
+				["u5b8n", 38],
+				["e1y3h", 134],
+				["j8l6p", 56],
+				["s2q9d", 191],
+				["g7m4x", 25],
+				["a5w8c", 113],
+				["l9h2v", 68],
+				["y1k7t", 159],
+				["d8z3u", 45],
+				["q2e6j", 177],
+				["r7p1s", 80],
+				["b5n9f", 126],
+				["v1x4m", 32],
+				["t7c8w", 198],
+				["z4u2h", 54],
+				["h9y5j", 143],
+				["n2l7s", 19],
+				["p8d1g", 104],
+				["f5b3a", 67],
+				["m2v9x", 171],
+				["x8a4c", 40],
+				["c1t7u", 187],
+				["u4b2e", 28],
+				["e9y6k", 135],
+				["j2l8q", 60],
+				["s7g1m", 119],
+				["g4w5t", 76],
+				["a9z2h", 164],
+				["l1h7p", 35],
+				["y8k3n", 185],
+				["d2u9f", 22],
+				["q7e4v", 110],
+				["r5p8x", 69],
+				["b1n6c", 152],
+				["v8x2w", 48],
+				["t4c7a", 142],
+				["z7u1j", 99],
+				["k2q5z", 174],
+				["v9n8a", 37],
+				["b6x3p", 189],
+				["w1m7s", 24],
+				["t5j2u", 115],
+				["z1c8l", 63],
+				["h6r4y", 155],
+				["n3d9q", 50],
+				["p7s2e", 137],
+				["f9g1b", 81],
+				["m4v6k", 170],
+				["x1a8w", 42],
+				["c8t3z", 194],
+				["u2b7n", 26],
+				["e5y9h", 130],
+				["j9l1p", 58],
+				["s4q6d", 182],
+				["g1m8x", 33],
+				["a8w5c", 108],
+				["l3h9v", 75],
+				["y2k4t", 161],
+				["d9z1u", 46],
+				["q5e8j", 149],
+				["r2p7s", 20],
+				["b9n3f", 122],
+				["v4x6m", 65],
+				["t1c9w", 179],
+				["z8u5h", 30],
+				["h3y2j", 136],
+				["n5l8s", 52],
+				["p1d4g", 167],
+				["f6b9a", 95],
+				["m3v2x", 156],
+				["x9a5c", 43],
+				["c2t8u", 192],
+				["u7b1e", 16],
+				["e4y6k", 129],
+				["j5l3q", 78],
+				["s1g9m", 118],
+				["g8w2t", 71],
+				["a3z7h", 173],
+				["l6h1p", 36],
+				["y9k5n", 184],
+				["d1u8f", 15],
+				["q8e3v", 111],
+				["r4p6x", 64],
+				["b2n7c", 151],
+				["v5x1w", 47],
+				["t8c4a", 140],
+				["z3u9j", 98],
+				["k7q2z", 176],
+				["v1n5a", 55],
+				["b8x6p", 195],
+				["w3m1s", 14],
+				["t6j9u", 116],
+				["z2c5l", 61],
+				["h7r3y", 153],
+				["n4d8q", 51],
+				["p2s7e", 139],
+				["f7g5b", 82],
+				["m9v1k", 169],
+				["x5a3w", 38],
+				["c9t6z", 197],
+				["u3b8n", 17],
+				["e6y2h", 131],
+				["j7l5p", 59],
+				["s3q8d", 181],
+				["g2m4x", 34],
+				["a6w9c", 107],
+				["l8h2v", 74],
+				["y4k7t", 162],
+				["d6z5u", 49],
+				["q3e1j", 148],
+				["r9p2s", 21],
+				["b4n8f", 121],
+				["v7x5m", 68],
+				["t2c1w", 178],
+				["z5u3h", 31],
+				["h8y6j", 133],
+				["n1l4s", 57],
+				["p5d7g", 166],
+				["f3b2a", 96],
+				["m6v8x", 158],
+				["x2a9c", 45],
+				["c5t1u", 191],
+				["u8b4e", 19],
+				["e3y7k", 128],
+				["j6l2q", 79],
+				["s9g5m", 114],
+				["g5w3t", 73]
 			];
 			await session.send(/* @__PURE__ */ (0, __satorijs_element_jsx_runtime.jsx)("message", { children: koishi.h.image(await this.ctx.gi.generateWordCloudImg(words, "词云测试"), "image/jpg") }));
 		});
@@ -1295,12 +1436,12 @@ var ComRegister = class {
 		const liveMsgObj = this.liveMsgManager.get(uid);
 		const sendDanmakuWordCloud = async () => {
 			this.logger.info("开始制作弹幕词云");
-			this.logger.info("正在获取前50热词");
-			const top50Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 50);
-			this.logger.info("弹幕词云前50词及权重：");
-			this.logger.info(top50Words);
+			this.logger.info("正在获取前150热词");
+			const top150Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 150);
+			this.logger.info("弹幕词云前150词及权重：");
+			this.logger.info(top150Words);
 			this.logger.info("正在准备生成弹幕词云");
-			const buffer = await this.ctx.gi.generateWordCloudImg(top50Words, masterInfo.username);
+			const buffer = await this.ctx.gi.generateWordCloudImg(top150Words, masterInfo.username);
 			this.logger.info("弹幕词云生成完成，正在准备发送词云图片");
 			await this.broadcastToTargets(uid, koishi.h.image(buffer, "image/jpeg"), PushType.Live);
 		};
@@ -1385,7 +1526,7 @@ var ComRegister = class {
 					masterInfo,
 					cardStyle
 				}, uid, liveStartMsg);
-				if (!pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
+				if (this.config.pushTime !== 0 && !pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			},
 			onLiveEnd: async () => {
 				liveStatus = false;
@@ -1407,7 +1548,7 @@ var ComRegister = class {
 				}, uid, liveEndMsg);
 				pushAtTimeTimer();
 				pushAtTimeTimer = null;
-				await sendDanmakuWordCloud();
+				if (this.config.wordcloud) await sendDanmakuWordCloud();
 			}
 		};
 		await this.ctx.bl.startLiveRoomListener(roomId, handler);
@@ -1421,7 +1562,7 @@ var ComRegister = class {
 				masterInfo,
 				cardStyle
 			}, uid, liveMsg);
-			if (!pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
+			if (this.config.pushTime !== 0 && !pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			liveStatus = true;
 		}
 	}
@@ -1827,6 +1968,7 @@ var ComRegister = class {
 			masterAccountGuildId: koishi.Schema.string()
 		}),
 		liveDetectType: koishi.Schema.string(),
+		wordcloud: koishi.Schema.boolean(),
 		restartPush: koishi.Schema.boolean().required(),
 		pushTime: koishi.Schema.number().required(),
 		pushImgsInDynamic: koishi.Schema.boolean().required(),
@@ -94486,19 +94628,19 @@ var GenerateImg = class extends koishi.Service {
                 const minWeight = Math.min(...words.map(w => w[1]));
 
                 // 设置最大字体大小、最小字体大小（以像素为单位）
-                const maxFontSize = 60;
+                const maxFontSize = 80;
                 const minFontSize = 14;
 
                 // 用映射函数代替 weightFactor
                 function getWeightFactor(size) {
                     if (maxWeight === minWeight) return maxFontSize; // 防止除0
                     const ratio = (size - minWeight) / (maxWeight - minWeight);
-                    return minFontSize + (maxFontSize - minFontSize) * ratio;
+                    return minFontSize + (maxFontSize - minFontSize) * Math.pow(ratio, 0.85);
                 }
 
                 WordCloud(canvas, {
                     list: words,
-                    gridSize: Math.round(8 * (cssWidth / 1024)), // 自动适配大小
+                    gridSize: Math.max(4, Math.round(5 * (cssWidth / 1024))),
                     weightFactor: getWeightFactor,
                     fontFamily: 'Quicksand, sans-serif',
                     color: () => {
@@ -95415,6 +95557,7 @@ var ServerManager = class extends koishi.Service {
 			const cr = this.ctx.plugin(comRegister_default, {
 				sub: globalConfig.sub,
 				master: globalConfig.master,
+				wordcloud: globalConfig.wordcloud,
 				liveDetectType: globalConfig.liveDetectType,
 				restartPush: globalConfig.restartPush,
 				pushTime: globalConfig.pushTime,

package/lib/index.mjs

@@ -114,6 +114,7 @@ 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("直播结束后，是否生成本场直播弹幕词云"),
 	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开播啦"),
@@ -849,7 +850,147 @@ var ComRegister = class {
 				["b8n5c", 70],
 				["v3x7w", 163],
 				["t6c4a", 49],
-				["z9u2j", 146]
+				["z9u2j", 146],
+				["k1q8z", 102],
+				["v7n2a", 31],
+				["b4x9p", 176],
+				["w2m5s", 61],
+				["t8j3u", 150],
+				["z5c7l", 84],
+				["h2r8y", 196],
+				["n9d1q", 44],
+				["p6s3e", 123],
+				["f8g2b", 17],
+				["m1v7k", 109],
+				["x4a9w", 72],
+				["c7t2z", 180],
+				["u5b8n", 38],
+				["e1y3h", 134],
+				["j8l6p", 56],
+				["s2q9d", 191],
+				["g7m4x", 25],
+				["a5w8c", 113],
+				["l9h2v", 68],
+				["y1k7t", 159],
+				["d8z3u", 45],
+				["q2e6j", 177],
+				["r7p1s", 80],
+				["b5n9f", 126],
+				["v1x4m", 32],
+				["t7c8w", 198],
+				["z4u2h", 54],
+				["h9y5j", 143],
+				["n2l7s", 19],
+				["p8d1g", 104],
+				["f5b3a", 67],
+				["m2v9x", 171],
+				["x8a4c", 40],
+				["c1t7u", 187],
+				["u4b2e", 28],
+				["e9y6k", 135],
+				["j2l8q", 60],
+				["s7g1m", 119],
+				["g4w5t", 76],
+				["a9z2h", 164],
+				["l1h7p", 35],
+				["y8k3n", 185],
+				["d2u9f", 22],
+				["q7e4v", 110],
+				["r5p8x", 69],
+				["b1n6c", 152],
+				["v8x2w", 48],
+				["t4c7a", 142],
+				["z7u1j", 99],
+				["k2q5z", 174],
+				["v9n8a", 37],
+				["b6x3p", 189],
+				["w1m7s", 24],
+				["t5j2u", 115],
+				["z1c8l", 63],
+				["h6r4y", 155],
+				["n3d9q", 50],
+				["p7s2e", 137],
+				["f9g1b", 81],
+				["m4v6k", 170],
+				["x1a8w", 42],
+				["c8t3z", 194],
+				["u2b7n", 26],
+				["e5y9h", 130],
+				["j9l1p", 58],
+				["s4q6d", 182],
+				["g1m8x", 33],
+				["a8w5c", 108],
+				["l3h9v", 75],
+				["y2k4t", 161],
+				["d9z1u", 46],
+				["q5e8j", 149],
+				["r2p7s", 20],
+				["b9n3f", 122],
+				["v4x6m", 65],
+				["t1c9w", 179],
+				["z8u5h", 30],
+				["h3y2j", 136],
+				["n5l8s", 52],
+				["p1d4g", 167],
+				["f6b9a", 95],
+				["m3v2x", 156],
+				["x9a5c", 43],
+				["c2t8u", 192],
+				["u7b1e", 16],
+				["e4y6k", 129],
+				["j5l3q", 78],
+				["s1g9m", 118],
+				["g8w2t", 71],
+				["a3z7h", 173],
+				["l6h1p", 36],
+				["y9k5n", 184],
+				["d1u8f", 15],
+				["q8e3v", 111],
+				["r4p6x", 64],
+				["b2n7c", 151],
+				["v5x1w", 47],
+				["t8c4a", 140],
+				["z3u9j", 98],
+				["k7q2z", 176],
+				["v1n5a", 55],
+				["b8x6p", 195],
+				["w3m1s", 14],
+				["t6j9u", 116],
+				["z2c5l", 61],
+				["h7r3y", 153],
+				["n4d8q", 51],
+				["p2s7e", 139],
+				["f7g5b", 82],
+				["m9v1k", 169],
+				["x5a3w", 38],
+				["c9t6z", 197],
+				["u3b8n", 17],
+				["e6y2h", 131],
+				["j7l5p", 59],
+				["s3q8d", 181],
+				["g2m4x", 34],
+				["a6w9c", 107],
+				["l8h2v", 74],
+				["y4k7t", 162],
+				["d6z5u", 49],
+				["q3e1j", 148],
+				["r9p2s", 21],
+				["b4n8f", 121],
+				["v7x5m", 68],
+				["t2c1w", 178],
+				["z5u3h", 31],
+				["h8y6j", 133],
+				["n1l4s", 57],
+				["p5d7g", 166],
+				["f3b2a", 96],
+				["m6v8x", 158],
+				["x2a9c", 45],
+				["c5t1u", 191],
+				["u8b4e", 19],
+				["e3y7k", 128],
+				["j6l2q", 79],
+				["s9g5m", 114],
+				["g5w3t", 73]
 			];
 			await session.send(/* @__PURE__ */ jsx("message", { children: h.image(await this.ctx.gi.generateWordCloudImg(words, "词云测试"), "image/jpg") }));
 		});
@@ -1297,12 +1438,12 @@ var ComRegister = class {
 		const liveMsgObj = this.liveMsgManager.get(uid);
 		const sendDanmakuWordCloud = async () => {
 			this.logger.info("开始制作弹幕词云");
-			this.logger.info("正在获取前50热词");
-			const top50Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 50);
-			this.logger.info("弹幕词云前50词及权重：");
-			this.logger.info(top50Words);
+			this.logger.info("正在获取前150热词");
+			const top150Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 150);
+			this.logger.info("弹幕词云前150词及权重：");
+			this.logger.info(top150Words);
 			this.logger.info("正在准备生成弹幕词云");
-			const buffer = await this.ctx.gi.generateWordCloudImg(top50Words, masterInfo.username);
+			const buffer = await this.ctx.gi.generateWordCloudImg(top150Words, masterInfo.username);
 			this.logger.info("弹幕词云生成完成，正在准备发送词云图片");
 			await this.broadcastToTargets(uid, h.image(buffer, "image/jpeg"), PushType.Live);
 		};
@@ -1387,7 +1528,7 @@ var ComRegister = class {
 					masterInfo,
 					cardStyle
 				}, uid, liveStartMsg);
-				if (!pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
+				if (this.config.pushTime !== 0 && !pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			},
 			onLiveEnd: async () => {
 				liveStatus = false;
@@ -1409,7 +1550,7 @@ var ComRegister = class {
 				}, uid, liveEndMsg);
 				pushAtTimeTimer();
 				pushAtTimeTimer = null;
-				await sendDanmakuWordCloud();
+				if (this.config.wordcloud) await sendDanmakuWordCloud();
 			}
 		};
 		await this.ctx.bl.startLiveRoomListener(roomId, handler);
@@ -1423,7 +1564,7 @@ var ComRegister = class {
 				masterInfo,
 				cardStyle
 			}, uid, liveMsg);
-			if (!pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
+			if (this.config.pushTime !== 0 && !pushAtTimeTimer) pushAtTimeTimer = this.ctx.setInterval(pushAtTimeFunc, this.config.pushTime * 1e3 * 60 * 60);
 			liveStatus = true;
 		}
 	}
@@ -1829,6 +1970,7 @@ var ComRegister = class {
 			masterAccountGuildId: Schema.string()
 		}),
 		liveDetectType: Schema.string(),
+		wordcloud: Schema.boolean(),
 		restartPush: Schema.boolean().required(),
 		pushTime: Schema.number().required(),
 		pushImgsInDynamic: Schema.boolean().required(),
@@ -94488,19 +94630,19 @@ var GenerateImg = class extends Service {
                 const minWeight = Math.min(...words.map(w => w[1]));
 
                 // 设置最大字体大小、最小字体大小（以像素为单位）
-                const maxFontSize = 60;
+                const maxFontSize = 80;
                 const minFontSize = 14;
 
                 // 用映射函数代替 weightFactor
                 function getWeightFactor(size) {
                     if (maxWeight === minWeight) return maxFontSize; // 防止除0
                     const ratio = (size - minWeight) / (maxWeight - minWeight);
-                    return minFontSize + (maxFontSize - minFontSize) * ratio;
+                    return minFontSize + (maxFontSize - minFontSize) * Math.pow(ratio, 0.85);
                 }
 
                 WordCloud(canvas, {
                     list: words,
-                    gridSize: Math.round(8 * (cssWidth / 1024)), // 自动适配大小
+                    gridSize: Math.max(4, Math.round(5 * (cssWidth / 1024))),
                     weightFactor: getWeightFactor,
                     fontFamily: 'Quicksand, sans-serif',
                     color: () => {
@@ -95417,6 +95559,7 @@ var ServerManager = class extends Service {
 			const cr = this.ctx.plugin(comRegister_default, {
 				sub: globalConfig.sub,
 				master: globalConfig.master,
+				wordcloud: globalConfig.wordcloud,
 				liveDetectType: globalConfig.liveDetectType,
 				restartPush: globalConfig.restartPush,
 				pushTime: globalConfig.pushTime,

package/package.json

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

package/readme.md

@@ -305,6 +305,7 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 > - ver 3.2.9-alpha.2 修复：`AxiosError: Request failed with status code 404 xxx at async BiliAPI.checkIfTokenNeedRefresh`、潜在cookie相关bug、弹幕词云bug `Error: 生成图片失败！错误: TimeoutError: Navigation timeout of 30000 ms exceeded`
 > - ver 3.2.9-alpha.3 修复：词云生成空白
 > - ver 3.2.9-alpha.4 修复：弹幕词云bug `Error: 生成图片失败！错误: TimeoutError: Navigation timeout of 30000 ms exceeded`
+> - ver 3.2.9-rc.0 优化：弹幕词云生成效果、选项 `pushTime` 设置为0时可关闭该功能； 新增：选项 `wordcloud` 可选择在直播结束后是否生成弹幕词云
 
 ## 交流群