koishi-plugin-bilibili-notify 2.0.0-alpha.21 → 2.0.0-alpha.23

package/lib/biliAPI.d.ts

@@ -54,7 +54,6 @@ declare class BiliAPI extends Service {
     createNewClient(): void;
     getTimeOfUTC8(): number;
     getCookies(): string;
-    getCookiesForHeader(): Promise<string>;
     getLoginInfoIsLoaded(): boolean;
     getLoginInfoFromDB(): Promise<{
         cookies: any;

package/lib/biliAPI.js

@@ -375,21 +375,6 @@ class BiliAPI extends koishi_1.Service {
         const cookies = JSON.stringify(this.jar.serializeSync().cookies);
         return cookies;
     }
-    async getCookiesForHeader() {
-        try {
-            // 获取cookies对象
-            const cookies = this.jar.serializeSync().cookies;
-            // 将每个 cookie 对象转换为 "key=value" 形式，并用 "; " 连接起来
-            const cookieHeader = cookies
-                .map(cookie => `${cookie.key}=${cookie.value}`)
-                .join('; ');
-            return cookieHeader;
-        }
-        catch (e) {
-            console.error("无效的 JSON 格式：", e);
-            return "";
-        }
-    }
     getLoginInfoIsLoaded() {
         return this.loginInfoIsLoaded;
     }

package/lib/comRegister.js

@@ -671,13 +671,17 @@ class ComRegister {
             else {
                 sendArr = target.channelIdArr;
             }
-            // 判断是否是直播推送，如果是则需要进一步判断是否需要艾特群体成员
+            // 判断是否是直播开播推送，如果是则需要进一步判断是否需要艾特群体成员
             if (live) {
                 // 直播开播推送，判断是否需要艾特全体成员
                 for (const channel of sendArr) {
                     // 判断是否需要推送直播消息
                     if (channel.live) {
-                        await this.sendMsgFunc(bot, channel.channelId, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [content, channel.atAll ? (0, jsx_runtime_1.jsx)("at", { type: "all" }) : ''] }));
+                        await this.sendMsgFunc(bot, channel.channelId, content);
+                    }
+                    // 判断是否需要艾特全体成员
+                    if (channel.atAll) {
+                        await this.sendMsgFunc(bot, channel.channelId, (0, jsx_runtime_1.jsx)("at", { type: "all" }));
                     }
                 }
             }

package/lib/index.js

@@ -47,7 +47,6 @@ const Database = __importStar(require("./database"));
 // import Service
 const generateImg_1 = __importDefault(require("./generateImg"));
 const biliAPI_1 = __importDefault(require("./biliAPI"));
-const blive_1 = __importDefault(require("./blive"));
 exports.inject = ['puppeteer', 'database', 'notifier'];
 exports.name = 'bilibili-notify';
 let globalConfig;
@@ -323,13 +322,10 @@ class ServerManager extends koishi_1.Service {
                 filter: globalConfig.filter,
                 dynamicDebugMode: globalConfig.dynamicDebugMode
             });
-            // BL = BLive
-            const bl = this.ctx.plugin(blive_1.default, {});
             // 添加服务
             this.servers.push(ba);
             this.servers.push(gi);
             this.servers.push(cr);
-            this.servers.push(bl);
         }
         catch (e) {
             this.logger.error('插件注册失败', e);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "2.0.0-alpha.21",
+  "version": "2.0.0-alpha.23",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -29,7 +29,6 @@
   "dependencies": {
     "axios": "^1.7.9",
     "axios-cookiejar-support": "^5.0.5",
-    "blive-message-listener": "^0.5.0",
     "jsdom": "^24.1.3",
     "luxon": "^3.5.0",
     "md5": "^2.3.0",

package/readme.md

@@ -208,6 +208,8 @@
 - ver 2.0.0-alpha.19 修复：开播通知后带false；下播通知卡片人气位置显示false
 - ver 2.0.0-alpha.20 修复：直播推送失败 `Error with request send_group_msg`
 - ver 2.0.0-alpha.21 修复：在某些场景下仍会出现 `2.0.0-alpha.19` 和 `2.0.0-alpha.20` 版本已修复的问题
+- ver 2.0.0-alpha.22 移除：不需要的服务
+- ver 2.0.0-alpha.23 优化：将艾特全体成员消息单独发送
 
 ## 交流群
 

package/lib/blive.d.ts

@@ -1,9 +0,0 @@
-import { Context, Logger } from "koishi";
-declare class BLive {
-    static inject: string[];
-    ctx: Context;
-    logger: Logger;
-    constructor(ctx: Context);
-    startLiveRoomListener(roomId: number): Promise<void>;
-}
-export default BLive;

package/lib/blive.js

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const blive_message_listener_1 = require("blive-message-listener");
-class BLive {
-    // 必要服务
-    static inject = ['ba'];
-    // 定义类属性
-    ctx;
-    logger;
-    constructor(ctx) {
-        // 将ctx赋值给类属性
-        this.ctx = ctx;
-        // 创建logger
-        this.logger = ctx.logger('bl');
-        // TEST
-        ctx.setTimeout(() => {
-            this.startLiveRoomListener(732);
-        }, 1000);
-    }
-    async startLiveRoomListener(roomId) {
-        // 获取cookieStr
-        const cookiesStr = await this.ctx.ba.getCookiesForHeader();
-        // 构建消息处理函数
-        const handler = {
-            onOpen: () => {
-                this.logger.info('服务器连接成功');
-            },
-            onClose: () => {
-                this.logger.info('服务器连接已断开');
-            },
-            onIncomeDanmu: (msg) => {
-                console.log(msg.id, msg.body);
-            },
-            onIncomeSuperChat: (msg) => {
-                console.log(msg.id, msg.body);
-            }
-        };
-        // 获取自身信息
-        const mySelfInfo = await this.ctx.ba.getMyselfInfo();
-        // 创建实例
-        (0, blive_message_listener_1.startListen)(roomId, handler, {
-            ws: {
-                headers: {
-                    Cookie: cookiesStr
-                },
-                uid: mySelfInfo.data.mid
-            }
-        });
-    }
-}
-exports.default = BLive;