koishi-plugin-bilibili-notify 1.2.5 → 1.2.7

package/lib/biliAPI.d.ts

@@ -28,6 +28,7 @@ declare class BiliAPI extends Service {
     getLiveRoomInfo(roomId: string): Promise<any>;
     getMasterInfo(mid: string): Promise<any>;
     disposeNotifier(): void;
+    getRandomUserAgent(): string;
     createNewClient(): void;
     getTimeOfUTC8(): number;
     getCookies(): string;

package/lib/biliAPI.js

@@ -150,13 +150,29 @@ class BiliAPI extends koishi_1.Service {
         }
     }
     disposeNotifier() { this.loginNotifier && this.loginNotifier.dispose(); }
+    getRandomUserAgent() {
+        const userAgents = [
+            // Chrome
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36',
+            // Firefox
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0',
+            // Safari
+            'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.3 Safari/605.1.15',
+            // Internet Explorer
+            'Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; AS; rv:11.0) like Gecko',
+            // Edge
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36 Edg/98.0.1108.62',
+        ];
+        const index = Math.floor(Math.random() * userAgents.length);
+        return userAgents[index];
+    }
     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',
-                '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',
+                'User-Agent': this.getRandomUserAgent(),
                 'Origin': 'https://www.bilibili.com',
                 'Referer': 'https://www.bilibili.com/'
             }

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('测试图片生成')
@@ -854,11 +845,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 +897,29 @@ class ComRegister {
                 }
             }
             // 推送直播信息
-            if (!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] }));
+            /* if (!liveStartMsg) {
                 // pic 存在，使用的是render模式
-                if (pic)
-                    return await this.sendMsg(ctx, guildId, bot, pic);
+                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) {
+                await this.sendMsg(ctx, guildId, bot, 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, " "] }));
+                if (pic) return await this.sendMsg(ctx, guildId, bot, pic + <><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 {
+                await this.sendMsg(ctx, guildId, bot, <>{h.image(buffer, 'image/png')} <at type="all" /> {liveStartMsg}</>)
+            } else {
                 // pic 存在，使用的是render模式
-                if (pic)
-                    return await this.sendMsg(ctx, guildId, bot, pic + liveStartMsg);
+                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));
-            }
+                await this.sendMsg(ctx, guildId, bot, h.image(buffer, 'image/png' + liveStartMsg))
+            } */
         };
         return async () => {
             try {

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.5",
+  "version": "1.2.7",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],

package/readme.md

@@ -139,6 +139,8 @@
 - 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，优化直播卡片推送逻辑
 
 ## 交流群