koishi-plugin-noah 1.4.1 → 1.4.2

package/lib/core/utils/card.d.ts

@@ -26,6 +26,34 @@ export declare function classifyCardId(ctx: Context, input: string): 'uid' | 'ko
  * @returns 删去空格的全大写字符串，并转换特殊字符(I→1, O/Q→0, V→U)
  */
 export declare function processInputCardCode(input: string): string;
+/**
+ * card.bsnk.me API 返回的卡片信息结构
+ */
+export interface CardLookupResponse {
+    type: string;
+    errors?: [string, string][];
+    ids?: {
+        e004?: string;
+        idm?: string;
+        idm_pmm?: string;
+        sega?: string;
+        bng?: string;
+        aicc?: string;
+        konami?: string;
+        [key: string]: string | undefined;
+    };
+    info?: {
+        [key: string]: Record<string, unknown>;
+    };
+}
+/**
+ * 通过 card.bsnk.me API 查询卡片详细信息
+ * @param ctx - Koishi Context 对象
+ * @param cardCode - 卡号（支持多种格式：Access Code, UID, Konami ID 等）
+ * @returns 卡片详细信息
+ * @throws 当 API 请求失败时抛出异常
+ */
+export declare function lookupCard(ctx: Context, cardCode: string): Promise<CardLookupResponse>;
 /**
  * 通过 card.bsnk.me API 将 Access Code 转换为 UID
  * @param ctx - Koishi Context 对象
@@ -34,3 +62,9 @@ export declare function processInputCardCode(input: string): string;
  * @throws 当 API 请求失败或无法转换时抛出异常
  */
 export declare function accessToUid(ctx: Context, accessCode: string): Promise<string>;
+/**
+ * 格式化卡片详细信息为人类可读的字符串
+ * @param data - 卡片查询结果
+ * @returns 格式化后的字符串
+ */
+export declare function formatCardInfo(data: CardLookupResponse): string;

package/lib/index.cjs

@@ -725,15 +725,28 @@ function processInputCardCode(input) {
   });
 }
 __name(processInputCardCode, "processInputCardCode");
