koishi-plugin-bilibili-notify 1.2.0-rc.3 → 1.2.0-rc.5

package/lib/comRegister.d.ts

@@ -12,6 +12,7 @@ declare class ComRegister {
         uid: string;
         roomId: string;
         targetId: string;
+        platform: string;
         live: boolean;
         dynamic: boolean;
         liveDispose: Function;
@@ -43,6 +44,12 @@ declare namespace ComRegister {
         customLiveEnd: string;
         dynamicLoopTime: number;
         dynamicCheckNumber: number;
+        filter: {
+            enable: boolean;
+            regex: string;
+            keywords: Array<string>;
+            notify: boolean;
+        };
     }
     const Config: Schema<Config>;
 }

package/lib/comRegister.js

@@ -440,6 +440,7 @@ class ComRegister {
                 uid: mid,
                 targetId,
                 roomId,
+                platform: session.event.platform,
                 live: liveMsg,
                 dynamic: dynamicMsg,
                 liveDispose: null,
@@ -454,16 +455,15 @@ class ComRegister {
             catch (e) {
                 return 'bili sub指令 getMasterInfo() 网络请求失败，请重试';
             }
-            this.logger.info(session.event.platform);
             // 需要订阅直播
             if (liveMsg) {
-                await session.execute(`bili live ${roomId} ${targetId.split(',').join(' ')} -b ${session.event.platform}`);
+                await session.execute(`bili live ${roomId} ${targetId.split(',').join(' ')}`);
                 // 发送订阅消息通知
                 await session.send(`订阅${userData.info.uname}直播通知`);
             }
             // 需要订阅动态
             if (dynamicMsg) {
-                await session.execute(`bili dynamic ${mid} ${targetId.split(',').join(' ')} -b ${session.event.platform}`);
+                await session.execute(`bili dynamic ${mid} ${targetId.split(',').join(' ')}`);
                 // 发送订阅消息通知
                 await session.send(`订阅${userData.info.uname}动态通知`);
             }
@@ -472,31 +472,28 @@ class ComRegister {
         });
         biliCom
             .subcommand('.dynamic <uid:string> <...guildId:string>', '订阅用户动态推送', { hidden: true })
-            .option('bot', '-b <type:string>')
+            // .option('bot', '-b <type:string>')
             .usage('订阅用户动态推送')
             .example('bili dynamic 1194210119 订阅UID为1194210119的动态')
-            .action(async ({ session, options }, uid, ...guildId) => {
+            .action(async ({ session }, uid, ...guildId) => {
             this.logger.info('调用bili.dynamic指令');
-            this.logger.info('Platform：', options.bot);
             // 如果uid为空则返回
             if (!uid)
                 return `${uid}非法调用 dynamic 指令`; // 用户uid不能为空
             if (!guildId)
                 return `${uid}非法调用 dynamic 指令`; // 目标群组或频道不能为空
-            if (!options.bot) {
-                this.logger.warn(`${uid}非法调用 dynamic 指令，未传入订阅平台`);
-                return `${uid}非法调用 dynamic 指令`;
-            }
+            /* if (!options.bot) {
+                this.logger.warn(`${uid}非法调用 dynamic 指令，未传入订阅平台`)
+                return `${uid}非法调用 dynamic 指令`
+            } */
             // 寻找对应订阅管理对象
             const index = this.subManager.findIndex(sub => sub.uid === uid);
             // 不存在则直接返回
-            if (index === -1) {
-                session.send('请勿直接调用该指令');
-                return;
-            }
+            if (index === -1)
+                return '请勿直接调用该指令';
             // 获取对应Bot
             let bot;
-            switch (options.bot) {
+            switch (session.event.platform) {
                 case 'qq':
                     bot = this.qqBot;
                     break;
@@ -524,29 +521,27 @@ class ComRegister {
         });
         biliCom
             .subcommand('.live <roomId:string> <...guildId:string>', '订阅主播开播通知', { hidden: true })
-            .option('bot', '-b <type:string>')
+            // .option('bot', '-b <type:string>')
             .usage('订阅主播开播通知')
             .example('bili live 26316137 订阅房间号为26316137的直播间')
-            .action(async ({ options }, roomId, ...guildId) => {
+            .action(async ({ session }, roomId, ...guildId) => {
             this.logger.info('调用bili.live指令');
-            this.logger.info('Platform：', options.bot);
             // 如果room_id为空则返回
             if (!roomId)
                 return `${roomId}非法调用 dynamic 指令`; // 订阅主播房间号不能为空
             if (!guildId)
                 return `${roomId}非法调用 dynamic 指令`; // 目标群组或频道不能为空
-            if (!options.bot) {
-                this.logger.warn(`${roomId}非法调用 dynamic 指令，未传入推送平台`);
-                return `${roomId}非法调用 dynamic 指令`;
-            }
-            // 保存到订阅管理对象
-            const index = this.subManager.findIndex(sub => sub.roomId === roomId);
+            /* if (!options.bot) {
+                this.logger.warn(`${roomId}非法调用 dynamic 指令，未传入推送平台`)
+                return `${roomId}非法调用 dynamic 指令`
+            } */
             // 要订阅的对象不在订阅管理对象中，直接返回
+            const index = this.subManager.findIndex(sub => sub.roomId === roomId);
             if (index === -1)
                 return '请勿直接调用该指令';
             // 获取对应Bot
             let bot;
-            switch (options.bot) {
+            switch (session.event.platform) {
                 case 'qq':
                     bot = this.qqBot;
                     break;
@@ -678,7 +673,8 @@ class ComRegister {
                                 if (e.message === '直播开播动态，不做处理')
                                     break;
                                 if (e.message === '出现关键词，屏蔽该动态') {
-                                    await this.sendMsg(guildId, bot, `UID:${uid} 发布了一条含有屏蔽关键字的动态`);
+                                    // 如果需要发送才发送
+                                    this.config.filter.notify && await this.sendMsg(guildId, bot, `UID:${uid} 发布了一条含有屏蔽关键字的动态`);
                                     break;
                                 }
                             }
@@ -1065,6 +1061,7 @@ class ComRegister {
                 uid: sub.uid,
                 roomId: sub.room_id,
                 targetId: sub.targetId,
+                platform: sub.platform,
                 live: +sub.live === 1 ? true : false,
                 dynamic: +sub.dynamic === 1 ? true : false,
                 liveDispose: null,
@@ -1171,7 +1168,13 @@ class ComRegister {
         customLiveStart: koishi_1.Schema.string().required(),
         customLiveEnd: koishi_1.Schema.string().required(),
         dynamicLoopTime: koishi_1.Schema.number().default(60),
-        dynamicCheckNumber: koishi_1.Schema.number().required()
+        dynamicCheckNumber: koishi_1.Schema.number().required(),
+        filter: koishi_1.Schema.object({
+            enable: koishi_1.Schema.boolean(),
+            regex: koishi_1.Schema.string(),
+            keywords: koishi_1.Schema.array(String),
+            notify: koishi_1.Schema.boolean(),
+        }),
     });
 })(ComRegister || (ComRegister = {}));
 exports.default = ComRegister;

package/lib/generateImg.d.ts

@@ -37,7 +37,6 @@ declare namespace GenerateImg {
             enable: boolean;
             regex: string;
             keywords: Array<string>;
-            filter: boolean;
         };
         removeBorder: boolean;
         cardColorStart: string;

package/lib/generateImg.js

@@ -1367,7 +1367,7 @@ class GenerateImg extends koishi_1.Service {
             enable: koishi_1.Schema.boolean(),
             regex: koishi_1.Schema.string(),
             keywords: koishi_1.Schema.array(String),
-            filter: koishi_1.Schema.boolean()
+            notify: koishi_1.Schema.boolean(),
         }),
         removeBorder: koishi_1.Schema.boolean(),
         cardColorStart: koishi_1.Schema.string(),

package/lib/index.js

@@ -114,7 +114,9 @@ exports.Config = koishi_1.Schema.object({
                 regex: koishi_1.Schema.string()
                     .description('正则表达式屏蔽'),
                 keywords: koishi_1.Schema.array(String)
-                    .description('关键字屏蔽，一个关键字为一项')
+                    .description('关键字屏蔽，一个关键字为一项'),
+                notify: koishi_1.Schema.boolean()
+                    .description('动态被屏蔽是否发送提示')
             }),
             koishi_1.Schema.object({})
         ])
@@ -182,12 +184,13 @@ function apply(ctx, config) {
         customLiveStart: config.customLiveStart,
         customLiveEnd: config.customLiveEnd,
         dynamicCheckNumber: config.dynamicCheckNumber,
-        dynamicLoopTime
+        dynamicLoopTime,
+        filter: config.filter
     });
     // 当用户输入“恶魔兔，启动！”时，执行 help 指令
     ctx.middleware((session, next) => {
         if (session.content === '恶魔兔，启动！') {
-            return session.execute('help', next);
+            return session.send('启动不了一点');
         }
         else {
             return next();

package/package.json

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

package/readme.md

@@ -111,6 +111,8 @@
 - ver 1.2.0-rc.1 现已支持Telegram平台(实验性)
 - ver 1.2.0-rc.2 添加更多日志输出
 - ver 1.2.0-rc.3 针对Telegram的Bug测试版本
+- ver 1.2.0-rc.4 修复了一个订阅指令的bug
+- ver 1.2.0-rc.5 屏蔽动态设置新增是否发送动态被屏蔽消息的选项
 
 ## 交流群
 801338523 使用问题或bug都可以在群里提出