koishi-plugin-wordle-game 2.2.8 → 2.3.0

package/lib/index.js

@@ -1010,6 +1010,14 @@ async function apply(ctx, config) {
             await setGuessRunningStatus(channelId, false);
             return await sendMessage(session, `【@${username}】\n操作太快了哦~\n再试一次吧！`);
         }
+        // 运行状态
+        await setGuessRunningStatus(channelId, true);
+        // 更新玩家记录表中的用户名
+        await updateNameInPlayerRecord(userId, username);
+        if (!gameInfo.isStarted) {
+            await setGuessRunningStatus(channelId, false);
+            return await sendMessage(session, `【@${username}】\n游戏还没开始呢！`);
+        }
         if (options.random) {
             inputWord = gameInfo.gameMode === '汉兜' || gameInfo.gameMode === '词影' ? getRandomIdiom(idiomsList).idiom : gameInfo.gameMode === 'Numberle' ? generateNumberString(gameInfo.guessWordLength) : gameInfo.gameMode === 'Math' ? getRandomFromStringList(equations[gameInfo.guessWordLength]) : getRandomWordTranslation('ALL', gameInfo.guessWordLength).word;
         }
@@ -1022,14 +1030,6 @@ async function apply(ctx, config) {
                 return await sendMessage(session, `【${username}】\n猜测操作已取消！`);
             inputWord = userInput.trim();
         }
-        // 运行状态
-        await setGuessRunningStatus(channelId, true);
-        // 更新玩家记录表中的用户名
-        await updateNameInPlayerRecord(userId, username);
-        if (!gameInfo.isStarted) {
-            await setGuessRunningStatus(channelId, false);
-            return await sendMessage(session, `【@${username}】\n游戏还没开始呢！`);
-        }
         // 作答时间限制
         const timeDifferenceInSeconds = (timestamp - gameInfo.timestamp) / 1000; // 将时间戳转换为秒
         if (config.enableWordGuessTimeLimit) {
@@ -1433,6 +1433,7 @@ ${settlementResult}
         // 更新玩家记录表中的用户名
         await updateNameInPlayerRecord(userId, username);
         if (targetUser) {
+            targetUser = await replaceAtTags(session, targetUser);
             const userIdRegex = /<at id="([^"]+)"(?: name="([^"]+)")?\/>/;
             const match = targetUser.match(userIdRegex);
             userId = match?.[1] ?? userId;
@@ -3028,6 +3029,24 @@ ${content}
         }
     }
     // hs*
+    async function replaceAtTags(session, content) {
+        // 正则表达式用于匹配 at 标签
+        const atRegex = /<at id="(\d+)"(?: name="([^"]*)")?\/>/g;
+        // 匹配所有 at 标签
+        let match;
+        while ((match = atRegex.exec(content)) !== null) {
+            const userId = match[1];
+            const name = match[2];
+            // 如果 name 不存在，根据 userId 获取相应的 name
+            if (!name) {
+                const guildMember = await session.bot.getGuildMember(session.guildId, userId);
+                // 替换原始的 at 标签
+                const newAtTag = `<at id="${userId}" name="${guildMember.name}"/>`;
+                content = content.replace(match[0], newAtTag);
+            }
+        }
+        return content;
+    }
     function checkStrokesData(inputWord) {
         for (const char of inputWord) {
             if (!strokesData[char]) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-wordle-game",
   "description": "欢迎来到 [Wordle](https://www.nytimes.com/games/wordle/index.html) | [汉兜](https://handle.antfu.me/) | [词影](https://cy.surprising.studio/) |... 猜单词|猜成语|猜数字|猜数学方程式|... 的小游戏，包含多种词库、多种主题、多种游戏设置和排行榜系统。",
-  "version": "2.2.8",
+  "version": "2.3.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -61,7 +61,7 @@
     "猜"
   ],
   "peerDependencies": {
-    "koishi": "^4.17.2"
+    "koishi": "^4.17.3"
   },
   "devDependencies": {
     "koishi-plugin-markdown-to-image-service": "^1.1.3",