koishi-plugin-bilibili-notify 3.0.0-alpha.18 → 3.0.0-alpha.19

package/lib/comRegister.d.ts

@@ -21,6 +21,7 @@ declare class ComRegister {
     constructor(ctx: Context, config: ComRegister.Config);
     init(config: ComRegister.Config): Promise<void>;
     getBot(pf: string): Bot<Context, any>;
+    test_wordCloud(): Promise<void>;
     sendPrivateMsg(content: string): Promise<void>;
     sendPrivateMsgAndRebootService(): Promise<void>;
     sendPrivateMsgAndStopService(): Promise<void>;

package/lib/comRegister.js

@@ -4,13 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("@satorijs/element/jsx-runtime");
+// Koishi核心依赖
 const koishi_1 = require("koishi");
-// 导入qrcode
+// 外部依赖：qrcode
 const qrcode_1 = __importDefault(require("qrcode"));
+// Types
 const type_1 = require("./type");
-// 弹幕词云
-// TODO:WorlCloud
-// import { Segment } from "segmentit";
 class ComRegister {
     // 必须服务
     static inject = ["ba", "gi", "database", "bl", "sm"];
@@ -284,8 +283,33 @@ class ComRegister {
         this.checkIfDynamicDetectIsNeeded();
         // 在控制台中显示订阅对象
         this.updateSubNotifier();
-        /* // Test
-        const testTarget: Target = [
+    }
+    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+    getBot(pf) {
+        return this.ctx.bots.find((bot) => bot.platform === pf);
+    }
+    // TODO:WordCloud
+    async test_wordCloud() {
+        /* const currentLiveDanmakuArr = []
+        // 定义获取弹幕权重Record函数
+        const getDanmakuWeightRecord = (): Record<string, number> => {
+            // 创建segmentit
+            const segmentit = useDefault(new Segment());
+            // 创建Record
+            const danmakuWeightRecord: Record<string, number> = {};
+            // 循环遍历currentLiveDanmakuArr
+            for (const danmaku of currentLiveDanmakuArr) {
+                // 遍历结果
+                segmentit.doSegment(danmaku).map((word: { w: string; p: number }) => {
+                    // 定义权重
+                    danmakuWeightRecord[word.w] = (danmakuWeightRecord[word.w] || 0) + 1;
+                });
+            }
+            // 返回Record
+            return danmakuWeightRecord;
+        }; */
+        // Test
+        const testTarget = [
             {
                 channelIdArr: [
                     {
@@ -299,13 +323,6 @@ class ComRegister {
                 platform: "qqguild",
             },
         ];
-
-        const buffer = await this.ctx.gi.generateWordCloudImg();
-        this.sendMsg(testTarget, h.image(buffer, "image/png")); */
-    }
-    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-    getBot(pf) {
-        return this.ctx.bots.find((bot) => bot.platform === pf);
     }
     async sendPrivateMsg(content) {
         if (this.config.master.enable) {
@@ -911,24 +928,6 @@ class ComRegister {
         }
         return content.data;
     }
-    // TODO:WordCloud
-    /* // 定义获取弹幕权重Record函数
-        const getDanmakuWeightRecord = (): Record<string, number> => {
-            // 创建segmentit
-            const segmentit = useDefault(new Segment());
-            // 创建Record
-            const danmakuWeightRecord: Record<string, number> = {};
-            // 循环遍历currentLiveDanmakuArr
-            for (const danmaku of currentLiveDanmakuArr) {
-                // 遍历结果
-                segmentit.doSegment(danmaku).map((word: { w: string; p: number }) => {
-                    // 定义权重
-                    danmakuWeightRecord[word.w] = (danmakuWeightRecord[word.w] || 0) + 1;
-                });
-            }
-            // 返回Record
-            return danmakuWeightRecord;
-        }; */
     async liveDetectWithListener(roomId, target) {
         // 定义开播时间
         let liveTime;
@@ -1049,7 +1048,9 @@ class ComRegister {
                 // 设置开播时间
                 liveTime = liveRoomInfo.live_time;
                 // 获取当前粉丝数
-                const follower = masterInfo.liveOpenFollowerNum >= 10_000 ? `${masterInfo.liveOpenFollowerNum.toFixed(1)}万` : masterInfo.liveOpenFollowerNum.toString();
+                const follower = masterInfo.liveOpenFollowerNum >= 10_000
+                    ? `${(masterInfo.liveOpenFollowerNum / 10000).toFixed(1)}万`
+                    : masterInfo.liveOpenFollowerNum.toString();
                 // 定义开播通知语
                 const liveStartMsg = this.config.customLiveStart
                     ? this.config.customLiveStart
@@ -1088,10 +1089,14 @@ class ComRegister {
                     // 判断是否大于0
                     if (liveFollowerChangeNum > 0) {
                         // 大于0则加+
-                        return liveFollowerChangeNum >= 10_000 ? `+${liveFollowerChangeNum.toFixed(1)}万` : `+${liveFollowerChangeNum}`;
+                        return liveFollowerChangeNum >= 10_000
+                            ? `+${liveFollowerChangeNum.toFixed(1)}万`
+                            : `+${liveFollowerChangeNum}`;
                     }
                     // 小于0
-                    return liveFollowerChangeNum <= -10_000 ? `${liveFollowerChangeNum.toFixed(1)}万` : liveFollowerChangeNum.toString();
+                    return liveFollowerChangeNum <= -10_000
+                        ? `${liveFollowerChangeNum.toFixed(1)}万`
+                        : liveFollowerChangeNum.toString();
                 })();
                 // 定义下播播通知语
                 const liveEndMsg = this.config.customLiveEnd

package/lib/generateImg.d.ts

@@ -24,7 +24,6 @@ declare class GenerateImg extends Service {
         link: string;
         buffer?: undefined;
     }>;
-    generateWordCloudImg(): Promise<Buffer<ArrayBufferLike>>;
     getLiveStatus(time: string, liveStatus: number): Promise<[string, string, boolean]>;
     getTimeDifference(dateString: string): Promise<string>;
     unixTimestampToString(timestamp: number): string;

package/lib/generateImg.js

@@ -1429,35 +1429,6 @@ class GenerateImg extends koishi_1.Service {
             }
         }
     }
-    async generateWordCloudImg() {
-        const page = await this.ctx.puppeteer.page();
-        // 创建HTML内容
-        const htmlContent = /* html */ `
-            <!DOCTYPE html>
-            <html>
-                <head>
-                <script src="https://cdn.jsdelivr.net/npm/echarts@5.4.0/dist/echarts.min.js"></script>
-                </head>
-                <body>
-                <div id="chart" style="width:800px;height:600px;"></div>
-                <script>
-                    const chart = echarts.init(document.getElementById('chart'));
-                    chart.setOption({
-                    title: { text: 'Node.js ECharts示例' },
-                    tooltip: {},
-                    xAxis: { data: ['A', 'B', 'C', 'D', 'E'] },
-                    yAxis: {},
-                    series: [{ name: '数据', type: 'bar', data: [5, 20, 36, 10, 15] }]
-                    });
-                </script>
-                </body>
-            </html>
-        `;
-        // 加载HTML并截图
-        await page.setContent(htmlContent);
-        const buffer = await page.screenshot({ path: "output.png" });
-        return buffer;
-    }
     async getLiveStatus(time, liveStatus) {
         let titleStatus;
         let liveTime;

package/lib/index.js

@@ -237,7 +237,7 @@ function apply(ctx, config) {
     });
     ctx.notifier.create({
         type: "warning",
-        content: "请使用Auth插件创建超级管理员账号，没有权限将无法使用该插件提供的指令。",
+        content: "请使用Auth插件创建超级管理员账号，没有权限将无法使用该插件提供的指令",
     });
     // load database
     ctx.plugin(Database);
@@ -302,18 +302,18 @@ exports.Config = koishi_1.Schema.object({
         .description("设置请求头User-Agen，请求出现-352时可以尝试修改，UA获取方法可参考：https://blog.csdn.net/qq_44503987/article/details/104929111"),
     subTitle: koishi_1.Schema.object({}).description("订阅配置"),
     sub: koishi_1.Schema.array(koishi_1.Schema.object({
-        uid: koishi_1.Schema.string().description("订阅用户UID"),
-        dynamic: koishi_1.Schema.boolean().description("是否订阅用户动态"),
-        live: koishi_1.Schema.boolean().description("是否订阅用户直播"),
+        uid: koishi_1.Schema.string().required().description("订阅用户UID"),
+        dynamic: koishi_1.Schema.boolean().required().description("是否订阅用户动态"),
+        live: koishi_1.Schema.boolean().required().description("是否订阅用户直播"),
         target: koishi_1.Schema.array(koishi_1.Schema.object({
             channelIdArr: koishi_1.Schema.array(koishi_1.Schema.object({
-                channelId: koishi_1.Schema.string().description("频道/群组号"),
-                dynamic: koishi_1.Schema.boolean().description("该频道/群组是否推送动态信息"),
-                live: koishi_1.Schema.boolean().description("该频道/群组是否推送直播通知"),
-                liveGuardBuy: koishi_1.Schema.boolean().description("该频道/群组是否推送上舰消息"),
-                atAll: koishi_1.Schema.boolean().description("推送开播通知时是否艾特全体成员"),
-            })).description("需推送的频道/群组详细设置"),
-            platform: koishi_1.Schema.string().description("推送平台"),
+                channelId: koishi_1.Schema.string().required().description("频道/群组号"),
+                dynamic: koishi_1.Schema.boolean().required().description("该频道/群组是否推送动态信息"),
+                live: koishi_1.Schema.boolean().required().description("该频道/群组是否推送直播通知"),
+                liveGuardBuy: koishi_1.Schema.boolean().required().description("该频道/群组是否推送上舰消息"),
+                atAll: koishi_1.Schema.boolean().required().description("推送开播通知时是否艾特全体成员"),
+            })).required().description("需推送的频道/群组详细设置"),
+            platform: koishi_1.Schema.string().required().description("推送平台"),
         })).description("订阅用户需要发送的平台和频道/群组信息(一个平台下可以推送多个频道/群组)"),
     }))
         .role("table")

package/package.json

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

package/readme.md

@@ -198,6 +198,7 @@
 - ver 3.0.0-alpha.16 重大更新：订阅不再依赖数据库，从指令订阅全面迁移到配置订阅； 修复：直播时长有误； 优化：`bili show` 指令更改为 `bili list`
 - ver 3.0.0-alpha.17 新增：更多的提示语变量，开播，当前粉丝数。正在直播，累计观看人数。下播，粉丝数变化。选项，新增的提示语变量是否展示到推送卡片中
 - ver 3.0.0-alpha.18 移除：直播检测API模式已被废弃； 优化：更多提示语数据显示优化
+- ver 3.0.0-alpha.19 修复：开播提示语粉丝数单位错误； 优化：订阅配置中所有配置项改为必填项
 
 ## 交流群
 
@@ -205,7 +206,9 @@
 
 ## 感谢
 
-感谢 [koishijs](https://github.com/koishijs/koishi) 官方提供的插件开发框架, 以及技术指导
+[koishijs](https://github.com/koishijs/koishi) 感谢官方提供的插件开发框架, 以及技术指导
+[blive-message-listener](https://github.com/ddiu8081/blive-message-listener) 感谢 `ddiu8081` 提供简单方便的B站直播监听依赖
+[bilibili-API-collect](https://github.com/SocialSisterYi/bilibili-API-collect) 感谢 `SocialSisterYi` 提供B站API参考
 
 ## License