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

package/lib/index.cjs

@@ -70,7 +70,7 @@ openai = __toESM(openai);
 const BAConfigSchema = koishi.Schema.object({
 	require: koishi.Schema.object({}).description("必填设置"),
 	key: koishi.Schema.string().pattern(/^[0-9a-f]{32}$/).role("secret").required().description("请输入一个32位小写字母的十六进制密钥（例如：9b8db7ae562b9864efefe06289cc5530），使用此密钥将你的B站登录信息存储在数据库中，请一定保存好此密钥。如果你忘记了此密钥，必须重新登录。你可以自行生成，或到这个网站生成：https://www.sexauth.com/"),
-	master: koishi.Schema.intersect([koishi.Schema.object({ enable: koishi.Schema.boolean().default(false).description("是否开启主人账号功能，如果您的机器人没有私聊权限请不要开启此功能。开启后如果机器人运行错误会向您进行报告") }).description("主人账号"), koishi.Schema.union([koishi.Schema.object({
+	master: koishi.Schema.intersect([koishi.Schema.object({ enable: koishi.Schema.boolean().default(false).description("是否开启主人账号功能，开启后如果机器人运行错误会向您进行报告。如果您的机器人没有私聊权限请不要开启此功能") }).description("主人账号"), koishi.Schema.union([koishi.Schema.object({
 		enable: koishi.Schema.const(true).required(),
 		platform: koishi.Schema.union([
 			"qq",
@@ -98,19 +98,19 @@ const BAConfigSchema = koishi.Schema.object({
 	subTitle: koishi.Schema.object({}).description("订阅配置"),
 	advancedSub: koishi.Schema.boolean().default(false).description("是否开启高级订阅，高级订阅是独立于本插件的一个专门用于订阅配置的插件，用于高度自定义订阅消息。若开启高级订阅，请打开该选项并下载插件 bilibili-notify-advanced-subscription"),
 	subs: koishi.Schema.array(koishi.Schema.object({
-		name: koishi.Schema.string().required().description("备注"),
+		name: koishi.Schema.string().required().description("UP昵称"),
 		uid: koishi.Schema.string().required().description("UID和roomid"),
 		dynamic: koishi.Schema.boolean().default(true).description("动态"),
-		dynamicAtAll: koishi.Schema.boolean().default(false).description("动态At全体"),
+		dynamicAtAll: koishi.Schema.boolean().default(false).description("动态@全体"),
 		live: koishi.Schema.boolean().default(true).description("直播"),
-		liveAtAll: koishi.Schema.boolean().default(true).description("直播At全体"),
+		liveAtAll: koishi.Schema.boolean().default(true).description("直播@全体"),
 		liveGuardBuy: koishi.Schema.boolean().default(false).description("上舰消息"),
 		superchat: koishi.Schema.boolean().default(false).description("SC消息"),
 		wordcloud: koishi.Schema.boolean().default(true).description("弹幕词云"),
 		liveSummary: koishi.Schema.boolean().default(true).description("直播总结"),
 		platform: koishi.Schema.string().required().description("平台名"),
 		target: koishi.Schema.string().required().description("群号/频道号")
-	})).role("table").description("输入订阅信息，自定义订阅内容； UID和roomid，如果经常在初始化插件遇到风控问题，请补充直播间房间号，使用英文逗号分隔例如,1234567,114514 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
+	})).role("table").description("请在这里填写订阅信息；UP昵称是必填项，影响通知时显示的UP主昵称；UID和roomid，请填写订阅用户的UID，如果经常在初始化插件遇到风控问题，请补充直播间房间号，使用英文逗号分隔例如：1234567,114514；平台名，请填写adapter-xxxx中的xxxx，例如你的机器人使用的是adapter-onebot就填写onebot；群号/频道号，直接填写即可，如果有多个群聊或频道请使用英文逗号分隔，例如：1234567,2345678"),
 	dynamic: koishi.Schema.object({}).description("动态推送设置"),
 	dynamicUrl: koishi.Schema.boolean().default(false).description("发送动态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！"),
 	dynamicCron: koishi.Schema.string().default("*/2 * * * *").description("动态监测时间，请填入cron表达式，请勿填入过短时间"),
@@ -130,8 +130,9 @@ const BAConfigSchema = koishi.Schema.object({
 		"🎖️ 特别嘉奖：-un4 & -un5",
 		"你们的弹幕，我们都记录在案！🕵️‍♀️"
 	]).role("table").description("自定义直播总结语，开启弹幕词云自动发送。变量解释：-dmc代表总弹幕发送人数，-mdn代表主播粉丝牌子名，-dca代表总弹幕数，-un1到-un5代表弹幕发送条数前五名用户的用户名，-dc1到-dc5代表弹幕发送条数前五名的弹幕发送数量，数组每一行代表换行"),
-	customGuardBuyImg: koishi.Schema.intersect([koishi.Schema.object({ enable: koishi.Schema.boolean().default(false).description("是否开启自定义上舰图片功能").experimental() }), koishi.Schema.union([koishi.Schema.object({
+	customGuardBuy: koishi.Schema.intersect([koishi.Schema.object({ enable: koishi.Schema.boolean().default(false).description("是否开启自定义上舰消息功能").experimental() }), koishi.Schema.union([koishi.Schema.object({
 		enable: koishi.Schema.const(true).required(),
+		guardBuyMsg: koishi.Schema.string().default("【-mname的直播间】-uname加入了大航海（-guard）").description("自定义上舰消息，-uname代表用户昵称，-muname代表主播昵称，-guard代表舰长类型"),
 		captainImgUrl: koishi.Schema.string().default("https://s1.hdslb.com/bfs/static/blive/live-pay-mono/relation/relation/assets/captain-Bjw5Byb5.png").description("舰长图片链接"),
 		supervisorImgUrl: koishi.Schema.string().default("https://s1.hdslb.com/bfs/static/blive/live-pay-mono/relation/relation/assets/supervisor-u43ElIjU.png").description("提督图片链接"),
 		governorImgUrl: koishi.Schema.string().default("https://s1.hdslb.com/bfs/static/blive/live-pay-mono/relation/relation/assets/governor-DpDXKEdA.png").description("总督图片链接")
@@ -865,11 +866,12 @@ var ComRegister = class ComRegister {
 				roomid,
 				dynamic: s.dynamic,
 				live: s.live,
+				liveEnd: true,
 				target,
 				customCardStyle: { enable: false },
 				customLiveMsg: { enable: false },
 				customLiveSummary: { enable: false },
-				customGuardBuyImg: { enable: false }
+				customGuardBuy: { enable: false }
 			};
 		});
 		return subs;
@@ -933,15 +935,17 @@ var ComRegister = class ComRegister {
 				sub.customLiveMsg.customLiveEnd = this.config.customLiveEnd;
 				sub.customLiveMsg.customLive = this.config.customLive;
 			}
-			if (sub.customGuardBuyImg.enable) {
-				if (!sub.customGuardBuyImg.captainImgUrl.trim()) sub.customGuardBuyImg.captainImgUrl = this.config.customGuardBuyImg.captainImgUrl;
-				if (!sub.customGuardBuyImg.supervisorImgUrl.trim()) sub.customGuardBuyImg.supervisorImgUrl = this.config.customGuardBuyImg.supervisorImgUrl;
-				if (!sub.customGuardBuyImg.governorImgUrl.trim()) sub.customGuardBuyImg.governorImgUrl = this.config.customGuardBuyImg.governorImgUrl;
-			} else if (this.config.customGuardBuyImg.enable) {
-				sub.customGuardBuyImg.enable = true;
-				sub.customGuardBuyImg.captainImgUrl = this.config.customGuardBuyImg.captainImgUrl;
-				sub.customGuardBuyImg.supervisorImgUrl = this.config.customGuardBuyImg.supervisorImgUrl;
-				sub.customGuardBuyImg.governorImgUrl = this.config.customGuardBuyImg.governorImgUrl;
+			if (sub.customGuardBuy.enable) {
+				if (!sub.customGuardBuy.guardBuyMsg.trim()) sub.customGuardBuy.guardBuyMsg = this.config.customGuardBuy.guardBuyMsg;
+				if (!sub.customGuardBuy.captainImgUrl.trim()) sub.customGuardBuy.captainImgUrl = this.config.customGuardBuy.captainImgUrl;
+				if (!sub.customGuardBuy.supervisorImgUrl.trim()) sub.customGuardBuy.supervisorImgUrl = this.config.customGuardBuy.supervisorImgUrl;
+				if (!sub.customGuardBuy.governorImgUrl.trim()) sub.customGuardBuy.governorImgUrl = this.config.customGuardBuy.governorImgUrl;
+			} else if (this.config.customGuardBuy.enable) {
+				sub.customGuardBuy.enable = true;
+				sub.customGuardBuy.guardBuyMsg = this.config.customGuardBuy.guardBuyMsg;
+				sub.customGuardBuy.captainImgUrl = this.config.customGuardBuy.captainImgUrl;
+				sub.customGuardBuy.supervisorImgUrl = this.config.customGuardBuy.supervisorImgUrl;
+				sub.customGuardBuy.governorImgUrl = this.config.customGuardBuy.governorImgUrl;
 			}
 			if (sub.customLiveSummary.enable) {
 				if (!sub.customLiveSummary.liveSummary.trim()) sub.customLiveSummary.liveSummary = this.config.liveSummary.join("\n");
@@ -1489,13 +1493,14 @@ var ComRegister = class ComRegister {
 			},
 			onGuardBuy: async ({ body }) => {
 				const msg = await (async () => {
-					if (sub.customGuardBuyImg.enable) {
+					if (sub.customGuardBuy.enable) {
 						const guardImg = {
-							[blive_message_listener.GuardLevel.Jianzhang]: sub.customGuardBuyImg.captainImgUrl,
-							[blive_message_listener.GuardLevel.Tidu]: sub.customGuardBuyImg.supervisorImgUrl,
-							[blive_message_listener.GuardLevel.Zongdu]: sub.customGuardBuyImg.governorImgUrl
+							[blive_message_listener.GuardLevel.Jianzhang]: sub.customGuardBuy.captainImgUrl,
+							[blive_message_listener.GuardLevel.Tidu]: sub.customGuardBuy.supervisorImgUrl,
+							[blive_message_listener.GuardLevel.Zongdu]: sub.customGuardBuy.governorImgUrl
 						};
-						return (0, koishi.h)("message", [koishi.h.image(guardImg[body.guard_level]), koishi.h.text(`【${masterInfo.username}的直播间】${body.user.uname}加入了大航海（${body.gift_name}）`)]);
+						const msg$1 = sub.customGuardBuy.guardBuyMsg.replace("-uname", body.user.uname).replace("-mname", masterInfo.username).replace("-guard", body.gift_name);
+						return (0, koishi.h)("message", [koishi.h.image(guardImg[body.guard_level]), koishi.h.text(msg$1)]);
 					} else {
 						const guardImg = ComRegister.GUARD_LEVEL_IMG[body.guard_level];
 						const data = await this.ctx["bilibili-notify-api"].getUserInfoInLive(body.user.uid.toString(), sub.uid);
@@ -1578,17 +1583,19 @@ var ComRegister = class ComRegister {
 				})();
 				liveData.fansChanged = followerChange;
 				const liveEndMsg = sub.customLiveMsg.customLiveEnd.replace("-name", masterInfo.username).replace("-time", diffTime).replace("-follower_change", followerChange).replaceAll("\\n", "\n");
-				await this.sendLiveNotifyCard(LiveType.StopBroadcast, liveData, {
-					liveRoomInfo,
-					masterInfo,
-					cardStyle: sub.customCardStyle
-				}, sub.uid, liveEndMsg);
+				if (sub.liveEnd) {
+					await this.sendLiveNotifyCard(LiveType.StopBroadcast, liveData, {
+						liveRoomInfo,
+						masterInfo,
+						cardStyle: sub.customCardStyle
+					}, sub.uid, liveEndMsg);
+					await sendDanmakuWordCloudAndLiveSummary(sub.customLiveSummary.liveSummary);
+				}
 				if (pushAtTimeTimer) {
 					pushAtTimeTimer();
 					pushAtTimeTimer = null;
 					this.liveWSManager.delete(sub.roomid);
 				}
-				await sendDanmakuWordCloudAndLiveSummary(sub.customLiveSummary.liveSummary);
 			}
 		});
 		if (!await useLiveRoomInfo(LiveType.FirstLiveBroadcast) && !await useMasterInfo(LiveType.FirstLiveBroadcast)) return this.sendPrivateMsg("获取直播间信息失败，启动直播间弹幕检测失败！");
@@ -1905,11 +1912,12 @@ var ComRegister = class ComRegister {
 			model: koishi.Schema.string().default("gpt-3.5-turbo"),
 			persona: koishi.Schema.string()
 		}),
-		customGuardBuyImg: koishi.Schema.object({
+		customGuardBuy: koishi.Schema.object({
 			enable: koishi.Schema.boolean().default(false).description("是否启用自定义舰长购买图片"),
 			captainImgUrl: koishi.Schema.string().description("舰长图片链接"),
 			supervisorImgUrl: koishi.Schema.string().description("提督图片链接"),
-			governorImgUrl: koishi.Schema.string().description("总督图片链接")
+			governorImgUrl: koishi.Schema.string().description("总督图片链接"),
+			guardBuyMsg: koishi.Schema.string().description("舰长购买消息")
 		})
 	});
 })(ComRegister || (ComRegister = {}));
@@ -4452,8 +4460,21 @@ const inject = [
 ];
 const name = "bilibili-notify";
 const usage = `
-	Bilibili-Notify
-	如遇到使用问题或bug，请加群咨询 801338523
+<h1>Bilibili-Notify</h1>
+<p>使用问题请加群咨询 801338523</p>
+
+---
+
+使用说明：
+- 请仔细阅读subs的配置说明，并在订阅配置中填写正确的 UID 和订阅类型
+- 订阅类型包括：动态、直播等
+
+注意事项：
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+
+---
 `;
 let globalConfig;
 var ServerManager = class extends koishi.Service {
@@ -4512,7 +4533,7 @@ var ServerManager = class extends koishi.Service {
 				customLiveStart: globalConfig.customLiveStart,
 				customLive: globalConfig.customLive,
 				customLiveEnd: globalConfig.customLiveEnd,
-				customGuardBuyImg: globalConfig.customGuardBuyImg,
+				customGuardBuyImg: globalConfig.customGuardBuy,
 				dynamicUrl: globalConfig.dynamicUrl,
 				dynamicCron: globalConfig.dynamicCron,
 				dynamicVideoUrlToBV: globalConfig.dynamicVideoUrlToBV,

package/lib/index.d.cts

@@ -38,8 +38,9 @@ interface BAConfig {
   live: {};
   wordcloudStopWords: string;
   liveSummary: Array<string>;
-  customGuardBuyImg: {
+  customGuardBuy: {
     enable: boolean;
+    guardBuyMsg?: string;
     captainImgUrl?: string;
     supervisorImgUrl?: string;
     governorImgUrl?: string;
@@ -95,8 +96,9 @@ type CustomLiveMsg = {
   customLive?: string;
   customLiveEnd?: string;
 };
-type CustomGuardBuyImg = {
+type CustomGuardBuy = {
   enable: boolean;
+  guardBuyMsg?: string;
   captainImgUrl?: string;
   supervisorImgUrl?: string;
   governorImgUrl?: string;
@@ -111,18 +113,19 @@ type Subscription = {
   roomid: string;
   dynamic: boolean;
   live: boolean;
+  liveEnd: boolean;
   target: Target;
   customCardStyle: CustomCardStyle;
   customLiveMsg: CustomLiveMsg;
   customLiveSummary: CustomLiveSummary;
-  customGuardBuyImg: CustomGuardBuyImg;
+  customGuardBuy: CustomGuardBuy;
 };
 type Subscriptions = Record<string, Subscription>;
 //#endregion
 //#region src/index.d.ts
 declare const inject: string[];
 declare const name = "bilibili-notify";
-declare const usage = "\n\tBilibili-Notify\n\t\u5982\u9047\u5230\u4F7F\u7528\u95EE\u9898\u6216bug\uFF0C\u8BF7\u52A0\u7FA4\u54A8\u8BE2 801338523\n";
+declare const usage = "\n<h1>Bilibili-Notify</h1>\n<p>\u4F7F\u7528\u95EE\u9898\u8BF7\u52A0\u7FA4\u54A8\u8BE2 801338523</p>\n\n---\n\n\u4F7F\u7528\u8BF4\u660E\uFF1A\n- \u8BF7\u4ED4\u7EC6\u9605\u8BFBsubs\u7684\u914D\u7F6E\u8BF4\u660E\uFF0C\u5E76\u5728\u8BA2\u9605\u914D\u7F6E\u4E2D\u586B\u5199\u6B63\u786E\u7684 UID \u548C\u8BA2\u9605\u7C7B\u578B\n- \u8BA2\u9605\u7C7B\u578B\u5305\u62EC\uFF1A\u52A8\u6001\u3001\u76F4\u64AD\u7B49\n\n\u6CE8\u610F\u4E8B\u9879\uFF1A\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n\n---\n";
 declare module "koishi" {
   interface Context {
     "bilibili-notify": ServerManager;

package/lib/index.d.mts

@@ -38,8 +38,9 @@ interface BAConfig {
   live: {};
   wordcloudStopWords: string;
   liveSummary: Array<string>;
-  customGuardBuyImg: {
+  customGuardBuy: {
     enable: boolean;
+    guardBuyMsg?: string;
     captainImgUrl?: string;
     supervisorImgUrl?: string;
     governorImgUrl?: string;
@@ -95,8 +96,9 @@ type CustomLiveMsg = {
   customLive?: string;
   customLiveEnd?: string;
 };
-type CustomGuardBuyImg = {
+type CustomGuardBuy = {
   enable: boolean;
+  guardBuyMsg?: string;
   captainImgUrl?: string;
   supervisorImgUrl?: string;
   governorImgUrl?: string;
@@ -111,18 +113,19 @@ type Subscription = {
   roomid: string;
   dynamic: boolean;
   live: boolean;
+  liveEnd: boolean;
   target: Target;
   customCardStyle: CustomCardStyle;
   customLiveMsg: CustomLiveMsg;
   customLiveSummary: CustomLiveSummary;
-  customGuardBuyImg: CustomGuardBuyImg;
+  customGuardBuy: CustomGuardBuy;
 };
 type Subscriptions = Record<string, Subscription>;
 //#endregion
 //#region src/index.d.ts
 declare const inject: string[];
 declare const name = "bilibili-notify";
-declare const usage = "\n\tBilibili-Notify\n\t\u5982\u9047\u5230\u4F7F\u7528\u95EE\u9898\u6216bug\uFF0C\u8BF7\u52A0\u7FA4\u54A8\u8BE2 801338523\n";
+declare const usage = "\n<h1>Bilibili-Notify</h1>\n<p>\u4F7F\u7528\u95EE\u9898\u8BF7\u52A0\u7FA4\u54A8\u8BE2 801338523</p>\n\n---\n\n\u4F7F\u7528\u8BF4\u660E\uFF1A\n- \u8BF7\u4ED4\u7EC6\u9605\u8BFBsubs\u7684\u914D\u7F6E\u8BF4\u660E\uFF0C\u5E76\u5728\u8BA2\u9605\u914D\u7F6E\u4E2D\u586B\u5199\u6B63\u786E\u7684 UID \u548C\u8BA2\u9605\u7C7B\u578B\n- \u8BA2\u9605\u7C7B\u578B\u5305\u62EC\uFF1A\u52A8\u6001\u3001\u76F4\u64AD\u7B49\n\n\u6CE8\u610F\u4E8B\u9879\uFF1A\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n- \u5982\u679C\u4F60\u4F7F\u7528\u7684\u662F onebot \u673A\u5668\u4EBA\uFF0C\u5E73\u53F0\u540D\u8BF7\u586B\u5199 onebot \u800C\u4E0D\u662F qq\n\n---\n";
 declare module "koishi" {
   interface Context {
     "bilibili-notify": ServerManager;

package/lib/index.mjs

@@ -41,7 +41,7 @@ var __export = (all, symbols) => {
 const BAConfigSchema = Schema.object({
 	require: Schema.object({}).description("必填设置"),
 	key: Schema.string().pattern(/^[0-9a-f]{32}$/).role("secret").required().description("请输入一个32位小写字母的十六进制密钥（例如：9b8db7ae562b9864efefe06289cc5530），使用此密钥将你的B站登录信息存储在数据库中，请一定保存好此密钥。如果你忘记了此密钥，必须重新登录。你可以自行生成，或到这个网站生成：https://www.sexauth.com/"),
-	master: Schema.intersect([Schema.object({ enable: Schema.boolean().default(false).description("是否开启主人账号功能，如果您的机器人没有私聊权限请不要开启此功能。开启后如果机器人运行错误会向您进行报告") }).description("主人账号"), Schema.union([Schema.object({
+	master: Schema.intersect([Schema.object({ enable: Schema.boolean().default(false).description("是否开启主人账号功能，开启后如果机器人运行错误会向您进行报告。如果您的机器人没有私聊权限请不要开启此功能") }).description("主人账号"), Schema.union([Schema.object({
 		enable: Schema.const(true).required(),
 		platform: Schema.union([
 			"qq",
@@ -69,19 +69,19 @@ const BAConfigSchema = Schema.object({
 	subTitle: Schema.object({}).description("订阅配置"),
 	advancedSub: Schema.boolean().default(false).description("是否开启高级订阅，高级订阅是独立于本插件的一个专门用于订阅配置的插件，用于高度自定义订阅消息。若开启高级订阅，请打开该选项并下载插件 bilibili-notify-advanced-subscription"),
 	subs: Schema.array(Schema.object({
-		name: Schema.string().required().description("备注"),
+		name: Schema.string().required().description("UP昵称"),
 		uid: Schema.string().required().description("UID和roomid"),
 		dynamic: Schema.boolean().default(true).description("动态"),
-		dynamicAtAll: Schema.boolean().default(false).description("动态At全体"),
+		dynamicAtAll: Schema.boolean().default(false).description("动态@全体"),
 		live: Schema.boolean().default(true).description("直播"),
-		liveAtAll: Schema.boolean().default(true).description("直播At全体"),
+		liveAtAll: Schema.boolean().default(true).description("直播@全体"),
 		liveGuardBuy: Schema.boolean().default(false).description("上舰消息"),
 		superchat: Schema.boolean().default(false).description("SC消息"),
 		wordcloud: Schema.boolean().default(true).description("弹幕词云"),
 		liveSummary: Schema.boolean().default(true).description("直播总结"),
 		platform: Schema.string().required().description("平台名"),
 		target: Schema.string().required().description("群号/频道号")
-	})).role("table").description("输入订阅信息，自定义订阅内容； UID和roomid，如果经常在初始化插件遇到风控问题，请补充直播间房间号，使用英文逗号分隔例如,1234567,114514 群号/频道号格式：频道号,频道号 使用英文逗号分隔，例如 1234567,2345678"),
+	})).role("table").description("请在这里填写订阅信息；UP昵称是必填项，影响通知时显示的UP主昵称；UID和roomid，请填写订阅用户的UID，如果经常在初始化插件遇到风控问题，请补充直播间房间号，使用英文逗号分隔例如：1234567,114514；平台名，请填写adapter-xxxx中的xxxx，例如你的机器人使用的是adapter-onebot就填写onebot；群号/频道号，直接填写即可，如果有多个群聊或频道请使用英文逗号分隔，例如：1234567,2345678"),
 	dynamic: Schema.object({}).description("动态推送设置"),
 	dynamicUrl: Schema.boolean().default(false).description("发送动态时是否同时发送链接。注意：如果使用的是QQ官方机器人不能开启此项！"),
 	dynamicCron: Schema.string().default("*/2 * * * *").description("动态监测时间，请填入cron表达式，请勿填入过短时间"),
@@ -101,8 +101,9 @@ const BAConfigSchema = Schema.object({
 		"🎖️ 特别嘉奖：-un4 & -un5",
 		"你们的弹幕，我们都记录在案！🕵️‍♀️"
 	]).role("table").description("自定义直播总结语，开启弹幕词云自动发送。变量解释：-dmc代表总弹幕发送人数，-mdn代表主播粉丝牌子名，-dca代表总弹幕数，-un1到-un5代表弹幕发送条数前五名用户的用户名，-dc1到-dc5代表弹幕发送条数前五名的弹幕发送数量，数组每一行代表换行"),
-	customGuardBuyImg: Schema.intersect([Schema.object({ enable: Schema.boolean().default(false).description("是否开启自定义上舰图片功能").experimental() }), Schema.union([Schema.object({
+	customGuardBuy: Schema.intersect([Schema.object({ enable: Schema.boolean().default(false).description("是否开启自定义上舰消息功能").experimental() }), Schema.union([Schema.object({
 		enable: Schema.const(true).required(),
+		guardBuyMsg: Schema.string().default("【-mname的直播间】-uname加入了大航海（-guard）").description("自定义上舰消息，-uname代表用户昵称，-muname代表主播昵称，-guard代表舰长类型"),
 		captainImgUrl: Schema.string().default("https://s1.hdslb.com/bfs/static/blive/live-pay-mono/relation/relation/assets/captain-Bjw5Byb5.png").description("舰长图片链接"),
 		supervisorImgUrl: Schema.string().default("https://s1.hdslb.com/bfs/static/blive/live-pay-mono/relation/relation/assets/supervisor-u43ElIjU.png").description("提督图片链接"),
 		governorImgUrl: Schema.string().default("https://s1.hdslb.com/bfs/static/blive/live-pay-mono/relation/relation/assets/governor-DpDXKEdA.png").description("总督图片链接")
@@ -836,11 +837,12 @@ var ComRegister = class ComRegister {
 				roomid,
 				dynamic: s.dynamic,
 				live: s.live,
+				liveEnd: true,
 				target,
 				customCardStyle: { enable: false },
 				customLiveMsg: { enable: false },
 				customLiveSummary: { enable: false },
-				customGuardBuyImg: { enable: false }
+				customGuardBuy: { enable: false }
 			};
 		});
 		return subs;
@@ -904,15 +906,17 @@ var ComRegister = class ComRegister {
 				sub.customLiveMsg.customLiveEnd = this.config.customLiveEnd;
 				sub.customLiveMsg.customLive = this.config.customLive;
 			}
-			if (sub.customGuardBuyImg.enable) {
-				if (!sub.customGuardBuyImg.captainImgUrl.trim()) sub.customGuardBuyImg.captainImgUrl = this.config.customGuardBuyImg.captainImgUrl;
-				if (!sub.customGuardBuyImg.supervisorImgUrl.trim()) sub.customGuardBuyImg.supervisorImgUrl = this.config.customGuardBuyImg.supervisorImgUrl;
-				if (!sub.customGuardBuyImg.governorImgUrl.trim()) sub.customGuardBuyImg.governorImgUrl = this.config.customGuardBuyImg.governorImgUrl;
-			} else if (this.config.customGuardBuyImg.enable) {
-				sub.customGuardBuyImg.enable = true;
-				sub.customGuardBuyImg.captainImgUrl = this.config.customGuardBuyImg.captainImgUrl;
-				sub.customGuardBuyImg.supervisorImgUrl = this.config.customGuardBuyImg.supervisorImgUrl;
-				sub.customGuardBuyImg.governorImgUrl = this.config.customGuardBuyImg.governorImgUrl;
+			if (sub.customGuardBuy.enable) {
+				if (!sub.customGuardBuy.guardBuyMsg.trim()) sub.customGuardBuy.guardBuyMsg = this.config.customGuardBuy.guardBuyMsg;
+				if (!sub.customGuardBuy.captainImgUrl.trim()) sub.customGuardBuy.captainImgUrl = this.config.customGuardBuy.captainImgUrl;
+				if (!sub.customGuardBuy.supervisorImgUrl.trim()) sub.customGuardBuy.supervisorImgUrl = this.config.customGuardBuy.supervisorImgUrl;
+				if (!sub.customGuardBuy.governorImgUrl.trim()) sub.customGuardBuy.governorImgUrl = this.config.customGuardBuy.governorImgUrl;
+			} else if (this.config.customGuardBuy.enable) {
+				sub.customGuardBuy.enable = true;
+				sub.customGuardBuy.guardBuyMsg = this.config.customGuardBuy.guardBuyMsg;
+				sub.customGuardBuy.captainImgUrl = this.config.customGuardBuy.captainImgUrl;
+				sub.customGuardBuy.supervisorImgUrl = this.config.customGuardBuy.supervisorImgUrl;
+				sub.customGuardBuy.governorImgUrl = this.config.customGuardBuy.governorImgUrl;
 			}
 			if (sub.customLiveSummary.enable) {
 				if (!sub.customLiveSummary.liveSummary.trim()) sub.customLiveSummary.liveSummary = this.config.liveSummary.join("\n");
@@ -1460,13 +1464,14 @@ var ComRegister = class ComRegister {
 			},
 			onGuardBuy: async ({ body }) => {
 				const msg = await (async () => {
-					if (sub.customGuardBuyImg.enable) {
+					if (sub.customGuardBuy.enable) {
 						const guardImg = {
-							[GuardLevel.Jianzhang]: sub.customGuardBuyImg.captainImgUrl,
-							[GuardLevel.Tidu]: sub.customGuardBuyImg.supervisorImgUrl,
-							[GuardLevel.Zongdu]: sub.customGuardBuyImg.governorImgUrl
+							[GuardLevel.Jianzhang]: sub.customGuardBuy.captainImgUrl,
+							[GuardLevel.Tidu]: sub.customGuardBuy.supervisorImgUrl,
+							[GuardLevel.Zongdu]: sub.customGuardBuy.governorImgUrl
 						};
-						return h("message", [h.image(guardImg[body.guard_level]), h.text(`【${masterInfo.username}的直播间】${body.user.uname}加入了大航海（${body.gift_name}）`)]);
+						const msg$1 = sub.customGuardBuy.guardBuyMsg.replace("-uname", body.user.uname).replace("-mname", masterInfo.username).replace("-guard", body.gift_name);
+						return h("message", [h.image(guardImg[body.guard_level]), h.text(msg$1)]);
 					} else {
 						const guardImg = ComRegister.GUARD_LEVEL_IMG[body.guard_level];
 						const data = await this.ctx["bilibili-notify-api"].getUserInfoInLive(body.user.uid.toString(), sub.uid);
@@ -1549,17 +1554,19 @@ var ComRegister = class ComRegister {
 				})();
 				liveData.fansChanged = followerChange;
 				const liveEndMsg = sub.customLiveMsg.customLiveEnd.replace("-name", masterInfo.username).replace("-time", diffTime).replace("-follower_change", followerChange).replaceAll("\\n", "\n");
-				await this.sendLiveNotifyCard(LiveType.StopBroadcast, liveData, {
-					liveRoomInfo,
-					masterInfo,
-					cardStyle: sub.customCardStyle
-				}, sub.uid, liveEndMsg);
+				if (sub.liveEnd) {
+					await this.sendLiveNotifyCard(LiveType.StopBroadcast, liveData, {
+						liveRoomInfo,
+						masterInfo,
+						cardStyle: sub.customCardStyle
+					}, sub.uid, liveEndMsg);
+					await sendDanmakuWordCloudAndLiveSummary(sub.customLiveSummary.liveSummary);
+				}
 				if (pushAtTimeTimer) {
 					pushAtTimeTimer();
 					pushAtTimeTimer = null;
 					this.liveWSManager.delete(sub.roomid);
 				}
-				await sendDanmakuWordCloudAndLiveSummary(sub.customLiveSummary.liveSummary);
 			}
 		});
 		if (!await useLiveRoomInfo(LiveType.FirstLiveBroadcast) && !await useMasterInfo(LiveType.FirstLiveBroadcast)) return this.sendPrivateMsg("获取直播间信息失败，启动直播间弹幕检测失败！");
@@ -1876,11 +1883,12 @@ var ComRegister = class ComRegister {
 			model: Schema.string().default("gpt-3.5-turbo"),
 			persona: Schema.string()
 		}),
-		customGuardBuyImg: Schema.object({
+		customGuardBuy: Schema.object({
 			enable: Schema.boolean().default(false).description("是否启用自定义舰长购买图片"),
 			captainImgUrl: Schema.string().description("舰长图片链接"),
 			supervisorImgUrl: Schema.string().description("提督图片链接"),
-			governorImgUrl: Schema.string().description("总督图片链接")
+			governorImgUrl: Schema.string().description("总督图片链接"),
+			guardBuyMsg: Schema.string().description("舰长购买消息")
 		})
 	});
 })(ComRegister || (ComRegister = {}));
@@ -4423,8 +4431,21 @@ const inject = [
 ];
 const name = "bilibili-notify";
 const usage = `
-	Bilibili-Notify
-	如遇到使用问题或bug，请加群咨询 801338523
+<h1>Bilibili-Notify</h1>
+<p>使用问题请加群咨询 801338523</p>
+
+---
+
+使用说明：
+- 请仔细阅读subs的配置说明，并在订阅配置中填写正确的 UID 和订阅类型
+- 订阅类型包括：动态、直播等
+
+注意事项：
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+- 如果你使用的是 onebot 机器人，平台名请填写 onebot 而不是 qq
+
+---
 `;
 let globalConfig;
 var ServerManager = class extends Service {
@@ -4483,7 +4504,7 @@ var ServerManager = class extends Service {
 				customLiveStart: globalConfig.customLiveStart,
 				customLive: globalConfig.customLive,
 				customLiveEnd: globalConfig.customLiveEnd,
-				customGuardBuyImg: globalConfig.customGuardBuyImg,
+				customGuardBuyImg: globalConfig.customGuardBuy,
 				dynamicUrl: globalConfig.dynamicUrl,
 				dynamicCron: globalConfig.dynamicCron,
 				dynamicVideoUrlToBV: globalConfig.dynamicVideoUrlToBV,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.5.0-alpha.0",
+  "version": "3.5.0",
   "main": "./lib/index.cjs",
   "typings": "lib/index.d.ts",
   "files": [
@@ -49,7 +49,7 @@
     "@types/qrcode": "^1.5.6",
     "@types/tough-cookie": "^4.0.5",
     "koishi-plugin-puppeteer": "^3.9.0",
-    "tsdown": "^0.16.0"
+    "tsdown": "^0.16.6"
   },
   "peerDependencies": {
     "koishi": "^4.18.9"