koishi-plugin-bilibili-notify 3.4.1 → 3.4.3

package/lib/index.cjs

@@ -5,21 +5,30 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (all) => {
+var __export = (all, symbols) => {
 	let target = {};
-	for (var name$2 in all) __defProp(target, name$2, {
-		get: all[name$2],
-		enumerable: true
-	});
+	for (var name$2 in all) {
+		__defProp(target, name$2, {
+			get: all[name$2],
+			enumerable: true
+		});
+	}
+	if (symbols) {
+		__defProp(target, Symbol.toStringTag, { value: "Module" });
+	}
 	return target;
 };
 var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+			key = keys[i];
+			if (!__hasOwnProp.call(to, key) && key !== except) {
+				__defProp(to, key, {
+					get: ((k) => from[k]).bind(null, key),
+					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+				});
+			}
+		}
 	}
 	return to;
 };
@@ -720,7 +729,7 @@ var ComRegister = class ComRegister {
 				guardLevel: blive_message_listener.GuardLevel.Jianzhang,
 				face: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQSESgEED4WoyK9O5FFgrV8cHZPM4w4JgleZQ&s",
 				uname: "恶魔兔",
-				accompany: 56
+				isAdmin: 1
 			}, {
 				masterName: "籽岷",
 				masterAvatarUrl: "https://img.touxiangkong.com/uploads/allimg/20203301251/2020/3/BjEbyu.jpg"
@@ -1470,14 +1479,12 @@ var ComRegister = class ComRegister {
 					const content = (0, koishi.h)("message", [koishi.h.text(`【${masterInfo.username}的直播间】${body.user.uname}加入了大航海（${body.gift_name}）`), koishi.h.image(guardImg)]);
 					return this.broadcastToTargets(sub.uid, content, PushType.LiveGuardBuy);
 				}
-				console.log(data);
 				const userInfo = data.data;
-				console.log(userInfo);
 				const buffer = await this.ctx["bilibili-notify-generate-img"].generateBoardingImg(guardImg, {
 					guardLevel: body.guard_level,
 					uname: userInfo.uname,
 					face: userInfo.face,
-					accompany: userInfo.guard.accompany
+					isAdmin: userInfo.is_admin
 				}, {
 					masterName: masterInfo.username,
 					masterAvatarUrl: masterInfo.userface
@@ -2228,11 +2235,10 @@ var GenerateImg = class GenerateImg extends koishi.Service {
 		[blive_message_listener.GuardLevel.Tidu]: ["#d8a0e6", "#b494e5"],
 		[blive_message_listener.GuardLevel.Zongdu]: ["#f2a053", "#ef5f5f"]
 	};
-	async generateBoardingImg(captainImgUrl, { guardLevel, uname, face, accompany }, { masterAvatarUrl, masterName }) {
+	async generateBoardingImg(captainImgUrl, { guardLevel, uname, face, isAdmin }, { masterAvatarUrl, masterName }) {
 		const bgColor = GenerateImg.BG_COLOR[guardLevel];
 		const desc = {
 			[blive_message_listener.GuardLevel.Jianzhang]: () => {
-				if (accompany && accompany > 0) return `"${uname}号"继续在<br/>"${masterName}"大航海舰队服役！`;
 				return `"${uname}号"加入<br/>"${masterName}"大航海舰队！`;
 			},
 			[blive_message_listener.GuardLevel.Tidu]: () => {
@@ -2359,6 +2365,10 @@ var GenerateImg = class GenerateImg extends koishi.Service {
                     }
 
                     .accompany span {
+                        max-width: 85px;
+                        white-space: nowrap;
+                        text-overflow: ellipsis;
+                        overflow: hidden;
                         color: white;
                         font-size: 10px;
                         font-weight: bold;
@@ -2395,7 +2405,7 @@ var GenerateImg = class GenerateImg extends koishi.Service {
                                         <span>${uname}</span>
                                     </div>
                                     <div class="accompany">
-                                        <div class="master-avatar"></div><span>已服役 ${accompany} 天</span>
+                                        <div class="master-avatar"></div><span>${isAdmin ? "房管" : masterName}</span>
                                     </div>
                                 </div>
                             </div>

package/lib/index.mjs

@@ -22,12 +22,17 @@ import OpenAI from "openai";
 
 //#region rolldown:runtime
 var __defProp = Object.defineProperty;
-var __export = (all) => {
+var __export = (all, symbols) => {
 	let target = {};
-	for (var name$2 in all) __defProp(target, name$2, {
-		get: all[name$2],
-		enumerable: true
-	});
+	for (var name$2 in all) {
+		__defProp(target, name$2, {
+			get: all[name$2],
+			enumerable: true
+		});
+	}
+	if (symbols) {
+		__defProp(target, Symbol.toStringTag, { value: "Module" });
+	}
 	return target;
 };
 
@@ -695,7 +700,7 @@ var ComRegister = class ComRegister {
 				guardLevel: GuardLevel.Jianzhang,
 				face: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQSESgEED4WoyK9O5FFgrV8cHZPM4w4JgleZQ&s",
 				uname: "恶魔兔",
-				accompany: 56
+				isAdmin: 1
 			}, {
 				masterName: "籽岷",
 				masterAvatarUrl: "https://img.touxiangkong.com/uploads/allimg/20203301251/2020/3/BjEbyu.jpg"
@@ -1445,14 +1450,12 @@ var ComRegister = class ComRegister {
 					const content = h("message", [h.text(`【${masterInfo.username}的直播间】${body.user.uname}加入了大航海（${body.gift_name}）`), h.image(guardImg)]);
 					return this.broadcastToTargets(sub.uid, content, PushType.LiveGuardBuy);
 				}
-				console.log(data);
 				const userInfo = data.data;
-				console.log(userInfo);
 				const buffer = await this.ctx["bilibili-notify-generate-img"].generateBoardingImg(guardImg, {
 					guardLevel: body.guard_level,
 					uname: userInfo.uname,
 					face: userInfo.face,
-					accompany: userInfo.guard.accompany
+					isAdmin: userInfo.is_admin
 				}, {
 					masterName: masterInfo.username,
 					masterAvatarUrl: masterInfo.userface
@@ -2203,11 +2206,10 @@ var GenerateImg = class GenerateImg extends Service {
 		[GuardLevel.Tidu]: ["#d8a0e6", "#b494e5"],
 		[GuardLevel.Zongdu]: ["#f2a053", "#ef5f5f"]
 	};
-	async generateBoardingImg(captainImgUrl, { guardLevel, uname, face, accompany }, { masterAvatarUrl, masterName }) {
+	async generateBoardingImg(captainImgUrl, { guardLevel, uname, face, isAdmin }, { masterAvatarUrl, masterName }) {
 		const bgColor = GenerateImg.BG_COLOR[guardLevel];
 		const desc = {
 			[GuardLevel.Jianzhang]: () => {
-				if (accompany && accompany > 0) return `"${uname}号"继续在<br/>"${masterName}"大航海舰队服役！`;
 				return `"${uname}号"加入<br/>"${masterName}"大航海舰队！`;
 			},
 			[GuardLevel.Tidu]: () => {
@@ -2334,6 +2336,10 @@ var GenerateImg = class GenerateImg extends Service {
                     }
 
                     .accompany span {
+                        max-width: 85px;
+                        white-space: nowrap;
+                        text-overflow: ellipsis;
+                        overflow: hidden;
                         color: white;
                         font-size: 10px;
                         font-weight: bold;
@@ -2370,7 +2376,7 @@ var GenerateImg = class GenerateImg extends Service {
                                         <span>${uname}</span>
                                     </div>
                                     <div class="accompany">
-                                        <div class="master-avatar"></div><span>已服役 ${accompany} 天</span>
+                                        <div class="master-avatar"></div><span>${isAdmin ? "房管" : masterName}</span>
                                     </div>
                                 </div>
                             </div>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "main": "./lib/index.cjs",
   "typings": "lib/index.d.ts",
   "files": [