koishi-plugin-ciyi 1.2.6 → 1.2.8

package/lib/index.d.ts

@@ -1,7 +1,7 @@
-import { Context, Schema } from "koishi";
+import { Context, Schema, Session } from "koishi";
 import { History } from "./view";
 export declare const name = "ciyi";
-export declare const usage = "## \u4F7F\u7528\n\n\u8BBE\u7F6E\u6307\u4EE4\u522B\u540D\u540E\uFF0C\u53D1\u9001 `ciyi` \u67E5\u770B\u73A9\u6CD5\u3002\u6BCF\u65E5\u85CF\u4E00\u4E2A\u4E24\u5B57\u8BCD\uFF0C\u7B2C\u4E00\u6B21\u731C\u6D4B\u4F1A\u81EA\u52A8\u5F00\u9898\u3002\n\n## \u6307\u4EE4\n\n| \u6307\u4EE4 | \u8BF4\u660E |\n| --- | --- |\n| `ciyi` | \u73A9\u6CD5\u8BF4\u660E |\n| `ciyi.\u731C <\u8BCD>` | \u5F00\u59CB\u4ECA\u65E5\u6E38\u620F\u5E76\u63D0\u4EA4\u731C\u6D4B |\n| `ciyi.\u6392\u884C\u699C` | \u731C\u4E2D\u6B21\u6570\u699C |";
+export declare const usage = "## \u4F7F\u7528\n\n\u8BBE\u7F6E\u6307\u4EE4\u522B\u540D\u540E\uFF0C\u53D1\u9001 `ciyi` \u67E5\u770B\u73A9\u6CD5\u3002\u6BCF\u65E5\u85CF\u4E00\u4E2A\u4E24\u5B57\u8BCD\uFF0C\u4F7F\u7528 `ciyi.\u731C <\u8BCD>` \u63D0\u4EA4\u7B2C\u4E00\u6B21\u731C\u6D4B\u5E76\u5F00\u9898\uFF1B\u5F00\u9898\u540E\u53EF\u76F4\u63A5\u53D1\u9001\u4E24\u5B57\u8BCD\u7EE7\u7EED\u731C\u6D4B\u3002\n\n## \u6307\u4EE4\n\n| \u6307\u4EE4 | \u8BF4\u660E |\n| --- | --- |\n| `ciyi` | \u73A9\u6CD5\u8BF4\u660E |\n| `ciyi.\u731C <\u8BCD>` | \u5F00\u59CB\u4ECA\u65E5\u6E38\u620F\u5E76\u63D0\u4EA4\u731C\u6D4B |\n| `ciyi.\u6392\u884C\u699C` | \u731C\u4E2D\u6B21\u6570\u699C |";
 export declare const inject: {
     required: string[];
     optional: string[];
@@ -39,4 +39,11 @@ export interface CiyiRank {
     score: number;
 }
 export type { History };
+/**
+ * 裸词中间件只接受一条完整、无修饰的两字中文纯文本消息。
+ * 引用、@、图片、富文本以及机器人消息都可能只是普通聊天的一部分，不能据此猜词。
+ */
+export declare function getMiddlewareGuess(session: Session): string | null;
+/** 裸词只能加入已开始且未封题的游戏，不能开题，也不重复提交旧猜测。 */
+export declare function canHandleMiddlewareGuess(game: Ciyi | null | undefined, guess: string): boolean;
 export declare function apply(ctx: Context, cfg: Config): void;

package/lib/index.js

@@ -22,6 +22,8 @@ var index_exports = {};
 __export(index_exports, {
   Config: () => Config,
   apply: () => apply,
+  canHandleMiddlewareGuess: () => canHandleMiddlewareGuess,
+  getMiddlewareGuess: () => getMiddlewareGuess,
   inject: () => inject,
   name: () => name,
   usage: () => usage
@@ -578,7 +580,7 @@ function renderIntroCard(service, opts) {
     textLeft(ctx, "ciyi.猜 山水", ix + s(96), y + s(24), `${s(13.5)}px ${FONT_NUM}`, C.ink);
     textLeftFit(
       ctx,
-      `开题并报一个两字词${opts.middleware ? "，也可以直接把词发出来" : ""}`,
+      `开题并报一个两字词${opts.middleware ? "；开题后可直接发词" : ""}`,
       ix + s(230),
       y + s(24),
       iw - s(268),
@@ -733,7 +735,9 @@ function renderWinCard(service, opts) {
 }
 __name(renderWinCard, "renderWinCard");
 function renderRankCard(service, opts) {
-  const innerW = s(620);
+  const innerW = s(640);
+  const rankPadX = s(32);
+  const rankInnerPad = s(20);
   const headerH = s(87);
   const contentGap = s(20);
   const rowH = s(52);
@@ -744,17 +748,21 @@ function renderRankCard(service, opts) {
   const contentH = opts.entries.length ? opts.entries.length * rowH + hiddenH : emptyH;
   const innerH = headerH + contentGap + contentH + footerGap + footerH;
   return toPng(service, innerW, innerH, (ctx, ix, iy, iw, ih) => {
+    const panelX = ix + rankPadX;
+    const panelW = iw - rankPadX * 2;
+    const contentLeft = panelX + rankInnerPad;
+    const contentRight = panelX + panelW - rankInnerPad;
     let y = iy + drawHeader(ctx, ix, iy, iw, "每日挑战 · 累计猜中", {
       big: String(opts.players),
       cap: "上榜人数"
     });
     y += s(20);
+    drawPanel(ctx, panelX, y, panelW, contentH);
     if (!opts.entries.length) {
-      drawPanel(ctx, ix + s(22), y, iw - s(44), emptyH);
       textCenter(
         ctx,
         "榜上无名。",
-        ix + iw / 2,
+        panelX + panelW / 2,
         y + s(31),
         `${s(13.5)}px ${FONT_SERIF}`,
         C.ink3
@@ -762,7 +770,7 @@ function renderRankCard(service, opts) {
       textCenter(
         ctx,
         "今日第一个猜中的人，会写在这里。",
-        ix + iw / 2,
+        panelX + panelW / 2,
         y + s(61),
         `${s(13.5)}px ${FONT_SERIF}`,
         C.ink3
@@ -774,17 +782,17 @@ function renderRankCard(service, opts) {
         const midY = ry + rowH / 2;
         if (e.me) {
           ctx.fillStyle = "rgba(178,58,46,0.055)";
-          ctx.fillRect(ix + s(22), ry, iw - s(44), rowH);
+          ctx.fillRect(panelX, ry, panelW, rowH);
         }
         if (i > 0) {
           ctx.strokeStyle = C.rule;
           ctx.beginPath();
-          ctx.moveTo(ix + s(22), ry);
-          ctx.lineTo(ix + iw - s(22), ry);
+          ctx.moveTo(contentLeft, ry);
+          ctx.lineTo(contentRight, ry);
           ctx.stroke();
         }
         const posSize = s(30);
-        const px = ix + s(26);
+        const px = contentLeft;
         const py = midY - posSize / 2;
         const posColors = [
           { bg: C.seal, fg: "#F7F1E5", border: C.seal },
@@ -801,12 +809,15 @@ function renderRankCard(service, opts) {
         const nameX = px + posSize + s(14);
         const nameFont = `${s(15)}px ${FONT_SERIF}`;
         const score = String(e.score);
-        const scoreRight = ix + iw - s(38);
-        const scoreLeft = scoreRight - textWidth(score, s(19));
+        const unitFont = s(11.5);
+        const unitW = textWidth("次", unitFont);
+        const scoreFont = s(19);
+        const scoreRight = contentRight - unitW - s(8);
+        const scoreLeft = scoreRight - textWidth(score, scoreFont);
         const meWidth = e.me ? textWidth("我", s(10.5)) + s(18) : 0;
         const fittedName = ellipsize(
           name2,
-          Math.max(0, scoreLeft - s(18) - nameX - meWidth),
+          Math.max(0, scoreLeft - s(16) - nameX - meWidth),
           s(15)
         );
         textLeft(ctx, fittedName, nameX, midY, nameFont, C.ink);
@@ -819,17 +830,17 @@ function renderRankCard(service, opts) {
           score,
           scoreRight,
           midY,
-          `700 ${s(19)}px ${FONT_NUM}`,
+          `700 ${scoreFont}px ${FONT_NUM}`,
           C.ink
         );
-        textRight(ctx, "次", ix + iw - s(22), midY, `${s(11.5)}px ${FONT_SERIF}`, C.ink3);
+        textRight(ctx, "次", contentRight, midY, `${unitFont}px ${FONT_SERIF}`, C.ink3);
         ry += rowH;
       }
       if (opts.hidden > 0) {
         textLeft(
           ctx,
           `⋯ 另有 ${opts.hidden} 人在榜`,
-          ix + s(26),
+          contentLeft,
           ry + s(16),
           `${s(11.5)}px ${FONT_SERIF}`,
           C.ink3
@@ -847,7 +858,7 @@ function renderRankCard(service, opts) {
     textLeft(
       ctx,
       "每猜中一日之词，记一次",
-      ix + s(22),
+      panelX,
       iy + ih - s(30),
       `${s(11.5)}px ${FONT_SERIF}`,
       C.ink3
@@ -860,7 +871,7 @@ __name(renderRankCard, "renderRankCard");
 var name = "ciyi";
 var usage = `## 使用
 
-设置指令别名后，发送 \`ciyi\` 查看玩法。每日藏一个两字词，第一次猜测会自动开题。
+设置指令别名后，发送 \`ciyi\` 查看玩法。每日藏一个两字词，使用 \`ciyi.猜 <词>\` 提交第一次猜测并开题；开题后可直接发送两字词继续猜测。
 
 ## 指令
 
@@ -873,11 +884,33 @@ var inject = { required: ["database"], optional: ["canvas"] };
 var Config = import_koishi.Schema.object({
   atReply: import_koishi.Schema.boolean().default(false).description("响应时 @"),
   quoteReply: import_koishi.Schema.boolean().default(false).description("响应时引用"),
-  isEnableMiddleware: import_koishi.Schema.boolean().default(true).description("是否启用中间件（若启用，猜测词语时可以不使用指令直接猜测）"),
+  isEnableMiddleware: import_koishi.Schema.boolean().default(true).description("是否启用中间件（若启用，已开题时可以不使用指令直接猜测）"),
   renderImage: import_koishi.Schema.boolean().default(true).description("渲染图片（复用 Koishi Canvas 服务；不可用时使用等价文本）"),
   maxHistory: import_koishi.Schema.number().default(10).min(0).description("猜测板最多列出的历史条数（最新一次猜测始终会列出）"),
   maxRank: import_koishi.Schema.number().default(10).min(0).description("最大排行榜人数")
 });
+function getMiddlewareGuess(session) {
+  const message = session.event.message;
+  if (!message || message.quote || session.event.user?.isBot || message.user?.isBot) {
+    return null;
+  }
+  const elements = message.elements ?? [];
+  if (elements.length !== 1 || elements[0].type !== "text") {
+    return null;
+  }
+  const text = elements[0].attrs.content;
+  if (typeof text !== "string" || text !== text.trim() || Array.from(text).length !== 2 || !/^\p{Script=Han}{2}$/u.test(text) || !allWords_default.includes(text)) {
+    return null;
+  }
+  return text;
+}
+__name(getMiddlewareGuess, "getMiddlewareGuess");
+function canHandleMiddlewareGuess(game, guess) {
+  if (!game || game.isOver) return false;
+  if (game.guessedHistoryInOneGame?.includes(guess)) return false;
+  return guess === game.answer || game.rankList?.includes(guess) === true;
+}
+__name(canHandleMiddlewareGuess, "canHandleMiddlewareGuess");
 function apply(ctx, cfg) {
   ctx.model.extend(
     "ciyi",
@@ -909,14 +942,21 @@ function apply(ctx, cfg) {
   const RULE = "────────────";
   if (cfg.isEnableMiddleware) {
     ctx.middleware(async (session, next) => {
-      const text = `${import_koishi.h.select(session.event.message.elements, "text")}`;
-      if (text.length !== 2) {
-        return await next();
-      }
-      if (!allWords_default.includes(text)) {
+      const guess = getMiddlewareGuess(session);
+      if (!guess || !session.channelId) return await next();
+      try {
+        const [game] = await ctx.database.get("ciyi", {
+          channelId: session.channelId
+        });
+        if (!canHandleMiddlewareGuess(game, guess)) return await next();
+      } catch (error) {
+        logger.warn(
+          "中间件读取游戏状态失败，本次消息不作猜测：%s",
+          error?.message ?? error
+        );
         return await next();
       }
-      return await session.execute(`ciyi.猜 ${text}`);
+      return await session.execute(`ciyi.猜 ${guess}`);
     });
   }
   ctx.command("ciyi", "词意（猜词游戏）").action(async ({ session }) => {
@@ -1018,9 +1058,10 @@ function apply(ctx, cfg) {
       "词意 · 按意思远近找词",
       `每天藏起一个两字词。你报词，我回它与答案的语义排名 —— 名次越小越近，#1 就是答案本身。`,
       [
-        `开始　ciyi.猜 山水　　开题并报一个两字词${cfg.isEnableMiddleware ? "（也可直接发词）" : ""}`,
+        `开始　ciyi.猜 山水　　开题并报一个两字词`,
+        cfg.isEnableMiddleware ? `续猜　直接发送两字词　仅限已开题且未结束` : null,
         `排行　ciyi.排行榜　　看谁猜中得最多`
-      ],
+      ].filter(Boolean),
       [
         `读板　？好）企业（地？ #467 · 沾边`,
         `　　　#467 是「企业」与答案的相近名次`,
@@ -1286,6 +1327,8 @@ __name(apply, "apply");
 0 && (module.exports = {
   Config,
   apply,
+  canHandleMiddlewareGuess,
+  getMiddlewareGuess,
   inject,
   name,
   usage

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ciyi",
-  "description": "Koishi 的词意（猜词游戏）插件。根据词语的含义相似程度，猜测正确的词语。",
-  "version": "1.2.6",
+  "description": "Koishi 的词意猜词插件。",
+  "version": "1.2.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -41,7 +41,12 @@
     "词意"
   ],
   "devDependencies": {
-    "@koishijs/canvas": "^0.2.0"
+    "@koishijs/canvas": "^0.2.0",
+    "koishi": "^4.18.11",
+    "tsx": "^4.23.13"
+  },
+  "scripts": {
+    "test": "tsx --test test/*.test.ts"
   },
   "peerDependencies": {
     "koishi": "^4.18.11"

package/readme.md

@@ -8,7 +8,7 @@ Koishi 的词意猜词插件。
 
 ## 使用
 
-设置指令别名后，发送 `ciyi` 查看玩法。每日藏一个两字词，第一次猜测会自动开题。
+设置指令别名后，发送 `ciyi` 查看玩法。每日藏一个两字词，使用 `ciyi.猜 <词>` 提交第一次猜测并开题；开题后可直接发送两字词继续猜测。
 
 ## 指令