koishi-plugin-bilibili-notify 3.4.0 → 3.4.2

package/lib/index.cjs

@@ -52,6 +52,7 @@ let node_https = require("node:https");
 node_https = __toESM(node_https);
 let axios = require("axios");
 axios = __toESM(axios);
+let jsdom = require("jsdom");
 let tough_cookie = require("tough-cookie");
 let openai = require("openai");
 openai = __toESM(openai);
@@ -719,7 +720,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"
@@ -1469,14 +1470,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
@@ -2227,11 +2226,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]: () => {
@@ -2394,7 +2392,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>${masterName} ${isAdmin ? "房管认证" : ""}</span>
                                     </div>
                                 </div>
                             </div>
@@ -4411,8 +4409,7 @@ var BiliAPI = class extends koishi.Service {
 		}
 		const correspondPath = await getCorrespondPath(luxon.DateTime.now().toMillis());
 		const { data: refreshCsrfHtml } = await this.client.get(`https://www.bilibili.com/correspond/1/${correspondPath}`);
-		const { JSDOM } = await import("jsdom");
-		const { document } = new JSDOM(refreshCsrfHtml).window;
+		const { document } = new jsdom.JSDOM(refreshCsrfHtml).window;
 		const targetElement = document.getElementById("1-name");
 		const refresh_csrf = targetElement ? targetElement.textContent : null;
 		const { data: refreshData } = await this.client.post("https://passport.bilibili.com/x/passport-login/web/cookie/refresh", {

package/lib/index.mjs

@@ -16,6 +16,7 @@ import crypto from "node:crypto";
 import http from "node:http";
 import https from "node:https";
 import axios from "axios";
+import { JSDOM } from "jsdom";
 import { Cookie, CookieJar } from "tough-cookie";
 import OpenAI from "openai";
 
@@ -694,7 +695,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"
@@ -1444,14 +1445,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
@@ -2202,11 +2201,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]: () => {
@@ -2369,7 +2367,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>${masterName} ${isAdmin ? "房管认证" : ""}</span>
                                     </div>
                                 </div>
                             </div>
@@ -4386,7 +4384,6 @@ var BiliAPI = class extends Service {
 		}
 		const correspondPath = await getCorrespondPath(DateTime.now().toMillis());
 		const { data: refreshCsrfHtml } = await this.client.get(`https://www.bilibili.com/correspond/1/${correspondPath}`);
-		const { JSDOM } = await import("jsdom");
 		const { document } = new JSDOM(refreshCsrfHtml).window;
 		const targetElement = document.getElementById("1-name");
 		const refresh_csrf = targetElement ? targetElement.textContent : null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "3.4.0",
+  "version": "3.4.2",
   "main": "./lib/index.cjs",
   "typings": "lib/index.d.ts",
   "files": [
@@ -34,7 +34,7 @@
     "blive-message-listener": "^0.5.2",
     "cacheable-lookup": "^7.0.0",
     "cron": "^4.3.3",
-    "jsdom": "^27.1.0",
+    "jsdom": "^26.1.0",
     "luxon": "^3.8.0-alpha.1",
     "md5": "^2.3.0",
     "openai": "^6.8.1",