koishi-plugin-bilibili-notify 1.0.8 → 1.0.9-alpha.0

package/lib/biliAPI.js

@@ -138,7 +138,15 @@ class BiliAPI extends koishi_1.Service {
     disposeNotifier() { this.loginNotifier && this.loginNotifier.dispose(); }
     createNewClient() {
         this.jar = new tough_cookie_1.CookieJar();
-        this.client = (0, axios_cookiejar_support_1.wrapper)(axios_1.default.create({ jar: this.jar, headers: { 'Content-Type': 'application/json' } }));
+        this.client = (0, axios_cookiejar_support_1.wrapper)(axios_1.default.create({
+            jar: this.jar,
+            headers: {
+                'Content-Type': 'application/json; charset=utf-8',
+                'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+                'Origin': 'https://www.bilibili.com',
+                'Referer': 'https://www.bilibili.com/'
+            }
+        }));
     }
     getCookies() {
         let cookies;

package/lib/comRegister.d.ts

@@ -30,6 +30,7 @@ declare class ComRegister {
 }
 declare namespace ComRegister {
     interface Config {
+        unlockSubLimits: boolean;
         pushTime: number;
         liveLoopTime: number;
         dynamicLoopTime: number;

package/lib/comRegister.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const jsx_runtime_1 = require("@satorijs/element/jsx-runtime");
 const koishi_1 = require("koishi");
 // 导入qrcode
 const qrcode_1 = __importDefault(require("qrcode"));
@@ -32,14 +33,15 @@ class ComRegister {
         this.qqguildBot = ctx.bots[ctx.bots.findIndex(bot => bot.platform === 'qqguild')];
         // 从数据库获取订阅
         this.getSubFromDatabase(ctx);
-        /* ctx.command('test', { hidden: true, permissions: ['authority:5'] })
-            .subcommand('.cookies')
+        /* const testCom = ctx.command('test', { hidden: true, permissions: ['authority:5'] })
+
+        testCom.subcommand('.cookies')
             .usage('测试指令，用于测试从数据库读取cookies')
             .action(async () => {
                 await ctx.biliAPI.loadCookiesFromDatabase()
             })
 
-        ctx.command('test')
+        testCom
             .subcommand('.my')
             .usage('测试指令，用于测试获取自己信息')
             .example('test.my')
@@ -48,7 +50,7 @@ class ComRegister {
                 console.log(content);
             })
 
-        ctx.command('test')
+        testCom
             .subcommand('.user <mid:string>')
             .usage('测试指令，用于测试获取用户信息')
             .example('test.user 用户UID')
@@ -57,7 +59,7 @@ class ComRegister {
                 console.log(content);
             })
 
-        ctx.command('test')
+        testCom
             .subcommand('.time')
             .usage('测试时间接口')
             .example('test.time')
@@ -65,7 +67,7 @@ class ComRegister {
                 session.send(await ctx.biliAPI.getTimeNow())
             })
 
-        ctx.command('test')
+        testCom
             .subcommand('.exist')
             .usage('测试写法')
             .example('test.exist')
@@ -74,7 +76,7 @@ class ComRegister {
                 console.log(num && `Hello World`);
             })
 
-        ctx.command('test')
+        testCom
             .subcommand('.gimg <uid:string> <index:number>')
             .usage('测试图片生成')
             .example('test.gimg')
@@ -89,7 +91,7 @@ class ComRegister {
                 await session.send(h.image(buffer, 'image/png'))
             })
 
-        ctx.command('test')
+        testCom
             .subcommand('.group')
             .usage('查看session groupId')
             .example('test group')
@@ -97,7 +99,7 @@ class ComRegister {
                 console.log(session.event.channel);
             })
 
-        ctx.command('test')
+        testCom
             .subcommand('.session')
             .usage('查看seesion')
             .example('test session')
@@ -105,15 +107,15 @@ class ComRegister {
                 console.log(session);
             })
 
-        ctx.command('test')
+        testCom
             .subcommand('.utc')
             .usage('获取当前UTC+8 Unix时间戳')
             .example('test utc')
             .action(async ({ session }) => {
                 session.send((await ctx.biliAPI.getServerUTCTime()).toString())
             }) */
-        ctx.command('bili', 'bili-notify插件相关指令', { permissions: ['authority:3'] })
-            .subcommand('.login', '登录B站之后才可以进行之后的操作')
+        const biliCom = ctx.command('bili', 'bili-notify插件相关指令', { permissions: ['authority:3'] });
+        biliCom.subcommand('.login', '登录B站之后才可以进行之后的操作')
             .usage('使用二维码登录，登录B站之后才可以进行之后的操作')
             .example('bili login')
             .action(async ({ session }) => {
@@ -188,7 +190,7 @@ class ComRegister {
                 }
             }, 1000);
         });
-        ctx.command('bili')
+        biliCom
             .subcommand('.unsub <uid:string>', '取消订阅UP主动态、直播或全部')
             .usage('取消订阅，加-l为取消直播订阅，加-d为取消动态订阅，什么都不加则为全部取消')
             .option('live', '-l')
@@ -238,7 +240,7 @@ class ComRegister {
             // 未订阅该用户，无需取消订阅
             !exist && session.send('未订阅该用户，无需取消订阅');
         });
-        ctx.command('bili')
+        biliCom
             .subcommand('.show', '展示订阅对象')
             .usage('展示订阅对象')
             .example('bili show')
@@ -246,7 +248,7 @@ class ComRegister {
             const subTable = this.subShow();
             return subTable;
         });
-        ctx.command('bili')
+        biliCom
             .subcommand('.sub <mid:string> [guildId:string]', '订阅用户动态和直播通知')
             .option('live', '-l')
             .option('dynamic', '-d')
@@ -260,7 +262,7 @@ class ComRegister {
                 return '请使用指令bili login登录后再进行订阅操作';
             }
             // 如果订阅人数超过三个则直接返回
-            if (this.num >= 3)
+            if (!config.unlockSubLimits && this.num >= 3)
                 return '目前最多只能订阅三个人';
             // 检查必选参数是否有值
             if (!mid)
@@ -385,16 +387,9 @@ class ComRegister {
                 await bot.sendMessage(sub.targetId, `订阅${userData.info.uname}动态通知`);
             }
             // 新增订阅展示到控制台
-            // 获取subTable
-            const subTable = this.subShow();
-            // 判断之前是否存在Notifier
-            this.subNotifier && this.subNotifier.dispose();
-            this.subNotifier = ctx.notifier.create({
-                type: 'primary',
-                content: subTable
-            });
+            this.updateSubNotifier(ctx);
         });
