@zhin.js/plugin-group-suite 0.1.0 → 0.1.2

package/src/teach.ts

@@ -1,6 +1,6 @@
 import { MessageCommand, type Plugin } from "zhin.js";
 import type { GroupSuiteConfig } from "./config.js";
-import { getMessageContextKey, ts } from "./shared.js";
+import { extractInboundText, getMessageContextKey, ts } from "./shared.js";
 
 const cooldownMap = new Map<string, number>();
 
@@ -15,6 +15,34 @@ function isSafeRegex(pattern: string): boolean {
   return true;
 }
 
+/** 从 teach / teach-regex 命令的剩余文本解析「问题|答案」或「问题 答案」 */
+function extractRestParam(payload: unknown): string {
+  if (Array.isArray(payload)) {
+    return payload.map((v) => String(v)).join(" ").trim();
+  }
+  return String(payload ?? "").trim();
+}
+
+function parseTeachPair(raw: string): { question: string; answer: string } | null {
+  if (!raw) return null;
+  const pipe = raw.indexOf("|");
+  if (pipe >= 0) {
+    const question = raw.slice(0, pipe).trim();
+    const answer = raw.slice(pipe + 1).trim();
+    if (question && answer) return { question, answer };
+    return null;
+  }
+  const lastSpace = raw.lastIndexOf(" ");
+  if (lastSpace < 0) return null;
+  const question = raw.slice(0, lastSpace).trim();
+  const answer = raw.slice(lastSpace + 1).trim();
+  if (!question || !answer) return null;
+  return { question, answer };
+}
+
+const TEACH_USAGE_HINT =
+  "格式：teach 关键词 回答（回答可含空格），或 teach 问题|答案";
+
 function processAnswer(
   answer: string,
   message: { $sender?: { name?: string; id?: string } },
@@ -39,8 +67,24 @@ function getQA(): any {
   return _db?.models?.get("teach_qa") ?? null;
 }
 
+/** teach_qa 无自增 id 列，更新/删除用业务主键 */
+function qaWhereKey(row: {
+  question: string;
+  context_type: string;
+  context_id: string;
+  is_regex?: number | boolean;
+}) {
+  return {
+    question: row.question,
+    context_type: row.context_type,
+    context_id: row.context_id,
+    is_regex: row.is_regex ? 1 : 0,
+  };
+}
+
 export function registerTeach(plugin: Plugin, cfg: GroupSuiteConfig): void {
-  const { addCommand, addMiddleware, useContext, onDispose } = plugin;
+  const { addCommand, useContext, onDispose } = plugin;
+  const root = plugin.root;
 
   useContext("database", (db: any) => {
     _db = db;
@@ -95,13 +139,14 @@ export function registerTeach(plugin: Plugin, cfg: GroupSuiteConfig): void {
     return null;
   }
 
-  addMiddleware(async (message, next) => {
-    const content = (message.$raw || "").trim();
+  // 入站链只执行 root.middleware（见 packages/im/core inbound-runner）
+  root.addMiddleware(async (message, next) => {
+    const content = extractInboundText(message);
     if (!content) return next();
     const { type: ctxType, id: ctxId } = getMessageContextKey(message);
     const matched = await findMatch(content, ctxType, ctxId);
     if (!matched) return next();
-    const cooldownKey = `${matched.id}:${ctxType}:${ctxId}`;
+    const cooldownKey = `${matched.question}:${ctxType}:${ctxId}:${matched.is_regex ?? 0}`;
     const last = cooldownMap.get(cooldownKey);
     if (last && Date.now() - last < cfg.teachCooldownMs) return next();
     cooldownMap.set(cooldownKey, Date.now());
@@ -111,7 +156,7 @@ export function registerTeach(plugin: Plugin, cfg: GroupSuiteConfig): void {
         await QA.update({
           hit_count: (matched.hit_count || 0) + 1,
           updated_at: ts(),
-        }).where({ id: matched.id });
+        }).where(qaWhereKey(matched));
       } catch {
         /* ignore */
       }
@@ -128,64 +173,50 @@ export function registerTeach(plugin: Plugin, cfg: GroupSuiteConfig): void {
       answer = processAnswer(answer, message);
     }
     await message.$reply(answer);
+    return;
   });
 
+  // 先注册较长前缀，避免 `teach [...]` 误匹配 teach-list / teach-regex
   addCommand(
-    new MessageCommand("teach <question:text> <answer:text>")
-      .desc("教我问答", "教会 Bot 一个新的问答对")
+    new MessageCommand("teach-list [page:number]")
+      .desc("问答列表", "查看问答对")
       .action(async (message, result) => {
         const QA = getQA();
-        if (!QA) return "问答数据库尚未就绪，请稍后重试";
-        const question = result.params.question?.trim();
-        const answer = result.params.answer?.trim();
-        if (!question || !answer) return "请提供问题和回答";
+        if (!QA) return "问答数据库尚未就绪";
+        const page = Math.max(1, result.params.page || 1);
         const { type: ctxType, id: ctxId } = getMessageContextKey(message);
-        if (ctxType === "group") {
-          const existing: any[] = await QA.select().where({
-            context_type: ctxType,
-            context_id: ctxId,
-          });
-          if (existing.length >= cfg.teachMaxPerGroup) {
-            return `该群问答数已达上限 (${cfg.teachMaxPerGroup})`;
-          }
-        }
-        const duplicate: any[] = await QA.select().where({
-          question,
-          context_type: ctxType,
-          context_id: ctxId,
-        });
-        if (duplicate.length > 0) {
-          await QA.update({ answer, updated_at: ts() }).where({
-            id: duplicate[0].id,
-          });
-          return `已更新问答：「${question}」→「${answer}」`;
-        }
-        await QA.insert({
-          question,
-          answer,
-          is_regex: 0,
-          context_type: ctxType,
-          context_id: ctxId,
-          creator_id: message.$sender?.id || "",
-          creator_name: message.$sender?.name || "",
-          hit_count: 0,
-          created_at: ts(),
-          updated_at: ts(),
+        const allItems: any[] = await QA.select().where(
+          ctxType === "global"
+            ? { context_type: "global" }
+            : { context_type: ctxType, context_id: ctxId },
+        );
+        if (allItems.length === 0) return "还没有教过任何问答哦～";
+        const totalPages = Math.ceil(allItems.length / cfg.teachPageSize);
+        const safePage = Math.min(page, totalPages);
+        const start = (safePage - 1) * cfg.teachPageSize;
+        const pageItems = allItems.slice(start, start + cfg.teachPageSize);
+        const lines = pageItems.map((item, i) => {
+          const prefix = item.is_regex ? "[正则]" : "[精确]";
+          const q = item.is_regex ? `/${item.question}/` : item.question;
+          return `${start + i + 1}. ${prefix} ${q} → ${item.answer}`;
         });
-        return `学会了！发送「${question}」我会回复「${answer}」`;
+        const header = ctxType === "global" ? "全局问答列表" : "本群问答列表";
+        return `${header}\n${lines.join("\n")}\n第 ${safePage}/${totalPages} 页 · 共 ${allItems.length} 条`;
       }),
   );
 
   addCommand(
-    new MessageCommand("teach-regex <pattern:text> <answer:text>")
+    new MessageCommand("teach-regex [...payload:text]")
       .desc("教我正则问答", "用正则匹配")
+      .usage("teach-regex 正则 回答", "teach-regex 正则|回答")
       .action(async (message, result) => {
         const QA = getQA();
         if (!QA) return "问答数据库尚未就绪";
         if (!cfg.teachAllowRegex) return "管理员已禁用正则问答";
-        const pattern = result.params.pattern?.trim();
-        const answer = result.params.answer?.trim();
-        if (!pattern || !answer) return "请提供正则和回答";
+        const parsed = parseTeachPair(extractRestParam(result.params.payload));
+        if (!parsed) return "格式：teach-regex 正则 回答，或 teach-regex 正则|回答";
+        const pattern = parsed.question;
+        const answer = parsed.answer;
         try {
           new RegExp(pattern, "i");
         } catch (e) {
@@ -224,36 +255,53 @@ export function registerTeach(plugin: Plugin, cfg: GroupSuiteConfig): void {
           context_id: ctxId,
         });
         if (items.length === 0) return `没有找到问题「${question}」`;
-        await QA.delete().where({ id: items[0].id });
+        await QA.delete().where(qaWhereKey(items[0]));
         return `已忘记「${question}」的回答`;
       }),
   );
 
   addCommand(
-    new MessageCommand("teach-list [page:number]")
-      .desc("问答列表", "查看问答对")
+    new MessageCommand("teach [...payload:text]")
+      .desc("教我问答", "教会 Bot 一个新的问答对")
+      .usage("teach 关键词 回答", "teach 问题|答案")
       .action(async (message, result) => {
         const QA = getQA();
-        if (!QA) return "问答数据库尚未就绪";
-        const page = Math.max(1, result.params.page || 1);
+        if (!QA) return "问答数据库尚未就绪，请稍后重试";
+        const parsed = parseTeachPair(extractRestParam(result.params.payload));
+        if (!parsed) return TEACH_USAGE_HINT;
+        const { question, answer } = parsed;
         const { type: ctxType, id: ctxId } = getMessageContextKey(message);
-        const allItems: any[] = await QA.select().where(
-          ctxType === "global"
-            ? { context_type: "global" }
-            : { context_type: ctxType, context_id: ctxId },
-        );
-        if (allItems.length === 0) return "还没有教过任何问答哦～";
-        const totalPages = Math.ceil(allItems.length / cfg.teachPageSize);
-        const safePage = Math.min(page, totalPages);
-        const start = (safePage - 1) * cfg.teachPageSize;
-        const pageItems = allItems.slice(start, start + cfg.teachPageSize);
-        const lines = pageItems.map((item, i) => {
-          const prefix = item.is_regex ? "[正则]" : "[精确]";
-          const q = item.is_regex ? `/${item.question}/` : item.question;
-          return `${start + i + 1}. ${prefix} ${q} → ${item.answer}`;
+        if (ctxType === "group") {
+          const existing: any[] = await QA.select().where({
+            context_type: ctxType,
+            context_id: ctxId,
+          });
+          if (existing.length >= cfg.teachMaxPerGroup) {
+            return `该群问答数已达上限 (${cfg.teachMaxPerGroup})`;
+          }
+        }
+        const duplicate: any[] = await QA.select().where({
+          question,
+          context_type: ctxType,
+          context_id: ctxId,
         });
-        const header = ctxType === "global" ? "全局问答列表" : "本群问答列表";
-        return `${header}\n${lines.join("\n")}\n第 ${safePage}/${totalPages} 页 · 共 ${allItems.length} 条`;
+        if (duplicate.length > 0) {
+          await QA.update({ answer, updated_at: ts() }).where(qaWhereKey(duplicate[0]));
+          return `已更新问答：「${question}」→「${answer}」`;
+        }
+        await QA.insert({
+          question,
+          answer,
+          is_regex: 0,
+          context_type: ctxType,
+          context_id: ctxId,
+          creator_id: message.$sender?.id || "",
+          creator_name: message.$sender?.name || "",
+          hit_count: 0,
+          created_at: ts(),
+          updated_at: ts(),
+        });
+        return `学会了！发送「${question}」我会回复「${answer}」`;
       }),
   );
 }

package/tools/checkin-query/handler.ts

@@ -1,7 +1,8 @@
-import { getModel, todayStr } from '../../src/index.js';
+import { getCheckinModel } from '../../src/checkin.js';
+import { todayStr } from '../../src/shared.js';
 
 export default async function (args: { user_id?: string }) {
-  const M = getModel();
+  const M = getCheckinModel();
   if (!M) return '签到数据库尚未就绪';
 
   const userId = args.user_id;

package/tools/checkin-rank/handler.ts

@@ -1,7 +1,7 @@
-import { getModel } from '../../src/index.js';
+import { getCheckinModel } from '../../src/checkin.js';
 
 export default async function (args: { limit?: number }) {
-  const M = getModel();
+  const M = getCheckinModel();
   if (!M) return '签到数据库尚未就绪';
 
   const limit = Math.min(Math.max(Number(args.limit) || 10, 1), 50);

package/tools/stats-query/handler.ts

@@ -1,7 +1,13 @@
-import { flushBuffer, queryStats, todayStr, weekStartStr, monthStartStr } from '../../src/index.js';
+import {
+  flushStatsBuffer,
+  queryStats,
+  weekStartStr,
+  monthStartStr,
+} from '../../src/stats.js';
+import { todayStr } from '../../src/shared.js';
 
 export default async function (args: { group_id?: string; period?: string }) {
-  await flushBuffer();
+  await flushStatsBuffer();
   const groupId = args.group_id || '';
   const period = args.period || 'today';
 

package/tools/stats-user/handler.ts

@@ -1,8 +1,9 @@
-import { flushBuffer, getModel, todayStr, weekStartStr } from '../../src/index.js';
+import { flushStatsBuffer, getStatsModel, weekStartStr } from '../../src/stats.js';
+import { todayStr } from '../../src/shared.js';
 
 export default async function (args: { user_id: string }) {
-  await flushBuffer();
-  const M = getModel();
+  await flushStatsBuffer();
+  const M = getStatsModel();
   if (!M) return '统计数据库尚未就绪';
 
   const userId = args.user_id;