koishi-plugin-bilibili-notify 3.0.5-alpha.2 → 3.1.0-alpha.1

package/lib/comRegister.d.ts

@@ -16,7 +16,6 @@ declare class ComRegister {
     loginDBData: FlatPick<LoginBili, "dynamic_group_id">;
     privateBot: Bot<Context>;
     dynamicDispose: () => void;
-    sendMsgFunc: (bot: Bot<Context, any>, channelId: string, content: any) => Promise<void>;
     constructor(ctx: Context, config: ComRegister.Config);
     init(config: ComRegister.Config): Promise<void>;
     getBot(pf: string): Bot<Context, any>;
@@ -24,7 +23,8 @@ declare class ComRegister {
     sendPrivateMsg(content: string): Promise<void>;
     sendPrivateMsgAndRebootService(): Promise<void>;
     sendPrivateMsgAndStopService(): Promise<void>;
-    sendMsg(targets: Target, content: any, live?: boolean): Promise<void>;
+    sendMessageWithRetry(bot: Bot<Context>, channelId: string, content: any): Promise<void>;
+    broadcastToTargets(targets: Target, content: any, live?: boolean): 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;
@@ -73,7 +73,6 @@ declare namespace ComRegister {
             masterAccount: string;
             masterAccountGuildId: string;
         };
-        automaticResend: boolean;
         liveDetectMode: "API" | "WS";
         restartPush: boolean;
         pushTime: number;

package/lib/comRegister.js

@@ -48,8 +48,6 @@ class ComRegister {
     privateBot;
     // 动态检测销毁函数
     dynamicDispose;
-    // 发送消息方式
-    sendMsgFunc;
     // 构造函数
     constructor(ctx, config) {
         // 将ctx赋值给类属性
@@ -286,49 +284,6 @@ class ComRegister {
                 content: "您未配置私人机器人，将无法向您推送机器人状态！",
             });
         }
-        // 判断消息发送方式
-        if (config.automaticResend) {
-            this.sendMsgFunc = async (
-            // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-            bot, channelId, 
-            // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-            content) => {
-                (0, utils_1.withRetry)(async () => await bot.sendMessage(channelId, content)).catch(async (e) => {
-                    if (e.message === "this._request is not a function") {
-                        // 2S之后重新发送消息
-                        this.ctx.setTimeout(async () => {
-                            await this.sendMsgFunc(bot, channelId, content);
-                        }, 2000);
-                        // 返回
-                        return;
-                    }
-                    // 打印错误信息
-                    this.logger.error(`发送群组ID:${channelId}消息失败！原因: ${e.message}`);
-                    await this.sendPrivateMsg(`发送群组ID:${channelId}消息失败，请查看日志`);
-                });
-            };
-        }
-        else {
-            this.sendMsgFunc = async (
-            // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-            bot, channelId, 
-            // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-            content) => {
-                (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.sendMsgFunc(bot, channelId, content);
-                        }, 2000);
-                        // 返回
-                        return;
-                    }
-                    // 打印错误信息
-                    this.logger.error(`发送群组ID:${channelId}消息失败！原因: ${e.message}`);
-                    await this.sendPrivateMsg(`发送群组ID:${channelId}消息失败，请查看日志`);
-                });
-            };
-        }
         // 检查登录数据库是否有数据
         this.loginDBData = (await this.ctx.database.get("loginBili", 1, ["dynamic_group_id"]))[0];
         // 判断登录信息是否已加载完毕