-        ctx.command('bili')
+        biliCom
             .subcommand('.dynamic <uid:string> <guildId:string>', '订阅用户动态推送', { hidden: true })
             .option('bot', '-b <type:string>')
             .usage('订阅用户动态推送')
@@ -431,7 +426,7 @@ class ComRegister {
             // 将销毁函数保存到订阅管理对象
             this.subManager[index].dynamicDispose = dispose;
         });
-        ctx.command('bili')
+        biliCom
             .subcommand('.live <roomId:string> <guildId:string>', '订阅主播开播通知', { hidden: true })
             .option('bot', '-b <type:string>')
             .usage('订阅主播开播通知')
@@ -466,7 +461,7 @@ class ComRegister {
             // 保存销毁函数
             this.subManager[index].liveDispose = dispose;
         });
-        ctx.command('bili')
+        biliCom
             .subcommand('.status <roomId:string>', '查询主播当前直播状态', { hidden: true })
             .usage('查询主播当前直播状态')
             .example('bili status 732')
@@ -806,12 +801,15 @@ class ComRegister {
         // 更新控制台提示
         this.subNotifier && this.subNotifier.dispose();
         // 获取subTable
-        const subTable = this.subShow();
+        let subTableArray = this.subShow().split('\n');
+        subTableArray.splice(subTableArray.length - 1, 1);
+        // 定义Table
+        let table = (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: (0, jsx_runtime_1.jsx)("ul", { children: subTableArray.map(str => ((0, jsx_runtime_1.jsx)("li", { children: str }))) }) });
+        /* subTableArray.forEach(str => {
+            table +=
+        }) */
         // 设置更新后的提示
-        this.subNotifier = ctx.notifier.create({
-            type: 'primary',
-            content: subTable
-        });
+        this.subNotifier = ctx.notifier.create(table);
     }
     async getSubFromDatabase(ctx) {
         // 如果未登录，则直接返回
@@ -826,10 +824,10 @@ class ComRegister {
         this.num = subData.length;
         // 如果订阅数量超过三个则被非法修改数据库
         // 在控制台提示重新订阅
-        if (this.num > 3) {
+        if (!this.config.unlockSubLimits && this.num > 3) {
             ctx.notifier.create({
                 type: 'danger',
-                content: '数据库被非法修改，请你删除bilibili表的所有内容后重启插件'
+                content: '您未解锁订阅限制，且订阅数大于3人，请您手动删除bilibili表中多余的数据后，重启本插件'
             });
             return;
         }
@@ -999,6 +997,7 @@ class ComRegister {
 }
 (function (ComRegister) {
     ComRegister.Config = koishi_1.Schema.object({
+        unlockSubLimits: koishi_1.Schema.boolean().required(),
         pushTime: koishi_1.Schema.number().required(),
         liveLoopTime: koishi_1.Schema.number().default(10),
         dynamicLoopTime: koishi_1.Schema.number().default(60),

package/lib/generateImg.d.ts

@@ -33,6 +33,7 @@ declare class GenerateImg extends Service {
 declare namespace GenerateImg {
     interface Config {
         renderType: number;
+        removeBorder: boolean;
         cardColorStart: string;
         cardColorEnd: string;
         font: string;

package/lib/generateImg.js

@@ -91,9 +91,13 @@ class GenerateImg extends koishi_1.Service {
                     }
 
                     .base-plate {
+                        ${this.config.removeBorder ? `
+                        width: 740px;
+                        ` : `
                         width: 704px;
-                        height: auto;
                         margin: 20px auto;
+                        `}
+                        height: auto;
                         border-radius: 10px;
                         background-color: #fff;
                     }
@@ -513,6 +517,7 @@ class GenerateImg extends koishi_1.Service {
                     * {
                         margin: 0;
                         padding: 0;
+                        box-sizing: border-box;
                         font-family: "${this.config.font}", "Custom Font", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
                     }
             
@@ -539,9 +544,13 @@ class GenerateImg extends koishi_1.Service {
                     }
             
                     .base-plate {
+                        ${this.config.removeBorder ? `
+                        width: 740px;
+                        ` : `
                         width: 704px;
-                        height: auto;
                         margin: 20px auto;
+                        `}
+                        height: auto;
                         border-radius: 10px;
                         background-color: #fff;
                     }
@@ -552,10 +561,9 @@ class GenerateImg extends koishi_1.Service {
                     }
             
                     .card .anchor-avatar {
-                        border-radius: 5px 5px 0 0;
-                        max-width: 50px;
+                        max-width: 70px;
                         /* 设置最大宽度为容器宽度的100% */
-                        max-height: 50px;
+                        max-height: 70px;
                         /* 设置最大高度为容器高度的90% */
                         margin-right: 20px;
                         border-radius: 10px;
@@ -575,15 +583,15 @@ class GenerateImg extends koishi_1.Service {
                         display: flex;
                         flex-direction: column;
                         justify-content: space-between;
-                        height: 50px;
+                        height: 70px;
                     }
             
                     .card .up-info .up-name {
-                        font-size: 20px;
+                        font-size: 27px;
                     }
             
                     .card .pub-time {
-                        font-size: 12px;
+                        font-size: 20px;
                         color: grey;
                     }
             
@@ -593,12 +601,9 @@ class GenerateImg extends koishi_1.Service {
         
                     .card .dress-up {
                         position: relative;
-                        max-width: 110px;
-                        max-height: 34px;
                         /* background-image: url('${dynamicCardUrl}');
                         background-size: cover; */
-                        font-size: 12px;
-                        line-height: 33px;
+                        font-size: 17px;
                     }
         
                     .card .dress-up img {
@@ -609,20 +614,23 @@ class GenerateImg extends koishi_1.Service {
                     .card .dress-up span {
                         position: absolute;
                         color: ${dynamicCardColor};
-                        right: 37px;
-                        top: 5px;
+                        right: 67px;
+                        top: 24px;
                     }
         
                     .card .card-topic {
                         display: flex;
                         align-items: center;
                         margin-top: 10px;
+                        font-size: 20px;
                         color: #008AC5;
                         gap: 3px;
                     }
             
                     .card .card-details {
+                        margin-top: 5px;
                         margin-bottom: 15px;
+                        font-size: 22px;
                         width: 90%;
                     }
             
@@ -749,8 +757,8 @@ class GenerateImg extends koishi_1.Service {
                     }
         
                     .card .card-forward {
-                        margin: 0 -15px 0 -85px;
-                        padding: 12px 15px 14px 85px;
+                        margin: 0 -15px 0 -105px;
+                        padding: 12px 15px 14px 105px;
                         background-color: #F6F7F8;
                     }
             
@@ -758,18 +766,18 @@ class GenerateImg extends koishi_1.Service {
                         display: flex;
                         align-items: center;
                         gap: 5px;
-                        height: 30px;
+                        height: 35px;
                     }
             
                     .forward-userinfo img {
-                        width: 20px;
-                        height: 20px;
+                        width: 25px;
+                        height: 25px;
                         border-radius: 50%;
                     }
             
                     .forward-userinfo span {
                         color: #61666D;
-                        font-size: 15px;
+                        font-size: 20px;
                     }
         
                     .card .card-reserve {
@@ -986,6 +994,7 @@ class GenerateImg extends koishi_1.Service {
 (function (GenerateImg) {
     GenerateImg.Config = koishi_1.Schema.object({
         renderType: koishi_1.Schema.number(),
+        removeBorder: koishi_1.Schema.boolean(),
         cardColorStart: koishi_1.Schema.string(),
         cardColorEnd: koishi_1.Schema.string(),
         font: koishi_1.Schema.string()

package/lib/index.d.ts

@@ -2,14 +2,19 @@ import { Context, Schema } from 'koishi';
 export declare const inject: string[];
 export declare const name = "bilibili-notify";
 export interface Config {
+    require: {};
+    key: string;
+    basicSettings: {};
+    unlockSubLimits: boolean;
     pushTime: number;
     dynamicCheckNumber: number;
     dynamicLoopTime: '1分钟' | '2分钟' | '3分钟' | '5分钟';
     renderType: 'render' | 'page';
+    style: {};
+    removeBorder: boolean;
     cardColorStart: string;
     cardColorEnd: string;
     font: string;
-    key: string;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -39,6 +39,16 @@ const biliAPI_1 = __importDefault(require("./biliAPI"));
 exports.inject = ['puppeteer', 'database', 'notifier'];
 exports.name = 'bilibili-notify';
 exports.Config = koishi_1.Schema.object({
+    require: koishi_1.Schema.object({}).description('必填设置'),
+    key: koishi_1.Schema.string()
+        .pattern(/^[0-9a-f]{32}$/)
+        .role('secret')
+        .required()
+        .description('请输入一个32位小写字母的十六进制密钥（例如：9b8db7ae562b9864efefe06289cc5530），使用此密钥将你的B站登录信息存储在数据库中，请一定保存好此密钥。如果你忘记了此密钥，必须重新登录。你可以自行生成，或到这个网站生成：https://www.sexauth.com/'),
+    basicSettings: koishi_1.Schema.object({}).description('基本设置'),
+    unlockSubLimits: koishi_1.Schema.boolean()
+        .default(false)
+        .description('解锁3个订阅限制，默认只允许订阅3位UP主。订阅过多用户可能有导致IP暂时被封禁的风险'),
     pushTime: koishi_1.Schema.number()
         .min(0)
         .max(12)
@@ -60,6 +70,10 @@ exports.Config = koishi_1.Schema.object({
         .role('')
         .default('render')
         .description('渲染类型，默认为render模式，渲染速度更快，但会出现乱码问题，若出现乱码问题，请切换到page模式。若使用自定义字体，建议选择render模式'),
+    style: koishi_1.Schema.object({}).description('美化设置'),
+    removeBorder: koishi_1.Schema.boolean()
+        .default(false)
+        .description('移除推送卡片边框'),
     cardColorStart: koishi_1.Schema.string()
         .pattern(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/)
         .default('#F38AB5')
@@ -69,17 +83,20 @@ exports.Config = koishi_1.Schema.object({
         .default('#F9CCDF')
         .description('推送卡片的结束渐变背景色，请填入16进制颜色代码，参考网站：https://colorate.azurewebsites.net/'),
     font: koishi_1.Schema.string()
-        .description('推送卡片的字体样式，如果你想用你自己的字体可以在此填写，例如：Microsoft YaHei'),
-    key: koishi_1.Schema.string()
-        .pattern(/^[0-9a-f]{32}$/)
-        .role('secret')
-        .required()
-        .description('请输入一个32位小写字母的十六进制密钥（例如：9b8db7ae562b9864efefe06289cc5530），使用此密钥将你的B站登录信息存储在数据库中，请一定保存好此密钥。如果你忘记了此密钥，必须重新登录。你可以自行生成，或到这个网站生成：https://www.sexauth.com/')
+        .description('推送卡片的字体样式，如果你想用你自己的字体可以在此填写，例如：Microsoft YaHei')
 });
 function apply(ctx, config) {
+    // 设置提示
     ctx.notifier.create({
         content: '请记得使用Auth插件创建超级管理员账号，没有权限将无法使用该插件提供的指令。'
     });
+    if (config.unlockSubLimits) { // 用户允许订阅超过三个用户
+        // 设置警告
+        ctx.notifier.create({
+            type: 'danger',
+            content: '过多的订阅可能会导致IP暂时被封禁！'
+        });
+    }
     // load config
     // 转换为具体时间
     let dynamicLoopTime;
@@ -111,11 +128,11 @@ function apply(ctx, config) {
     ctx.plugin(Database);
     // Regist server
     ctx.plugin(wbi_1.default, { key: config.key });
-    ctx.plugin(generateImg_1.default, { renderType, cardColorStart: config.cardColorStart, cardColorEnd: config.cardColorEnd, font: config.font });
+    ctx.plugin(generateImg_1.default, { renderType, removeBorder: config.removeBorder, cardColorStart: config.cardColorStart, cardColorEnd: config.cardColorEnd, font: config.font });
     ctx.plugin(biliAPI_1.default);
     // load plugin
     // ctx.plugin(Authority)
-    ctx.plugin(comRegister_1.default, { pushTime: config.pushTime, dynamicCheckNumber: config.dynamicCheckNumber, dynamicLoopTime });
+    ctx.plugin(comRegister_1.default, { unlockSubLimits: config.unlockSubLimits, pushTime: config.pushTime, dynamicCheckNumber: config.dynamicCheckNumber, dynamicLoopTime });
     // 当用户输入“恶魔兔，启动！”时，执行 help 指令
     ctx.middleware((session, next) => {
         if (session.content === '恶魔兔，启动！') {

package/package.json

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

package/readme.md

@@ -84,6 +84,7 @@
 - ver 1.0.6 修复了转发动态转发信息出现undefined的bug，修复了再次登录订阅显示错误的bug，优化了动态推送的逻辑
 - ver 1.0.7 修复了在已登录情况下，再次登录会导致重复订阅和提示用户未订阅任何UP主的提示（实际上已订阅）的bug，新增了订阅对象在控制台的显示，优化了bili show指令的逻辑
 - ver 1.0.8 修复了取消订阅的bug
+- ver 1.0.9 更新请求客户端header信息。优化了动态推送卡片的页面布局，增加了字体大小。提供用户开放订阅数量限制的选项，提供用户移除推送卡片边框的选项。在控制台页面增加订阅信息提示
 
 ## 感谢