koishi-plugin-bilibili-notify 3.1.0-alpha.0 → 3.1.0

package/lib/comRegister.d.ts

@@ -1,7 +1,7 @@
 import { type Bot, type Context, type FlatPick, type Logger, Schema } from "koishi";
 import type { Notifier } from "@koishijs/plugin-notifier";
 import type { LoginBili } from "./database";
-import { LiveType, type MasterInfo, type SubItem, type SubManager, type Target } from "./type";
+import { LiveType, type MasterInfo, PushType, type SubItem, type SubManager, type Target } from "./type";
 declare class ComRegister {
     static inject: string[];
     qqRelatedBotList: Array<string>;
@@ -23,8 +23,8 @@ declare class ComRegister {
     sendPrivateMsg(content: string): Promise<void>;
     sendPrivateMsgAndRebootService(): Promise<void>;
     sendPrivateMsgAndStopService(): Promise<void>;
-    sendMessageWithRetry(broadcastTarget: string[], content: any): Promise<void>;
-    broadcastToTargets(targets: Target, content: any, live?: boolean): Promise<void>;
+    sendMessageWithRetry(bot: Bot<Context>, channelId: string, content: any): Promise<void>;
+    broadcastToTargets(targets: Target, content: any, type: PushType): Promise<void>;
     dynamicDetect(): (...args: any[]) => void;
     debug_dynamicDetect(): (...args: any[]) => void;
     useMasterInfo(uid: string, masterInfo: MasterInfo, liveType: LiveType): Promise<MasterInfo>;
@@ -50,7 +50,7 @@ declare namespace ComRegister {
             dynamic: boolean;
             live: boolean;
             target: Array<{
-                channelIdArr: Array<{
+                channelArr: Array<{
                     channelId: string;
                     dynamic: boolean;
                     live: boolean;

package/lib/comRegister.js

@@ -339,7 +339,7 @@ class ComRegister {
         // Test
         const testTarget = [
             {
-                channelIdArr: [
+                channelArr: [
                     {
                         channelId: "635762054",
                         dynamic: true,
@@ -405,73 +405,97 @@ class ComRegister {
         // 结束
         return;
     }
-    async sendMessageWithRetry(broadcastTarget, 
+    async sendMessageWithRetry(bot, channelId, 
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
     content) {
-        (0, utils_1.withRetry)(async () => await this.ctx.broadcast(broadcastTarget, content), 1).catch(async (e) => {
+        (0, utils_1.withRetry)(async () => await bot.sendMessage(channelId, content), 1).catch(async (e) => {
             if (e.message === "this._request is not a function") {
                 // 2S之后重新发送消息
                 this.ctx.setTimeout(async () => {
-                    await this.sendMessageWithRetry(broadcastTarget, content);
+                    await this.sendMessageWithRetry(bot, channelId, content);
                 }, 2000);
                 // 返回
                 return;
             }
             // 打印错误信息
-            this.logger.error(`发送群组ID:${broadcastTarget[0]}消息失败！原因: ${e.message}`);
-            await this.sendPrivateMsg(`发送群组ID:${broadcastTarget[0]}消息失败，请查看日志`);
+            this.logger.error(`发送群组ID:${channelId}消息失败！原因: ${e.message}`);
+            await this.sendPrivateMsg(`发送群组ID:${channelId}消息失败，请查看日志`);
         });
     }
-    ;
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-    async broadcastToTargets(targets, content, live) {
+    async broadcastToTargets(targets, content, type) {
         for (const target of targets) {
             // 获取机器人实例
             const bot = this.getBot(target.platform);
             // 定义需要发送的数组
-            let sendArr = [];
+            let channelArr = [];
             // 判断是否需要推送所有机器人加入的群
-            if (target.channelIdArr[0].channelId === "all") {
+            if (target.channelArr[0].channelId === "all") {
                 // 获取所有guild
                 for (const guild of (await bot.getGuildList()).data) {
-                    sendArr.push({
+                    channelArr.push({
                         channelId: guild.id,
-                        dynamic: target.channelIdArr[0].dynamic,
-                        live: target.channelIdArr[0].live,
-                        liveGuardBuy: target.channelIdArr[0].liveGuardBuy,
-                        atAll: target.channelIdArr[0].atAll,
+                        dynamic: target.channelArr[0].dynamic,
+                        live: target.channelArr[0].live,
+                        liveGuardBuy: target.channelArr[0].liveGuardBuy,
+                        atAll: target.channelArr[0].atAll,
                     });
                 }
             }
             else {
-                sendArr = target.channelIdArr;
+                channelArr = target.channelArr;
             }
-            // 判断是否是直播开播推送，如果是则需要进一步判断是否需要艾特群体成员
-            if (live) {
-                // 直播开播推送，判断是否需要艾特全体成员
-                for (const channel of sendArr) {
-                    // 构建广播目标
-                    const broadcastTarget = [`${target.platform}:${channel.channelId}`];
-                    // 判断是否需要推送直播消息
-                    if (channel.live) {
-                        await this.sendMessageWithRetry(broadcastTarget, content);
+            // 模式匹配
+            const pushTypePatternMatching = {
+                [type_1.PushType.Live]: async () => {
+                    for (const channel of channelArr) {
+                        // 判断是否需要推送动态消息
+                        if (channel.live) {
+                            await this.sendMessageWithRetry(bot, channel.channelId, content);
+                        }
+                        // 延迟发送
+                        await this.ctx.sleep(500);
                     }
-                    // 判断是否需要艾特全体成员
-                    if (channel.atAll) {
-                        await this.sendMessageWithRetry(broadcastTarget, (0, jsx_runtime_1.jsx)("at", { type: "all" }));
+                },
+                [type_1.PushType.Dynamic]: async () => {
+                    for (const channel of channelArr) {
+                        // 判断是否需要推送动态消息
+                        if (channel.live) {
+                            await this.sendMessageWithRetry(bot, channel.channelId, content);
+                        }
+                        // 延迟发送
+                        await this.ctx.sleep(500);
                     }
-                }
-            }
-            else {
-                for (const channel of sendArr) {
-                    // 构建广播目标
-                    const broadcastTarget = [`${target.platform}:${channel.channelId}`];
-                    // 判断是否需要推送动态消息
-                    if (channel.dynamic || channel.live) {
-                        await this.sendMessageWithRetry(broadcastTarget, content);
+                },
+                [type_1.PushType.StartBroadcasting]: async () => {
+                    // 直播开播推送，判断是否需要艾特全体成员
+                    for (const channel of channelArr) {
+                        // 判断是否需要推送直播消息
+                        if (channel.live) {
+                            await this.sendMessageWithRetry(bot, channel.channelId, content);
+                        }
+                        // 判断是否需要艾特全体成员
+                        if (channel.atAll) {
+                            await this.sendMessageWithRetry(bot, channel.channelId, (0, jsx_runtime_1.jsx)("at", { type: "all" }));
+                        }
+                        // 延迟发送
+                        await this.ctx.sleep(500);
+                    }
+                },
+                [type_1.PushType.LiveGuardBuy]: async () => {
+                    // 直播守护购买推送，判断是否需要艾特全体成员
+                    for (const channel of channelArr) {
+                        // 判断是否需要推送直播消息
+                        if (channel.liveGuardBuy) {
+                            await this.sendMessageWithRetry(bot, channel.channelId, content);
+                        }
+                        // 延迟发送
+                        await this.ctx.sleep(500);
                     }
                 }
-            }
+            };
+            // 推送
+            await pushTypePatternMatching[type]();
         }
     }
     dynamicDetect() {
@@ -588,7 +612,7 @@ class ComRegister {
                     // 寻找关注的UP主的动态
                     for (const sub of this.subManager) {
                         // 判断是否是订阅的UP主
-                        if (sub.dynamic && sub.uid === upUID) {
+                        if (sub.uid === upUID && sub.dynamic) {
                             // 订阅该UP主，推送该动态
                             // 推送该条动态
                             const buffer = await (0, utils_1.withRetry)(async () => {
@@ -601,13 +625,13 @@ class ComRegister {
                                 if (e.message === "出现关键词，屏蔽该动态") {
                                     // 如果需要发送才发送
                                     if (this.config.filter.notify) {
-                                        await this.broadcastToTargets(sub.target, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                        await this.broadcastToTargets(sub.target, `${upName}发布了一条含有屏蔽关键字的动态`, type_1.PushType.Dynamic);
                                     }
                                     return;
                                 }
                                 if (e.message === "已屏蔽转发动态") {
                                     if (this.config.filter.notify) {
-                                        await this.broadcastToTargets(sub.target, `${upName}转发了一条动态，已屏蔽`);
+                                        await this.broadcastToTargets(sub.target, `${upName}转发了一条动态，已屏蔽`, type_1.PushType.Dynamic);
                                     }
                                     return;
                                 }
@@ -626,7 +650,7 @@ class ComRegister {
                             // logger
                             this.logger.info("推送动态中...");
                             // 发送推送卡片
-                            await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), dUrl] }));
+                            await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), dUrl] }), type_1.PushType.Dynamic);
                             // 判断是否需要发送动态中的图片
                             if (this.config.pushImgsInDynamic) {
                                 // 判断是否为图文动态，且存在draw
@@ -634,7 +658,7 @@ class ComRegister {
                                     item.modules.module_dynamic.major?.draw) {
                                     for (const img of item.modules.module_dynamic.major.draw
                                         .items) {
-                                        await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsx)("img", { src: img.src, alt: "\u52A8\u6001\u56FE\u7247" }));
+                                        await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsx)("img", { src: img.src, alt: "\u52A8\u6001\u56FE\u7247" }), type_1.PushType.Dynamic);
                                     }
                                 }
                             }
@@ -819,13 +843,13 @@ class ComRegister {
                                 if (e.message === "出现关键词，屏蔽该动态") {
                                     // 如果需要发送才发送
                                     if (this.config.filter.notify) {
-                                        await this.broadcastToTargets(sub.target, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                        await this.broadcastToTargets(sub.target, `${upName}发布了一条含有屏蔽关键字的动态`, type_1.PushType.Dynamic);
                                     }
                                     return;
                                 }
                                 if (e.message === "已屏蔽转发动态") {
                                     if (this.config.filter.notify) {
-                                        await this.broadcastToTargets(sub.target, `${upName}转发了一条动态，已屏蔽`);
+                                        await this.broadcastToTargets(sub.target, `${upName}转发了一条动态，已屏蔽`, type_1.PushType.Dynamic);
                                     }
                                     return;
                                 }
@@ -853,7 +877,7 @@ class ComRegister {
                             // logger
                             this.logger.info("推送动态中...");
                             // 发送推送卡片
-                            await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), dUrl] }));
+                            await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), dUrl] }), type_1.PushType.Dynamic);
                             // logger
                             this.logger.info("动态推送完毕！");
                             // 判断是否需要发送动态中的图片
@@ -865,7 +889,7 @@ class ComRegister {
                                     item.modules.module_dynamic.major?.draw) {
                                     for (const img of item.modules.module_dynamic.major.draw
                                         .items) {
-                                        await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsx)("img", { src: img.src, alt: "\u52A8\u6001\u56FE\u7247" }));
+                                        await this.broadcastToTargets(sub.target, (0, jsx_runtime_1.jsx)("img", { src: img.src, alt: "\u52A8\u6001\u56FE\u7247" }), type_1.PushType.Dynamic);
                                     }
                                 }
                                 // logger
@@ -953,7 +977,7 @@ class ComRegister {
         let liveStatus = false;
         // 处理target
         // 定义channelIdArr总长度
-        let channelIdArrLen = 0;
+        let channelArrLen = 0;
         // 定义数据
         // biome-ignore lint/suspicious/noExplicitAny: <explanation>
         let liveRoomInfo;
@@ -974,17 +998,17 @@ class ComRegister {
             // 推送直播信息
             const msg = ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [koishi_1.h.image(buffer, "image/jpeg"), liveNotifyMsg || ""] }));
             // 只有在开播时才艾特全体成员
-            return await this.broadcastToTargets(target, msg, liveType === type_1.LiveType.StartBroadcasting);
+            return await this.broadcastToTargets(target, msg, liveType === type_1.LiveType.StartBroadcasting ? type_1.PushType.StartBroadcasting : type_1.PushType.Live);
         };
         // 找到频道/群组对应的
         const liveGuardBuyPushTargetArr = target.map((channel) => {
             // 获取符合条件的target
-            const liveGuardBuyArr = channel.channelIdArr.filter((channelId) => channelId.liveGuardBuy);
+            const liveGuardBuyArr = channel.channelArr.filter((channelId) => channelId.liveGuardBuy);
             // 将当前liveDanmakuArr的长度+到channelIdArrLen中
-            channelIdArrLen += liveGuardBuyArr.length;
+            channelArrLen += liveGuardBuyArr.length;
             // 返回符合的target
             return {
-                channelIdArr: liveGuardBuyArr,
+                channelArr: liveGuardBuyArr,
                 platform: channel.platform,
             };
         });
@@ -1057,7 +1081,8 @@ class ComRegister {
                 // 定义消息
                 const content = `[${masterInfo.username}的直播间]「${body.user.uname}」加入了大航海（${body.gift_name}）`;
                 // 直接发送消息
-                channelIdArrLen > 0 && this.broadcastToTargets(liveGuardBuyPushTargetArr, content);
+                channelArrLen > 0 &&
+                    this.broadcastToTargets(liveGuardBuyPushTargetArr, content, type_1.PushType.LiveGuardBuy);
             },
             onLiveStart: async () => {
                 // 判断是否已经开播
@@ -1502,7 +1527,7 @@ class ComRegister {
             dynamic: koishi_1.Schema.boolean().description("是否订阅用户动态"),
             live: koishi_1.Schema.boolean().description("是否订阅用户直播"),
             target: koishi_1.Schema.array(koishi_1.Schema.object({
-                channelIdArr: koishi_1.Schema.array(koishi_1.Schema.object({
+                channelArr: koishi_1.Schema.array(koishi_1.Schema.object({
                     channelId: koishi_1.Schema.string().description("频道/群组号"),
                     dynamic: koishi_1.Schema.boolean().description("该频道/群组是否推送动态信息"),
                     live: koishi_1.Schema.boolean().description("该频道/群组是否推送直播通知"),

package/lib/index.d.ts

@@ -30,7 +30,7 @@ export interface Config {
         live: boolean;
         card: {};
         target: Array<{
-            channelIdArr: Array<{
+            channelArr: Array<{
                 channelId: string;
                 dynamic: boolean;
                 live: boolean;

package/lib/index.js

@@ -196,12 +196,13 @@ function apply(ctx, config) {
     // 设置提示
     ctx.notifier.create({
         type: "danger",
-        content: "3.0.0-alpha.16 全面从指令订阅迁移到配置订阅，以前使用指令的订阅需要全部重新填写到订阅配置中",
+        content: "从3.1.0-alpha.0及以前版本升级到3.1.0-alpha.1及以后版本必定报错，请重新填写订阅配置中sub.target.channelArr的内容",
     });
     ctx.notifier.create({
         type: "warning",
         content: "请使用Auth插件创建超级管理员账号，没有权限将无法使用该插件提供的指令",
     });
+    ctx.logger.warn("从3.1.0-alpha.0及以前版本升级到3.1.0-alpha.1版本必定报错，请重新填写订阅配置中sub.target.channelArr的内容");
     // load database
     ctx.plugin(Database);
     // Register ServerManager
@@ -269,7 +270,7 @@ exports.Config = koishi_1.Schema.object({
             platform: koishi_1.Schema.string()
                 .required()
                 .description("推送平台，例如onebot、qq、discord"),
-            channelIdArr: koishi_1.Schema.array(koishi_1.Schema.object({
+            channelArr: koishi_1.Schema.array(koishi_1.Schema.object({
                 channelId: koishi_1.Schema.string().required().description("频道/群组号"),
                 dynamic: koishi_1.Schema.boolean()
                     .default(false)

package/lib/type/index.d.ts

@@ -5,7 +5,7 @@ export declare enum LiveType {
     StopBroadcast = 3,
     FirstLiveBroadcast = 4
 }
-export type ChannelIdArr = Array<{
+export type ChannelArr = Array<{
     channelId: string;
     dynamic: boolean;
     live: boolean;
@@ -13,7 +13,7 @@ export type ChannelIdArr = Array<{
     atAll: boolean;
 }>;
 export type TargetItem = {
-    channelIdArr: ChannelIdArr;
+    channelArr: ChannelArr;
     platform: string;
 };
 export type Target = Array<TargetItem>;
@@ -89,3 +89,9 @@ export type AllDynamicInfo = {
         update_num: number;
     };
 };
+export declare enum PushType {
+    Live = 0,
+    Dynamic = 1,
+    StartBroadcasting = 2,
+    LiveGuardBuy = 3
+}

package/lib/type/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LiveType = void 0;
+exports.PushType = exports.LiveType = void 0;
 var LiveType;
 (function (LiveType) {
     LiveType[LiveType["NotLiveBroadcast"] = 0] = "NotLiveBroadcast";
@@ -9,3 +9,10 @@ var LiveType;
     LiveType[LiveType["StopBroadcast"] = 3] = "StopBroadcast";
     LiveType[LiveType["FirstLiveBroadcast"] = 4] = "FirstLiveBroadcast";
 })(LiveType || (exports.LiveType = LiveType = {}));
+var PushType;
+(function (PushType) {
+    PushType[PushType["Live"] = 0] = "Live";
+    PushType[PushType["Dynamic"] = 1] = "Dynamic";
+    PushType[PushType["StartBroadcasting"] = 2] = "StartBroadcasting";
+    PushType[PushType["LiveGuardBuy"] = 3] = "LiveGuardBuy";
+})(PushType || (exports.PushType = PushType = {}));

package/package.json

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

package/readme.md

@@ -231,6 +231,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 - ver 3.0.5-alpha.1 优化：推送卡片渲染，调整渲染图片格式为 `jpeg`
 - ver 3.0.5-alpha.2 优化：移除多余依赖
 - ver 3.1.0-alpha.0 修复：新插件在第一次订阅时提示 `订阅失败，错误信息：该分组已经存在`； 移除：消息重发功能； 重构：将消息发送模式改为 `broadcast`
+- ver 3.1.0-alpha.1 修复：无法发送 `@全体成员` 消息，将消息发送模式改回
+- ver 3.1.0 修复：订阅某位UP主直播和动态后，某些群聊只开启推送直播也会推送动态
 
 ## 交流群