koishi-plugin-bilibili-notify 3.1.1-alpha.0 → 3.1.2-alpha.0

package/lib/comRegister.d.ts

@@ -24,6 +24,7 @@ declare class ComRegister {
     sendPrivateMsgAndRebootService(): Promise<void>;
     sendPrivateMsgAndStopService(): Promise<void>;
     sendMessageWithRetry(bot: Bot<Context>, channelId: string, content: any): Promise<void>;
+    getGroupsThatMeetCriteria(targets: Target, type: PushType): string[];
     broadcastToTargets(targets: Target, content: any, type: PushType): Promise<void>;
     dynamicDetect(): (...args: any[]) => void;
     debug_dynamicDetect(): (...args: any[]) => void;

package/lib/comRegister.js

@@ -422,82 +422,93 @@ class ComRegister {
             await this.sendPrivateMsg(`发送群组ID:${channelId}消息失败，请查看日志`);
         });
     }
-    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-    async broadcastToTargets(targets, content, type) {
-        for (const target of targets) {
-            // 获取机器人实例
-            const bot = this.getBot(target.platform);
-            // 定义需要发送的数组
-            let channelArr = [];
-            // 判断是否需要推送所有机器人加入的群
-            if (target.channelArr[0].channelId === "all") {
-                // 获取所有guild
-                for (const guild of (await bot.getGuildList()).data) {
-                    channelArr.push({
-                        channelId: guild.id,
-                        dynamic: target.channelArr[0].dynamic,
-                        live: target.channelArr[0].live,
-                        liveGuardBuy: target.channelArr[0].liveGuardBuy,
-                        atAll: target.channelArr[0].atAll,
-                    });
+    getGroupsThatMeetCriteria(targets, type) {
+        // 定义数组
+        const pushArr = [];
+        // 判断类型
+        if (type === type_1.PushType.Live || type === type_1.PushType.StartBroadcasting) {
+            for (const target of targets) {
+                for (const channel of target.channelArr) {
+                    if (channel.live) {
+                        pushArr.push(`${target.platform}:${channel.channelId}`);
+                    }
                 }
             }
-            else {
-                channelArr = target.channelArr;
-            }
-            // 模式匹配
-            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);
-                    }
-                },
-                [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);
-                    }
-                },
-                [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);
+            return pushArr;
+        }
+        if (type === type_1.PushType.Dynamic) {
+            for (const target of targets) {
+                for (const channel of target.channelArr) {
+                    if (channel.dynamic) {
+                        pushArr.push(`${target.platform}:${channel.channelId}`);
                     }
-                },
-                [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);
+                }
+            }
+            return pushArr;
+        }
+        if (type === type_1.PushType.LiveGuardBuy) {
+            for (const target of targets) {
+                for (const channel of target.channelArr) {
+                    if (channel.liveGuardBuy) {
+                        pushArr.push(`${target.platform}:${channel.channelId}`);
                     }
-                },
-            };
-            // 推送
-            await pushTypePatternMatching[type]();
+                }
+            }
+            return pushArr;
         }
     }
+    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+    async broadcastToTargets(targets, content, type) {
+        // 不止一个目标平台或一个目标频道
+        if (targets.length !== 1 || targets[0].channelArr.length !== 1) {
+            // 直接使用broadcast
+            const pushArr = this.getGroupsThatMeetCriteria(targets, type);
+            // logger
+            this.logger.info(`推送消息到 ${pushArr.length} 个目标频道，目标频道为：${pushArr.join(", ")}`);
+            // 推送消息
+            await (0, utils_1.withRetry)(async () => {
+                await this.ctx.broadcast(pushArr, content);
+            }, 1);
+            // 结束
+            return;
+        }
+        // 获取目标
+        const targetChannel = targets[0].channelArr[0];
+        // 获取机器人实例
+        const bot = this.getBot(targets[0].platform);
+        // 模式匹配
+        const pushTypePatternMatching = {
+            [type_1.PushType.Live]: async () => {
+                if (targetChannel.live) {
+                    // 直接推送
+                    await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
+                }
+            },
+            [type_1.PushType.Dynamic]: async () => {
+                if (targetChannel.dynamic) {
+                    await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
+                }
+            },
+            [type_1.PushType.StartBroadcasting]: async () => {
+                // 判断是否需要推送直播消息
+                if (targetChannel.live) {
+                    await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
+                }
+                // 判断是否需要艾特全体成员
+                if (targetChannel.atAll) {
+                    await this.sendMessageWithRetry(bot, targetChannel.channelId, (0, jsx_runtime_1.jsx)("at", { type: "all" }));
+                }
+            },
+            [type_1.PushType.LiveGuardBuy]: async () => {
+                // 判断是否需要推送直播消息
+                if (targetChannel.liveGuardBuy) {
+                    await this.sendMessageWithRetry(bot, targetChannel.channelId, content);
+                }
+            },
+        };
+        // 推送
+        await pushTypePatternMatching[type]();
+    }
     dynamicDetect() {
         // 检测初始化变量
         let detectSetup = true;

package/lib/type/index.d.ts

@@ -5,13 +5,14 @@ export declare enum LiveType {
     StopBroadcast = 3,
     FirstLiveBroadcast = 4
 }
-export type ChannelArr = Array<{
+export type Channel = {
     channelId: string;
     dynamic: boolean;
     live: boolean;
     liveGuardBuy: boolean;
     atAll: boolean;
-}>;
+};
+export type ChannelArr = Array<Channel>;
 export type TargetItem = {
     channelArr: ChannelArr;
     platform: string;

package/package.json

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

package/readme.md

@@ -234,6 +234,7 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 - ver 3.1.0-alpha.1 修复：无法发送 `@全体成员` 消息，将消息发送模式改回
 - ver 3.1.0 修复：订阅某位UP主直播和动态后，某些群聊只开启推送直播也会推送动态
 - ver 3.1.1-alpha.0 修复：稿件重投后，会将之前日期的动态一起推送； 优化：加强动态debug输出； 移除：不必要选项 `live.liveDetectMode`
+- ver 3.1.2-alpha.0 重构：对消息发送模块进行小型重构，多群多平台推送将不再支持艾特全体成员，仅单平台单群聊支持； 移除：群聊 `all` 选项
 
 ## 交流群