koishi-plugin-ciyi 1.4.1 → 2.0.0

package/README.md

@@ -16,7 +16,7 @@ yarn add koishi-plugin-ciyi
 | --- | --- |
 | `ciyi` | 玩法 |
 | `ciyi.猜 <词>` | 开始今日游戏并提交猜测 |
-| `ciyi.裸词 [开/关]` | 切换本群无前缀续猜 |
+| `ciyi.裸词 [开/关]` | 切换本频道无前缀续猜 |
 | `ciyi.排行榜` | 猜中次数排行 |
 
 首次用 `ciyi.猜 <词>` 开题，之后可直接发送两字词继续猜。裸词设置只对当前群生效，重启后恢复默认。

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\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 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\u5BF9\u5C40\u5E76\u62A5\u4E00\u4E2A\u4E24\u5B57\u8BCD |\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[];
@@ -9,10 +9,11 @@ export declare const inject: {
 export interface Config {
     atReply: boolean;
     quoteReply: boolean;
-    isEnableMiddleware: boolean;
+    enableDirectInput: boolean;
     renderImage: boolean;
     maxHistory: number;
     maxRank: number;
+    retractDelay: number;
 }
 export declare const Config: Schema<Config>;
 declare module "koishi" {

package/lib/index.js

@@ -650,7 +650,7 @@ function drawBoardTable(ctx, x, y, w, opts, rowH) {
       ry += s(8);
       textCenter(
         ctx,
-        `⋯ 另有 ${row.gapBefore} 词未列 ⋯`,
+        `…… 另有 ${row.gapBefore} 词未列`,
         cx + tableW / 2,
         ry + s(10),
         `${s(11.5)}px ${FONT_SANS}`,
@@ -755,7 +755,7 @@ function renderIntroCard(service, opts) {
     textLeft(ctx, "ciyi.裸词 开/关", ix + s(96), y + s(52), `${s(13.5)}px ${FONT_NUM}`, C.onSurface);
     textLeftFit(
       ctx,
-      "临时改本群的续猜方式",
+      "临时改本频道的续猜方式",
       ix + s(230),
       y + s(52),
       iw - s(268),
@@ -1011,7 +1011,7 @@ function renderRankCard(service, opts) {
       if (opts.hidden > 0) {
         textLeft(
           ctx,
-          `⋯ 另有 ${opts.hidden} 人在榜`,
+          `…… 另有 ${opts.hidden} 人在榜`,
           contentLeft,
           ry + s(16),
           `${s(11.5)}px ${FONT_SANS}`,
@@ -1050,19 +1050,20 @@ var usage = `## 使用
 | 指令 | 说明 |
 | --- | --- |
 | \`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("回复时引用消息。"),
-  isEnableMiddleware: import_koishi.Schema.boolean().default(true).description(
-    "已开题时，直接发送两字词即可续猜，无需指令前缀。各频道可用「ciyi.裸词」临时切换。"
+  enableDirectInput: import_koishi.Schema.boolean().default(true).description(
+    "对局中直接发送两字词即可续猜，无需指令前缀。各频道可用「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("排行榜最多显示的人数。")
+  maxRank: import_koishi.Schema.number().default(10).min(0).description("排行榜最多显示的人数。"),
+  retractDelay: import_koishi.Schema.number().min(0).default(0).description("自动撤回延迟（秒），0 表示不撤回。")
 });
 function getMiddlewareGuess(session) {
   const message = session.event.message;
@@ -1128,9 +1129,9 @@ function apply(ctx, cfg) {
   );
   const logger = ctx.logger("ciyi");
   const random = new import_koishi.Random(() => Math.random());
-  const RULE = "────────────";
+  const busy = /* @__PURE__ */ new Set();
   const middlewareOverrides = /* @__PURE__ */ new Map();
-  const middlewareOn = /* @__PURE__ */ __name((channelId) => channelId === void 0 ? cfg.isEnableMiddleware : middlewareOverrides.get(channelId) ?? cfg.isEnableMiddleware, "middlewareOn");
+  const middlewareOn = /* @__PURE__ */ __name((channelId) => channelId === void 0 ? cfg.enableDirectInput : middlewareOverrides.get(channelId) ?? cfg.enableDirectInput, "middlewareOn");
   ctx.middleware(async (session, next) => {
     if (!session.channelId || !middlewareOn(session.channelId)) return await next();
     const guess = getMiddlewareGuess(session);
@@ -1152,7 +1153,7 @@ function apply(ctx, cfg) {
   ctx.command("ciyi", "词意 · 按意思远近找词").action(async ({ session }) => {
     return await wf(session);
   });
-  ctx.command("ciyi.猜 <guess:string>", "报一个两字词").usage("例：ciyi.猜 山水").action(async ({ session }, guess) => {
+  ctx.command("ciyi.猜 <guess:string>", "开题并报一个两字词").usage("例：ciyi.猜 山水").action(async ({ session }, guess) => {
     return await c(session, guess?.trim());
   });
   ctx.command("ciyi.排行榜", "查看累计猜中排行榜").action(async ({ session }) => {
@@ -1160,7 +1161,7 @@ function apply(ctx, cfg) {
   });
   ctx.command("ciyi.裸词 [state:string]", "开关本频道的无前缀续猜").usage("例：ciyi.裸词（切换）· ciyi.裸词 开 · ciyi.裸词 关 · ciyi.裸词 状态").action(async ({ session }, state) => {
     const result = resolveMiddlewareSwitch(
-      cfg.isEnableMiddleware,
+      cfg.enableDirectInput,
       session.channelId === void 0 ? void 0 : middlewareOverrides.get(session.channelId),
       state
     );
@@ -1235,7 +1236,7 @@ function apply(ctx, cfg) {
   __name(bestRank, "bestRank");
   function textCard(title, ...sections) {
     const body = sections.map((s2) => Array.isArray(s2) ? s2.filter(Boolean).join("\n") : s2).filter((s2) => !!s2 && !!s2.trim()).join("\n\n");
-    return [`▍${title}`, RULE, body].filter(Boolean).join("\n");
+    return [`▍${title}`, body].filter(Boolean).join("\n");
   }
   __name(textCard, "textCard");
   function neighborText(hint, side) {
@@ -1246,7 +1247,7 @@ function apply(ctx, cfg) {
   function boardText(rows, hidden, attempts) {
     const lines = [];
     rows.forEach((row, i) => {
-      if (row.gapBefore) lines.push(`　⋯ 另有 ${row.gapBefore} 词未列 ⋯`);
+      if (row.gapBefore) lines.push(`　…… 另有 ${row.gapBefore} 词未列`);
       const { guess, rank, leftHint, rightHint } = row.history;
       const mark = row.fresh ? "▸" : "　";
       lines.push(
@@ -1259,7 +1260,7 @@ function apply(ctx, cfg) {
       `词意 · 第 ${attempts} 次猜测`,
       best === null ? null : `当前最佳 #${best} · ${tierOf(best).name}（${tierOf(best).note}）`,
       lines,
-      hidden > 0 && !tail ? `　⋯ 另有 ${hidden} 词未列 ⋯` : null,
+      hidden > 0 && !tail ? `　…… 另有 ${hidden} 词未列` : null,
       "左邻更近答案，右邻更远；？ 为隐去的字"
     );
   }
@@ -1267,12 +1268,16 @@ function apply(ctx, cfg) {
   function introText(channelOn) {
     return textCard(
       "词意 · 按意思远近找词",
-      `每天藏起一个两字词。你报词，我回它与答案的语义排名 —— 名次越小越近，#1 就是答案本身。`,
+      [
+        `每天藏起一个两字词。`,
+        `报一个两字词，回它与答案的语义排名。`,
+        `名次越小越近，#1 就是答案本身。`
+      ],
       [
         `开始　ciyi.猜 山水　　开题并报一个两字词`,
         channelOn ? `续猜　直接发送两字词　仅限已开题且未结束` : null,
-        `排行　ciyi.排行榜　　看谁猜中得最多`,
-        `切换　ciyi.裸词 开/关　　临时改本群续猜方式`
+        `排行榜　ciyi.排行榜　　看谁猜中得最多`,
+        `切换　ciyi.裸词 开/关　　临时改本频道续猜方式`
       ].filter(Boolean),
       [
         `读板　？好）企业（地？ #467 · 沾边`,
@@ -1284,21 +1289,22 @@ function apply(ctx, cfg) {
         `亲疏　咫尺 ≤10　毗邻 ≤50　相近 ≤200`,
         `　　　沾边 ≤1000　疏远 ≤5000　天涯 5000+`
       ],
-      `词库 ${allWords_default.length.toLocaleString()} 词，题库 ${questionList_default.length.toLocaleString()} 题，一日一词。`
+      `词库 ${allWords_default.length.toLocaleString()} 词，一日一词。`
     );
   }
   __name(introText, "introText");
   function middlewareSwitchText(o) {
     const mark = "✅";
     const state = o.on ? "开启" : "停用";
-    const config = cfg.isEnableMiddleware ? "开启" : "停用";
+    const config = cfg.enableDirectInput ? "开启" : "停用";
     if (!o.temporary) {
-      return `${mark} 裸词续猜 · ${o.reverted ? "已复原，" : ""}跟随插件配置（${state}）`;
+      return `${mark} 裸词续猜 · 跟随插件配置
+当前${state}。${o.reverted ? "本次已复原。" : ""}`;
     }
     const hint = o.on ? "开题后直接发送两字词即可续猜" : "续猜改用「ciyi.猜 山水」";
     return [
-      `${mark} 裸词续猜 · 本频道临时${state}（插件配置：${config}）`,
-      `${hint}；再次发送「ciyi.裸词」复原`
+      `${mark} 裸词续猜 · 本频道临时${state}`,
+      `${hint}；插件配置为${config}；再次发送「ciyi.裸词」复原`
     ].join("\n");
   }
   __name(middlewareSwitchText, "middlewareSwitchText");
@@ -1312,23 +1318,24 @@ function apply(ctx, cfg) {
         `累计　${o.username} 已猜中 ${o.score} 次`,
         o.neighbors.length ? `近旁　${o.neighbors.join(" · ")}` : null
       ].filter(Boolean),
-      o.canStartToday ? "继续 ciyi.猜 山水 · 开启今日新题" : "明日零点换新题 · ciyi.排行榜 看战绩"
+      o.canStartToday ? "继续发送「ciyi.猜 山水」开启今日新题" : "明日零点换新题 · 发送「ciyi.排行榜」看战绩"
     );
   }
   __name(winText, "winText");
   function rankText(entries, hidden) {
     if (!entries.length) {
       return textCard(
-        "词意每日挑战排行榜",
-        "榜上无名。今日第一个猜中的人，名字会写在这里。"
+        "📋 排行榜还空着",
+        "第一个猜中的人，名字会写在这里。",
+        "发送「ciyi.猜 山水」开一局。"
       );
     }
     return textCard(
-      "词意每日挑战排行榜",
+      "📋 词意每日挑战排行榜",
       entries.map(
         (e, i) => `${String(i + 1).padStart(2, "0")}. ${e.username || "无名氏"} ${e.score} 次`
       ),
-      hidden > 0 ? `⋯ 另有 ${hidden} 人在榜 ⋯` : null
+      hidden > 0 ? `…… 另有 ${hidden} 人在榜` : null
     );
   }
   __name(rankText, "rankText");
@@ -1343,16 +1350,33 @@ function apply(ctx, cfg) {
     }
   }
   __name(renderCard, "renderCard");
+  const lastMessage = /* @__PURE__ */ new Map();
+  async function send(session, content) {
+    const ids = await session.send(content);
+    const messageId = ids?.[0];
+    if (!cfg.retractDelay || !messageId) return;
+    const previous = lastMessage.get(session.channelId);
+    if (previous) {
+      const passed = Date.now() - previous.timestamp;
+      if (passed < 118e3) {
+        ctx.setTimeout(() => {
+          session.bot.deleteMessage(session.channelId, previous.id).catch((error) => logger.debug("撤回消息 %s 失败：%s", previous.id, error.message));
+        }, Math.max(0, cfg.retractDelay * 1e3 - passed));
+      }
+    }
+    lastMessage.set(session.channelId, { id: messageId, timestamp: Date.now() });
+  }
+  __name(send, "send");
   async function sendCard(session, render, fallback) {
     const image = await renderCard(render);
     const prefix = [];
     if (cfg.quoteReply && session.messageId) prefix.push(import_koishi.h.quote(session.messageId));
     if (cfg.atReply) prefix.push(import_koishi.h.at(session.userId), (0, import_koishi.h)("p"));
     if (image) {
-      await session.send([...prefix, image]);
+      await send(session, [...prefix, image]);
       return;
     }
-    await session.send([...prefix, ...import_koishi.h.normalize(fallback)]);
+    await send(session, [...prefix, ...import_koishi.h.normalize(fallback)]);
   }
   __name(sendCard, "sendCard");
   async function wf(session) {
@@ -1429,6 +1453,18 @@ function apply(ctx, cfg) {
       return await sendMsg(session, `⚠️ 「${guess}」不在词库里
 换个常见些的词试试。`);
     }
+    if (session.channelId && busy.has(session.channelId)) {
+      return await sendMsg(session, "⏳ 上一手还在处理\n稍等再发一次。");
+    }
+    if (session.channelId) busy.add(session.channelId);
+    try {
+      return await guessOnce(session, guess);
+    } finally {
+      if (session.channelId) busy.delete(session.channelId);
+    }
+  }
+  __name(c, "c");
+  async function guessOnce(session, guess) {
     const gameInfo = await getTodayGame(session);
     if (!gameInfo) {
       return await sendMsg(
@@ -1439,7 +1475,7 @@ function apply(ctx, cfg) {
     if (gameInfo.isOver) {
       return await sendMsg(
         session,
-        `💡 今日挑战已结束，答案是「${gameInfo.answer}」。
+        `💡 今日挑战已结束，答案是「${gameInfo.answer}」
 明日零点换新题，发送「ciyi.排行榜」看战绩。`
       );
     }
@@ -1499,7 +1535,7 @@ 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];
@@ -1524,7 +1560,7 @@ function apply(ctx, cfg) {
       boardText(rows, hidden, history.length)
     );
   }
-  __name(c, "c");
+  __name(guessOnce, "guessOnce");
   async function fetchCiYi(word) {
     const url = `https://ci-ying.oss-cn-zhangjiakou.aliyuncs.com/v1/ci-yi-list/${word}.txt`;
     try {
@@ -1547,7 +1583,7 @@ function apply(ctx, cfg) {
     const prefix = [];
     if (cfg.quoteReply && session.messageId) prefix.push(import_koishi.h.quote(session.messageId));
     if (cfg.atReply) prefix.push(import_koishi.h.at(session.userId), (0, import_koishi.h)("p"));
-    await session.send([...prefix, ...import_koishi.h.normalize(msg)]);
+    await send(session, [...prefix, ...import_koishi.h.normalize(msg)]);
   }
   __name(sendMsg, "sendMsg");
 }

package/package.json

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