koishi-plugin-bilibili-notify 1.2.3-rc.9 → 1.2.3

package/lib/comRegister.js

@@ -7,6 +7,8 @@ const jsx_runtime_1 = require("@satorijs/element/jsx-runtime");
 const koishi_1 = require("koishi");
 // 导入qrcode
 const qrcode_1 = __importDefault(require("qrcode"));
+const axios_1 = __importDefault(require("axios"));
+const sharp_1 = __importDefault(require("sharp"));
 var LiveType;
 (function (LiveType) {
     LiveType[LiveType["NotLiveBroadcast"] = 0] = "NotLiveBroadcast";
@@ -116,6 +118,8 @@ class ComRegister {
             .usage('测试图片生成')
             .example('test.gimg')
             .action(async ({ session }, uid, index) => {
+                // logger
+                this.logger.info('调用test gimg指令')
                 // 获取用户空间动态数据
                 const { data } = await ctx.biliAPI.getUserSpaceDynamic(uid)
                 // 获取动态推送图片
@@ -155,12 +159,23 @@ class ComRegister {
             .usage('发送下播提示语测试')
             .example('test livestop')
             .action(async ({ session }) => {
+                // logger
+                this.logger.info('调用test gimg指令')
+                // 获取主播信息
                 const { data } = await ctx.biliAPI.getMasterInfo('194484313')
-                console.log(data);
+                // 获取图片二进制
+                const resp = await axios({
+                    url: data.info.face,
+                    method: 'GET',
+                    responseType: 'arraybuffer'
+                })
+                // 使用sharp调整图片大小
+                const resizedImage = await sharp(resp.data)
+                    .resize(100, 100)
+                    .toBuffer()
+                // 发送下播提示语
                 await session.send(
-                    <>
-                        <img width="10px" height="10px" src="https://koishi.chat/logo.png" />
-                    </>
+                    <>{h.image(resizedImage, 'image/png')} 主播{data.info.uname}已下播</>
                 )
             })
 
@@ -171,7 +186,7 @@ class ComRegister {
             .action(async ({ session }) => {
                 // 获得对应bot
                 const bot = this.getTheCorrespondingBotBasedOnTheSession(session)
-                this.sendMsg(['all'], bot, 'Hello World')
+                // this.sendMsg(['all'], bot, 'Hello World')
             }) */
         const biliCom = ctx.command('bili', 'bili-notify插件相关指令', { permissions: ['authority:3'] });
         biliCom.subcommand('.login', '登录B站之后才可以进行之后的操作')
@@ -710,12 +725,18 @@ class ComRegister {
     }
     async sendPrivateMsgAndRebootService(ctx, bot, content) {
         await this.sendPrivateMsg(bot, content);
-        // 停用插件
-        ctx.sm.disposePlugin();
-        // 隔一秒启动插件
-        ctx.setTimeout(() => {
-            ctx.sm.registerPlugin();
-        }, 1000);
+        // 重启插件
+        const flag = ctx.sm.restartPlugin();
+        // 判断是否重启成功
+        if (flag) {
+            this.logger.info('重启插件成功');
+        }
+        else {
+            // 重启失败，发送消息
+            await this.sendPrivateMsg(bot, '已重启插件三次，请检查机器人状态后手动重启');
+            // 关闭插件
+            ctx.sm.disposePlugin();
+        }
     }
     async sendMsg(ctx, targets, bot, content) {
         // 定义需要发送的数组
@@ -782,6 +803,9 @@ class ComRegister {
                 }
                 // 取消订阅
                 this.unsubSingle(ctx, uid, 1); /* 1为取消动态订阅 */
+                // 发送取消订阅消息
+                await this.sendPrivateMsg(bot, `UID:${uid}，已取消订阅动态`);
+                // 结束循环
                 return;
             }
             // 获取数据内容
@@ -977,8 +1001,18 @@ class ComRegister {
                             let liveEndMsg = this.config.customLiveEnd
                                 .replace('-name', uData.info.uname)
                                 .replace('-time', await ctx.gimg.getTimeDifference(liveTime));
+                            // 获取图片二进制
+                            const resp = await (0, axios_1.default)({
+                                url: uData.info.face,
+                                method: 'GET',
+                                responseType: 'arraybuffer'
+                            });
+                            // 使用sharp调整图片大小
+                            const resizedImage = await (0, sharp_1.default)(resp.data)
+                                .resize(100, 100)
+                                .toBuffer();
                             // 发送下播通知
-                            await this.sendMsg(ctx, guildId, bot, liveEndMsg);
+                            await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(resizedImage, 'image/png'), " ", liveEndMsg] }));
                         }
                         // 未进循环，还未开播，继续循环
                         break;
@@ -1104,7 +1138,7 @@ class ComRegister {
             let subTableArray = subInfo.split('\n');
             subTableArray.splice(subTableArray.length - 1, 1);
             // 定义Table
-            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 }))) }) });
+            table = (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("p", { children: "\u5F53\u524D\u8BA2\u9605\u5BF9\u8C61\uFF1A" }), (0, jsx_runtime_1.jsx)("ul", { children: subTableArray.map(str => ((0, jsx_runtime_1.jsx)("li", { children: str }))) })] });
         }
         // 设置更新后的提示
         this.subNotifier = ctx.notifier.create(table);