+async function lookupCard(ctx, cardCode) {
+  const cleanCardCode = cardCode.replaceAll(" ", "");
+  try {
+    const data = await ctx.http.post("https://card.bsnk.me/lookup", {
+      card: cleanCardCode
+    });
+    return data;
+  } catch (error) {
+    if (error instanceof Error) {
+      throw new Error(`Failed to lookup card: ${error.message}`);
+    }
+    throw new Error("Failed to lookup card: unknown error");
+  }
+}
+__name(lookupCard, "lookupCard");
 async function accessToUid(ctx, accessCode) {
   const cleanAccessCode = accessCode.replaceAll(" ", "");
   if (cleanAccessCode.length !== 20 || !/^\d{20}$/.test(cleanAccessCode)) {
     throw new Error("Access Code must be 20 digits");
   }
   try {
-    const data = await ctx.http.post("https://card.bsnk.me/lookup", {
-      card: cleanAccessCode
-    });
+    const data = await lookupCard(ctx, cleanAccessCode);
     if (data.ids?.e004) {
       return data.ids.e004.toUpperCase();
     }
@@ -749,6 +762,30 @@ async function accessToUid(ctx, accessCode) {
   }
 }
 __name(accessToUid, "accessToUid");
+function formatCardInfo(data) {
+  let result = "";
+  if (data.ids) {
+    const idTypes = {
+      e004: "Konami Old Card ID",
+      idm: "FeliCa IDm",
+      idm_pmm: "FeliCa IDm+PMm",
+      "0008": "0008-style Access Code",
+      sega: "SEGA Aime Access Code",
+      bng: "Banapass Access Code",
+      aicc: "Amusement IC Access Code",
+      konami: "Konami User ID"
+    };
+    for (const [idType, value] of Object.entries(data.ids)) {
+      if (value) {
+        const typeName = idTypes[idType] || idType;
+        result += `${typeName}: ${value}
+`;
+      }
+    }
+  }
+  return result.trim();
+}
+__name(formatCardInfo, "formatCardInfo");
 
 // src/core/commands/bind.ts
 function bind(ctx, config) {
@@ -959,20 +996,19 @@ var ServerService = class {
 
 // src/core/commands/card.ts
 function card(ctx, config) {
-  ctx.command("card").alias("卡片管理").userFields(["id"]).channelFields(["id"]).option("convert", "-c  <cardCode:text>").action(async ({ session, options }) => {
+  ctx.command("card").alias("卡片管理").userFields(["id"]).channelFields(["id"]).option("detail", "-d <cardCode:text>").action(async ({ session, options }) => {
     const cardService = new CardService(ctx);
     const atGuild = session.guildId != null;
-    if (options.convert) {
-      const cardCode = processInputCardCode(options.convert);
-      switch (classifyCardId(ctx, cardCode)) {
-        case "invalid":
-          return session.text(".invalid-code");
-        case "access":
-          return await accessToUid(ctx, cardCode);
-        case "konamiid":
-          return konamiIdToUid(cardCode);
-        case "uid":
-          return uidToKonamiId(cardCode);
+    if (options.detail) {
+      const cardCode = processInputCardCode(options.detail);
+      try {
+        const cardInfo = await lookupCard(ctx, cardCode);
+        return formatCardInfo(cardInfo);
+      } catch (error) {
+        if (error instanceof Error) {
+          return session.text(".lookup-error", { message: error.message });
+        }
+        return session.text(".lookup-error-unknown");
       }
     }
     const serverService = new ServerService(ctx);
@@ -1281,6 +1317,21 @@ var import_koishi3 = require("koishi");
 var serverValues = ["asphyxia", "mao"];
 
 // src/core/commands/server.ts
+function normalizeUrl(url) {
+  try {
+    if (!url.match(/^https?:\/\//i)) {
+      url = "http://" + url;
+    }
+    const urlObj = new URL(url);
+    if (urlObj.protocol === "http:" || urlObj.protocol === "https:") {
+      return url;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
+__name(normalizeUrl, "normalizeUrl");
 function server(ctx, config) {
   ctx.command("server").alias("服务器管理").option("channel", "-c").userFields(["id"]).channelFields(["id"]).action(async ({ session, options }) => {
     const serverService = new ServerService(ctx);
@@ -1464,25 +1515,38 @@ async function showServerMenu(ctx, session, serverService, userService, server2,
     return session.text(".menu-1-success");
   }
   if (selectNum === 2) {
-    await session.send(session.text(".menu-2-prompt", server2));
-    const url = await session.prompt();
-    if (!url) return session.text("commands.timeout");
-    if (url === "0")
-      return showServerMenu(
-        ctx,
-        session,
-        serverService,
-        userService,
-        server2,
-        from,
-        uid,
-        userDefaultServerId,
-        cid,
-        channelDefaultServerId
-      );
-    if (url === "q") return session.text(".quit");
-    await serverService.updateServer(server2.id, { baseUrl: url });
-    return session.text(".menu-2-success");
+    let attempts = 0;
+    const maxAttempts = 3;
+    while (attempts < maxAttempts) {
+      await session.send(session.text(".menu-2-prompt", server2));
+      const url = await session.prompt();
+      if (!url) return session.text("commands.timeout");
+      if (url === "0")
+        return showServerMenu(
+          ctx,
+          session,
+          serverService,
+          userService,
+          server2,
+          from,
+          uid,
+          userDefaultServerId,
+          cid,
+          channelDefaultServerId
+        );
+      if (url === "q") return session.text(".quit");
+      const normalizedUrl = normalizeUrl(url);
+      if (!normalizedUrl) {
+        attempts++;
+        if (attempts >= maxAttempts) {
+          return session.text(".menu-2-too-many-attempts");
+        }
+        await session.send(session.text(".menu-2-invalid-url"));
+        continue;
+      }
+      await serverService.updateServer(server2.id, { baseUrl: normalizedUrl });
+      return session.text(".menu-2-success");
+    }
   }
   if (selectNum === 3) {
     await serverService.removeServer(server2.id);
@@ -1546,10 +1610,30 @@ async function addServer(ctx, session, serverService, userService, from, uid, us
     return session.text(".invalid-select");
   }
   const serverType = serverValues[selectNum - 1];
-  await session.send(session.text(".add-url"));
-  const url = await session.prompt();
-  if (!url) return session.text("commands.timeout");
-  if (url === "q") return session.text(".quit");
+  let url;
+  if (serverType === "mao") {
+    url = ctx.config.maoServerUrl;
+  } else {
+    let attempts = 0;
+    const maxAttempts = 3;
+    while (attempts < maxAttempts) {
+      await session.send(session.text(".add-url"));
+      const urlInput = await session.prompt();
+      if (!urlInput) return session.text("commands.timeout");
+      if (urlInput === "q") return session.text(".quit");
+      const normalizedUrl = normalizeUrl(urlInput);
+      if (!normalizedUrl) {
+        attempts++;
+        if (attempts >= maxAttempts) {
+          return session.text(".add-too-many-attempts");
+        }
+        await session.send(session.text(".add-invalid-url"));
+        continue;
+      }
+      url = normalizedUrl;
+      break;
+    }
+  }
   await session.send(session.text(".add-name"));
   const serverName = await session.prompt();
   if (!serverName) return session.text("commands.timeout");
@@ -1747,7 +1831,6 @@ function guildRequest(ctx, config) {
 }
 __name(guildRequest, "guildRequest");
 function guildNameCard(ctx, config) {
-  let currentNameCardIndex = 0;
   const timerDisposers = /* @__PURE__ */ new Map();
   async function updateBotNameCards(bot) {
     if (!config.guildNameCards || config.guildNameCards.length === 0) {
@@ -1756,22 +1839,30 @@ function guildNameCard(ctx, config) {
     const guilds = bot.getGuildIter();
     for await (const guild of guilds) {
       try {
-        const nameCard = config.guildNameCards[currentNameCardIndex];
         const memberInfo = await bot.getGuildMember(guild.id, bot.selfId);
-        if (memberInfo.nick === nameCard) continue;
-        if (memberInfo.nick === "Noah  |  🚧维护中") continue;
-        await bot.internal.setGroupCard(guild.id, bot.selfId, nameCard);
+        const currentNameCard = memberInfo.nick;
+        if (currentNameCard === "Noah  |  🚧维护中") continue;
+        const currentIndex = config.guildNameCards.findIndex(
+          (card2) => card2 === currentNameCard
+        );
+        const nextIndex = (currentIndex + 1) % config.guildNameCards.length;
+        const nextNameCard = config.guildNameCards[nextIndex];
+        if (currentNameCard === nextNameCard) continue;
+        await bot.internal.setGroupCard(
+          guild.id,
+          bot.selfId,
+          nextNameCard
+        );
         ctx.logger("guild-namecard").info(
-          `更新 ${bot.selfId} 在 ${guild.name} 的群名片为 ${nameCard}`
+          `更新 ${bot.selfId} 在 ${guild.name} 的群名片: ${currentNameCard} -> ${nextNameCard}`
         );
-        await ctx.sleep(1e3);
+        await ctx.sleep(2e3);
       } catch (error) {
         ctx.logger("guild-namecard").warn(
           `更新 ${bot.selfId} 在 ${guild.name} 的群名片失败: ${error}`
         );
       }
     }
-    currentNameCardIndex = (currentNameCardIndex + 1) % config.guildNameCards.length;
   }
   __name(updateBotNameCards, "updateBotNameCards");
   async function setupTimersForBot(bot) {
@@ -1779,7 +1870,14 @@ function guildNameCard(ctx, config) {
     if (disposer) {
       disposer();
     }
-    await updateBotNameCards(bot);
+    ctx.setTimeout(async () => {
+      try {
+        await updateBotNameCards(bot);
+        ctx.logger("guild-namecard").info(`Bot ${bot.selfId} 更新群名片成功`);
+      } catch (err) {
+        ctx.logger("guild-namecard").warn(`Bot ${bot.selfId} 更新群名片失败: ${err}`);
+      }
+    }, 5e3);
     const dispose = ctx.setInterval(
       () => {
         updateBotNameCards(bot).catch((err) => {
@@ -1825,10 +1923,10 @@ function apply4(ctx, config) {
 __name(apply4, "apply");
 
 // src/core/locales/en-US.yml
-var en_US_default2 = { _config: { $desc: "Core Module Settings", adminUsers: "**Plugin Admin** User ID (use inspect command to get)", guildNameCards: "**Group Card** Name List" }, commands: { maintain: { description: "Switch to maintenance mode", messages: { start: "<p>Entering maintenance mode</p>", "success-start": "<p>Successfully switched to maintenance mode</p>", stop: "<p>Exiting maintenance mode</p>", "success-stop": "<p>Successfully exited maintenance mode</p>" } }, timeout: "Noah didn't wait for your reply, please try again!", noah: { help: { description: "Show Noah help information", messages: { content: "<p>Guide:</p>\n<a>https://docs.logthm.cn/noah</a>" } } }, locale: { description: "Set language", messages: { "no-auth": "<p>Only group admins can use this feature~</p>", "invalid-select": "<p>No such option!</p>", quit: "<p>Quit!</p>", "reset-channel": "<p>Reset successfully!</p>", "reset-user": "<p>Reset successfully!</p>", success: "<p>Set successfully!</p>", "set-channel": "<p>Select the default language for group chats:</p>\n<p>1. 简体中文</p>\n<p>2. English</p>\n<p>q. Quit</p>", "set-user": "<p>Select the language you use:</p>\n<p>1. 中文</p>\n<p>2. English</p>\n<p>q. Quit</p>" } }, bind: { description: "Bind card", messages: { prompt: "<p>Please enter your card number:</p>", "invalid-code": "<p>The card number is incorrect, if you don't remember it, go to the arcade to check it~</p>", duplicate: "<p>This card has already been bound （︶^︶）</p>", name: "<p>Received! Please give this card a name, no spaces allowed:</p>", invalid_name: "<p>No spaces allowed! Please try again o(一︿一+)o</p>", success: "<p>Bound successfully, your card information is as follows:</p>\n<p>[{cardName}]</p>\n<p>{cardCode}</p>" } }, card: { description: "Manage cards", messages: { "invalid-code": "<p>The card number is incorrect, if you don't remember it, go to the arcade to check it~</p>", "invalid-select": "<p>No such option!</p>", "menu-select": "<p>[Card Management]</p>\n{card_list}\n<p>0. Add new card</p>\n<p>Please enter the serial number:</p>", menu: "<p>[{name}]</p>\n<p>1. Set as default card</p>\n<p>2. View or modify card number</p>\n<p>3. Delete the card</p>\n<p>4. Rename the card</p>\n<p>5. Bind the card to a specified server</p>\n<p>0. Return to card selection</p>\n<p>Please enter the serial number:</p>", "menu-has-bound-server": "<p>[{name}]</p>\n<p>Bound server: {defaultServerName}</p>\n<p>1. Set as default card</p>\n<p>2. View or modify card number</p>\n<p>3. Delete the card</p>\n<p>4. Rename the card</p>\n<p>5. Bind the card to a specified server</p>\n<p>0. Return to card selection</p>\n<p>Please enter the serial number:</p>", "menu-1-success": "<p>Set successfully!</p>", "menu-1-error-duplicate": "<p>The selected card is the same as the old default card!</p>", "menu-2-prompt": "<p>Card number: {code}</p>\n<p>Please enter the new card number:</p>\n<p>Enter 0 to return</p>", "menu-2-success": "<p>Modified successfully!</p>", "menu-2-error-invalid-code": "<p>The card number is incorrect, if you don't remember it, go to the arcade to check it~</p>", "menu-3-success": "<p>Deleted successfully!</p>", "menu-4-prompt": "<p>Enter a new name, no spaces allowed:</p>", "menu-4-error-invalid-name": "<p>No spaces allowed! Please try again o(一︿一+)o</p>", "menu-4-success": "<p>Modified successfully!</p>", "menu-5": "{server_list}\n<p>Please enter the serial number:</p>", "menu-5-success": "<p>Set successfully!</p>", "menu-5-error-duplicate": "<p>The selected server is the same as the old default server!</p>" } }, server: { description: "Manage servers", messages: { "no-channel": "<p>Please use this feature in group chats~</p>", "invalid-select": "<p>No such option!</p>", "no-auth": "<p>Only group admins can use this feature~</p>", "admin-menu-select": "<p>[Group server management]</p>\n{server_list}\n<p>0. Add new server</p>\n<p>Please enter the serial number:</p>", "menu-select": "<p>[Server management]</p>\n{server_list}\n<p>0. Add new server</p>\n<p>Please enter the serial number:</p>", menu: "<p>[{name}]</p>\n<p>Type: {type}</p>\n<p>1. Set as default server</p>\n<p>2. View or modify url</p>\n<p>3. Delete the server</p>\n<p>4. Rename the server</p>\n<p>0. Return to server selection</p>\n<p>Please enter the serial number:</p>", "menu-1-success": "<p>Set successfully!</p>", "menu-1-error-duplicate": "<p>The selected server is the same as the old default server!</p>", "menu-2-prompt": "<p>The server's url: {baseUrl}</p>\n<p>Please enter the new server url:</p>\n<p>Enter 0 to return</p>", "menu-2-success": "<p>Modified successfully!</p>", "menu-3-success": "<p>Deleted successfully!</p>", "menu-4-prompt": "<p>Enter a new name, no spaces allowed:</p>", "menu-4-error-invalid-name": "<p>No spaces allowed! Please try again o(一︿一+)o</p>", "menu-4-success": "<p>Modified successfully!</p>", "add-type": "<p>Please select the server type:</p>\n{server_type_list}", "add-url": "<p>Please enter the server url:</p>", "add-name": "<p>Received! Please give the server a name, no spaces allowed:</p>", "add-invalid_name": "<p>No spaces allowed! Please try again o(一︿一+)o</p>", "add-success": "<p>Added successfully, the server information is as follows:</p>\n<p>[{serverName}]</p>\n<p>Type: {serverType}</p>" } } } };
+var en_US_default2 = { _config: { $desc: "Core Module Settings", adminUsers: "**Plugin Admin** User ID (use inspect command to get)", guildNameCards: "**Group Card** Name List" }, commands: { maintain: { description: "Switch to maintenance mode", messages: { "no-auth": "<p>You don't have permission to use this feature~</p>", start: "<p>Entering maintenance mode</p>", "success-start": "<p>Successfully switched to maintenance mode</p>", stop: "<p>Exiting maintenance mode</p>", "success-stop": "<p>Successfully exited maintenance mode</p>" } }, timeout: "Noah didn't wait for your reply, please try again!", noah: { help: { description: "Show Noah help information", messages: { content: "<p>Guide:</p>\n<a>https://docs.logthm.cn/noah</a>" } } }, locale: { description: "Set language", messages: { "no-auth": "<p>Only group admins can use this feature~</p>", "invalid-select": "<p>No such option!</p>", quit: "<p>Quit!</p>", "reset-channel": "<p>Reset successfully!</p>", "reset-user": "<p>Reset successfully!</p>", success: "<p>Set successfully!</p>", "set-channel": "<p>Select the default language for group chats:</p>\n<p>1. 简体中文</p>\n<p>2. English</p>\n<p>q. Quit</p>", "set-user": "<p>Select the language you use:</p>\n<p>1. 中文</p>\n<p>2. English</p>\n<p>q. Quit</p>" } }, bind: { description: "Bind card", messages: { prompt: "<p>Please enter your card number:</p>", "invalid-code": "<p>The card number is incorrect, if you don't remember it, go to the arcade to check it~</p>", duplicate: "<p>This card has already been bound （︶^︶）</p>", name: "<p>Received! Please give this card a name, no spaces allowed:</p>", invalid_name: "<p>No spaces allowed! Please try again o(一︿一+)o</p>", success: "<p>Bound successfully, your card information is as follows:</p>\n<p>[{cardName}]</p>\n<p>{cardCode}</p>" } }, card: { description: "Manage cards", options: { detail: "Show detailed card information" }, messages: { "invalid-code": "<p>The card number is incorrect, if you don't remember it, go to the arcade to check it~</p>", "invalid-select": "<p>No such option!</p>", "lookup-error": "Lookup failed: {message}", "lookup-error-unknown": "Lookup failed: unknown error", "menu-select": "<p>[Card Management]</p>\n{card_list}\n<p>0. Add new card</p>\n<p>Please enter the serial number:</p>", menu: "<p>[{name}]</p>\n<p>1. Set as default card</p>\n<p>2. View or modify card number</p>\n<p>3. Delete the card</p>\n<p>4. Rename the card</p>\n<p>5. Bind the card to a specified server</p>\n<p>0. Return to card selection</p>\n<p>Please enter the serial number:</p>", "menu-has-bound-server": "<p>[{name}]</p>\n<p>Bound server: {defaultServerName}</p>\n<p>1. Set as default card</p>\n<p>2. View or modify card number</p>\n<p>3. Delete the card</p>\n<p>4. Rename the card</p>\n<p>5. Bind the card to a specified server</p>\n<p>0. Return to card selection</p>\n<p>Please enter the serial number:</p>", "menu-1-success": "<p>Set successfully!</p>", "menu-1-error-duplicate": "<p>The selected card is the same as the old default card!</p>", "menu-2-prompt": "<p>Card number: {code}</p>\n<p>Please enter the new card number:</p>\n<p>Enter 0 to return</p>", "menu-2-success": "<p>Modified successfully!</p>", "menu-2-error-invalid-code": "<p>The card number is incorrect, if you don't remember it, go to the arcade to check it~</p>", "menu-3-success": "<p>Deleted successfully!</p>", "menu-4-prompt": "<p>Enter a new name, no spaces allowed:</p>", "menu-4-error-invalid-name": "<p>No spaces allowed! Please try again o(一︿一+)o</p>", "menu-4-success": "<p>Modified successfully!</p>", "menu-5": "{server_list}\n<p>Please enter the serial number:</p>", "menu-5-success": "<p>Set successfully!</p>", "menu-5-error-duplicate": "<p>The selected server is the same as the old default server!</p>" } }, server: { description: "Manage servers", messages: { "no-channel": "<p>Please use this feature in group chats~</p>", "invalid-select": "<p>No such option!</p>", "no-auth": "<p>Only group admins can use this feature~</p>", "admin-menu-select": "<p>[Group server management]</p>\n{server_list}\n<p>0. Add new server</p>\n<p>Please enter the serial number:</p>", "menu-select": "<p>[Server management]</p>\n{server_list}\n<p>0. Add new server</p>\n<p>Please enter the serial number:</p>", menu: "<p>[{name}]</p>\n<p>Type: {type}</p>\n<p>1. Set as default server</p>\n<p>2. View or modify url</p>\n<p>3. Delete the server</p>\n<p>4. Rename the server</p>\n<p>0. Return to server selection</p>\n<p>Please enter the serial number:</p>", "menu-1-success": "<p>Set successfully!</p>", "menu-1-error-duplicate": "<p>The selected server is the same as the old default server!</p>", "menu-2-prompt": "<p>The server's url: {baseUrl}</p>\n<p>Please enter the new server url:</p>\n<p>Enter 0 to return</p>", "menu-2-success": "<p>Modified successfully!</p>", "menu-2-invalid-url": "<p>Invalid URL format! Please enter a valid url address.</p>", "menu-2-too-many-attempts": "<p>Too many attempts. Operation cancelled.</p>", "menu-3-success": "<p>Deleted successfully!</p>", "menu-4-prompt": "<p>Enter a new name, no spaces allowed:</p>", "menu-4-error-invalid-name": "<p>No spaces allowed! Please try again o(一︿一+)o</p>", "menu-4-success": "<p>Modified successfully!</p>", "add-type": "<p>Please select the server type:</p>\n{server_type_list}", "add-url": "<p>Please enter the server url:</p>", "add-invalid-url": "<p>Invalid URL format! Please enter a valid url address.</p>", "add-too-many-attempts": "<p>Too many attempts. Operation cancelled.</p>", "add-name": "<p>Received! Please give the server a name, no spaces allowed:</p>", "add-invalid_name": "<p>No spaces allowed! Please try again o(一︿一+)o</p>", "add-success": "<p>Added successfully, the server information is as follows:</p>\n<p>[{serverName}]</p>\n<p>Type: {serverType}</p>" } } } };
 
 // src/core/locales/zh-CN.yml
-var zh_CN_default2 = { _config: { $desc: "Core 模块设置", adminUsers: "**插件管理员** 的用户id (使用 inspect 指令获取)", guildNameCards: "**群聊卡片** 的名称列表" }, commands: { maintain: { description: "切换到维护模式", messages: { start: "<p>正在进入维护模式</p>", "success-start": "<p>成功切换到维护模式</p>", stop: "<p>正在退出维护模式</p>", "success-stop": "<p>成功退出维护模式</p>" } }, timeout: "Noah 没等到你的回复，请重试！", noah: { help: { description: "显示 Noah 帮助信息", messages: { content: "<p>使用文档：</p>\n<a>https://docs.logthm.cn/noah</a>" } } }, locale: { description: "设置语言", messages: { "no-auth": "<p>只有群管理员能使用本功能哦~</p>", "invalid-select": "<p>没有该选项！</p>", quit: "<p>已退出~</p>", "reset-channel": "<p>重置成功！</p>", "reset-user": "<p>重置成功！</p>", success: "<p>设置成功！</p>", "set-channel": "<p>选择群聊默认使用的语言：</p>\n<p>1. 简体中文</p>\n<p>2. English</p>\n<p>q. 退出</p>", "set-user": "<p>选择你使用的语言：</p>\n<p>1. 简体中文</p>\n<p>2. English</p>\n<p>q. 退出</p>" } }, bind: { description: "绑定卡片", messages: { prompt: "<p>请输入你的卡号：</p>", "invalid-code": "<p>卡号不对哟，不记得的话去机台刷一下吧~</p>", duplicate: "<p>这张卡已经被绑定啦 （︶^︶）</p>", name: "<p>收到！为这张卡取一个名字吧，不要带空格哦：</p>", invalid_name: "<p>名字不要带空格！重来重来 o(一︿一+)o</p>", success: "<p>绑好啦，你的卡片信息如下：</p>\n<p>[{cardName}]</p>\n<p>{cardCode}</p>" } }, card: { description: "管理卡片", messages: { "invalid-code": "<p>卡号不对哟，不记得的话去机台刷一下吧~</p>", "invalid-select": "<p>没有该选项！</p>", quit: "<p>已退出~</p>", "menu-select": "<p>[卡片管理]</p>\n{card_list}\n<p>0. 添加新卡片</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", menu: "<p>[{name}]</p>\n<p>1. 设为默认卡片</p>\n<p>2. 查看或修改卡号</p>\n<p>3. 删除该卡</p>\n<p>4. 重命名该卡片</p>\n<p>5. 将卡片与指定服务器绑定</p>\n<p>0. 返回卡片选择</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", "menu-has-bound-server": "<p>[{name}]</p>\n<p>已绑定服务器：{defaultServerName}</p>\n<p>1. 设为默认卡片</p>\n<p>2. 查看或修改卡号</p>\n<p>3. 删除该卡</p>\n<p>4. 重命名该卡片</p>\n<p>5. 将卡片与指定服务器绑定</p>\n<p>0. 返回卡片选择</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", "menu-1-success": "<p>设置成功！</p>", "menu-1-error-duplicate": "<p>选择的卡片与旧的默认卡片相同！</p>", "menu-2-prompt": "<p>卡号：{code}</p>\n<p>请输入新的卡号：</p>\n<p>0. 返回</p>\n<p>q. 退出</p>", "menu-2-success": "<p>修改成功！</p>", "menu-2-error-invalid-code": "<p>卡号不对哟，不记得的话去机台刷一下吧~</p>", "menu-3-success": "<p>已删除！</p>", "menu-4-prompt": "<p>输入一个新名字，不要带空格哦：</p>\n<p>q. 退出</p>", "menu-4-error-invalid-name": "<p>名字不要带空格！重来重来 o(一︿一+)o</p>", "menu-4-success": "<p>修改成功！</p>", "menu-5": "<p>请选择一个服务器：</p>\n{server_list}\n<p>q. 退出</p>", "menu-5-success": "<p>设置成功！</p>", "menu-5-error-duplicate": "<p>选择的服务器与旧的默认服务器相同！</p>" } }, server: { description: "管理服务器", messages: { "no-channel": "<p>请在群聊中使用本功能哦~</p>", "invalid-select": "<p>没有该选项！</p>", "no-auth": "<p>只有群管理员能使用本功能哦~</p>", quit: "<p>已退出~</p>", "admin-menu-select": "<p>[群聊服务器管理]</p>\n{server_list}\n<p>0. 添加新服务器</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", "menu-select": "<p>[服务器管理]</p>\n{server_list}\n<p>0. 添加新服务器</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", menu: "<p>[{name}]</p>\n<p>类型：{type}</p>\n<p>1. 设为默认服务器</p>\n<p>2. 查看或修改 url</p>\n<p>3. 删除该服务器</p>\n<p>4. 重命名该服务器</p>\n<p>0. 返回服务器选择</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", "menu-1-success": "<p>设置成功！</p>", "menu-1-error-duplicate": "<p>选择的服务器与旧的默认服务器相同！</p>", "menu-2-prompt": "<p>该服务器的 url：{baseUrl}</p>\n<p>请输入新的服务器 url：</p>\n<p>0. 返回</p>\n<p>q. 退出</p>", "menu-2-success": "<p>修改成功！</p>", "menu-3-success": "<p>已删除！</p>", "menu-4-prompt": "<p>输入一个新名字，不要带空格哦：</p>\n<p>0. 返回</p>\n<p>q. 退出</p>", "menu-4-error-invalid-name": "<p>名字不要带空格！重来重来 o(一︿一+)o</p>", "menu-4-success": "<p>修改成功！</p>", "add-type": "<p>请选择服务器的类型：</p>\n{server_type_list}\n<p>q. 退出</p>", "add-url": "<p>请输入服务器的 url：</p>\n<p>q. 退出</p>", "add-name": "<p>收到！为服务器取一个名字吧，不要带空格哦：</p>\n<p>q. 退出</p>", "add-invalid_name": "<p>名字不要带空格！重来重来 o(一︿一+)o</p>", "add-success": "<p>添加成功啦，服务器信息如下：</p>\n<p>[{serverName}]</p>\n<p>类型：{serverType}</p>" } } } };
+var zh_CN_default2 = { _config: { $desc: "Core 模块设置", adminUsers: "**插件管理员** 的用户id (使用 inspect 指令获取)", guildNameCards: "**群聊卡片** 的名称列表" }, commands: { maintain: { description: "切换到维护模式", messages: { "no-auth": "<p>你没有权限使用本功能哦~</p>", start: "<p>正在进入维护模式</p>", "success-start": "<p>成功切换到维护模式</p>", stop: "<p>正在退出维护模式</p>", "success-stop": "<p>成功退出维护模式</p>" } }, timeout: "Noah 没等到你的回复，请重试！", noah: { help: { description: "显示 Noah 帮助信息", messages: { content: "<p>使用文档：</p>\n<a>https://docs.logthm.cn/noah</a>" } } }, locale: { description: "设置语言", messages: { "no-auth": "<p>只有群管理员能使用本功能哦~</p>", "invalid-select": "<p>没有该选项！</p>", quit: "<p>已退出~</p>", "reset-channel": "<p>重置成功！</p>", "reset-user": "<p>重置成功！</p>", success: "<p>设置成功！</p>", "set-channel": "<p>选择群聊默认使用的语言：</p>\n<p>1. 简体中文</p>\n<p>2. English</p>\n<p>q. 退出</p>", "set-user": "<p>选择你使用的语言：</p>\n<p>1. 简体中文</p>\n<p>2. English</p>\n<p>q. 退出</p>" } }, bind: { description: "绑定卡片", messages: { prompt: "<p>请输入你的卡号：</p>", "invalid-code": "<p>卡号不对哟，不记得的话去机台刷一下吧~</p>", duplicate: "<p>这张卡已经被绑定啦 （︶^︶）</p>", name: "<p>收到！为这张卡取一个名字吧，不要带空格哦：</p>", invalid_name: "<p>名字不要带空格！重来重来 o(一︿一+)o</p>", success: "<p>绑好啦，你的卡片信息如下：</p>\n<p>[{cardName}]</p>\n<p>{cardCode}</p>" } }, card: { description: "管理卡片", options: { detail: "显示卡片详细信息" }, messages: { "invalid-code": "<p>卡号不对哟，不记得的话去机台刷一下吧~</p>", "invalid-select": "<p>没有该选项！</p>", quit: "<p>已退出~</p>", "lookup-error": "查询失败: {message}", "lookup-error-unknown": "查询失败: 未知错误", "menu-select": "<p>[卡片管理]</p>\n{card_list}\n<p>0. 添加新卡片</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", menu: "<p>[{name}]</p>\n<p>1. 设为默认卡片</p>\n<p>2. 查看或修改卡号</p>\n<p>3. 删除该卡</p>\n<p>4. 重命名该卡片</p>\n<p>5. 将卡片与指定服务器绑定</p>\n<p>0. 返回卡片选择</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", "menu-has-bound-server": "<p>[{name}]</p>\n<p>已绑定服务器：{defaultServerName}</p>\n<p>1. 设为默认卡片</p>\n<p>2. 查看或修改卡号</p>\n<p>3. 删除该卡</p>\n<p>4. 重命名该卡片</p>\n<p>5. 将卡片与指定服务器绑定</p>\n<p>0. 返回卡片选择</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", "menu-1-success": "<p>设置成功！</p>", "menu-1-error-duplicate": "<p>选择的卡片与旧的默认卡片相同！</p>", "menu-2-prompt": "<p>卡号：{code}</p>\n<p>请输入新的卡号：</p>\n<p>0. 返回</p>\n<p>q. 退出</p>", "menu-2-success": "<p>修改成功！</p>", "menu-2-error-invalid-code": "<p>卡号不对哟，不记得的话去机台刷一下吧~</p>", "menu-3-success": "<p>已删除！</p>", "menu-4-prompt": "<p>输入一个新名字，不要带空格哦：</p>\n<p>q. 退出</p>", "menu-4-error-invalid-name": "<p>名字不要带空格！重来重来 o(一︿一+)o</p>", "menu-4-success": "<p>修改成功！</p>", "menu-5": "<p>请选择一个服务器：</p>\n{server_list}\n<p>q. 退出</p>", "menu-5-success": "<p>设置成功！</p>", "menu-5-error-duplicate": "<p>选择的服务器与旧的默认服务器相同！</p>" } }, server: { description: "管理服务器", messages: { "no-channel": "<p>请在群聊中使用本功能哦~</p>", "invalid-select": "<p>没有该选项！</p>", "no-auth": "<p>只有群管理员能使用本功能哦~</p>", quit: "<p>已退出~</p>", "admin-menu-select": "<p>[群聊服务器管理]</p>\n{server_list}\n<p>0. 添加新服务器</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", "menu-select": "<p>[服务器管理]</p>\n{server_list}\n<p>0. 添加新服务器</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", menu: "<p>[{name}]</p>\n<p>类型：{type}</p>\n<p>1. 设为默认服务器</p>\n<p>2. 查看或修改 url</p>\n<p>3. 删除该服务器</p>\n<p>4. 重命名该服务器</p>\n<p>0. 返回服务器选择</p>\n<p>q. 退出菜单</p>\n<p>请输入序号：</p>", "menu-1-success": "<p>设置成功！</p>", "menu-1-error-duplicate": "<p>选择的服务器与旧的默认服务器相同！</p>", "menu-2-prompt": "<p>该服务器的 url：{baseUrl}</p>\n<p>请输入新的服务器 url：</p>\n<p>0. 返回</p>\n<p>q. 退出</p>", "menu-2-success": "<p>修改成功！</p>", "menu-2-invalid-url": "<p>URL 格式不正确！请输入有效的 url 地址。</p>", "menu-2-too-many-attempts": "<p>尝试次数过多，操作已取消。</p>", "menu-3-success": "<p>已删除！</p>", "menu-4-prompt": "<p>输入一个新名字，不要带空格哦：</p>\n<p>0. 返回</p>\n<p>q. 退出</p>", "menu-4-error-invalid-name": "<p>名字不要带空格！重来重来 o(一︿一+)o</p>", "menu-4-success": "<p>修改成功！</p>", "add-type": "<p>请选择服务器的类型：</p>\n{server_type_list}\n<p>q. 退出</p>", "add-url": "<p>请输入服务器的 url：</p>\n<p>q. 退出</p>", "add-invalid-url": "<p>URL 格式不正确！请输入有效的 url 地址。</p>", "add-too-many-attempts": "<p>尝试次数过多，操作已取消。</p>", "add-name": "<p>收到！为服务器取一个名字吧，不要带空格哦：</p>\n<p>q. 退出</p>", "add-invalid_name": "<p>名字不要带空格！重来重来 o(一︿一+)o</p>", "add-success": "<p>添加成功啦，服务器信息如下：</p>\n<p>[{serverName}]</p>\n<p>类型：{serverType}</p>" } } } };
 
 // src/core/index.ts
 var name5 = "Noah-Core";
@@ -2066,6 +2164,7 @@ var SDVXDrawer = class extends BaseDrawer {
       }
     } catch (error) {
       this.ctx.logger("SDVX-Drawer").warn(`Failed to load jacket image: ${error.message}`);
+      jacketImage = null;
     }
     const canvas = new Canvas(bgImage.width, bgImage.height);
     const ctx = canvas.getContext("2d");
@@ -2073,28 +2172,30 @@ var SDVXDrawer = class extends BaseDrawer {
     ctx.imageSmoothingQuality = "high";
     ctx.clearRect(0, 0, canvas.width, canvas.height);
     ctx.drawImage(bgImage, 0, 0);
-    ctx.save();
-    ctx.translate(556, 17);
-    ctx.beginPath();
-    const r = 16, w = 100, h9 = 200, x0 = 0, y0 = 0;
-    ctx.moveTo(x0 + r, y0);
-    ctx.lineTo(x0 + w - r, y0);
-    ctx.arcTo(x0 + w, y0, x0 + w, y0 + r, r);
-    ctx.lineTo(x0 + w, y0 + h9 - r);
-    ctx.arcTo(x0 + w, y0 + h9, x0 + w - r, y0 + h9, r);
-    ctx.lineTo(x0 + r, y0 + h9);
-    ctx.arcTo(x0, y0 + h9, x0, y0 + h9 - r, r);
-    ctx.lineTo(x0, y0 + r);
-    ctx.arcTo(x0, y0, x0 + r, y0, r);
-    ctx.closePath();
-    const circleRadius = 14;
-    const circleX = x0 + w;
-    const circleY = y0 + h9 / 2;
-    ctx.moveTo(circleX + circleRadius, circleY);
-    ctx.arc(circleX, circleY, circleRadius, 0, Math.PI * 2, true);
-    ctx.clip();
-    ctx.drawImage(jacketImage, -100, 0, 200, 200);
-    ctx.restore();
+    if (jacketImage) {
+      ctx.save();
+      ctx.translate(556, 17);
+      ctx.beginPath();
+      const r = 16, w = 100, h9 = 200, x0 = 0, y0 = 0;
+      ctx.moveTo(x0 + r, y0);
+      ctx.lineTo(x0 + w - r, y0);
+      ctx.arcTo(x0 + w, y0, x0 + w, y0 + r, r);
+      ctx.lineTo(x0 + w, y0 + h9 - r);
+      ctx.arcTo(x0 + w, y0 + h9, x0 + w - r, y0 + h9, r);
+      ctx.lineTo(x0 + r, y0 + h9);
+      ctx.arcTo(x0, y0 + h9, x0, y0 + h9 - r, r);
+      ctx.lineTo(x0, y0 + r);
+      ctx.arcTo(x0, y0, x0 + r, y0, r);
+      ctx.closePath();
+      const circleRadius = 14;
+      const circleX = x0 + w;
+      const circleY = y0 + h9 / 2;
+      ctx.moveTo(circleX + circleRadius, circleY);
+      ctx.arc(circleX, circleY, circleRadius, 0, Math.PI * 2, true);
+      ctx.clip();
+      ctx.drawImage(jacketImage, -100, 0, 200, 200);
+      ctx.restore();
+    }
     ctx.drawImage(ticketBgImage, 0, 0);
     let mainTitle = "";
     let subTitle = "";
@@ -4975,7 +5076,10 @@ function vf(ctx, config, logger5) {
       } else {
         session.send(import_koishi14.h.image(imageBuffer, "image/jpg"));
       }
-      const totalVolforce = scoreList.slice(0, 50).reduce((sum, score) => sum + score.extra.volforce, 0) / 50;
+      const sortedScores = [...best50ScoreList].sort((a, b) => b.extra.volforce - a.extra.volforce).slice(0, 50);
+      const total = sortedScores.reduce((sum, score) => sum + score.extra.volforce, 0);
+      const totalVolforce = Math.round(total / 50 * 1e3) / 1e3;
+      console.log(totalVolforce);
       if (totalVolforce >= 20) {
         try {
           await new Promise((resolve3) => setTimeout(resolve3, 2e3));
@@ -5084,7 +5188,8 @@ var assetConfig = import_koishi16.Schema.object({
 var import_koishi17 = require("koishi");
 var coreConfig = import_koishi17.Schema.object({
   adminUsers: import_koishi17.Schema.array(String).role("table"),
-  guildNameCards: import_koishi17.Schema.array(String).role("table").default(["Noah  |  /help 获取食用指南"])
+  guildNameCards: import_koishi17.Schema.array(String).role("table").default(["Noah  |  /help 获取食用指南"]),
+  maoServerUrl: import_koishi17.Schema.string().default("http://maomani.cn:573")
 }).i18n({
   "en-US": en_US_default2._config,
   "zh-CN": zh_CN_default2._config

package/lib/types/config.d.ts

@@ -14,6 +14,8 @@ export interface CoreConfig extends BaseConfig {
     adminUsers?: string[];
     /** 群名片列表 */
     guildNameCards?: string[];
+    /** 猫网服务器 URL */
+    maoServerUrl?: string;
 }
 /**
  * SDVX 游戏配置接口

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koishi-plugin-noah",
-    "version": "1.4.1",
+    "version": "1.4.2",
     "contributors": [
         "Logthm <logthm@outlook.com>"
     ],