koishi-plugin-wordle-game 2.4.7 → 2.4.8

package/lib/index.d.ts

@@ -28,6 +28,7 @@ export interface Config {
     customTemplateId: string;
     key: string;
     numberOfMessageButtonsPerRow: number;
+    isUsingUnifiedKoishiBuiltInUsername: boolean;
 }
 export declare const Config: Schema<Config>;
 declare module 'koishi' {

package/lib/index.js

@@ -24,7 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.apply = exports.Config = exports.usage = exports.name = exports.inject = void 0;
+exports.Config = exports.usage = exports.name = exports.inject = void 0;
+exports.apply = apply;
 const koishi_1 = require("koishi");
 const cheerio_1 = require("cheerio");
 const path = __importStar(require("path"));
@@ -156,6 +157,7 @@ exports.Config = koishi_1.Schema.intersect([
                 customTemplateId: koishi_1.Schema.string().default('').description(`自定义模板 ID。`),
                 key: koishi_1.Schema.string().default('').description(`文本内容中特定插值的 key，用于存放文本。如果你的插值为 {{.info}}，那么请在这里填 info。`),
                 numberOfMessageButtonsPerRow: koishi_1.Schema.number().min(4).max(5).default(4).description(`每行消息按钮的数量。`),
+                isUsingUnifiedKoishiBuiltInUsername: koishi_1.Schema.boolean().default(true).description(`是否使用统一的 Koishi 内置用户名。`),
             }),
             koishi_1.Schema.object({}),
         ]),
@@ -2278,32 +2280,55 @@ ${rankType3.map((type, index) => `${index + 1}. ${type}`).join('\n')}`}
     // gm*
     ctx.command('wordleGame.改名 [newPlayerName:text]', '更改玩家名字')
         .action(async ({ session }, newPlayerName) => {
-        let { channelId, userId, username } = session;
-        username = await getSessionUserName(session);
+        const { userId, user } = session;
+        const username = await getSessionUserName(session);
         await updateNameInPlayerRecord(session, userId, username);
-        // 修剪玩家名字
         newPlayerName = newPlayerName?.trim();
         if (!newPlayerName) {
-            return await sendMessage(session, `【@${username}】\n请输入新的玩家名字。`, `改名`);
+            return sendMessage(session, `请输入新的玩家名字。`, `改名`);
         }
-        if (!(config.isEnableQQOfficialRobotMarkdownTemplate && session.platform === 'qq' && config.key !== '' && config.customTemplateId !== '')) {
-            return await sendMessage(session, `【@${username}】\n不是 QQ 官方机器人的话，不用改名哦~`, `改名`);
+        if (!(config.isEnableQQOfficialRobotMarkdownTemplate && session.platform === 'qq' && config.key && config.customTemplateId)) {
+            return sendMessage(session, `不是 QQ 官方机器人的话，不用改名哦~`, `改名`);
         }
-        // 判断新的玩家名字是否过长
         if (newPlayerName.length > 20) {
-            return await sendMessage(session, `【@${username}】\n新的玩家名字过长，请重新输入。`, `改名`);
+            return sendMessage(session, `新的玩家名字过长，请重新输入。`, `改名`);
         }
-        const players = await ctx.database.get('wordle_player_records', {});
-        // 判断新的玩家名字是否已经存在
-        for (const player of players) {
-            if (player.username === newPlayerName) {
-                return await sendMessage(session, `【@${username}】\n新的玩家名字已经存在，请重新输入。`, `改名`);
+        if (newPlayerName.includes("@everyone")) {
+            return sendMessage(session, `新的玩家名字不合法，请重新输入。`, `改名`);
+        }
+        if (config.isUsingUnifiedKoishiBuiltInUsername) {
+            return handleUnifiedKoishiUsername(session, user, newPlayerName);
+        }
+        else {
+            return handleCustomUsername(ctx, session, userId, newPlayerName);
+        }
+    });
+    // hs*
+    async function handleUnifiedKoishiUsername(session, user, newPlayerName) {
+        const name = koishi_1.h.transform(newPlayerName, { text: true, default: false }).trim();
+        if (name === user.name) {
+            return sendMessage(session, `新的玩家名字已经存在，请重新输入。`, `改名`);
+        }
+        try {
+            user.name = name;
+            await user.$update();
+            return sendMessage(session, `玩家名字已更改为：【${newPlayerName}】`, `查询玩家记录 开始游戏 改名`, 2);
+        }
+        catch (error) {
+            if (koishi_1.RuntimeError.check(error, 'duplicate-entry')) {
+                return sendMessage(session, `新的玩家名字已经存在，请重新输入。`, `改名`);
+            }
+            else {
+                logger.warn(error);
+                return sendMessage(session, `玩家名字更改失败。`, `改名`);
             }
         }
-        if (newPlayerName.includes("@everyone")) {
-            return await sendMessage(session, `【@${username}】\n新的玩家名字不合法，请重新输入。`, `改名`);
+    }
+    async function handleCustomUsername(ctx, session, userId, newPlayerName) {
+        const players = await ctx.database.get('wordle_player_records', {});
+        if (players.some(player => player.username === newPlayerName)) {
+            return sendMessage(session, `新的玩家名字已经存在，请重新输入。`, `改名`);
         }
-        // 玩家记录表操作
         const userRecord = await ctx.database.get('wordle_player_records', { userId });
         if (userRecord.length === 0) {
             await ctx.database.create('wordle_player_records', {
@@ -2314,10 +2339,8 @@ ${rankType3.map((type, index) => `${index + 1}. ${type}`).join('\n')}`}
         else {
             await ctx.database.set('wordle_player_records', { userId }, { username: newPlayerName });
         }
