koishi-plugin-bilibili-notify 1.3.6 → 2.0.0-alpha.0

package/lib/database.d.ts

@@ -20,6 +20,7 @@ export interface LoginBili {
     id: number;
     bili_cookies: string;
     bili_refresh_token: string;
+    dynamic_group_id: string;
 }
 export declare const name = "Database";
 export declare function apply(ctx: Context): void;

package/lib/database.js

@@ -4,12 +4,6 @@ exports.name = void 0;
 exports.apply = apply;
 exports.name = 'Database';
 function apply(ctx) {
-    // 新增LoginBili表
-    ctx.model.extend('loginBili', {
-        id: 'unsigned',
-        bili_cookies: 'text',
-        bili_refresh_token: 'text'
-    });
     // 新增Bilibili表
     ctx.model.extend('bilibili', {
         id: 'unsigned',
@@ -22,4 +16,11 @@ function apply(ctx) {
         platform: 'string',
         time: 'timestamp'
     }, { autoInc: true });
+    // 新增LoginBili表
+    ctx.model.extend('loginBili', {
+        id: 'unsigned',
+        bili_cookies: 'text',
+        bili_refresh_token: 'text',
+        dynamic_group_id: 'string'
+    });
 }

package/lib/generateImg.d.ts

@@ -9,14 +9,14 @@ declare class GenerateImg extends Service {
     giConfig: GenerateImg.Config;
     constructor(ctx: Context, config: GenerateImg.Config);
     generateLiveImg(data: any, username: string, userface: string, liveStatus: number): Promise<{
-        buffer: Buffer;
+        buffer: Buffer<ArrayBufferLike>;
         pic?: undefined;
     } | {
         pic: string;
         buffer?: undefined;
     }>;
     generateDynamicImg(data: any): Promise<{
-        buffer: Buffer;
+        buffer: Buffer<ArrayBufferLike>;
         link: string;
         pic?: undefined;
     } | {

package/lib/generateImg.js

@@ -183,7 +183,7 @@ class GenerateImg extends koishi_1.Service {
                                 </div>
                                 ${this.giConfig.hideDesc ? '' : `<p class="card-text">${data.description ? data.description : '这个主播很懒，什么都简介都没写'}</p>`}
                                 <p class="card-link">
-                                    <span>人气：${data.online > 10000 ? `${data.online / 10000}万` : data.online}</span>
+                                    <span>人气：${data.online > 10000 ? `${(data.online / 10000).toFixed(1)}万` : data.online}</span>
                                     <span>分区名称：${data.area_name}</span>
                                 </p>
                                 <p class="card-link">

package/lib/index.d.ts

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

package/lib/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -47,6 +57,10 @@ 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', 'red', 'telegram', 'satori', 'chronocat', 'lark'])
+        .role('')
+        .default('qq')
+        .description('请选择你的机器人平台，目前支持QQ、QQ群、OneBot、RedBot、Telegram、Satori、ChronoCat、Lark。从2.0版本开始，只能在一个平台下使用本插件'),
     master: koishi_1.Schema.intersect([
         koishi_1.Schema.object({
             enable: koishi_1.Schema.boolean()
@@ -104,6 +118,9 @@ exports.Config = koishi_1.Schema.object({
     liveStartAtAll: koishi_1.Schema.boolean()
         .default(false)
         .description('直播开始时艾特全体成员，默认关闭'),
+    restartPush: koishi_1.Schema.boolean()
+        .default(true)
+        .description('插件重启后，如果订阅的主播正在直播，是否进行一次推送，默认开启'),
     pushUrl: koishi_1.Schema.boolean()
         .default(false)
         .description('推送直播状态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！')
@@ -276,11 +293,13 @@ 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,
@@ -345,7 +364,7 @@ function apply(ctx, config) {
     globalConfig = config;
     // 设置提示
     ctx.notifier.create({
-        content: '请记得使用Auth插件创建超级管理员账号，没有权限将无法使用该插件提供的指令。'
+        content: '请使用Auth插件创建超级管理员账号，没有权限将无法使用该插件提供的指令。'
     });
     if (config.unlockSubLimits) { // 用户允许订阅超过三个用户
         // 设置警告

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "1.3.6",
+  "version": "2.0.0-alpha.0",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -24,11 +24,11 @@
     "bilibili"
   ],
   "peerDependencies": {
-    "koishi": "^4.17.5"
+    "koishi": "^4.18.7"
   },
   "dependencies": {
-    "axios": "^1.7.7",
-    "axios-cookiejar-support": "^5.0.3",
+    "axios": "^1.7.9",
+    "axios-cookiejar-support": "^5.0.5",
     "jimp": "^1.6.0",
     "jsdom": "^24.1.3",
     "luxon": "^3.5.0",
@@ -37,15 +37,15 @@
     "tough-cookie": "^4.1.4"
   },
   "devDependencies": {
-    "@eslint/js": "^9.12.0",
+    "@eslint/js": "^9.20.0",
     "@types/luxon": "^3.4.2",
     "@types/md5": "^2.3.5",
     "@types/qrcode": "^1.5.5",
     "@types/tough-cookie": "^4.0.5",
-    "eslint": "^9.12.0",
-    "globals": "^15.11.0",
+    "eslint": "^9.20.0",
+    "globals": "^15.14.0",
     "koishi-plugin-puppeteer": "^3.9.0",
-    "typescript-eslint": "^7.18.0"
+    "typescript-eslint": "^7.18.1-alpha.3"
   },
   "koishi": {
     "service": {

package/readme.md

@@ -175,6 +175,9 @@
 - ver 1.3.6-beta.0 取消出错自动重启插件功能
 - ver 1.3.6-rc.0 修复重启或更新后提示未登录或订阅时提示请登录后再订阅的问题
 - ver 1.3.6 现在基本设置中的userAgent选项为必填项，当因风控订阅失败时会提示更换UA，优化直播人气显示
+- ver 1.3.7 新增设置项：插件重启后是否进行直播推送。优化直播人气显示
+
+- ver 2.0.0-alpha.0 重构：对动态订阅进行了重构，优化了订阅流程
 
 ## 交流群