@@ -384,7 +339,7 @@ class ComRegister {
         // Test
         const testTarget = [
             {
-                channelIdArr: [
+                channelArr: [
                     {
                         channelId: "635762054",
                         dynamic: true,
@@ -450,49 +405,71 @@ class ComRegister {
         // 结束
         return;
     }
+    async sendMessageWithRetry(bot, channelId, 
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
-    async sendMsg(targets, content, live) {
+    content) {
+        (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(bot, channelId, content);
+                }, 2000);
+                // 返回
+                return;
+            }
+            // 打印错误信息
+            this.logger.error(`发送群组ID:${channelId}消息失败！原因: ${e.message}`);
+            await this.sendPrivateMsg(`发送群组ID:${channelId}消息失败，请查看日志`);
+        });
+    }
+    // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+    async broadcastToTargets(targets, content, live) {
         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) {
+                for (const channel of channelArr) {
                     // 判断是否需要推送直播消息
                     if (channel.live) {
-                        await this.sendMsgFunc(bot, channel.channelId, content);
+                        await this.sendMessageWithRetry(bot, channel.channelId, content);
                     }
                     // 判断是否需要艾特全体成员
                     if (channel.atAll) {
-                        await this.sendMsgFunc(bot, channel.channelId, (0, jsx_runtime_1.jsx)("at", { type: "all" }));
+                        await this.sendMessageWithRetry(bot, channel.channelId, (0, jsx_runtime_1.jsx)("at", { type: "all" }));
                     }
+                    // 延迟发送
+                    await this.ctx.sleep(500);
                 }
             }
             else {
-                for (const channel of sendArr) {
+                // 不是直播开播推送
+                for (const channel of channelArr) {
                     // 判断是否需要推送动态消息
                     if (channel.dynamic || channel.live) {
-                        await this.sendMsgFunc(bot, channel.channelId, content);
+                        await this.sendMessageWithRetry(bot, channel.channelId, content);
                     }
+                    // 延迟发送
+                    await this.ctx.sleep(500);
                 }
             }
         }
@@ -624,13 +601,13 @@ class ComRegister {
                                 if (e.message === "出现关键词，屏蔽该动态") {
                                     // 如果需要发送才发送
                                     if (this.config.filter.notify) {
-                                        await this.sendMsg(sub.target, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                        await this.broadcastToTargets(sub.target, `${upName}发布了一条含有屏蔽关键字的动态`);
                                     }
                                     return;
                                 }
                                 if (e.message === "已屏蔽转发动态") {
                                     if (this.config.filter.notify) {
-                                        await this.sendMsg(sub.target, `${upName}转发了一条动态，已屏蔽`);
+                                        await this.broadcastToTargets(sub.target, `${upName}转发了一条动态，已屏蔽`);
                                     }
                                     return;
                                 }
@@ -649,7 +626,7 @@ class ComRegister {
                             // logger
                             this.logger.info("推送动态中...");
                             // 发送推送卡片
-                            await this.sendMsg(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] }));
                             // 判断是否需要发送动态中的图片
                             if (this.config.pushImgsInDynamic) {
                                 // 判断是否为图文动态，且存在draw
@@ -657,7 +634,7 @@ class ComRegister {
                                     item.modules.module_dynamic.major?.draw) {
                                     for (const img of item.modules.module_dynamic.major.draw
                                         .items) {
-                                        await this.sendMsg(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" }));
                                     }
                                 }
                             }
@@ -842,13 +819,13 @@ class ComRegister {
                                 if (e.message === "出现关键词，屏蔽该动态") {
                                     // 如果需要发送才发送
                                     if (this.config.filter.notify) {
-                                        await this.sendMsg(sub.target, `${upName}发布了一条含有屏蔽关键字的动态`);
+                                        await this.broadcastToTargets(sub.target, `${upName}发布了一条含有屏蔽关键字的动态`);
                                     }
                                     return;
                                 }
                                 if (e.message === "已屏蔽转发动态") {
                                     if (this.config.filter.notify) {
-                                        await this.sendMsg(sub.target, `${upName}转发了一条动态，已屏蔽`);
+                                        await this.broadcastToTargets(sub.target, `${upName}转发了一条动态，已屏蔽`);
                                     }
                                     return;
                                 }
@@ -876,7 +853,7 @@ class ComRegister {
                             // logger
                             this.logger.info("推送动态中...");
                             // 发送推送卡片
-                            await this.sendMsg(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] }));
                             // logger
                             this.logger.info("动态推送完毕！");
                             // 判断是否需要发送动态中的图片
@@ -888,7 +865,7 @@ class ComRegister {
                                     item.modules.module_dynamic.major?.draw) {
                                     for (const img of item.modules.module_dynamic.major.draw
                                         .items) {
-                                        await this.sendMsg(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" }));
                                     }
                                 }
                                 // logger
@@ -976,7 +953,7 @@ class ComRegister {
         let liveStatus = false;
         // 处理target
         // 定义channelIdArr总长度
-        let channelIdArrLen = 0;
+        let channelArrLen = 0;
         // 定义数据
         // biome-ignore lint/suspicious/noExplicitAny: <explanation>
         let liveRoomInfo;
@@ -997,17 +974,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.sendMsg(target, msg, liveType === type_1.LiveType.StartBroadcasting);
+            return await this.broadcastToTargets(target, msg, liveType === type_1.LiveType.StartBroadcasting);
         };
         // 找到频道/群组对应的
         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,
             };
         });
@@ -1080,7 +1057,8 @@ class ComRegister {
                 // 定义消息
                 const content = `[${masterInfo.username}的直播间]「${body.user.uname}」加入了大航海（${body.gift_name}）`;
                 // 直接发送消息
-                channelIdArrLen > 0 && this.sendMsg(liveGuardBuyPushTargetArr, content);
+                channelArrLen > 0 &&
+                    this.broadcastToTargets(liveGuardBuyPushTargetArr, content);
             },
             onLiveStart: async () => {
                 // 判断是否已经开播
@@ -1257,8 +1235,12 @@ class ComRegister {
                         if (group.name === "订阅") {
                             // 拿到分组id
                             this.loginDBData.dynamic_group_id = group.tagid;
-                            // 结束循环
-                            break;
+                            // 保存到数据库
+                            this.ctx.database.set("loginBili", 1, {
+                                dynamic_group_id: this.loginDBData.dynamic_group_id,
+                            });
+                            // 返回分组已存在
+                            return { code: 0, msg: "分组已存在" };
                         }
                     }
                 }
@@ -1521,7 +1503,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("该频道/群组是否推送直播通知"),
@@ -1546,7 +1528,6 @@ class ComRegister {
             masterAccount: koishi_1.Schema.string(),
             masterAccountGuildId: koishi_1.Schema.string(),
         }),
-        automaticResend: koishi_1.Schema.boolean().required(),
         liveDetectMode: koishi_1.Schema.union([
             koishi_1.Schema.const("API"),
             koishi_1.Schema.const("WS"),

package/lib/index.d.ts

@@ -20,7 +20,6 @@ export interface Config {
     key: string;
     master: {};
     basicSettings: {};
-    automaticResend: boolean;
     userAgent: string;
     subTitle: {};
     subLoadTimeout: number;
@@ -31,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

@@ -127,7 +127,6 @@ class ServerManager extends koishi_1.Service {
                 subLoadTimeout: globalConfig.subLoadTimeout,
                 sub: globalConfig.sub,
                 master: globalConfig.master,
-                automaticResend: globalConfig.automaticResend,
                 liveDetectMode: globalConfig.liveDetectMode,
                 restartPush: globalConfig.restartPush,
                 pushTime: globalConfig.pushTime,
@@ -197,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
@@ -254,9 +254,6 @@ exports.Config = koishi_1.Schema.object({
         ]),
     ]),
     basicSettings: koishi_1.Schema.object({}).description("基本设置"),
-    automaticResend: koishi_1.Schema.boolean()
-        .default(true)
-        .description("是否开启自动重发功能，默认开启。开启后，如果推送失败，将会自动重发，尝试三次。关闭后，推送失败将不会再重发，直到下一次推送"),
     userAgent: koishi_1.Schema.string()
         .required()
         .description("设置请求头User-Agen，请求出现-352时可以尝试修改，UA获取方法可参考：https://blog.csdn.net/qq_44503987/article/details/104929111"),
@@ -273,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>;

package/package.json

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

package/readme.md

@@ -230,6 +230,8 @@ uid为必填参数，为要推送的UP主的UID，index为可选参数，为要
 - ver 3.0.5-alpha.0 优化：推送卡片渲染，压缩图片； 新增：指令 `bili dyn` 可用于推送指定UP主指定动态
 - 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 修复：无法发送 `@全体成员` 消息，将消息发送模式改回
 
 ## 交流群