koishi-plugin-bilibili-notify 3.0.0-alpha.2 → 3.0.0-alpha.4

package/lib/biliAPI.js

@@ -298,6 +298,7 @@ class BiliAPI extends koishi_1.Service {
             return data;
         }
         catch (e) {
+            console.warn(e);
             throw new Error('网络异常，本次请求失败！');
         }
     }

package/lib/comRegister.js

@@ -583,6 +583,14 @@ class ComRegister {
         }
         // 检查登录数据库是否有数据
         this.loginDBData = (await this.ctx.database.get('loginBili', 1, ['dynamic_group_id']))[0];
+        // 判断登录信息是否已加载完毕
+        await this.checkIfLoginInfoIsLoaded();
+        // 如果未登录，则直接返回
+        if (!(await this.checkIfIsLogin())) {
+            // log
+            this.logger.info(`账号未登录，请登录`);
+            return;
+        }
         // 从配置获取订阅
         config.sub && await this.loadSubFromConfig(config.sub);
         // 从数据库获取订阅
@@ -1368,7 +1376,7 @@ class ComRegister {
         const temporaryLiveDanmakuArr = [];
         // 处理target
         // 找到频道/群组对应的
-        const newTarget = target.map(channel => {
+        const danmakuPushTargetArr = target.map(channel => {
             const liveDanmakuArr = channel.channelIdArr.filter(channelId => channelId.liveDanmaku);
             return {
                 channelIdArr: liveDanmakuArr,
@@ -1390,7 +1398,7 @@ class ComRegister {
             await this.sendLiveNotifyCard({
                 username: masterInfo.username,
                 userface: masterInfo.userface,
-                target: newTarget,
+                target,
                 data: liveRoomInfo
             }, LiveType.LiveBroadcast, liveMsg);
         };
@@ -1399,7 +1407,7 @@ class ComRegister {
             // 判断数组是否有内容
             if (temporaryLiveDanmakuArr.length > 0) {
                 // 发送消息
-                this.sendMsg(newTarget, temporaryLiveDanmakuArr.join('\n'));
+                this.sendMsg(danmakuPushTargetArr, temporaryLiveDanmakuArr.join('\n'));
                 // 将临时消息数组清空
                 temporaryLiveDanmakuArr.length = 0;
             }
@@ -1451,7 +1459,7 @@ class ComRegister {
                 await this.sendLiveNotifyCard({
                     username: masterInfo.username,
                     userface: masterInfo.userface,
-                    target: newTarget,
+                    target,
                     data: liveRoomInfo
                 }, LiveType.StopBroadcast, liveEndMsg);
             },
@@ -1473,7 +1481,7 @@ class ComRegister {
                 await this.sendLiveNotifyCard({
                     username: masterInfo.username,
                     userface: masterInfo.userface,
-                    target: newTarget,
+                    target,
                     data: liveRoomInfo
                 }, LiveType.StartBroadcasting, liveEndMsg);
             }
@@ -1494,7 +1502,7 @@ class ComRegister {
                 await this.sendLiveNotifyCard({
                     username: masterInfo.username,
                     userface: masterInfo.userface,
-                    target: newTarget,
+                    target,
                     data: liveRoomInfo
                 }, LiveType.LiveBroadcast, liveMsg);
             }
@@ -1683,7 +1691,7 @@ class ComRegister {
                         break;
                     }
                     catch (e) {
-                        this.logger.error('getSubFromDatabase() getUserInfo() 发生了错误，错误为：' + e.message);
+                        this.logger.error('loadSubFromConfig() getUserInfo() 发生了错误，错误为：' + e.message);
                         if (i === attempts - 1) { // 已尝试三次
                             // 发送私聊消息并重启服务
                             return await this.sendPrivateMsgAndStopService();
@@ -1723,17 +1731,6 @@ class ComRegister {
         }
     }
     async loadSubFromDatabase() {
-        // 判断登录信息是否已加载完毕
-        await this.checkIfLoginInfoIsLoaded();
-        // 如果未登录，则直接返回
-        if (!(await this.checkIfIsLogin())) {
-            // log
-            this.logger.info(`账号未登录，请登录`);
-            return;
-        }
-        // 已存在订阅管理对象，不再进行订阅操作
-        if (this.subManager.length !== 0)
-            return;
         // 从数据库中获取数据
         const subData = await this.ctx.database.get('bilibili', { id: { $gt: 0 } });
         // 定义变量：订阅直播数

package/package.json

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

package/readme.md

@@ -214,6 +214,8 @@
 - ver 3.0.0-alpha.0 重构：直播  新增：直播弹幕推送到群
 - ver 3.0.0-alpha.1 测试版本
 - ver 3.0.0-alpha.2 修复：只订阅直播也会将该UP主的动态进行推送、推送过的动态过一段时间又会再次推送
+- ver 3.0.0-alpha.3 修复：未开启弹幕推送也不会推送直播通知卡片
+- ver 3.0.0-alpha.4 修复：使用了手动订阅，数据库中的订阅不会加载
 
 ## 交流群