koishi-plugin-bilibili-notify 1.2.6 → 1.2.8

package/lib/comRegister.js

@@ -103,15 +103,6 @@ class ComRegister {
                 session.send(await ctx.biliAPI.getTimeNow())
             })
 
-        testCom
-            .subcommand('.exist')
-            .usage('测试写法')
-            .example('test.exist')
-            .action(async () => {
-                let num = 1;
-                console.log(num && `Hello World`);
-            })
-
         testCom
             .subcommand('.gimg <uid:string> <index:number>')
             .usage('测试图片生成')
@@ -161,13 +152,19 @@ class ComRegister {
                 // logger
                 this.logger.info('调用test gimg指令')
                 // 获取主播信息
-                const { data } = await ctx.biliAPI.getMasterInfo('194484313')
-                const resizedImage = await Jimp.read(data.info.face).then(async image => {
-                    return await image.resize(100, 100).getBufferAsync(Jimp.MIME_PNG)
-                })
+                const { data } = await ctx.biliAPI.getMasterInfo('686127')
+                let resizedImage: Buffer
+                try {
+                    resizedImage = await Jimp.read(data.info.face).then(async image => {
+                        return await image.resize(100, 100).getBufferAsync(Jimp.MIME_PNG)
+                    })
+                } catch (e) {
+                    if (e.message === 'Unsupported MIME type: image/webp') console.log('主播使用的是webp格式头像，无法进行渲染');
+                    else console.log(e);
+                }
                 // 发送下播提示语
                 await session.send(
-                    <>{h.image(resizedImage, 'image/png')} 主播{data.info.uname}已下播</>
+                    <>{resizedImage && h.image(resizedImage, 'image/png')} 主播{data.info.uname}已下播</>
                 )
             })
 
@@ -854,11 +851,11 @@ class ComRegister {
                     // 如果pic存在，则直接返回pic
                     if (pic) {
                         // pic存在，使用的是render模式
-                        await this.sendMsg(ctx, guildId, bot, pic + dUrl);
+                        await this.sendMsg(ctx, guildId, bot, pic + (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: dUrl }));
                     }
                     else {
                         // pic不存在，说明使用的是page模式
-                        await this.sendMsg(ctx, guildId, bot, koishi_1.h.image(buffer, 'image/png' + dUrl));
+                        await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, 'image/png'), " ", dUrl] }));
                     }
                     // 更新时间点为最新发布动态的发布时间
                     switch (num) {
@@ -906,27 +903,13 @@ class ComRegister {
                 }
             }
             // 推送直播信息
-            if (!liveStartMsg) {
-                // pic 存在，使用的是render模式
-                if (pic)
-                    return await this.sendMsg(ctx, guildId, bot, pic);
-                // pic不存在，说明使用的是page模式
-                await this.sendMsg(ctx, guildId, bot, koishi_1.h.image(buffer, 'image/png'));
-            }
-            else if (liveStartMsg && atAll) {
-                // pic 存在，使用的是render模式
-                if (pic)
-                    return await this.sendMsg(ctx, guildId, bot, pic + (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("at", { type: "all" }), " ", liveStartMsg, " "] }));
-                // pic不存在，说明使用的是page模式
-                await this.sendMsg(ctx, guildId, bot, koishi_1.h.image(buffer, 'image/png' + (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("at", { type: "all" }), " ", liveStartMsg] })));
-            }
-            else {
-                // pic 存在，使用的是render模式
-                if (pic)
-                    return await this.sendMsg(ctx, guildId, bot, pic + liveStartMsg);
-                // pic不存在，说明使用的是page模式
-                await this.sendMsg(ctx, guildId, bot, koishi_1.h.image(buffer, 'image/png' + liveStartMsg));
+            // pic 存在，使用的是render模式
+            if (pic) {
+                let 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, bot, pic + msg);
             }
+            // pic不存在，说明使用的是page模式
+            await this.sendMsg(ctx, guildId, bot, (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] }));
         };
         return async () => {
             try {
@@ -1000,11 +983,21 @@ class ComRegister {
                                 .replace('-name', uData.info.uname)
                                 .replace('-time', await ctx.gimg.getTimeDifference(liveTime));
                             // 获取头像并缩放
-                            const resizedImage = await jimp_1.default.read(uData.info.face).then(async (image) => {
-                                return await image.resize(100, 100).getBufferAsync(jimp_1.default.MIME_PNG);
-                            });
+                            let resizedImage;
+                            // Jimp无法处理Webp格式，直接跳过
+                            try {
+                                resizedImage = await jimp_1.default.read(uData.info.face).then(async (image) => {
+                                    return await image.resize(100, 100).getBufferAsync(jimp_1.default.MIME_PNG);
+                                });
+                            }
+                            catch (e) {
+                                if (e.message === 'Unsupported MIME type: image/webp')
+                                    console.log('主播使用的是webp格式头像，无法进行渲染');
+                                else
+                                    console.log(e);
+                            }
                             // 发送下播通知
-                            await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(resizedImage, 'image/png'), " ", liveEndMsg] }));
+                            await this.sendMsg(ctx, guildId, bot, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [resizedImage && koishi_1.h.image(resizedImage, 'image/png'), " ", liveEndMsg] }));
                         }
                         // 未进循环，还未开播，继续循环
                         break;

package/lib/index.js

@@ -158,7 +158,7 @@ class ServerManager extends koishi_1.Service {
         super(ctx, 'sm');
     }
     start() {
-        this.registerPlugin();
+        // 根据用户设置的渲染模式设置
         switch (globalConfig.renderType) {
             case 'render':
                 this.renderType = 0;
@@ -167,6 +167,8 @@ class ServerManager extends koishi_1.Service {
                 this.renderType = 1;
                 break;
         }
+        // 注册插件
+        this.registerPlugin();
     }
     registerPlugin = () => {
         const biliApi = this.ctx.plugin(biliAPI_1.default);

package/package.json

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

package/readme.md

@@ -139,6 +139,9 @@
 - ver 1.2.3 完善主播下播消息发送头像功能，优化控制台订阅信息显示
 - ver 1.2.4 优化了下播消息发送头像图片的质量和插件重启提示
 - ver 1.2.5 修复了在多群订阅的情况下，其中一个群推送失败会导致其余的群全部重新推送的bug。更换图片处理依赖以解决在插件市场中被标记为不安全插件的问题
+- ver 1.2.6 现在可以随机生成UA，并更新了UA
+- ver 1.2.7 修复不论选择什么渲染模式都是render模式的bug，优化直播卡片推送逻辑
+- ver 1.2.8 修复例如像UP主籽岷使用webp格式的头像，下播通知无法发出的bug
 
 ## 交流群