-        // 返回
-        return await sendMessage(session, `【@${username}】\n玩家名字已更改为：【${newPlayerName}】`, `查询玩家记录 开始游戏 改名`, 2);
-    });
-    // hs*
+        return await sendMessage(session, `玩家名字已更改为：【${newPlayerName}】`, `查询玩家记录 开始游戏 改名`, 2);
+    }
     function replaceSymbols(message) {
         let firstLessThan = true;
         let firstGreaterThan = true;
@@ -2347,15 +2370,20 @@ ${rankType3.map((type, index) => `${index + 1}. ${type}`).join('\n')}`}
     async function getSessionUserName(session) {
         let sessionUserName = session.username;
         if (isQQOfficialRobotMarkdownTemplateEnabled && session.platform === 'qq') {
-            let userRecord = await ctx.database.get('wordle_player_records', { userId: session.userId });
-            if (userRecord.length === 0) {
-                await ctx.database.create('wordle_player_records', {
-                    userId: session.userId,
-                    username: sessionUserName,
-                });
-                userRecord = await ctx.database.get('wordle_player_records', { userId: session.userId });
+            if (config.isUsingUnifiedKoishiBuiltInUsername && session.user.name) {
+                sessionUserName = session.user.name;
+            }
+            else {
+                let userRecord = await ctx.database.get('', { userId: session.userId });
+                if (userRecord.length === 0) {
+                    await ctx.database.create('wordle_player_records', {
+                        userId: session.userId,
+                        username: sessionUserName,
+                    });
+                    userRecord = await ctx.database.get('wordle_player_records', { userId: session.userId });
+                }
+                sessionUserName = userRecord[0].username;
             }
-            sessionUserName = userRecord[0].username;
         }
         return sessionUserName;
     }
@@ -3327,8 +3355,10 @@ ${gridHtml}
                         }
                     })
                         .join('\n');
-                    const imageBuffer = await ctx.markdownToImage.convertToImage(modifiedMessage);
-                    [messageId] = await session.send(koishi_1.h.image(imageBuffer, `image/${config.imageType}`));
+                    ctx.inject(['markdownToImage'], async (ctx) => {
+                        const imageBuffer = await ctx.markdownToImage.convertToImage(modifiedMessage);
+                        [messageId] = await session.send(koishi_1.h.image(imageBuffer, `image/${config.imageType}`));
+                    });
                 }
                 if (config.retractDelay !== 0) {
                     isPushMessageId = true;
@@ -3411,8 +3441,10 @@ ${gridHtml}
                         }
                     })
                         .join('\n');
-                    const imageBuffer = await ctx.markdownToImage.convertToImage(modifiedMessage);
-                    [messageId] = await session.send(koishi_1.h.image(imageBuffer, `image/${config.imageType}`));
+                    ctx.inject(['markdownToImage'], async (ctx) => {
+                        const imageBuffer = await ctx.markdownToImage.convertToImage(modifiedMessage);
+                        [messageId] = await session.send(koishi_1.h.image(imageBuffer, `image/${config.imageType}`));
+                    });
                 }
             }
             else {
@@ -5336,4 +5368,3 @@ ${content}
                     </div>`;
     // apply
 }
-exports.apply = apply;

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/) |... 猜单词|猜成语|猜数字|猜数学方程式|... 的小游戏，支持QQ官方MD模板，且包含多种词库、主题、游戏设置和排行榜系统等。",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -61,10 +61,10 @@
     "猜"
   ],
   "peerDependencies": {
-    "koishi": "^4.17.5"
+    "koishi": "^4.17.9"
   },
   "devDependencies": {
-    "koishi-plugin-markdown-to-image-service": "^1.1.8",
+    "koishi-plugin-markdown-to-image-service": "^1.1.9",
     "koishi-plugin-monetary": "^0.1.3",
     "koishi-plugin-puppeteer": "^3.8.4"
   },