koishi-plugin-bilibili-notify 3.0.0-alpha.21 → 3.0.0-alpha.23

package/lib/biliAPI.d.ts

@@ -26,21 +26,7 @@ declare class BiliAPI extends Service {
     }): Promise<string>;
     encrypt(text: string): string;
     decrypt(text: string): string;
-    getTheUserWhoIsLiveStreaming(): Promise<{
-        count: number;
-        group: string;
-        items: [
-            {
-                face: string;
-                is_reserve_recall: boolean;
-                jump_url: string;
-                mid: number;
-                room_id: number;
-                title: string;
-                uname: string;
-            }
-        ];
-    }>;
+    getTheUserWhoIsLiveStreaming(): Promise<any>;
     getLiveRoomInfoStreamKey(roomId: string): Promise<any>;
     getServerUTCTime(): Promise<number>;
     getTimeNow(): Promise<any>;

package/lib/biliAPI.js

@@ -120,9 +120,9 @@ class BiliAPI extends koishi_1.Service {
     // BA API
     async getTheUserWhoIsLiveStreaming() {
         // 获取直播间信息流密钥
-        const { data: { live_users }, } = await this.client.get(GET_LATEST_UPDATED_UPS);
+        const { data } = await this.client.get(GET_LATEST_UPDATED_UPS);
         // 返回data
-        return live_users;
+        return data;
     }
     async getLiveRoomInfoStreamKey(roomId) {
         // 获取直播间信息流密钥

package/lib/blive.js

@@ -33,7 +33,7 @@ class BLive extends koishi_1.Service {
             },
         });
         // logger
-        this.logger.info(`${roomId}直播间弹幕监听已开启`);
+        this.logger.info(`${roomId}直播间监听已开启`);
     }
     closeListener(roomId) {
         // 判断直播间监听器是否关闭

package/lib/comRegister.js

@@ -213,6 +213,40 @@ class ComRegister {
             // 发送提示
             await session.send("已发送消息，如未收到则说明您的机器人不支持发送私聊消息或您的信息填写有误");
         });
