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

package/{readme.md → README.md}

@@ -181,6 +181,8 @@
 - ver 2.0.0-alpha.1 修复：无法成功取消订阅自己、用户没有直播间订阅直播出错。对直播订阅进行了限制，继承自以前的unlockSubLimits配置项。优化了一些配置项
 - ver 2.0.0-alpha.2 新增：支持Discord平台。优化了下播通知
 - 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主只能推送一个平台
 
 ## 交流群
 

package/lib/comRegister.d.ts

@@ -22,17 +22,18 @@ declare class ComRegister {
     subNotifier: Notifier;
     subManager: SubManager;
     loginDBData: FlatPick<LoginBili, "dynamic_group_id">;
-    bot: Bot<Context>;
+    privateBot: Bot<Context>;
     dynamicDispose: Function;
-    sendMsgFunc: (guild: string, content: any) => Promise<void>;
+    sendMsgFunc: (bot: Bot<Context, any>, guild: string, content: any) => Promise<void>;
     constructor(ctx: Context, config: ComRegister.Config);
+    getBot(ctx: Context, pf: string): Bot<Context, any>;
     sendPrivateMsg(content: string): Promise<void>;
     sendPrivateMsgAndRebootService(ctx: Context): Promise<void>;
     sendPrivateMsgAndStopService(ctx: Context): Promise<void>;
-    sendMsg(targets: Array<string>, content: any): Promise<void>;
+    sendMsg(ctx: Context, targets: Array<string>, content: any, platform: string): Promise<void>;
     dynamicDetect(ctx: Context): () => Promise<void>;
     debug_dynamicDetect(ctx: Context): () => Promise<void>;
-    liveDetect(ctx: Context, roomId: string, guildId: Array<string>): () => Promise<void>;
+    liveDetect(ctx: Context, roomId: string, guildId: Array<string>, platform: string): () => Promise<void>;
     subShow(): string;
     checkIfNeedSub(liveSub: boolean, dynamicSub: boolean, session: Session, data?: any): Promise<Array<boolean>>;
     updateSubNotifier(ctx: Context): void;
@@ -49,9 +50,9 @@ declare class ComRegister {
 }
 declare namespace ComRegister {
     interface Config {
-        platform: string;
         master: {
             enable: boolean;
+            platform: string;
             masterAccount: string;
             masterAccountGuildId: string;
         };
@@ -60,10 +61,10 @@ declare namespace ComRegister {
         changeMasterInfoApi: boolean;
         liveStartAtAll: boolean;
         restartPush: boolean;
-        pushUrl: boolean;
         pushTime: number;
         liveLoopTime: number;
         customLiveStart: string;
+        customLive: string;
         customLiveEnd: string;
         dynamicUrl: boolean;
         dynamicLoopTime: number;

package/lib/comRegister.js

@@ -29,7 +29,7 @@ class ComRegister {
     // 检查登录数据库是否有数据
     loginDBData;
     // 机器人实例
-    bot;
+    privateBot;
     // 动态销毁函数
     dynamicDispose;
     // 发送消息方式
@@ -38,14 +38,13 @@ class ComRegister {
     constructor(ctx, config) {
         this.logger = ctx.logger('cr');
         this.config = config;
-        // 拿到机器人实例
-        this.bot = ctx.bots.find(bot => bot.platform === config.platform);
-        if (!this.bot) {
+        // 拿到私人机器人实例
+        this.privateBot = ctx.bots.find(bot => bot.platform === config.master.platform);
+        if (!this.privateBot) {
             ctx.notifier.create({
-                type: 'danger',
-                content: '未找到对应机器人实例，请检查配置是否正确或重新配置适配器！'
+                content: '您未配置私人机器人，将无法向您推送机器人状态！'
             });
-            this.logger.error('未找到对应机器人实例，请检查配置是否正确或重新配置适配器！');
+            this.logger.error('您未配置私人机器人，将无法向您推送机器人状态！');
         }
         // 检查登录数据库是否有数据
         ctx.database.get('loginBili', 1, ['dynamic_group_id']).then(data => this.loginDBData = data[0]);
@@ -53,13 +52,13 @@ class ComRegister {
         this.getSubFromDatabase(ctx);
         // 判断消息发送方式
         if (config.automaticResend) {
-            this.sendMsgFunc = async (guild, content) => {
+            this.sendMsgFunc = async (bot, guild, content) => {
                 // 多次尝试发送消息
                 const attempts = 3;
                 for (let i = 0; i < attempts; i++) {
                     try {
                         // 发送消息
-                        await this.bot.sendMessage(guild, content);
+                        await bot.sendMessage(guild, content);
                         // 防止消息发送速度过快被忽略
                         await ctx.sleep(500);
                         // 成功发送消息，跳出循环
@@ -76,10 +75,10 @@ class ComRegister {
             };
         }
         else {
-            this.sendMsgFunc = async (guild, content) => {
+            this.sendMsgFunc = async (bot, guild, content) => {
                 try {
                     // 发送消息
-                    await this.bot.sendMessage(guild, content);
+                    await bot.sendMessage(guild, content);
                 }
                 catch (e) {
                     this.logger.error(`发送群组ID:${guild}消息失败！原因: ` + e.message);
@@ -103,7 +102,7 @@ class ComRegister {
             .usage('查看订阅管理对象')
             .example('status sm')
             .action(async () => {
-            console.log(this.subManager);
+            this.logger.info(this.subManager);
             return '查看控制台';
         });
         const biliCom = ctx.command('bili', 'bili-notify插件相关指令', { permissions: ['authority:3'] });
@@ -282,19 +281,6 @@ class ComRegister {
             if (options.live && !this.config.unlockSubLimits && (this.subManager.reduce((acc, cur) => acc + (cur.live ? 1 : 0), 0) >= 3)) {
                 return '直播订阅已达上限，请取消部分直播订阅后再进行订阅';
             }
-            // 检查是否是不支持的平台
-            switch (session.event.platform) {
-                case 'lark':
-                case 'red':
-                case 'onebot':
-                case 'telegram':
-                case 'satori':
-                case 'chronocat':
-                case 'qq':
-                case 'qqguild':
-                case 'discord': break;
-                default: return '暂不支持该平台';
-            }
             // 检查是否登录
             if (!(await this.checkIfIsLogin(ctx))) {
                 // 未登录直接返回
@@ -303,7 +289,11 @@ class ComRegister {
             // 检查必选参数是否已填
             if (!mid)
                 return '请输入用户uid';
-            // 订阅对象 TODO
+            // 订阅对象
+            const subUserData = await this.subUserInBili(ctx, mid);
+            // 判断是否订阅对象存在
+            if (!subUserData.flag)
+                return '订阅对象失败，请稍后重试！';
             // 定义外围变量                
             let content;
             try {
@@ -390,8 +380,10 @@ class ComRegister {
                         case 'red':
                         case 'satori':
                         case 'chronocat': {
+                            // 获取该会话机器人
+                            const bot = this.getBot(ctx, session.event.platform);
                             // 检查机器人是否加入该群
-                            okGuild = await checkIfGuildHasJoined(this.bot);
+                            okGuild = await checkIfGuildHasJoined(bot);
                             break;
                         }
                         default: {
@@ -509,7 +501,7 @@ class ComRegister {
             if (index === -1)
                 return '请勿直接调用该指令';
             // 开始循环检测
-            const dispose = ctx.setInterval(this.liveDetect(ctx, roomId, guildId), config.liveLoopTime * 1000);
+            const dispose = ctx.setInterval(this.liveDetect(ctx, roomId, guildId, this.subManager[index].platform), config.liveLoopTime * 1000);
             // 保存销毁函数
             this.subManager[index].liveDispose = dispose;
         });
@@ -580,15 +572,18 @@ class ComRegister {
             await session.send('已发送消息，如未收到则说明您的机器人不支持发送私聊消息或您的信息填写有误');
         });
     }
+    getBot(ctx, pf) {
+        return ctx.bots.find(bot => bot.platform === pf);
+    }
     async sendPrivateMsg(content) {
         if (this.config.master.enable) {
             if (this.config.master.masterAccountGuildId) {
                 // 向机器人主人发送消息
-                await this.bot.sendPrivateMessage(this.config.master.masterAccount, content, this.config.master.masterAccountGuildId);
+                await this.privateBot.sendPrivateMessage(this.config.master.masterAccount, content, this.config.master.masterAccountGuildId);
             }
             else {
                 // 向机器人主人发送消息
-                await this.bot.sendPrivateMessage(this.config.master.masterAccount, content);
+                await this.privateBot.sendPrivateMessage(this.config.master.masterAccount, content);
             }
         }
     }
@@ -633,13 +628,15 @@ class ComRegister {
         // 结束
         return;
     }
-    async sendMsg(targets, content) {
+    async sendMsg(ctx, targets, content, platform) {
+        // 获取机器人实例
+        const bot = this.getBot(ctx, platform);
         // 定义需要发送的数组
         let sendArr = [];
         // 判断是否需要推送所有机器人加入的群
         if (targets[0] === 'all') {
             // 获取所有guild
-            for (const guild of (await this.bot.getGuildList()).data) {
+            for (const guild of (await bot.getGuildList()).data) {
                 sendArr.push(guild.id);
             }
         }
@@ -648,7 +645,7 @@ class ComRegister {
         }
         // 循环给每个群组发送
         for (const guild of sendArr) {
-            await this.sendMsgFunc(guild, content);
+            await this.sendMsgFunc(bot, guild, content);
         }
     }
     dynamicDetect(ctx) {
@@ -778,13 +775,13 @@ class ComRegister {
                                     if (e.message === '出现关键词，屏蔽该动态') {
                                         // 如果需要发送才发送
                                         if (this.config.filter.notify) {
-                                            await this.sendMsg(sub.targetIdArr, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                            await this.sendMsg(ctx, sub.targetIdArr, `${upName}发布了一条含有屏蔽关键字的动态`, sub.platform);
                                         }
                                         return;
                                     }
                                     if (e.message === '已屏蔽转发动态') {
                                         if (this.config.filter.notify) {
-                                            await this.sendMsg(sub.targetIdArr, `${upName}发布了一条转发动态，已屏蔽`);
+                                            await this.sendMsg(ctx, sub.targetIdArr, `${upName}发布了一条转发动态，已屏蔽`, sub.platform);
                                         }
                                         return;
                                     }
@@ -802,12 +799,12 @@ class ComRegister {
                             if (pic) {
                                 this.logger.info('推送动态中，使用render模式');
                                 // pic存在，使用的是render模式
-                                await this.sendMsg(sub.targetIdArr, pic + (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: dUrl }));
+                                await this.sendMsg(ctx, sub.targetIdArr, pic + (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: dUrl }), sub.platform);
                             }
                             else if (buffer) {
                                 this.logger.info('推送动态中，使用page模式');
                                 // pic不存在，说明使用的是page模式
-                                await this.sendMsg(sub.targetIdArr, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), dUrl] }));
+                                await this.sendMsg(ctx, sub.targetIdArr, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), dUrl] }), sub.platform);
                             }
                             else {
                                 this.logger.info(items[num].modules.module_author.name + '发布了一条动态，但是推送失败');
@@ -962,13 +959,13 @@ class ComRegister {
                                     if (e.message === '出现关键词，屏蔽该动态') {
                                         // 如果需要发送才发送
                                         if (this.config.filter.notify) {
-                                            await this.sendMsg(sub.targetIdArr, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                            await this.sendMsg(ctx, sub.targetIdArr, `${upName}发布了一条含有屏蔽关键字的动态`, sub.platform);
                                         }
                                         return;
                                     }
                                     if (e.message === '已屏蔽转发动态') {
                                         if (this.config.filter.notify) {
-                                            await this.sendMsg(sub.targetIdArr, `${upName}发布了一条转发动态，已屏蔽`);
+                                            await this.sendMsg(ctx, sub.targetIdArr, `${upName}发布了一条转发动态，已屏蔽`, sub.platform);
                                         }
                                         return;
                                     }
@@ -986,12 +983,12 @@ class ComRegister {
                             if (pic) {
                                 this.logger.info('推送动态中，使用render模式');
                                 // pic存在，使用的是render模式
-                                await this.sendMsg(sub.targetIdArr, pic + (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: dUrl }));
+                                await this.sendMsg(ctx, sub.targetIdArr, pic + (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: dUrl }), sub.platform);
                             }
                             else if (buffer) {
                                 this.logger.info('推送动态中，使用page模式');
                                 // pic不存在，说明使用的是page模式
-                                await this.sendMsg(sub.targetIdArr, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), dUrl] }));
+                                await this.sendMsg(ctx, sub.targetIdArr, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), dUrl] }), sub.platform);
                             }
                             else {
                                 this.logger.info(items[num].modules.module_author.name + '发布了一条动态，但是推送失败');
@@ -1005,7 +1002,7 @@ class ComRegister {
             }
         };
     }
-    liveDetect(ctx, roomId, guildId) {
+    liveDetect(ctx, roomId, guildId, platform) {
         let firstSubscription = true;
         let timer = 0;
         let open = false;
@@ -1015,80 +1012,40 @@ class ComRegister {
         // 相当于锁的作用，防止上一个循环没处理完
         let flag = true;
         // 定义发送直播通知卡片方法
-        let sendLiveNotifyCard;
-        // 判断直播是否需要@全体成员
-        if (this.config.pushUrl) {
-            sendLiveNotifyCard = async (data, liveType, liveStartMsg, atAll) => {
-                // 定义变量
-                let pic;
-                let buffer;
-                // 多次尝试生成图片
-                const attempts = 3;
-                for (let i = 0; i < attempts; i++) {
-                    try {
-                        // 获取直播通知卡片
-                        const { pic: picv, buffer: bufferv } = await ctx.gi.generateLiveImg(data, username, userface, liveType);
-                        // 赋值
-                        pic = picv;
-                        buffer = bufferv;
-                        // 成功则跳出循环
-                        break;
-                    }
-                    catch (e) {
-                        if (i === attempts - 1) { // 已尝试三次
-                            this.logger.error('liveDetect generateLiveImg() 推送卡片生成失败，原因：' + e.message);
-                            // 发送私聊消息并重启服务
-                            return await this.sendPrivateMsgAndStopService(ctx);
-                        }
-                    }
-                }
-                // 推送直播信息
-                // 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, liveType !== LiveType.StartBroadcasting ? `https://live.bilibili.com/${roomId}` : ''] });
-                    return await this.sendMsg(guildId, pic + msg);
+        const sendLiveNotifyCard = async (data, liveType, liveStartMsg, atAll) => {
+            // 定义变量
+            let pic;
+            let buffer;
+            // 多次尝试生成图片
+            const attempts = 3;
+            for (let i = 0; i < attempts; i++) {
+                try {
+                    // 获取直播通知卡片
+                    const { pic: picv, buffer: bufferv } = await ctx.gi.generateLiveImg(data, username, userface, liveType);
+                    // 赋值
+                    pic = picv;
+                    buffer = bufferv;
+                    // 成功则跳出循环
+                    break;
                 }
-                // 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, liveType !== LiveType.StartBroadcasting ? `https://live.bilibili.com/${roomId}` : ''] });
-                await this.sendMsg(guildId, msg);
-            };
-        }
-        else {
-            sendLiveNotifyCard = async (data, liveType, liveStartMsg, atAll) => {
-                // 定义变量
-                let pic;
-                let buffer;
-                // 多次尝试生成图片
-                const attempts = 3;
-                for (let i = 0; i < attempts; i++) {
-                    try {
-                        // 获取直播通知卡片
-                        const { pic: picv, buffer: bufferv } = await ctx.gi.generateLiveImg(data, username, userface, liveType);
-                        // 赋值
-                        pic = picv;
-                        buffer = bufferv;
-                        // 成功则跳出循环
-                        break;
-                    }
-                    catch (e) {
-                        if (i === attempts - 1) { // 已尝试三次
-                            this.logger.error('liveDetect generateLiveImg() 推送卡片生成失败，原因：' + e.message);
-                            // 发送私聊消息并重启服务
-                            return await this.sendPrivateMsgAndStopService(ctx);
-                        }
+                catch (e) {
+                    if (i === attempts - 1) { // 已尝试三次
+                        this.logger.error('liveDetect generateLiveImg() 推送卡片生成失败，原因：' + e.message);
+                        // 发送私聊消息并重启服务
+                        return await this.sendPrivateMsgAndStopService(ctx);
                     }
                 }
-                // 推送直播信息
-                // 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] });
-                    return await this.sendMsg(guildId, pic + msg);
-                }
-                // 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] });
-                await this.sendMsg(guildId, msg);
-            };
-        }
+            }
+            // 推送直播信息
+            // 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] });
+                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] });
+            await this.sendMsg(ctx, guildId, msg, platform);
+        };
         // 定义获取主播信息方法
         let useMasterInfo;
         if (this.config.changeMasterInfoApi) {
@@ -1230,8 +1187,13 @@ class ComRegister {
                                 if (timer >= (6 * 60 * this.config.pushTime)) { // 到时间推送直播消息
                                     // 到时间重新计时
                                     timer = 0;
+                                    // 定义直播中通知消息
+                                    const liveMsg = 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}`);
                                     // 发送直播通知卡片
-                                    sendLiveNotifyCard(data, LiveType.LiveBroadcast);
+                                    sendLiveNotifyCard(data, LiveType.LiveBroadcast, liveMsg);
                                 }
                             }
                             // 否则继续循环
@@ -1533,7 +1495,7 @@ class ComRegister {
                     // 直播订阅数+1
                     liveSubNum++;
                     // 订阅直播，开始循环检测
-                    const dispose = ctx.setInterval(this.liveDetect(ctx, sub.room_id, targetIdArr), this.config.liveLoopTime * 1000);
+                    const dispose = ctx.setInterval(this.liveDetect(ctx, sub.room_id, targetIdArr, sub.platform), this.config.liveLoopTime * 1000);
                     // 保存销毁函数
                     subManagerItem.liveDispose = dispose;
                 }
@@ -1672,9 +1634,9 @@ class ComRegister {
 }
 (function (ComRegister) {
     ComRegister.Config = koishi_1.Schema.object({
-        platform: koishi_1.Schema.string(),
         master: koishi_1.Schema.object({
             enable: koishi_1.Schema.boolean(),
+            platform: koishi_1.Schema.string(),
             masterAccount: koishi_1.Schema.string(),
             masterAccountGuildId: koishi_1.Schema.string()
         }),
@@ -1683,10 +1645,10 @@ class ComRegister {
         changeMasterInfoApi: koishi_1.Schema.boolean().required(),
         liveStartAtAll: koishi_1.Schema.boolean().required(),
         restartPush: koishi_1.Schema.boolean().required(),
-        pushUrl: koishi_1.Schema.boolean().required(),
         pushTime: koishi_1.Schema.number().required(),
         liveLoopTime: koishi_1.Schema.number().default(10),
         customLiveStart: koishi_1.Schema.string().required(),
+        customLive: koishi_1.Schema.string(),
         customLiveEnd: koishi_1.Schema.string().required(),
         dynamicUrl: koishi_1.Schema.boolean().required(),
         dynamicLoopTime: koishi_1.Schema.number().default(60),

package/lib/index.d.ts

@@ -9,7 +9,6 @@ declare module 'koishi' {
 export interface Config {
     require: {};
     key: string;
-    platform: 'qq' | 'qqguild' | 'onebot' | 'discord' | 'red' | 'telegram' | 'satori' | 'chronocat' | 'lark';
     master: {};
     basicSettings: {};
     unlockSubLimits: boolean;
@@ -24,9 +23,9 @@ export interface Config {
     changeMasterInfoApi: boolean;
     liveStartAtAll: boolean;
     restartPush: boolean;
-    pushUrl: boolean;
     pushTime: number;
     customLiveStart: string;
+    customLive: string;
     customLiveEnd: string;
     hideDesc: boolean;
     style: {};

package/lib/index.js

@@ -57,10 +57,6 @@ exports.Config = koishi_1.Schema.object({
         .role('secret')
         .required()
         .description('请输入一个32位小写字母的十六进制密钥（例如：9b8db7ae562b9864efefe06289cc5530），使用此密钥将你的B站登录信息存储在数据库中，请一定保存好此密钥。如果你忘记了此密钥，必须重新登录。你可以自行生成，或到这个网站生成：https://www.sexauth.com/'),
-    platform: koishi_1.Schema.union(['qq', 'qqguild', 'onebot', 'discord', 'red', 'telegram', 'satori', 'chronocat', 'lark'])
-        .role('')
-        .required()
-        .description('请选择你的机器人平台，目前支持QQ、QQ群、OneBot、Discord、RedBot、Telegram、Satori、ChronoCat、Lark。从2.0版本开始，只能在一个平台下使用本插件'),
     master: koishi_1.Schema.intersect([
         koishi_1.Schema.object({
             enable: koishi_1.Schema.boolean()
@@ -70,6 +66,8 @@ exports.Config = koishi_1.Schema.object({
         koishi_1.Schema.union([
             koishi_1.Schema.object({
                 enable: koishi_1.Schema.const(true).required(),
+                platform: koishi_1.Schema.union(['qq', 'qqguild', 'onebot', 'discord', 'red', 'telegram', 'satori', 'chronocat', 'lark'])
+                    .description('请选择您的私人机器人平台，目前支持QQ、QQ群、OneBot、Discord、RedBot、Telegram、Satori、ChronoCat、Lark。从2.0版本开始，只能在一个平台下使用本插件'),
                 masterAccount: koishi_1.Schema.string()
                     .role('secret')
                     .required()
@@ -120,9 +118,6 @@ exports.Config = koishi_1.Schema.object({
     restartPush: koishi_1.Schema.boolean()
         .default(true)
         .description('插件重启后，如果订阅的主播正在直播，是否进行一次推送，默认开启'),
-    pushUrl: koishi_1.Schema.boolean()
-        .default(false)
-        .description('推送直播状态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！'),
     pushTime: koishi_1.Schema.number()
         .min(0)
         .max(12)
@@ -132,6 +127,8 @@ exports.Config = koishi_1.Schema.object({
     customLiveStart: koishi_1.Schema.string()
         .default('-name开播啦 -link')
         .description('自定义开播提示语，-name代表UP昵称，-link代表直播间链接（如果使用的是QQ官方机器人，请不要使用）。例如-name开播啦，会发送为xxxUP开播啦'),
+    customLive: koishi_1.Schema.string()
+        .description('自定义直播中提示语，-name代表UP昵称，-time代表开播时长，-link代表直播间链接（如果使用的是QQ官方机器人，请不要使用）。例如-name正在直播，会发送为xxxUP正在直播xxx'),
     customLiveEnd: koishi_1.Schema.string()
         .default('-name下播啦，本次直播了-time')
         .description('自定义下播提示语，-name代表UP昵称，-time代表开播时长。例如-name下播啦，本次直播了-time，会发送为xxxUP下播啦，直播时长为xx小时xx分钟xx秒'),
@@ -293,14 +290,12 @@ class ServerManager extends koishi_1.Service {
             });
             // CR = ComRegister
             const cr = this.ctx.plugin(comRegister_1.default, {
-                platform: globalConfig.platform,
                 master: globalConfig.master,
                 unlockSubLimits: globalConfig.unlockSubLimits,
                 automaticResend: globalConfig.automaticResend,
                 changeMasterInfoApi: globalConfig.changeMasterInfoApi,
                 liveStartAtAll: globalConfig.liveStartAtAll,
                 restartPush: globalConfig.restartPush,
-                pushUrl: globalConfig.pushUrl,
                 pushTime: globalConfig.pushTime,
                 customLiveStart: globalConfig.customLiveStart,
                 customLiveEnd: globalConfig.customLiveEnd,

package/package.json

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