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

package/lib/index.js

@@ -1238,6 +1238,11 @@ var ComRegister = class {
 		let masterInfo;
 		let watchedNum;
 		const liveMsgObj = this.liveMsgManager.get(uid);
+		const sendDanmakuWordCloud = async () => {
+			const top50Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 50);
+			const buffer = await this.ctx.gi.generateWordCloudImg(top50Words, masterInfo.username);
+			await this.broadcastToTargets(uid, koishi.h.image(buffer, "image/jpeg"), PushType.Live);
+		};
 		const pushAtTimeFunc = async () => {
 			if (!await useMasterAndLiveRoomInfo(LiveType.LiveBroadcast)) {
 				await this.sendPrivateMsg("获取直播间信息失败，推送直播卡片失败！");
@@ -1344,6 +1349,7 @@ var ComRegister = class {
 				const words = Object.entries(danmakuWeightRecord);
 				const buffer = await this.ctx.gi.generateWordCloudImg(words, masterInfo.username);
 				await this.broadcastToTargets(uid, koishi.h.image(buffer, "image/jpeg"), PushType.Live);
+				await sendDanmakuWordCloud();
 			}
 		};
 		await this.ctx.bl.startLiveRoomListener(roomId, handler);
@@ -94408,10 +94414,25 @@ var GenerateImg = class extends koishi.Service {
 
                 const words = ${JSON.stringify(words)}
 
+                // 词云大小缩放
+                const maxWeight = Math.max(...words.map(w => w[1]));
+                const minWeight = Math.min(...words.map(w => w[1]));
+
+                // 设置最大字体大小、最小字体大小（以像素为单位）
+                const maxFontSize = 60;
+                const minFontSize = 14;
+
+                // 用映射函数代替 weightFactor
+                function getWeightFactor(size) {
+                    if (maxWeight === minWeight) return maxFontSize; // 防止除0
+                    const ratio = (size - minWeight) / (maxWeight - minWeight);
+                    return minFontSize + (maxFontSize - minFontSize) * ratio;
+                }
+
                 WordCloud(canvas, {
                     list: words,
                     gridSize: Math.round(8 * (cssWidth / 1024)), // 自动适配大小
-                    weightFactor: size => size * (cssWidth / 1024) * 1.2,
+                    weightFactor: getWeightFactor,
                     fontFamily: 'Quicksand, sans-serif',
                     color: () => {
                         const colors = ['#007CF0', '#00DFD8', '#7928CA', '#FF0080', '#FF4D4D', '#F9CB28'];
@@ -94798,7 +94819,10 @@ var BiliAPI = class extends koishi.Service {
 		return data$1;
 	}
 	async getCookieInfo(refreshToken) {
-		const { data: data$1 } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`);
+		const { data: data$1 } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`).catch((e$1) => {
+			this.logger.info(e$1.message);
+			return null;
+		});
 		return data$1;
 	}
 	async getUserInfo(mid) {
@@ -95021,7 +95045,7 @@ var BiliAPI = class extends koishi.Service {
 		};
 		try {
 			const { data: data$1 } = await this.getCookieInfo(refreshToken);
-			if (!data$1.refresh) return;
+			if (!data$1?.refresh) return;
 		} catch (_$2) {
 			if (times$1 >= 1) this.ctx.setTimeout(() => {
 				this.checkIfTokenNeedRefresh(refreshToken, csrf, times$1 - 1);

package/lib/index.mjs

@@ -1240,6 +1240,11 @@ var ComRegister = class {
 		let masterInfo;
 		let watchedNum;
 		const liveMsgObj = this.liveMsgManager.get(uid);
+		const sendDanmakuWordCloud = async () => {
+			const top50Words = Object.entries(danmakuWeightRecord).sort((a$1, b$2) => b$2[1] - a$1[1]).slice(0, 50);
+			const buffer = await this.ctx.gi.generateWordCloudImg(top50Words, masterInfo.username);
+			await this.broadcastToTargets(uid, h.image(buffer, "image/jpeg"), PushType.Live);
+		};
 		const pushAtTimeFunc = async () => {
 			if (!await useMasterAndLiveRoomInfo(LiveType.LiveBroadcast)) {
 				await this.sendPrivateMsg("获取直播间信息失败，推送直播卡片失败！");
@@ -1346,6 +1351,7 @@ var ComRegister = class {
 				const words = Object.entries(danmakuWeightRecord);
 				const buffer = await this.ctx.gi.generateWordCloudImg(words, masterInfo.username);
 				await this.broadcastToTargets(uid, h.image(buffer, "image/jpeg"), PushType.Live);
+				await sendDanmakuWordCloud();
 			}
 		};
 		await this.ctx.bl.startLiveRoomListener(roomId, handler);
@@ -94410,10 +94416,25 @@ var GenerateImg = class extends Service {
 
                 const words = ${JSON.stringify(words)}
 
+                // 词云大小缩放
+                const maxWeight = Math.max(...words.map(w => w[1]));
+                const minWeight = Math.min(...words.map(w => w[1]));
+
+                // 设置最大字体大小、最小字体大小（以像素为单位）
+                const maxFontSize = 60;
+                const minFontSize = 14;
+
+                // 用映射函数代替 weightFactor
+                function getWeightFactor(size) {
+                    if (maxWeight === minWeight) return maxFontSize; // 防止除0
+                    const ratio = (size - minWeight) / (maxWeight - minWeight);
+                    return minFontSize + (maxFontSize - minFontSize) * ratio;
+                }
+
                 WordCloud(canvas, {
                     list: words,
                     gridSize: Math.round(8 * (cssWidth / 1024)), // 自动适配大小
-                    weightFactor: size => size * (cssWidth / 1024) * 1.2,
+                    weightFactor: getWeightFactor,
                     fontFamily: 'Quicksand, sans-serif',
                     color: () => {
                         const colors = ['#007CF0', '#00DFD8', '#7928CA', '#FF0080', '#FF4D4D', '#F9CB28'];
@@ -94800,7 +94821,10 @@ var BiliAPI = class extends Service {
 		return data$1;
 	}
 	async getCookieInfo(refreshToken) {
-		const { data: data$1 } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`);
+		const { data: data$1 } = await this.client.get(`${GET_COOKIES_INFO}?csrf=${refreshToken}`).catch((e$1) => {
+			this.logger.info(e$1.message);
+			return null;
+		});
 		return data$1;
 	}
 	async getUserInfo(mid) {
@@ -95023,7 +95047,7 @@ var BiliAPI = class extends Service {
 		};
 		try {
 			const { data: data$1 } = await this.getCookieInfo(refreshToken);
-			if (!data$1.refresh) return;
+			if (!data$1?.refresh) return;
 		} catch (_$2) {
 			if (times$1 >= 1) this.ctx.setTimeout(() => {
 				this.checkIfTokenNeedRefresh(refreshToken, csrf, times$1 - 1);

package/package.json

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

package/readme.md

@@ -301,6 +301,7 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 
 > [!CAUTION]
 > - ver 3.2.9-alpha.0 新增：弹幕词云； 不建议更新，目前仅做测试用！
+> - ver 3.2.9-alpha.1 修复：弹幕词云显示问题，弹幕过多导致插件爆炸； 不建议更新，目前仅做测试用！
 
 
 ## 交流群