koishi-plugin-bilibili-notify 2.0.0-alpha.5 → 2.0.0-alpha.6

package/lib/comRegister.d.ts

@@ -44,7 +44,7 @@ declare class ComRegister {
     }>;
     getSubFromDatabase(ctx: Context): Promise<void>;
     unsubSingle(ctx: Context, id: string, type: number): string;
-    checkIfUserThatIsSubDynAndUnsub(): void;
+    checkIfUserIsTheLastOneWhoSubDyn(): void;
     unsubAll(ctx: Context, uid: string): void;
     checkIfIsLogin(ctx: Context): Promise<boolean>;
 }

package/lib/comRegister.js

@@ -1012,7 +1012,7 @@ class ComRegister {
         // 相当于锁的作用，防止上一个循环没处理完
         let flag = true;
         // 定义发送直播通知卡片方法
-        const sendLiveNotifyCard = async (data, liveType, liveStartMsg, atAll) => {
+        const sendLiveNotifyCard = async (data, liveType, liveNotifyMsg, atAll) => {
             // 定义变量
             let pic;
             let buffer;
@@ -1039,11 +1039,11 @@ class ComRegister {
             // 推送直播信息
             // pic 存在，使用的是render模式
             if (pic) {
-                const msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg] });
+                const msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveNotifyMsg && liveNotifyMsg] });
                 return await this.sendMsg(ctx, guildId, pic + msg, platform);
             }
             // pic不存在，说明使用的是page模式
-            const msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveStartMsg && liveStartMsg] });
+            const msg = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" }), liveNotifyMsg && liveNotifyMsg] });
             await this.sendMsg(ctx, guildId, msg, platform);
         };
         // 定义获取主播信息方法
@@ -1188,10 +1188,10 @@ class ComRegister {
                                     // 到时间重新计时
                                     timer = 0;
                                     // 定义直播中通知消息
-                                    const liveMsg = this.config.customLive
+                                    const liveMsg = this.config.customLive ? this.config.customLive
                                         .replace('-name', username)
                                         .replace('-time', await ctx.gi.getTimeDifference(liveTime))
-                                        .replace('-link', `https://live.bilibili.com/${data.short_id === 0 ? data.room_id : data.short_id}`);
+                                        .replace('-link', `https://live.bilibili.com/${data.short_id === 0 ? data.room_id : data.short_id}`) : '';
                                     // 发送直播通知卡片
                                     sendLiveNotifyCard(data, LiveType.LiveBroadcast, liveMsg);
                                 }
@@ -1530,7 +1530,7 @@ class ComRegister {
             // num--
             this.num--;
             // 判断是否还存在订阅了动态的对象，不存在则停止动态监测
-            this.checkIfUserThatIsSubDynAndUnsub();
+            this.checkIfUserIsTheLastOneWhoSubDyn();
         };
         try {
             switch (type) {
@@ -1575,7 +1575,7 @@ class ComRegister {
                     // 取消订阅
                     this.subManager[index].dynamic = false;
                     // 判断是否还存在订阅了动态的对象，不存在则停止动态监测
-                    this.checkIfUserThatIsSubDynAndUnsub();
+                    this.checkIfUserIsTheLastOneWhoSubDyn();
                     // 如果没有对这个UP的任何订阅，则移除
                     if (checkIfNoSubExist(sub)) {
                         // 从管理对象中移除
@@ -1596,7 +1596,7 @@ class ComRegister {
             this.updateSubNotifier(ctx);
         }
     }
-    checkIfUserThatIsSubDynAndUnsub() {
+    checkIfUserIsTheLastOneWhoSubDyn() {
         if (this.subManager.some(sub => sub.dynamic)) {
             // 停止动态监测
             this.dynamicDispose();
@@ -1609,7 +1609,7 @@ class ComRegister {
             if (sub.live)
                 await this.subManager[i].liveDispose();
             // 判断是否还存在订阅了动态的对象，不存在则停止动态监测
-            this.checkIfUserThatIsSubDynAndUnsub();
+            this.checkIfUserIsTheLastOneWhoSubDyn();
             // 从数据库中删除订阅
             await ctx.database.remove('bilibili', { uid: this.subManager[i].uid });
             // 将该订阅对象从订阅管理对象中移除

package/package.json

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

package/{README.md → readme.md}

@@ -183,6 +183,7 @@
 - ver 2.0.0-alpha.3 修复：订阅和取消订阅的bug，下播通知的bug
 - ver 2.0.0-alpha.4 修复：初次订阅后不推送动态的bug 优化：下播不再发送链接
 - ver 2.0.0-alpha.5 移除：选项pushUrl，选项platform 新增：选项customLive，主人账号中platform选项。支持多平台，且可同时推送不同平台，单个UP主只能推送一个平台
+- ver 2.0.0-alpha.6 修复：直播推送发送失败的bug
 
 ## 交流群