koishi-plugin-ciyi 1.2.8 → 1.2.10

package/README.md

@@ -0,0 +1,26 @@
+# koishi-plugin-ciyi
+
+词意猜词：每天一个两字词，在群里开猜
+
+## 安装
+
+```sh
+yarn add koishi-plugin-ciyi
+```
+
+在 Koishi 配置中启用，并提供 database 服务；需要图片输出时再提供 canvas 服务。
+
+## 指令
+
+| 指令 | 说明 |
+| --- | --- |
+| `ciyi` | 玩法 |
+| `ciyi.猜 <词>` | 开始今日游戏并提交猜测 |
+| `ciyi.裸词 [开/关]` | 切换本群无前缀续猜 |
+| `ciyi.排行榜` | 猜中次数排行 |
+
+首次用 `ciyi.猜 <词>` 开题，之后可直接发送两字词继续猜。裸词设置只对当前群生效，重启后恢复默认。
+
+## 许可证
+
+可按 [Apache-2.0](LICENSE-APACHE) 或 [MIT](LICENSE-MIT) 使用。

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\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 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 inject: {
     required: string[];
     optional: string[];
@@ -40,10 +40,27 @@ export interface CiyiRank {
 }
 export type { History };
 /**
- * 裸词中间件只接受一条完整、无修饰的两字中文纯文本消息。
- * 引用、@、图片、富文本以及机器人消息都可能只是普通聊天的一部分，不能据此猜词。
+ * 裸词中间件只看消息里的文本，引用、@、图片等非文本元素一律过滤掉：
+ * 回复时带上引用或 @ 是常见操作，不应因此把一条两字词挡在门外。
+ * 剩下的正文仍必须是一条完整、无多余空白的两字中文词。
  */
 export declare function getMiddlewareGuess(session: Session): string | null;
 /** 裸词只能加入已开始且未封题的游戏，不能开题，也不重复提交旧猜测。 */
 export declare function canHandleMiddlewareGuess(game: Ciyi | null | undefined, guess: string): boolean;
+export type MiddlewareSwitch = {
+    error: string;
+} | {
+    /** 写回本群覆盖表的新值；undefined 表示清除覆盖，回到插件配置 */
+    override: boolean | undefined;
+    /** 切换后的生效状态 */
+    on: boolean;
+    /** 本次是否清除了本群已有的临时改动 */
+    reverted: boolean;
+};
+/**
+ * 裸词开关是「插件配置」与「本群临时相反」之间的往返：本群从不保留与配置相同的冗余覆盖，
+ * 状态只有两种来历 —— 本群临时改动，或跟随插件配置，回复也因此总能如实相告。
+ * 无参调用是切换，显式 开/关 与配置同值时视作复原，状态 只查不改。
+ */
+export declare function resolveMiddlewareSwitch(config: boolean, override: boolean | undefined, action: string | null | undefined): MiddlewareSwitch;
 export declare function apply(ctx: Context, cfg: Config): void;

package/lib/index.js

@@ -18,17 +18,18 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var index_exports = {};
-__export(index_exports, {
+var src_exports = {};
+__export(src_exports, {
   Config: () => Config,
   apply: () => apply,
   canHandleMiddlewareGuess: () => canHandleMiddlewareGuess,
   getMiddlewareGuess: () => getMiddlewareGuess,
   inject: () => inject,
   name: () => name,
+  resolveMiddlewareSwitch: () => resolveMiddlewareSwitch,
   usage: () => usage
 });
-module.exports = __toCommonJS(index_exports);
+module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
 
 // src/data/allWords.json
@@ -565,7 +566,7 @@ function renderBoardCard(service, opts) {
 __name(renderBoardCard, "renderBoardCard");
 function renderIntroCard(service, opts) {
   const innerW = s(720);
-  const innerH = s(688);
+  const innerH = s(716);
   return toPng(service, innerW, innerH, (ctx, ix, iy, iw, ih) => {
     let y = iy + drawHeader(ctx, ix, iy, iw, "按意思远近找词 · 每日一题", {
       big: opts.words.toLocaleString(),
@@ -574,7 +575,7 @@ function renderIntroCard(service, opts) {
     y += s(20);
     y += drawSectionTitle(ctx, ix + s(22), y, iw - s(44), "玩法");
     y += s(11);
-    const p1h = s(76);
+    const p1h = s(104);
     drawPanel(ctx, ix + s(22), y, iw - s(44), p1h);
     textLeft(ctx, "开始", ix + s(38), y + s(24), `${s(14)}px ${FONT_SERIF}`, C.seal);
     textLeft(ctx, "ciyi.猜 山水", ix + s(96), y + s(24), `${s(13.5)}px ${FONT_NUM}`, C.ink);
@@ -587,9 +588,20 @@ function renderIntroCard(service, opts) {
       `${s(14)}px ${FONT_SERIF}`,
       C.ink
     );
-    textLeft(ctx, "排行", ix + s(38), y + s(52), `${s(14)}px ${FONT_SERIF}`, C.seal);
-    textLeft(ctx, "ciyi.排行榜", ix + s(96), y + s(52), `${s(13.5)}px ${FONT_NUM}`, C.ink);
-    textLeft(ctx, "看谁猜中得最多", ix + s(230), y + s(52), `${s(14)}px ${FONT_SERIF}`, C.ink);
+    textLeft(ctx, "切换", ix + s(38), y + s(52), `${s(14)}px ${FONT_SERIF}`, C.seal);
+    textLeft(ctx, "ciyi.裸词 开/关", ix + s(96), y + s(52), `${s(13.5)}px ${FONT_NUM}`, C.ink);
+    textLeftFit(
+      ctx,
+      "临时改本群的续猜方式",
+      ix + s(230),
+      y + s(52),
+      iw - s(268),
+      `${s(14)}px ${FONT_SERIF}`,
+      C.ink
+    );
+    textLeft(ctx, "排行", ix + s(38), y + s(80), `${s(14)}px ${FONT_SERIF}`, C.seal);
+    textLeft(ctx, "ciyi.排行榜", ix + s(96), y + s(80), `${s(13.5)}px ${FONT_NUM}`, C.ink);
+    textLeft(ctx, "看谁猜中得最多", ix + s(230), y + s(80), `${s(14)}px ${FONT_SERIF}`, C.ink);
     y += p1h + s(19);
     y += drawSectionTitle(ctx, ix + s(22), y, iw - s(44), "读板");
     y += s(11);
@@ -871,35 +883,34 @@ __name(renderRankCard, "renderRankCard");
 var name = "ciyi";
 var usage = `## 使用
 
-设置指令别名后，发送 \`ciyi\` 查看玩法。每日藏一个两字词，使用 \`ciyi.猜 <词>\` 提交第一次猜测并开题；开题后可直接发送两字词继续猜测。
+设置指令别名后，发送 \`ciyi\` 查看玩法。每日藏一个两字词，首次用 \`ciyi.猜 <词>\` 开题，之后可以直接发送两字词继续猜。裸词设置只对当前群生效，重启后恢复默认。
 
 ## 指令
 
 | 指令 | 说明 |
 | --- | --- |
-| \`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("响应时引用"),
-  isEnableMiddleware: import_koishi.Schema.boolean().default(true).description("是否启用中间件（若启用，已开题时可以不使用指令直接猜测）"),
+  isEnableMiddleware: 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("最大排行榜人数")
 });
 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") {
+  if (!message || session.event.user?.isBot || message.user?.isBot) {
     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)) {
+  const text = (message.elements ?? []).filter((element) => element.type === "text").map((element) => element.attrs.content).filter((content) => typeof content === "string").join("");
+  if (text !== text.trim() || Array.from(text).length !== 2 || !/^\p{Script=Han}{2}$/u.test(text) || !allWords_default.includes(text)) {
     return null;
   }
   return text;
@@ -911,6 +922,24 @@ function canHandleMiddlewareGuess(game, guess) {
   return guess === game.answer || game.rankList?.includes(guess) === true;
 }
 __name(canHandleMiddlewareGuess, "canHandleMiddlewareGuess");
+function resolveMiddlewareSwitch(config, override, action) {
+  const arg = action?.trim();
+  if (!arg) {
+    return override === void 0 ? { override: !config, on: !config, reverted: false } : { override: void 0, on: config, reverted: true };
+  }
+  if (arg === "状态") {
+    return { override, on: override ?? config, reverted: false };
+  }
+  const on = arg === "开" || arg === "开启";
+  if (!on && arg !== "关" && arg !== "关闭") {
+    return { error: "裸词开关只认 开 / 关 / 状态" };
+  }
+  if (on === config) {
+    return { override: void 0, on: config, reverted: override !== void 0 };
+  }
+  return { override: on, on, reverted: false };
+}
+__name(resolveMiddlewareSwitch, "resolveMiddlewareSwitch");
 function apply(ctx, cfg) {
   ctx.model.extend(
     "ciyi",
@@ -940,25 +969,26 @@ function apply(ctx, cfg) {
   const logger = ctx.logger("ciyi");
   const random = new import_koishi.Random(() => Math.random());
   const RULE = "────────────";
-  if (cfg.isEnableMiddleware) {
-    ctx.middleware(async (session, next) => {
-      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.猜 ${guess}`);
-    });
-  }
+  const middlewareOverrides = /* @__PURE__ */ new Map();
+  const middlewareOn = /* @__PURE__ */ __name((channelId) => channelId === void 0 ? cfg.isEnableMiddleware : middlewareOverrides.get(channelId) ?? cfg.isEnableMiddleware, "middlewareOn");
+  ctx.middleware(async (session, next) => {
+    if (!session.channelId || !middlewareOn(session.channelId)) return await next();
+    const guess = getMiddlewareGuess(session);
+    if (!guess) 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 instanceof Error ? error.message : String(error)
+      );
+      return await next();
+    }
+    return await session.execute(`ciyi.猜 ${guess}`);
+  });
   ctx.command("ciyi", "词意（猜词游戏）").action(async ({ session }) => {
     return await wf(session);
   });
@@ -968,6 +998,26 @@ function apply(ctx, cfg) {
   ctx.command("ciyi.排行榜", "累计猜中次数榜").action(async ({ session }) => {
     return await phb(session);
   });
+  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.裸词 开`);
+    }
+    if (result.override === void 0) middlewareOverrides.delete(session.channelId);
+    else middlewareOverrides.set(session.channelId, result.override);
+    return await sendMsg(
+      session,
+      middlewareSwitchText({
+        on: result.on,
+        temporary: result.override !== void 0,
+        reverted: result.reverted
+      })
+    );
+  });
   function getNewUniqueAnswer(oldGuessedWords) {
     const usedWordsSet = new Set(oldGuessedWords);
     const availableWords = questionList_default.filter(
@@ -1053,14 +1103,15 @@ function apply(ctx, cfg) {
     );
   }
   __name(boardText, "boardText");
-  function introText() {
+  function introText(channelOn) {
     return textCard(
       "词意 · 按意思远近找词",
       `每天藏起一个两字词。你报词，我回它与答案的语义排名 —— 名次越小越近，#1 就是答案本身。`,
       [
         `开始　ciyi.猜 山水　　开题并报一个两字词`,
-        cfg.isEnableMiddleware ? `续猜　直接发送两字词　仅限已开题且未结束` : null,
-        `排行　ciyi.排行榜　　看谁猜中得最多`
+        channelOn ? `续猜　直接发送两字词　仅限已开题且未结束` : null,
+        `排行　ciyi.排行榜　　看谁猜中得最多`,
+        `切换　ciyi.裸词 开/关　　临时改本群续猜方式`
       ].filter(Boolean),
       [
         `读板　？好）企业（地？ #467 · 沾边`,
@@ -1076,6 +1127,20 @@ function apply(ctx, cfg) {
     );
   }
   __name(introText, "introText");
+  function middlewareSwitchText(o) {
+    const mark = o.on ? "✅" : "⛔";
+    const state = o.on ? "开启" : "停用";
+    const config = cfg.isEnableMiddleware ? "开启" : "停用";
+    if (!o.temporary) {
+      return `${mark} 裸词续猜 · ${o.reverted ? "已复原，" : ""}跟随插件配置（${state}）`;
+    }
+    const hint = o.on ? "开题后直接发送两字词即可续猜" : "续猜请用 ciyi.猜 山水";
+    return [
+      `${mark} 裸词续猜 · 本群临时${state}（插件配置：${config}）`,
+      `${hint}；再次发送 ciyi.裸词 复原`
+    ].join("\n");
+  }
+  __name(middlewareSwitchText, "middlewareSwitchText");
   function winText(o) {
     return textCard(
       "猜中了 · 今日已封题",
@@ -1130,14 +1195,15 @@ function apply(ctx, cfg) {
   }
   __name(sendCard, "sendCard");
   async function wf(session) {
+    const channelOn = middlewareOn(session.channelId);
     return await sendCard(
       session,
       () => renderIntroCard(ctx.canvas, {
         total: allWords_default.length,
         words: allWords_default.length,
-        middleware: cfg.isEnableMiddleware
+        middleware: channelOn
       }),
-      introText()
+      introText(channelOn)
     );
   }
   __name(wf, "wf");
@@ -1331,5 +1397,6 @@ __name(apply, "apply");
   getMiddlewareGuess,
   inject,
   name,
+  resolveMiddlewareSwitch,
   usage
 });

package/package.json

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

package/readme.md

@@ -1,40 +0,0 @@
-koishi-plugin-ciyi
-==================
-
-[<img alt="github" src="https://img.shields.io/badge/github-araea/koishi__plugin__ciyi-8da0cb?style=for-the-badge&labelColor=555555&logo=github" height="20">](https://github.com/araea/koishi-plugin-ciyi)
-[<img alt="npm" src="https://img.shields.io/npm/v/koishi-plugin-ciyi.svg?style=for-the-badge&color=fc8d62&logo=npm" height="20">](https://www.npmjs.com/package/koishi-plugin-ciyi)
-
-Koishi 的词意猜词插件。
-
-## 使用
-
-设置指令别名后，发送 `ciyi` 查看玩法。每日藏一个两字词，使用 `ciyi.猜 <词>` 提交第一次猜测并开题；开题后可直接发送两字词继续猜测。
-
-## 指令
-
-| 指令 | 说明 |
-| --- | --- |
-| `ciyi` | 玩法说明 |
-| `ciyi.猜 <词>` | 开始今日游戏并提交猜测 |
-| `ciyi.排行榜` | 猜中次数榜 |
-
-## QQ 群
-
-956758505
-
-<br>
-
-#### License
-
-<sup>
-Licensed under either of <a href="LICENSE-APACHE">Apache License, Version
-2.0</a> or <a href="LICENSE-MIT">MIT license</a> at your option.
-</sup>
-
-<br>
-
-<sub>
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in this crate by you, as defined in the Apache-2.0 license, shall
-be dual licensed as above, without any additional terms or conditions.
-</sub>