+        biliCom
+            .subcommand(".ll")
+            .usage("展示当前正在直播的订阅对象")
+            .example("bili ll")
+            .action(async () => {
+            // 获取liveUsers
+            const { data: { live_users }, } = (await ctx.ba.getTheUserWhoIsLiveStreaming());
+            // 定义当前正在直播且订阅的UP主列表
+            const subLiveUsers = [];
+            // 获取当前订阅的UP主
+            for (const sub of this.subManager) {
+                // 定义开播标志位
+                let onLive = false;
+                // 遍历liveUsers
+                for (const user of live_users.items) {
+                    // 判断是否是订阅直播的UP
+                    if (user.mid.toString() === sub.uid && sub.live) {
+                        // 设置标志位为true
+                        onLive = true;
+                        // break
+                        break;
+                    }
+                }
+                // 判断是否未开播
+                subLiveUsers.push({ uid: Number.parseInt(sub.uid), uname: sub.uname, onLive });
+            }
+            // 定义table字符串
+            let table = "";
+            // 遍历liveUsers
+            for (const user of subLiveUsers) {
+                table += `[UID:${user.uid}] 「${user.uname}」 ${user.onLive ? '正在直播' : '未开播'}\n`;
+            }
+            return table;
+        });
     }
     async init(config) {
         // 设置logger
@@ -1372,6 +1406,7 @@ class ComRegister {
             this.subManager.push({
                 id: +sub.uid,
                 uid: sub.uid,
+                uname: data.name,
                 roomId: sub.live ? data.live_room.roomid : "",
                 target: sub.target,
                 platform: "",

package/lib/index.js

@@ -154,7 +154,7 @@ class ServerManager extends koishi_1.Service {
                 hideDesc: globalConfig.hideDesc,
                 enableLargeFont: globalConfig.enableLargeFont,
                 font: globalConfig.font,
-                followerDisplay: globalConfig.followerDisplay
+                followerDisplay: globalConfig.followerDisplay,
             });
             // CR = ComRegister
             const cr = this.ctx.plugin(comRegister_1.default, {
@@ -303,17 +303,30 @@ exports.Config = koishi_1.Schema.object({
         dynamic: koishi_1.Schema.boolean().default(false).description("是否订阅用户动态"),
         live: koishi_1.Schema.boolean().default(false).description("是否订阅用户直播"),
         target: koishi_1.Schema.array(koishi_1.Schema.object({
+            platform: koishi_1.Schema.string()
+                .required()
+                .description("推送平台，例如onebot、qq、discord"),
             channelIdArr: koishi_1.Schema.array(koishi_1.Schema.object({
                 channelId: koishi_1.Schema.string().required().description("频道/群组号"),
-                dynamic: koishi_1.Schema.boolean().default(false).description("该频道/群组是否推送动态信息"),
-                live: koishi_1.Schema.boolean().default(false).description("该频道/群组是否推送直播通知"),
-                liveGuardBuy: koishi_1.Schema.boolean().default(false).description("该频道/群组是否推送上舰消息"),
-                atAll: koishi_1.Schema.boolean().default(false).description("推送开播通知时是否艾特全体成员"),
-            })).description("需推送的频道/群组详细设置"),
-            platform: koishi_1.Schema.string().required().description("推送平台，例如onebot、qq、discord"),
+                dynamic: koishi_1.Schema.boolean()
+                    .default(false)
+                    .description("该频道/群组是否推送动态信息"),
+                live: koishi_1.Schema.boolean()
+                    .default(false)
+                    .description("该频道/群组是否推送直播通知"),
+                liveGuardBuy: koishi_1.Schema.boolean()
+                    .default(false)
+                    .description("该频道/群组是否推送上舰消息"),
+                atAll: koishi_1.Schema.boolean()
+                    .default(false)
+                    .description("推送开播通知时是否艾特全体成员"),
+            }))
+                .role("table")
+                .required()
+                .description("需推送的频道/群组详细设置"),
         })).description("订阅用户需要发送的平台和频道/群组信息(一个平台下可以推送多个频道/群组)"),
-    }))
-        .role("table")
+    }).collapse())
+        .collapse()
         .description("输入订阅信息，自定义订阅内容； uid: 订阅用户UID，dynamic: 是否需要订阅动态，live: 是否需要订阅直播"),
     dynamic: koishi_1.Schema.object({}).description("动态推送设置"),
     dynamicUrl: koishi_1.Schema.boolean()

package/lib/type/index.d.ts

@@ -20,6 +20,7 @@ export type Target = Array<TargetItem>;
 export type SubItem = {
     id: number;
     uid: string;
+    uname: string;
     roomId: string;
     target: Target;
     platform: string;
@@ -35,3 +36,17 @@ export type MasterInfo = {
     liveEndFollowerNum: number;
     liveFollowerChange: number;
 };
+export type LiveUsersItem = {
+    face: string;
+    is_reserve_recall: boolean;
+    jump_url: string;
+    mid: number;
+    room_id: number;
+    title: string;
+    uname: string;
+};
+export type LiveUsers = {
+    count: number;
+    group: string;
+    items: Array<LiveUsersItem>;
+};

package/package.json

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

package/readme.md

@@ -59,6 +59,10 @@
 
 - 使用指令 `bili list`
 
+查看目前订阅直播的UP主们的直播情况：
+
+- 使用指令 `bili ll`
+
 插件的启动、停止和重启
 
 - 使用指令 `sys`
@@ -201,6 +205,8 @@
 - ver 3.0.0-alpha.19 修复：开播提示语粉丝数单位错误； 优化：订阅配置中所有配置项改为必填项
 - ver 3.0.0-alpha.20 优化：订阅配置中开关选项默认为关闭
 - ver 3.0.0-alpha.21 优化：部分代码； 新增：更新插件后，由于机器人还未启动，已开始发送消息报错 `this._request is not a function` ，新增报错后自动重新发送消息的功能
+- ver 3.0.0-alpha.22 优化：订阅配置展示优化
+- ver 3.0.0-alpha.23 新增：指令 `bili ll` 可以查看当前订阅直播的UP主们的开播情况
 
 ## 交流群