package/lib/generateImg.js

@@ -68,40 +68,38 @@ class GenerateImg extends koishi_1.Service {
                     * {
                         margin: 0;
                         padding: 0;
+                        box-sizing: border-box;
                         font-family: "${this.giConfig.font}", "Custom Font", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
                     }
-
+        
                     html {
-                        width: 770px;
+                        width: 800px;
                         height: auto;
                     }
-
+        
                     .background {
-                        width: 770px;
+                        width: 100%;
                         height: auto;
+                        padding: 15px;
                         background: linear-gradient(to right bottom, ${this.giConfig.cardColorStart}, ${this.giConfig.cardColorEnd});
                         overflow: hidden;
                     }
-
-                    .card {
-                        width: 740px;
+        
+                    .base-plate {
+                        width: 100%;
                         height: auto;
                         box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
-                        border-radius: 5px;
-                        margin: 15px auto;
-                        overflow: hidden;
+                        padding: 15px;
+                        border-radius: 10px;
                         background-color: #FFF5EE;
                     }
-
-                    .base-plate {
-                        ${this.giConfig.removeBorder ? `
-                        width: 740px;
-                        ` : `
-                        width: 704px;
-                        margin: 20px auto;
-                        `}
+        
+                    .card {
+                        width: 100%;
                         height: auto;
-                        border-radius: 10px;
+                        border-radius: 5px;
+                        padding: 15px;
+                        overflow: hidden;
                         background-color: #fff;
                     }
 
@@ -165,8 +163,8 @@ class GenerateImg extends koishi_1.Service {
             </head>
             <body>
                 <div class="background">
-                    <div class="card">
-                        <div class="base-plate">
+                    <div ${this.giConfig.removeBorder ? '' : 'class="base-plate"'}>
+                        <div class="card">
                             <img src="${cover ? data.user_cover : data.keyframe}"
                             alt="封面">
                             <div class="card-body">
@@ -321,8 +319,9 @@ class GenerateImg extends koishi_1.Service {
                     // 转发动态
                     if (dynamicMajorData.type === DYNAMIC_TYPE_FORWARD) {
                         //转发动态屏蔽
-                        if (this.giConfig.filter.enable && this.giConfig.filter.forward)
+                        if (this.giConfig.filter.enable && this.giConfig.filter.forward) {
                             throw new Error('已屏蔽转发动态');
+                        }
                         // User info
                         const forward_module_author = dynamicMajorData.orig.modules.module_author;
                         const forwardUserAvatarUrl = forward_module_author.face;
@@ -333,7 +332,7 @@ class GenerateImg extends koishi_1.Service {
                         main += `
                         <div class="card-forward">
                             <div class="forward-userinfo">
-                                <img class="forward-avatar" src="${forwardUserAvatarUrl}" alt="">
+                                <img class="forward-avatar" src="${forwardUserAvatarUrl}" alt="avatar">
                                 <span class="forward-username">${forwardUserName} ${forwardInfo ? forwardInfo : ''}</span>
                             </div>
                             <div class="forward-main">
@@ -548,38 +547,35 @@ class GenerateImg extends koishi_1.Service {
                 box-sizing: border-box;
                 font-family: "${this.giConfig.font}", "Custom Font", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
             }
-    
+
             html {
-                width: 770px;
+                width: 800px;
                 height: auto;
             }
-    
+
             .background {
-                width: 770px;
+                width: 100%;
                 height: auto;
+                padding: 15px;
                 background: linear-gradient(to right bottom, ${this.giConfig.cardColorStart}, ${this.giConfig.cardColorEnd});
                 overflow: hidden;
             }
-    
-            .card {
-                width: 740px;
+
+            .base-plate {
+                width: 100%;
                 height: auto;
                 box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
-                border-radius: 5px;
-                margin: 15px auto;
-                overflow: hidden;
+                padding: 15px;
+                border-radius: 10px;
                 background-color: #FFF5EE;
             }
-    
-            .base-plate {
-                ${this.giConfig.removeBorder ? `
-                width: 740px;
-                ` : `
-                width: 704px;
-                margin: 20px auto;
-                `}
+
+            .card {
+                width: 100%;
                 height: auto;
-                border-radius: 10px;
+                border-radius: 5px;
+                padding: 15px;
+                overflow: hidden;
                 background-color: #fff;
             }
     
@@ -785,8 +781,8 @@ class GenerateImg extends koishi_1.Service {
             }
 
             .card .card-forward {
-                margin: 0 -15px 0 -105px;
-                padding: 12px 15px 14px 105px;
+                border-radius: 5px;
+                padding: 12px 10px 14px 10px;
                 background-color: #F6F7F8;
             }
     
@@ -876,36 +872,38 @@ class GenerateImg extends koishi_1.Service {
             * {
                 margin: 0;
                 padding: 0;
+                box-sizing: border-box;
                 font-family: "${this.giConfig.font}", "Custom Font", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
             }
     
             html {
-                width: 770px;
+                width: 800px;
                 height: auto;
             }
     
             .background {
-                width: 770px;
+                width: 100%;
                 height: auto;
+                padding: 15px;
                 background: linear-gradient(to right bottom, ${this.giConfig.cardColorStart}, ${this.giConfig.cardColorEnd});
                 overflow: hidden;
             }
-    
-            .card {
-                width: 740px;
+
+            .base-plate {
+                width: 100%;
                 height: auto;
                 box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
-                border-radius: 5px;
-                margin: 15px auto;
-                overflow: hidden;
+                padding: 15px;
+                border-radius: 10px;
                 background-color: #FFF5EE;
             }
     
-            .base-plate {
-                width: 704px;
+            .card {
+                width: 100%;
                 height: auto;
-                margin: 20px auto;
-                border-radius: 10px;
+                border-radius: 5px;
+                padding: 15px;
+                overflow: hidden;
                 background-color: #fff;
             }
     
@@ -1112,8 +1110,8 @@ class GenerateImg extends koishi_1.Service {
             }
 
             .card .card-forward {
-                margin: 0 -15px 0 -85px;
-                padding: 12px 15px 14px 85px;
+                border-radius: 5px;
+                padding: 12px 10px 14px 10px;
                 background-color: #F6F7F8;
             }
     
@@ -1205,8 +1203,8 @@ class GenerateImg extends koishi_1.Service {
             </head>
             <body>
                 <div class="background">
-                    <div class="card">
-                        <div class="base-plate">
+                    <div ${this.giConfig.removeBorder ? '' : 'class="base-plate"'}>
+                        <div class="card">
                             <div class="card-body">
                                 <!-- 主播头像 -->
                                 <img class="anchor-avatar"

package/lib/index.d.ts

@@ -34,10 +34,12 @@ export declare const Config: Schema<Config>;
 declare class ServerManager extends Service {
     servers: ForkScope[];
     renderType: number;
+    restartCount: number;
     constructor(ctx: Context);
     protected start(): void | Promise<void>;
     registerPlugin: () => void;
     disposePlugin: () => void;
+    restartPlugin: () => boolean;
 }
 export declare function apply(ctx: Context, config: Config): void;
 export {};

package/lib/index.js

@@ -148,9 +148,12 @@ exports.Config = koishi_1.Schema.object({
     ]),
 });
 class ServerManager extends koishi_1.Service {
+    // 服务
     servers = [];
     // 渲染模式
     renderType;
+    // 重启次数
+    restartCount = 0;
     constructor(ctx) {
         super(ctx, 'sm');
     }
@@ -184,6 +187,21 @@ class ServerManager extends koishi_1.Service {
             fork.dispose();
         });
     };
+    restartPlugin = () => {
+        // 重启次数大于等于3次
+        if (this.restartCount >= 3)
+            return false;
+        // 重启次数+1
+        this.restartCount++;
+        // 停用插件
+        this.disposePlugin();
+        // 隔一秒启动插件
+        this.ctx.setTimeout(() => {
+            this.registerPlugin();
+        }, 1000);
+        // 返回true
+        return true;
+    };
 }
 function apply(ctx, config) {
     // 设置config

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "1.2.3-rc.9",
+  "version": "1.2.3",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -33,6 +33,7 @@
     "luxon": "^3.4.4",
     "md5": "^2.3.0",
     "qrcode": "^1.5.3",
+    "sharp": "^0.33.3",
     "tough-cookie": "^4.1.3"
   },
   "devDependencies": {

package/readme.md

@@ -134,6 +134,9 @@
 - ver 1.2.3-rc.7 尝试修复多群推送时部分群未推送的bug
 - ver 1.2.3-rc.8 修复在 `1.2.3-rc.7` 版本引入的连续推送三次的bug
 - ver 1.2.3-rc.9 完善了插件出错时的日志输出
+- ver 1.2.3-rc.10 修复不能移除边框的bug，对图片布局进行了调整，新增下播消息发送主播头像
+- ver 1.2.3-rc.11 测试版本，请跳过
+- ver 1.2.3 完善主播下播消息发送头像功能，优化控制台订阅信息显示
 
 ## 交流群