koishi-plugin-bilibili-notify 2.0.0-alpha.16 → 2.0.0-alpha.18

package/lib/biliAPI.d.ts

@@ -26,6 +26,7 @@ declare class BiliAPI extends Service {
     }): Promise<string>;
     encrypt(text: string): string;
     decrypt(text: string): string;
+    getLiveRoomInfoStreamKey(roomId: string): Promise<any>;
     getServerUTCTime(): Promise<number>;
     getTimeNow(): Promise<any>;
     getAllGroup(): Promise<any>;

package/lib/biliAPI.js

@@ -41,6 +41,8 @@ const MODIFY_GROUP_MEMBER = 'https://api.bilibili.com/x/relation/tags/addUsers';
 const GET_ALL_GROUP = 'https://api.bilibili.com/x/relation/tags';
 const COPY_USER_TO_GROUP = 'https://api.bilibili.com/x/relation/tags/copyUsers';
 const GET_RELATION_GROUP_DETAIL = 'https://api.bilibili.com/x/relation/tag';
+// 直播
+const GET_LIVE_ROOM_INFO_STREAM_KEY = 'https://api.live.bilibili.com/xlive/web-room/v1/index/getDanmuInfo';
 class BiliAPI extends koishi_1.Service {
     static inject = ['database', 'notifier'];
     jar;
@@ -103,6 +105,17 @@ class BiliAPI extends koishi_1.Service {
         return decrypted.toString();
     }
     // BA API
+    async getLiveRoomInfoStreamKey(roomId) {
+        try {
+            // 获取直播间信息流密钥
+            const { data } = await this.client.get(`${GET_LIVE_ROOM_INFO_STREAM_KEY}?id=${roomId}`);
+            // 返回data
+            return data;
+        }
+        catch (e) {
+            throw new Error('网络异常，本次请求失败！');
+        }
+    }
     async getServerUTCTime() {
         try {
             const { data } = await this.client.get(GET_SERVER_UTC_TIME);

package/lib/comRegister.js

@@ -293,7 +293,7 @@ class ComRegister {
                     target = this.splitMultiPlatformStr(options.multiplatform);
                 }
                 // 判断是否使用了多平台
-                if (target) {
+                if (target.length > 0) {
                     for (const [index, { channelIdArr, platform }] of target.entries()) {
                         if (channelIdArr.length > 0) { // 输入了推送群号或频道号
                             // 拿到对应的bot
@@ -337,7 +337,7 @@ class ComRegister {
                                 // 判断targetArr是否为空
                                 if (target.length === 0) {
                                     // 为空则默认为当前环境
-                                    target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, atAll: options.atAll }], platform: session.event.platform }];
+                                    target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, atAll: options.atAll ? options.atAll : false }], platform: session.event.platform }];
                                     // 没有满足条件的群组或频道
                                     await session.send('没有满足条件的群组或频道，默认订阅到当前聊天环境');
                                 }
@@ -348,7 +348,7 @@ class ComRegister {
                         }
                         else {
                             // 未填写群号或频道号，默认为当前环境
-                            target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, atAll: options.atAll }], platform: session.event.platform }];
+                            target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, atAll: options.atAll ? options.atAll : false }], platform: session.event.platform }];
                             // 发送提示消息
                             await session.send('没有填写群号或频道号，默认订阅到当前聊天环境');
                         }
@@ -356,7 +356,7 @@ class ComRegister {
                 }
                 else {
                     // 用户直接订阅，将当前环境赋值给target
-                    target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, atAll: options.atAll }], platform: session.event.platform }];
+                    target = [{ channelIdArr: [{ channelId: session.event.channel.id, dynamic: true, live: true, atAll: options.atAll ? options.atAll : false }], platform: session.event.platform }];
                 }
             }
             // 定义外围变量                
@@ -1165,9 +1165,14 @@ class ComRegister {
                     if (data.live_status === 1) { // 当前正在直播
                         // 设置开播时间
                         liveTime = data.live_time;
+                        // 设置直播中消息
+                        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}`) : '';
                         // 发送直播通知卡片
                         if (this.config.restartPush)
-                            sendLiveNotifyCard(data, LiveType.LiveBroadcast);
+                            sendLiveNotifyCard(data, LiveType.LiveBroadcast, liveMsg);
                         // 改变开播状态
                         open = true;
                     } // 未开播，直接返回
@@ -1218,7 +1223,7 @@ class ComRegister {
                                     }
                                 }
                             }
-                            // 定义开播通知语
+                            // 定义开播通知语                            
                             const liveStartMsg = this.config.customLiveStart
                                 .replace('-name', username)
                                 .replace('-time', await ctx.gi.getTimeDifference(liveTime))
@@ -1455,9 +1460,7 @@ class ComRegister {
                 // 判断是否订阅直播
                 if (sub.live) {
                     // 订阅直播
-                    liveDispose = ctx.setInterval(() => {
-                        this.liveDetect(ctx, data.live_room.room_id, sub.target);
-                    }, this.config.liveLoopTime * 1000);
+                    liveDispose = ctx.setInterval(this.liveDetect(ctx, data.live_room.roomid, sub.target), this.config.liveLoopTime * 1000);
                 }
             }
             // 在B站中订阅该对象

package/lib/index.js

@@ -314,6 +314,7 @@ class ServerManager extends koishi_1.Service {
                 restartPush: globalConfig.restartPush,
                 pushTime: globalConfig.pushTime,
                 customLiveStart: globalConfig.customLiveStart,
+                customLive: globalConfig.customLive,
                 customLiveEnd: globalConfig.customLiveEnd,
                 dynamicCheckNumber: globalConfig.dynamicCheckNumber,
                 dynamicLoopTime: this.dynamicLoopTime,

package/package.json

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

package/readme.md

@@ -203,6 +203,8 @@
 - ver 2.0.0-alpha.14 修复：订阅TG群组时提示输入无效
 - ver 2.0.0-alpha.15 新增：手动订阅功能  修复：一些潜在的bug
 - ver 2.0.0-alpha.16 优化：手动订阅功能
+- ver 2.0.0-alpha.17 修复：直接订阅当前环境不会推送
+- ver 2.0.0-alpha.18 修复：手动订阅无法推送直播通知；自定义直播中通知语不会发送
 
 ## 交流群