koishi-plugin-bilibili-notify 2.0.0-alpha.15 → 2.0.0-alpha.17

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.d.ts

@@ -3,6 +3,8 @@ import { Notifier } from "@koishijs/plugin-notifier";
 import { LoginBili } from "./database";
 type ChannelIdArr = Array<{
     channelId: string;
+    dynamic: boolean;
+    live: boolean;
     atAll: boolean;
 }>;
 type TargetItem = {
@@ -69,7 +71,15 @@ declare namespace ComRegister {
             uid: string;
             dynamic: boolean;
             live: boolean;
-            target: string;
+            target: Array<{
+                channelIdArr: Array<{
+                    channelId: string;
+                    dynamic: boolean;
+                    live: boolean;
+                    atAll: boolean;
+                }>;
+                platform: string;
+            }>;
         }>;
         master: {
             enable: boolean;

package/lib/comRegister.js

@@ -276,6 +276,8 @@ class ComRegister {
                 groupId.forEach(group => {
                     channelIdArr.push({
                         channelId: group,
+                        dynamic: true,
+                        live: true,
                         atAll: options.atAll
                     });
                 });
@@ -291,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
@@ -335,7 +337,7 @@ class ComRegister {
                                 // 判断targetArr是否为空
                                 if (target.length === 0) {
                                     // 为空则默认为当前环境
-                                    target = [{ channelIdArr: [{ channelId: session.event.channel.id, 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('没有满足条件的群组或频道，默认订阅到当前聊天环境');
                                 }
@@ -346,7 +348,7 @@ class ComRegister {
                         }
                         else {
                             // 未填写群号或频道号，默认为当前环境
-                            target = [{ channelIdArr: [{ channelId: session.event.channel.id, 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('没有填写群号或频道号，默认订阅到当前聊天环境');
                         }
@@ -354,7 +356,7 @@ class ComRegister {
                 }
                 else {
                     // 用户直接订阅，将当前环境赋值给target
-                    target = [{ channelIdArr: [{ channelId: session.event.channel.id, 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 }];
                 }
             }
             // 定义外围变量                
@@ -587,7 +589,7 @@ class ComRegister {
             const channelIdArr = idStr.split(',').map(id => {
                 const atAll = /@$/.test(id); // 使用正则表达式检查 id 是否以 @ 结尾
                 const channelId = atAll ? id.slice(0, -1) : id; // 去除末尾的 @
-                return { channelId, atAll };
+                return { channelId, dynamic: true, live: true, atAll };
             });
             return { channelIdArr, platform };
         });
@@ -658,22 +660,33 @@ class ComRegister {
             if (target.channelIdArr[0].channelId === 'all') {
                 // 获取所有guild
                 for (const guild of (await bot.getGuildList()).data) {
-                    sendArr.push({ channelId: guild.id, atAll: target.channelIdArr[0].atAll });
+                    sendArr.push({
+                        channelId: guild.id,
+                        dynamic: target.channelIdArr[0].dynamic,
+                        live: target.channelIdArr[0].live,
+                        atAll: target.channelIdArr[0].atAll
+                    });
                 }
             }
             else {
                 sendArr = target.channelIdArr;
             }
-            // 循环给每个群组发送
+            // 判断是否是直播推送，如果是则需要进一步判断是否需要艾特群体成员
             if (live) {
-                // 直播推送，需要判断是否为
+                // 直播开播推送，判断是否需要艾特全体成员
                 for (const channel of sendArr) {
-                    await this.sendMsgFunc(bot, channel.channelId, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [content, channel.atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" })] }));
+                    // 判断是否需要推送直播消息
+                    if (channel.live) {
+                        await this.sendMsgFunc(bot, channel.channelId, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [content, channel.atAll && (0, jsx_runtime_1.jsx)("at", { type: "all" })] }));
+                    }
                 }
             }
             else {
                 for (const channel of sendArr) {
-                    await this.sendMsgFunc(bot, channel.channelId, content);
+                    // 判断是否需要推送动态消息和直播消息
+                    if (channel.dynamic || channel.live) {
+                        await this.sendMsgFunc(bot, channel.channelId, content);
+                    }
                 }
             }
         }
@@ -1405,8 +1418,6 @@ class ComRegister {
     }
     async loadSubFromConfig(ctx, subs) {
         for (const sub of subs) {
-            // 整理target
-            const target = this.splitMultiPlatformStr(sub.target);
             // 定义Data
             let data;
             // 定义直播销毁函数
@@ -1445,7 +1456,7 @@ class ComRegister {
                 if (sub.live) {
                     // 订阅直播
                     liveDispose = ctx.setInterval(() => {
-                        this.liveDetect(ctx, data.live_room.room_id, target);
+                        this.liveDetect(ctx, data.live_room.room_id, sub.target);
                     }, this.config.liveLoopTime * 1000);
                 }
             }
@@ -1459,7 +1470,7 @@ class ComRegister {
                 id: +sub.uid,
                 uid: sub.uid,
                 roomId: sub.live ? data.live_room.roomid : '',
-                target,
+                target: sub.target,
                 platform: '',
                 live: sub.live,
                 dynamic: sub.dynamic,
@@ -1736,12 +1747,19 @@ class ComRegister {
 (function (ComRegister) {
     ComRegister.Config = koishi_1.Schema.object({
         sub: koishi_1.Schema.array(koishi_1.Schema.object({
-            uid: koishi_1.Schema.string(),
-            roomid: koishi_1.Schema.string(),
-            dynamic: koishi_1.Schema.boolean(),
-            live: koishi_1.Schema.boolean(),
-            target: koishi_1.Schema.string(),
-        })),
+            uid: koishi_1.Schema.string().description('订阅用户UID'),
+            dynamic: koishi_1.Schema.boolean().description('是否订阅用户动态'),
+            live: koishi_1.Schema.boolean().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('该频道/群组是否推送直播通知'),
+                    atAll: koishi_1.Schema.boolean().description('推送开播通知时是否艾特全体成员')
+                })).description('频道/群组信息'),
+                platform: koishi_1.Schema.string().description('推送平台')
+            })).description('订阅用户需要发送的频道/群组信息')
+        })).role('table').description('手动输入订阅信息，方便自定义订阅内容，这里的订阅内容不会存入数据库。uid: 订阅用户UID，dynamic: 是否需要订阅动态，live: 是否需要订阅直播'),
         master: koishi_1.Schema.object({
             enable: koishi_1.Schema.boolean(),
             platform: koishi_1.Schema.string(),

package/lib/index.d.ts

@@ -20,7 +20,15 @@ export interface Config {
         uid: string;
         dynamic: boolean;
         live: boolean;
-        target: string;
+        target: Array<{
+            channelIdArr: Array<{
+                channelId: string;
+                dynamic: boolean;
+                live: boolean;
+                atAll: boolean;
+            }>;
+            platform: string;
+        }>;
     }>;
     dynamic: {};
     dynamicUrl: boolean;

package/lib/index.js

@@ -95,11 +95,19 @@ 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(),
-        dynamic: koishi_1.Schema.boolean(),
-        live: koishi_1.Schema.boolean(),
-        target: koishi_1.Schema.string()
-    })).role('table').description('手动输入订阅信息，方便自定义订阅内容，这里的订阅内容不会存入数据库。uid: 订阅用户UID，dynamic: 是否需要订阅动态，live: 是否需要订阅直播，target：推送目标群组/频道号，若有多个请用逗号分隔'),
+        uid: koishi_1.Schema.string().description('订阅用户UID'),
+        dynamic: koishi_1.Schema.boolean().description('是否订阅用户动态'),
+        live: koishi_1.Schema.boolean().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('该频道/群组是否推送直播通知'),
+                atAll: koishi_1.Schema.boolean().description('推送开播通知时是否艾特全体成员')
+            })).description('频道/群组信息'),
+            platform: koishi_1.Schema.string().description('推送平台')
+        })).description('订阅用户需要发送的频道/群组信息')
+    })).role('table').description('手动输入订阅信息，方便自定义订阅内容，这里的订阅内容不会存入数据库。uid: 订阅用户UID，dynamic: 是否需要订阅动态，live: 是否需要订阅直播'),
     dynamic: koishi_1.Schema.object({}).description('动态推送设置'),
     dynamicUrl: koishi_1.Schema.boolean()
         .default(false)

package/package.json

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

package/readme.md

@@ -202,6 +202,8 @@
 - ver 2.0.0-alpha.13 修复：无法对TG群组的特殊频道号进行订阅处理；提示 `您未配置对应平台的机器人，不能在该平台进行订阅操作` 仍进行订阅操作
 - 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 修复：直接订阅当前环境不会推送
 
 ## 交流群