koishi-plugin-wordle-game 3.0.0 → 4.0.0

package/README.md

@@ -20,7 +20,7 @@ yarn add koishi-plugin-wordle-game
 | `wordle.查询进度` | 查询当前游戏进度 |
 | `wordle.结束` | 结束游戏 |
 | `wordle.排行榜 [人数]` | 查看排行榜 |
-| `wordle.查询玩家记录 [@某人]` | 查询玩家记录 |
+| `wordle.战绩 [@某人]` | 查询玩家记录 |
 | `wordle.查单词 <词>` | 查单词引导 |
 | `wordle.查成语 <成语>` | 查询成语的拼音与解释（汉典） |
 | `wordle.拼音速查表` | 查看拼音速查表 |

package/lib/config.d.ts

@@ -8,7 +8,7 @@ export interface Config {
     maxSimultaneousGuesses: number;
     compositeImagePageWidth: number;
     compositeImagePageHeight: number;
-    enableWordGuessMiddleware: boolean;
+    enableDirectInput: boolean;
     shouldPromptWordLengthInput: boolean;
     isPreventUserDuplicateGuessInput: boolean;
     shouldPromptForWordLengthOnNonClassicStart: boolean;

package/lib/index.js

@@ -79,7 +79,7 @@ var Config = import_koishi.Schema.intersect([
   }).description("游戏设置"),
   import_koishi.Schema.intersect([
     import_koishi.Schema.object({
-      enableWordGuessMiddleware: import_koishi.Schema.boolean().default(true).description(`对局进行中时，直接发送猜测词即可，无需指令前缀。`),
+      enableDirectInput: import_koishi.Schema.boolean().default(true).description(`对局中直接发送猜测词即可续猜，无需指令前缀。`),
       isPreventUserDuplicateGuessInput: import_koishi.Schema.boolean().default(true).description(`拦截重复提交的猜测词。`),
       shouldPromptWordLengthInput: import_koishi.Schema.boolean().default(true).description(
         `引导式开局时，追问一次单词长度。关闭则直接用默认长度。`
@@ -14079,7 +14079,7 @@ function register2(g) {
   const equations = g.data.equations;
   ctx.middleware(async (session, next) => {
     let { channelId, content } = session;
-    if (!config.enableWordGuessMiddleware) {
+    if (!config.enableDirectInput) {
       return await next();
     }
     if (content) {
@@ -14121,7 +14121,7 @@ function register2(g) {
       return await sendMessage(
         g,
         session,
-        `💡 本频道没有进行中的对局。
+        `💡 本频道没有进行中的对局
 发送「wordle.开始」开一局。`
       );
     }
@@ -14225,7 +14225,7 @@ ${exams.map((exam, index) => `${index + 1}. ${exam}`).join("\n")}
       );
     }
   });
-  ctx.command("wordle.开始.经典", "开始经典猜单词游戏").option("hard", "--hard 困难模式", { fallback: false }).option("ultraHardMode", "--uhard 超困难模式", { fallback: false }).option("absurd", "--absurd 变态模式", { fallback: false }).option("challenge", "--challenge 变态挑战模式", { fallback: false }).option("wordles", "--wordles <value:number> 同时猜测多个单词", {
+  ctx.command("wordle.开始.经典", "以经典模式开局").option("hard", "--hard 困难模式", { fallback: false }).option("ultraHardMode", "--uhard 超困难模式", { fallback: false }).option("absurd", "--absurd 变态模式", { fallback: false }).option("challenge", "--challenge 变态挑战模式", { fallback: false }).option("wordles", "--wordles <value:number> 同时猜测多个单词", {
     fallback: 1
   }).action(async ({ session, options }) => {
     let { channelId, userId, username, timestamp } = session;
@@ -14643,7 +14643,7 @@ ${image}${tail}`
       return await sendMessage(
         g,
         session,
-        `💡 本频道没有进行中的对局。
+        `💡 本频道没有进行中的对局
 发送「wordle.开始」开一局。`
       );
     }
@@ -14678,7 +14678,7 @@ ${image}${tail}`
         await sendMessage(
           g,
           session,
-          `⏳ 作答超过 ${config.wordGuessTimeLimitInSeconds} 秒，本局结束。
+          `⏳ 作答超过 ${config.wordGuessTimeLimitInSeconds} 秒，本局结束
 发送「wordle.开始」再来一局。`
         );
         await endGame(g, channelId);
@@ -14955,7 +14955,7 @@ ${rule}
         await sendMessage(
           g,
           session,
-          `💡 按现有线索，已经没有可用的单词了，本局到此为止。
+          `💡 按现有线索，已经没有可用的单词了，本局到此为止
 发送「wordle.开始」再来一局。`
         );
         await endGame(g, channelId);
@@ -15005,7 +15005,7 @@ ${emptyGridHtml}`
           return await sendMessage(
             g,
             session,
-            `⏳ 没有等到有效输入，已按「撤销」处理。
+            `⏳ 没有等到有效输入，已按「撤销」处理
 ${import_koishi3.h.image(
               imageBuffer22,
               `image/${config.imageType}`
@@ -15020,7 +15020,7 @@ ${import_koishi3.h.image(
           return await sendMessage(
             g,
             session,
-            `✅ 已撤销，挑战继续。
+            `✅ 已撤销，挑战继续
 ${import_koishi3.h.image(
               imageBuffer22,
               `image/${config.imageType}`
@@ -15533,7 +15533,7 @@ ${serializedDefinitions ? serializedDefinitions : `• 这个单词的定义暂
       return sendMessage(
         g,
         session,
-        `📋 这个用户还没有游戏记录。
+        `📋 这个用户还没有战绩
 发送「wordle.开始」开一局，记录就有了。`
       );
     }
@@ -15561,7 +15561,7 @@ function register4(g) {
       return await sendMessage(
         g,
         session,
-        `💡 本频道没有进行中的对局。
+        `💡 本频道没有进行中的对局
 发送「wordle.开始」开一局。`
       );
     }
@@ -15845,14 +15845,11 @@ __name(getLeaderboardFastestGuessTime, "getLeaderboardFastestGuessTime");
 // src/commands/leaderboard.ts
 function register5(g) {
   const { ctx, config } = g;
-  ctx.command("wordle.排行榜 [number:number]", "查看排行榜").action(
-    async ({ session }, number = config.defaultMaxLeaderboardEntries) => {
+  ctx.command("wordle.排行榜 [count:posint]", "查看排行榜").action(
+    async ({ session }, count = config.defaultMaxLeaderboardEntries) => {
       let { username, userId } = session;
       username = await getSessionUserName(g, session);
       await updateNameInPlayerRecord(g, session, userId, username);
-      if (typeof number !== "number" || isNaN(number) || number < 0) {
-        return "⚠️ 排行榜人数须是不小于 0 的整数。";
-      }
       await sendMessage(
         g,
         session,
@@ -15868,9 +15865,9 @@ ${rankType.map((type, index) => `${index + 1}. ${type}`).join("\n")}
       const userInputNumber = parseInt(userInput);
       if (!isNaN(userInputNumber) && userInputNumber > 0 && userInputNumber <= rankType.length) {
         const rankName = rankType[userInputNumber - 1];
-        await session.execute(`wordle.排行榜.${rankName} ${number}`);
+        await session.execute(`wordle.排行榜.${rankName} ${count}`);
       } else if (rankType.includes(userInput)) {
-        await session.execute(`wordle.排行榜.${userInput} ${number}`);
+        await session.execute(`wordle.排行榜.${userInput} ${count}`);
       } else {
         return sendMessage(g, session, `⚠️ 认不出这一项
 发送上面列出的序号或名称。`);
@@ -15878,14 +15875,11 @@ ${rankType.map((type, index) => `${index + 1}. ${type}`).join("\n")}
     }
   );
   rankType2.forEach((type) => {
-    ctx.command(`wordle.排行榜.${type} [number:number]`, `查看${type}排行榜`).action(
-      async ({ session }, number = config.defaultMaxLeaderboardEntries) => {
+    ctx.command(`wordle.排行榜.${type} [count:posint]`, `查看${type}排行榜`).action(
+      async ({ session }, count = config.defaultMaxLeaderboardEntries) => {
         let { username, userId } = session;
         username = await getSessionUserName(g, session);
         await updateNameInPlayerRecord(g, session, userId, username);
-        if (typeof number !== "number" || isNaN(number) || number < 0) {
-          return "⚠️ 排行榜人数须是不小于 0 的整数。";
-        }
         let rankType3;
         if (type === "总") {
           rankType3 = ["胜场", "输场"];
@@ -15910,11 +15904,11 @@ ${rankType3.map((type2, index) => `${index + 1}. ${type2}`).join("\n")}
         if (!isNaN(userInputNumber) && userInputNumber > 0 && userInputNumber <= rankType3.length) {
           const rankName = rankType3[userInputNumber - 1];
           await session.execute(
-            `wordle.排行榜.${type}.${rankName} ${number}`
+            `wordle.排行榜.${type}.${rankName} ${count}`
           );
         } else if (rankType3.includes(userInput)) {
           await session.execute(
-            `wordle.排行榜.${type}.${userInput} ${number}`
+            `wordle.排行榜.${type}.${userInput} ${count}`
           );
         } else {
           return sendMessage(g, session, `⚠️ 认不出这一项
@@ -15924,79 +15918,67 @@ ${rankType3.map((type2, index) => `${index + 1}. ${type2}`).join("\n")}
     );
   });
   ctx.command(
-    "wordle.排行榜.猜出次数 [number:number]",
+    "wordle.排行榜.猜出次数 [count:posint]",
     "查看玩家猜出次数排行榜"
   ).action(
-    async ({ session }, number = config.defaultMaxLeaderboardEntries) => {
+    async ({ session }, count = config.defaultMaxLeaderboardEntries) => {
       let { username, userId } = session;
       username = await getSessionUserName(g, session);
       await updateNameInPlayerRecord(g, session, userId, username);
-      if (typeof number !== "number" || isNaN(number) || number < 0) {
-        return "⚠️ 排行榜人数须是不小于 0 的整数。";
-      }
       return await getLeaderboard(
         g,
         session,
         "wordGuessCount",
         "玩家猜出次数排行榜",
-        number
+        count
       );
     }
   );
   ctx.command(
-    "wordle.排行榜.总.胜场 [number:number]",
+    "wordle.排行榜.总.胜场 [count:posint]",
     "查看玩家总胜场排行榜"
   ).action(
-    async ({ session }, number = config.defaultMaxLeaderboardEntries) => {
+    async ({ session }, count = config.defaultMaxLeaderboardEntries) => {
       let { username, userId } = session;
       username = await getSessionUserName(g, session);
       await updateNameInPlayerRecord(g, session, userId, username);
-      if (typeof number !== "number" || isNaN(number) || number < 0) {
-        return "⚠️ 排行榜人数须是不小于 0 的整数。";
-      }
       return await getLeaderboard(
         g,
         session,
         "win",
         "玩家总胜场排行榜",
-        number
+        count
       );
     }
   );
   ctx.command(
-    "wordle.排行榜.总.输场 [number:number]",
+    "wordle.排行榜.总.输场 [count:posint]",
     "查看玩家总输场排行榜"
   ).action(
-    async ({ session }, number = config.defaultMaxLeaderboardEntries) => {
+    async ({ session }, count = config.defaultMaxLeaderboardEntries) => {
       let { username, userId } = session;
       username = await getSessionUserName(g, session);
       await updateNameInPlayerRecord(g, session, userId, username);
-      if (typeof number !== "number" || isNaN(number) || number < 0) {
-        return "⚠️ 排行榜人数须是不小于 0 的整数。";
-      }
       return await getLeaderboard(
         g,
         session,
         "lose",
         "玩家总输场排行榜",
-        number
+        count
       );
     }
   );
   rankType4.forEach((type) => {
     ctx.command(
-      `wordle.排行榜.${type}.胜场 [number:number]`,
+      `wordle.排行榜.${type}.胜场 [count:posint]`,
       `查看${type}胜场排行榜`
     ).option("hard", "--hard 查看困难模式", { fallback: false }).option("wordles", "--wordles <value:number> 查看多猜测模式", {
       fallback: 0
     }).action(
-      async ({ session, options }, number = config.defaultMaxLeaderboardEntries) => {
+      async ({ session, options }, count = config.defaultMaxLeaderboardEntries) => {
         let { username, userId } = session;
         username = await getSessionUserName(g, session);
         await updateNameInPlayerRecord(g, session, userId, username);
-        if (typeof number !== "number" || isNaN(number) || number < 0) {
-          return "⚠️ 排行榜人数须是不小于 0 的整数。";
-        }
         if (type === "词影" && options.wordles !== 0 || type === "词影" && options.hard) {
           if (options.wordles === 0) {
             options.wordles = 1;
@@ -16013,30 +15995,27 @@ ${rankType3.map((type2, index) => `${index + 1}. ${type2}`).join("\n")}
             session,
             options.wordles,
             `玩家胜场排行榜（词影 x${options.wordles}${options.hard && options.wordles === 1 ? "（困难）" : ""}）`,
-            number,
+            count,
             options.hard
           );
         }
         return await sendMessage(
           g,
           session,
-          await getLeaderboardWinOrLose(g, type, number, "win", "胜场")
+          await getLeaderboardWinOrLose(g, type, count, "win", "胜场")
         );
       }
     );
     ctx.command(
-      `wordle.排行榜.${type}.输场 [number:number]`,
+      `wordle.排行榜.${type}.输场 [count:posint]`,
       `查看${type}输场排行榜`
     ).option("hard", "--hard 查看困难模式", { fallback: false }).option("wordles", "--wordles <value:number> 查看多猜测模式", {
       fallback: 0
     }).action(
-      async ({ session, options }, number = config.defaultMaxLeaderboardEntries) => {
+      async ({ session, options }, count = config.defaultMaxLeaderboardEntries) => {
         let { username, userId } = session;
         username = await getSessionUserName(g, session);
         await updateNameInPlayerRecord(g, session, userId, username);
-        if (typeof number !== "number" || isNaN(number) || number < 0) {
-          return "⚠️ 排行榜人数须是不小于 0 的整数。";
-        }
         if (type === "词影" && options.wordles !== 0 || type === "词影" && options.hard) {
           if (options.wordles === 0) {
             options.wordles = 1;
@@ -16053,30 +16032,27 @@ ${rankType3.map((type2, index) => `${index + 1}. ${type2}`).join("\n")}
             session,
             options.wordles,
             `玩家输场排行榜（词影 x${options.wordles}${options.hard && options.wordles === 1 ? "（困难）" : ""}）`,
-            number,
+            count,
             options.hard
           );
         }
         return await sendMessage(
           g,
           session,
-          await getLeaderboardWinOrLose(g, type, number, "lose", "输场")
+          await getLeaderboardWinOrLose(g, type, count, "lose", "输场")
         );
       }
     );
     ctx.command(
-      `wordle.排行榜.${type}.最快用时 [number:number]`,
+      `wordle.排行榜.${type}.最快用时 [count:posint]`,
       `查看${type}最快用时排行榜`
     ).option("hard", "--hard 查看困难模式", { fallback: false }).option("wordles", "--wordles <value:number> 查看多猜测模式", {
       fallback: 0
     }).action(
-      async ({ session, options }, number = config.defaultMaxLeaderboardEntries) => {
+      async ({ session, options }, count = config.defaultMaxLeaderboardEntries) => {
         let { username, userId } = session;
         username = await getSessionUserName(g, session);
         await updateNameInPlayerRecord(g, session, userId, username);
-        if (typeof number !== "number" || isNaN(number) || number < 0) {
-          return "⚠️ 排行榜人数须是不小于 0 的整数。";
-        }
         if (type === "词影" && options.wordles !== 0 || type === "词影" && options.hard) {
           if (options.wordles === 0) {
             options.wordles = 1;
@@ -16093,31 +16069,28 @@ ${rankType3.map((type2, index) => `${index + 1}. ${type2}`).join("\n")}
             session,
             options.wordles,
             `玩家最快用时排行榜（词影 x${options.wordles}${options.hard && options.wordles === 1 ? "（困难）" : ""}）`,
-            number,
+            count,
             options.hard
           );
         }
         return await sendMessage(
           g,
           session,
-          await getLeaderboardFastestGuessTime(g, type, number)
+          await getLeaderboardFastestGuessTime(g, type, count)
         );
       }
     );
   });
   ctx.command(
-    "wordle.排行榜.词影.猜出次数 [number:number]",
+    "wordle.排行榜.词影.猜出次数 [count:posint]",
     "查看玩家猜出次数排行榜（词影）"
   ).option("hard", "--hard 查看困难模式", { fallback: false }).option("wordles", "--wordles <value:number> 查看多猜测模式", {
     fallback: 1
   }).action(
-    async ({ session, options }, number = config.defaultMaxLeaderboardEntries) => {
+    async ({ session, options }, count = config.defaultMaxLeaderboardEntries) => {
       let { username, userId } = session;
       username = await getSessionUserName(g, session);
       await updateNameInPlayerRecord(g, session, userId, username);
-      if (typeof number !== "number" || isNaN(number) || number < 0) {
-        return "⚠️ 排行榜人数须是不小于 0 的整数。";
-      }
       if (typeof options.wordles !== "number" || options.wordles < 1 || options.wordles > 4) {
         return await sendMessage(
           g,
@@ -16131,7 +16104,7 @@ ${rankType3.map((type2, index) => `${index + 1}. ${type2}`).join("\n")}
         options.wordles,
         "successCount",
         `玩家猜出次数排行榜（词影 x${options.wordles}${options.hard && options.wordles === 1 ? "（困难）" : ""}）`,
-        number,
+        count,
         options.hard
       );
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-wordle-game",
   "description": "Koishi 的多模式猜词游戏插件。",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [