koishi-plugin-ciyi 1.3.0 → 1.4.1

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 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\u9996\u6B21\u7528 `ciyi.\u731C <\u8BCD>` \u5F00\u9898\uFF0C\u4E4B\u540E\u53EF\u4EE5\u76F4\u63A5\u53D1\u9001\u4E24\u5B57\u8BCD\u7EE7\u7EED\u731C\u3002\u88F8\u8BCD\u8BBE\u7F6E\u53EA\u5BF9\u5F53\u524D\u7FA4\u751F\u6548\uFF0C\u91CD\u542F\u540E\u6062\u590D\u9ED8\u8BA4\u3002\n\n## \u6307\u4EE4\n\n| \u6307\u4EE4 | \u8BF4\u660E |\n| --- | --- |\n| `ciyi` | \u73A9\u6CD5 |\n| `ciyi.\u731C <\u8BCD>` | \u5F00\u59CB\u4ECA\u65E5\u6E38\u620F\u5E76\u63D0\u4EA4\u731C\u6D4B |\n| `ciyi.\u88F8\u8BCD [\u5F00/\u5173]` | \u5207\u6362\u672C\u7FA4\u65E0\u524D\u7F00\u7EED\u731C |\n| `ciyi.\u6392\u884C\u699C` | \u731C\u4E2D\u6B21\u6570\u6392\u884C |";
+export declare const usage = "## \u4F7F\u7528\n\n\u53D1\u9001 `ciyi` \u67E5\u770B\u73A9\u6CD5\u3002\u6BCF\u65E5\u85CF\u4E00\u4E2A\u4E24\u5B57\u8BCD\uFF0C\u7528 `ciyi.\u731C <\u8BCD>` \u5F00\u9898\uFF0C\u4E4B\u540E\u53EF\u4EE5\u76F4\u63A5\u53D1\u9001\u4E24\u5B57\u8BCD\u7EE7\u7EED\u731C\u3002\u88F8\u8BCD\u8BBE\u7F6E\u53EA\u5BF9\u5F53\u524D\u9891\u9053\u751F\u6548\uFF0C\u91CD\u542F\u540E\u6062\u590D\u9ED8\u8BA4\u3002\n\n## \u6307\u4EE4\n\n| \u6307\u4EE4 | \u8BF4\u660E |\n| --- | --- |\n| `ciyi` | \u73A9\u6CD5 |\n| `ciyi.\u731C <\u8BCD>` | \u5F00\u59CB\u4ECA\u65E5\u6E38\u620F\u5E76\u63D0\u4EA4\u731C\u6D4B |\n| `ciyi.\u88F8\u8BCD [\u5F00/\u5173]` | \u5F00\u5173\u672C\u9891\u9053\u7684\u65E0\u524D\u7F00\u7EED\u731C |\n| `ciyi.\u6392\u884C\u699C` | \u7D2F\u8BA1\u731C\u4E2D\u6392\u884C\u699C |";
 export declare const inject: {
     required: string[];
     optional: string[];

package/lib/index.js

@@ -430,7 +430,7 @@ function drawWordGrid(ctx, x, y, word, size, mask) {
   const gap = s(g.gap);
   const chars = Array.from(word || "");
   if (chars.length === 0) {
-    textCenter(ctx, "—", x + s(14), y + cell / 2, `${s(13)}px ${FONT_SANS}`, C.outline);
+    textCenter(ctx, "—", x + s(14), y + cell / 2, `${s(13)}px ${FONT_SANS}`, C.onSurfaceVariant);
     return s(28);
   }
   let cx = x;
@@ -472,7 +472,7 @@ function drawHeader(ctx, innerX, innerY, innerW, sub, right) {
     brandX,
     innerY + padTop + s(36),
     `italic ${s(10)}px ${FONT_NUM}`,
-    C.outline
+    C.onSurfaceVariant
   );
   const subRight = right ? innerX + innerW - padX - s(150) : innerX + innerW - padX;
   textLeftFit(
@@ -487,7 +487,7 @@ function drawHeader(ctx, innerX, innerY, innerW, sub, right) {
   if (right) {
     const rx = innerX + innerW - padX;
     textRight(ctx, right.big, rx, innerY + padTop + s(16), `700 ${s(31)}px ${FONT_NUM}`, C.primary);
-    textRight(ctx, right.cap, rx, innerY + padTop + s(44), `${s(10.5)}px ${FONT_SANS}`, C.outline);
+    textRight(ctx, right.cap, rx, innerY + padTop + s(44), `${s(10.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
   }
   const lineY = innerY + h2;
   ctx.strokeStyle = C.outlineVariant;
@@ -527,7 +527,7 @@ function drawFooter(ctx, innerX, y, innerW, legendItems, tip) {
     lx += s(9) + s(6);
     textLeft(ctx, tier.name, lx, cy, `${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
     lx += textWidth(tier.name, s(11.5)) + s(4);
-    textLeft(ctx, range, lx, cy, `${s(11)}px ${FONT_NUM}`, C.outline);
+    textLeft(ctx, range, lx, cy, `${s(11)}px ${FONT_NUM}`, C.onSurfaceVariant);
     lx += textWidth(range, s(11)) + s(13);
   }
   const tipFont = `${s(11.5)}px ${FONT_SANS}`;
@@ -538,7 +538,7 @@ function drawFooter(ctx, innerX, y, innerW, legendItems, tip) {
     innerX + innerW - padX,
     cy,
     tipFont,
-    C.outline
+    C.onSurfaceVariant
   );
   return h2 + padY * 2;
 }
@@ -552,8 +552,8 @@ function drawLegendFull(ctx, x, y, w) {
     const cy = y + Math.floor(i / 2) * rowH;
     fillRound(ctx, cx, cy - s(4.5), s(9), s(9), s(SHAPE.full), t.color);
     textLeft(ctx, t.name, cx + s(15), cy, `${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
-    textLeft(ctx, tierRange(i), cx + s(52), cy, `${s(11)}px ${FONT_NUM}`, C.outline);
-    textLeft(ctx, t.note, cx + s(100), cy, `${s(11.5)}px ${FONT_SANS}`, C.outline);
+    textLeft(ctx, tierRange(i), cx + s(52), cy, `${s(11)}px ${FONT_NUM}`, C.onSurfaceVariant);
+    textLeft(ctx, t.note, cx + s(100), cy, `${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
   }
   return rowH * Math.ceil(TIERS.length / 2) + s(8);
 }
@@ -637,12 +637,12 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
   const mtX = mt0 + Math.max(0, (cols.mt - meterBlockW) / 2);
   const headY = y;
   const fs = s(10.5);
-  textLeft(ctx, "序", noX, headY, `${fs}px ${FONT_SANS}`, C.outline);
-  textCenter(ctx, "更近 ◀", nb0 + cols.nb / 2, headY, `${fs}px ${FONT_SANS}`, C.outline);
-  textCenter(ctx, "猜测", gw0 + cols.gw / 2, headY, `${fs}px ${FONT_SANS}`, C.outline);
-  textCenter(ctx, "▶ 更远", nb1 + cols.nb / 2, headY, `${fs}px ${FONT_SANS}`, C.outline);
-  textCenter(ctx, "排名", rk0 + cols.rk / 2, headY, `${fs}px ${FONT_SANS}`, C.outline);
-  textCenter(ctx, "亲疏", mt0 + cols.mt / 2, headY, `${fs}px ${FONT_SANS}`, C.outline);
+  textLeft(ctx, "序", noX, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
+  textCenter(ctx, "更近 ◀", nb0 + cols.nb / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
+  textCenter(ctx, "猜测", gw0 + cols.gw / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
+  textCenter(ctx, "▶ 更远", nb1 + cols.nb / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
+  textCenter(ctx, "排名", rk0 + cols.rk / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
+  textCenter(ctx, "亲疏", mt0 + cols.mt / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
   let ry = y + s(22);
   let ordinal = 0;
   for (const row of opts.rows) {
@@ -654,7 +654,7 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
         cx + tableW / 2,
         ry + s(10),
         `${s(11.5)}px ${FONT_SANS}`,
-        C.outline
+        C.onSurfaceVariant
       );
       ctx.strokeStyle = C.outlineVariant;
       ctx.beginPath();
@@ -684,7 +684,7 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
       noX,
       midY,
       `${s(13)}px ${FONT_NUM}`,
-      C.outline
+      C.onSurfaceVariant
     );
     const nbX = nb0 + (cols.nb - gridWidth(history.leftHint, "sm")) / 2;
     drawWordGrid(ctx, nbX, midY - s(13), history.leftHint, "sm", 0);
@@ -698,7 +698,7 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
     const hashW = textWidth("#", s(13));
     const rankBlock = hashW + s(3) + rankWidth;
     const rankLeft = rk0 + (cols.rk - rankBlock) / 2;
-    textLeft(ctx, "#", rankLeft, midY, `${s(13)}px ${FONT_NUM}`, C.outline);
+    textLeft(ctx, "#", rankLeft, midY, `${s(13)}px ${FONT_NUM}`, C.onSurfaceVariant);
     textLeft(ctx, rankText, rankLeft + hashW + s(3), midY, rankFont, tier.color);
     drawNearBar(ctx, mtX, midY, pct, tier);
     ry += rowH;
@@ -789,7 +789,7 @@ function renderIntroCard(service, opts) {
       ix + s(38),
       y + s(104),
       `${s(12)}px ${FONT_SANS}`,
-      C.outline
+      C.onSurfaceVariant
     );
     textLeft(
       ctx,
@@ -797,7 +797,7 @@ function renderIntroCard(service, opts) {
       ix + s(38),
       y + s(126),
       `${s(12)}px ${FONT_SANS}`,
-      C.outline
+      C.onSurfaceVariant
     );
     textLeft(
       ctx,
@@ -828,7 +828,7 @@ function renderIntroCard(service, opts) {
       ix + s(22),
       iy + ih - s(30),
       `${s(11.5)}px ${FONT_SANS}`,
-      C.outline
+      C.onSurfaceVariant
     );
   });
 }
@@ -842,11 +842,11 @@ function renderWinCard(service, opts) {
     const revealH = s(130);
     drawPanel(ctx, ix + s(22), y, iw - s(44), revealH);
     drawSeal(ctx, ix + iw - s(80), y - s(13), s(42), ["中"]);
-    textLeft(ctx, "今日答案", ix + s(38), y + s(24), `${s(11.5)}px ${FONT_SANS}`, C.outline);
+    textLeft(ctx, "今日答案", ix + s(38), y + s(24), `${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
     drawWordGrid(ctx, ix + s(38), y + s(40), opts.answer, "lg");
     const ax = ix + iw - s(310);
     if (opts.neighbors.length) {
-      textLeft(ctx, "意思最近的几个词", ax, y + s(24), `${s(11.5)}px ${FONT_SANS}`, C.outline);
+      textLeft(ctx, "意思最近的几个词", ax, y + s(24), `${s(11.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
       let nx = ax;
       let ny = y + s(48);
       const chipFont = `${s(14)}px ${FONT_SANS}`;
@@ -888,7 +888,7 @@ function renderWinCard(service, opts) {
       if (stats[i].u) {
         textLeft(ctx, stats[i].u, sx + s(14) + textWidth(stats[i].n, s(23)) + s(3), y + s(26), `${s(12)}px ${FONT_SANS}`, C.onSurfaceVariant);
       }
-      textLeft(ctx, stats[i].c, sx + s(14), y + s(44), `${s(10.5)}px ${FONT_SANS}`, C.outline);
+      textLeft(ctx, stats[i].c, sx + s(14), y + s(44), `${s(10.5)}px ${FONT_SANS}`, C.onSurfaceVariant);
     }
     const quip = opts.closest === null ? "一击即中，今日无需第二次落笔" : `从 #${opts.closest} 一步跨到 #1`;
     const footerTip = opts.canStartToday ? "ciyi.猜 山水 · 开启今日新题" : "明日零点换新题 · ciyi.排行榜";
@@ -945,7 +945,7 @@ function renderRankCard(service, opts) {
         panelX + panelW / 2,
         y + s(31),
         `${s(13.5)}px ${FONT_SANS}`,
-        C.outline
+        C.onSurfaceVariant
       );
       textCenter(
         ctx,
@@ -953,7 +953,7 @@ function renderRankCard(service, opts) {
         panelX + panelW / 2,
         y + s(61),
         `${s(13.5)}px ${FONT_SANS}`,
-        C.outline
+        C.onSurfaceVariant
       );
     } else {
       let ry = y;
@@ -1005,7 +1005,7 @@ function renderRankCard(service, opts) {
           `700 ${scoreFont}px ${FONT_NUM}`,
           C.onSurface
         );
-        textRight(ctx, "次", contentRight, midY, `${unitFont}px ${FONT_SANS}`, C.outline);
+        textRight(ctx, "次", contentRight, midY, `${unitFont}px ${FONT_SANS}`, C.onSurfaceVariant);
         ry += rowH;
       }
       if (opts.hidden > 0) {
@@ -1015,7 +1015,7 @@ function renderRankCard(service, opts) {
           contentLeft,
           ry + s(16),
           `${s(11.5)}px ${FONT_SANS}`,
-          C.outline
+          C.onSurfaceVariant
         );
       }
     }
@@ -1033,7 +1033,7 @@ function renderRankCard(service, opts) {
       panelX,
       iy + ih - s(30),
       `${s(11.5)}px ${FONT_SANS}`,
-      C.outline
+      C.onSurfaceVariant
     );
   });
 }
@@ -1043,7 +1043,7 @@ __name(renderRankCard, "renderRankCard");
 var name = "ciyi";
 var usage = `## 使用
 
-设置指令别名后，发送 \`ciyi\` 查看玩法。每日藏一个两字词，首次用 \`ciyi.猜 <词>\` 开题，之后可以直接发送两字词继续猜。裸词设置只对当前群生效，重启后恢复默认。
+发送 \`ciyi\` 查看玩法。每日藏一个两字词，用 \`ciyi.猜 <词>\` 开题，之后可以直接发送两字词继续猜。裸词设置只对当前频道生效，重启后恢复默认。
 
 ## 指令
 
@@ -1051,18 +1051,18 @@ var usage = `## 使用
 | --- | --- |
 | \`ciyi\` | 玩法 |
 | \`ciyi.猜 <词>\` | 开始今日游戏并提交猜测 |
-| \`ciyi.裸词 [开/关]\` | 切换本群无前缀续猜 |
-| \`ciyi.排行榜\` | 猜中次数排行 |`;
+| \`ciyi.裸词 [开/关]\` | 开关本频道的无前缀续猜 |
+| \`ciyi.排行榜\` | 累计猜中排行榜 |`;
 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("响应时引用"),
+  atReply: import_koishi.Schema.boolean().default(false).description("回复时 @ 用户。"),
+  quoteReply: import_koishi.Schema.boolean().default(false).description("回复时引用消息。"),
   isEnableMiddleware: import_koishi.Schema.boolean().default(true).description(
-    "是否启用中间件（若启用，已开题时可以不使用指令直接猜测；ciyi.裸词 指令可在单个群内临时切换）"
+    "已开题时，直接发送两字词即可续猜，无需指令前缀。各频道可用「ciyi.裸词」临时切换。"
   ),
-  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("最大排行榜人数")
+  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;
@@ -1092,7 +1092,7 @@ function resolveMiddlewareSwitch(config, override, action) {
   }
   const on = arg === "开" || arg === "开启";
   if (!on && arg !== "关" && arg !== "关闭") {
-    return { error: "裸词开关只认 开 / 关 / 状态" };
+    return { error: "裸词开关只认「开」「关」「状态」" };
   }
   if (on === config) {
     return { override: void 0, on: config, reverted: override !== void 0 };
@@ -1149,23 +1149,24 @@ function apply(ctx, cfg) {
     }
     return await session.execute(`ciyi.猜 ${guess}`);
   });
-  ctx.command("ciyi", "词意（猜词游戏）").action(async ({ session }) => {
+  ctx.command("ciyi", "词意 · 按意思远近找词").action(async ({ session }) => {
     return await wf(session);
   });
   ctx.command("ciyi.猜 <guess:string>", "报一个两字词").usage("例：ciyi.猜 山水").action(async ({ session }, guess) => {
     return await c(session, guess?.trim());
   });
-  ctx.command("ciyi.排行榜", "累计猜中次数榜").action(async ({ session }) => {
+  ctx.command("ciyi.排行榜", "查看累计猜中排行榜").action(async ({ session }) => {
     return await phb(session);
   });
-  ctx.command("ciyi.裸词 [state:string]", "临时开关本群的裸词续猜").usage("例：ciyi.裸词（切换）· ciyi.裸词 开 · ciyi.裸词 关 · ciyi.裸词 状态").action(async ({ session }, state) => {
+  ctx.command("ciyi.裸词 [state:string]", "开关本频道的无前缀续猜").usage("例：ciyi.裸词（切换）· ciyi.裸词 开 · ciyi.裸词 关 · ciyi.裸词 状态").action(async ({ session }, state) => {
     const result = resolveMiddlewareSwitch(
       cfg.isEnableMiddleware,
       session.channelId === void 0 ? void 0 : middlewareOverrides.get(session.channelId),
       state
     );
     if ("error" in result) {
-      return await sendMsg(session, `⚠️ ${result.error}。例：ciyi.裸词 开`);
+      return await sendMsg(session, `⚠️ ${result.error}
+例：「ciyi.裸词 开」，不带参数则来回切换。`);
     }
     if (result.override === void 0) middlewareOverrides.delete(session.channelId);
     else middlewareOverrides.set(session.channelId, result.override);
@@ -1288,16 +1289,16 @@ function apply(ctx, cfg) {
   }
   __name(introText, "introText");
   function middlewareSwitchText(o) {
-    const mark = o.on ? "✅" : "⛔";
+    const mark = "✅";
     const state = o.on ? "开启" : "停用";
     const config = cfg.isEnableMiddleware ? "开启" : "停用";
     if (!o.temporary) {
       return `${mark} 裸词续猜 · ${o.reverted ? "已复原，" : ""}跟随插件配置（${state}）`;
     }
-    const hint = o.on ? "开题后直接发送两字词即可续猜" : "续猜请用 ciyi.猜 山水";
+    const hint = o.on ? "开题后直接发送两字词即可续猜" : "续猜改用「ciyi.猜 山水」";
     return [
-      `${mark} 裸词续猜 · 本群临时${state}（插件配置：${config}）`,
-      `${hint}；再次发送 ciyi.裸词 复原`
+      `${mark} 裸词续猜 · 本频道临时${state}（插件配置：${config}）`,
+      `${hint}；再次发送「ciyi.裸词」复原`
     ].join("\n");
   }
   __name(middlewareSwitchText, "middlewareSwitchText");
@@ -1319,7 +1320,7 @@ function apply(ctx, cfg) {
     if (!entries.length) {
       return textCard(
         "词意每日挑战排行榜",
-        "榜上无名。今日第一个猜中的人，会写在这里。"
+        "榜上无名。今日第一个猜中的人，名字会写在这里。"
       );
     }
     return textCard(
@@ -1422,30 +1423,31 @@ function apply(ctx, cfg) {
   __name(getTodayGame, "getTodayGame");
   async function c(session, guess) {
     if (!guess || Array.from(guess).length !== 2) {
-      return await sendMsg(session, "⚠️ 词意只收两字词。例：ciyi.猜 山水");
+      return await sendMsg(session, "⚠️ 词意只收两字词\n例：「ciyi.猜 山水」。");
     }
     if (!allWords_default.includes(guess)) {
-      return await sendMsg(session, `⚠️ 「${guess}」不在词库中，换个常见些的词试试。`);
+      return await sendMsg(session, `⚠️ 「${guess}」不在词库里
+换个常见些的词试试。`);
     }
     const gameInfo = await getTodayGame(session);
     if (!gameInfo) {
       return await sendMsg(
         session,
-        "❌ 今日题目暂时无法载入，请稍后再试。"
+        "❌ 今日的题目没能载入\n词库文件暂时读不到，稍后再试一次。"
       );
     }
     if (gameInfo.isOver) {
       return await sendMsg(
         session,
-        `今日挑战已结束。答案是「${gameInfo.answer}」
-明日零点换新题。发送 ciyi.排行榜 查看战绩。`
+        `💡 今日挑战已结束，答案是「${gameInfo.answer}」。
+明日零点换新题，发送「ciyi.排行榜」看战绩。`
       );
     }
     if (gameInfo.guessedHistoryInOneGame.includes(guess)) {
       const old = gameInfo.history.find((it) => it.guess === guess);
       return await sendMsg(
         session,
-        old ? `⚠️ 「${guess}」已猜过 · #${old.rank} · ${tierOf(old.rank).name}` : `⚠️ 「${guess}」已猜过`
+        old ? `💡 「${guess}」已经猜过 · #${old.rank} · ${tierOf(old.rank).name}` : `💡 「${guess}」已经猜过`
       );
     }
     if (guess === gameInfo.answer) {
@@ -1497,7 +1499,8 @@ function apply(ctx, cfg) {
     const entry = getHistory(guess, rankList);
     if (!entry) {
       logger.warn(`「${guess}」不在 ${gameInfo.answer} 的榜单中`);
-      return await sendMsg(session, `⚠️ 「${guess}」不在今日榜单中，换个词试试。`);
+      return await sendMsg(session, `⚠️ 「${guess}」不在今日的榜单里
+换个词试试。`);
     }
     const history = [...gameInfo.history, entry];
     await ctx.database.set(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ciyi",
   "description": "Koishi 的词意猜词插件。",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [