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

package/lib/teach.js

@@ -1,5 +1,5 @@
 import { MessageCommand } from "zhin.js";
-import { getMessageContextKey, ts } from "./shared.js";
+import { extractInboundText, getMessageContextKey, ts } from "./shared.js";
 const cooldownMap = new Map();
 function isSafeRegex(pattern) {
     if (pattern.length > 200)
@@ -15,6 +15,34 @@ function isSafeRegex(pattern) {
     }
     return true;
 }
+/** 从 teach / teach-regex 命令的剩余文本解析「问题|答案」或「问题 答案」 */
+function extractRestParam(payload) {
+    if (Array.isArray(payload)) {
+        return payload.map((v) => String(v)).join(" ").trim();
+    }
+    return String(payload ?? "").trim();
+}
+function parseTeachPair(raw) {
+    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, message, match) {
     let result = answer;
     result = result.replace(/\{sender\}/g, message.$sender?.name || "你");
@@ -32,8 +60,18 @@ let _db = null;
 function getQA() {
     return _db?.models?.get("teach_qa") ?? null;
 }
+/** teach_qa 无自增 id 列，更新/删除用业务主键 */
+function qaWhereKey(row) {
+    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, cfg) {
-    const { addCommand, addMiddleware, useContext, onDispose } = plugin;
+    const { addCommand, useContext, onDispose } = plugin;
+    const root = plugin.root;
     useContext("database", (db) => {
         _db = db;
         db.define("teach_qa", {
@@ -83,15 +121,16 @@ export function registerTeach(plugin, cfg) {
         }
         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();
@@ -102,7 +141,7 @@ export function registerTeach(plugin, cfg) {
                 await QA.update({
                     hit_count: (matched.hit_count || 0) + 1,
                     updated_at: ts(),
-                }).where({ id: matched.id });
+                }).where(qaWhereKey(matched));
             }
             catch {
                 /* ignore */
@@ -122,64 +161,48 @@ export function registerTeach(plugin, cfg) {
             answer = processAnswer(answer, message);
         }
         await message.$reply(answer);
+        return;
     });
-    addCommand(new MessageCommand("teach <question:text> <answer:text>")
-        .desc("教我问答", "教会 Bot 一个新的问答对")
+    // 先注册较长前缀，避免 `teach [...]` 误匹配 teach-list / teach-regex
+    addCommand(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 "请提供问题和回答";
+            return "问答数据库尚未就绪";
+        const page = Math.max(1, result.params.page || 1);
         const { type: ctxType, id: ctxId } = getMessageContextKey(message);
-        if (ctxType === "group") {
-            const existing = await QA.select().where({
-                context_type: ctxType,
-                context_id: ctxId,
-            });
-            if (existing.length >= cfg.teachMaxPerGroup) {
-                return `该群问答数已达上限 (${cfg.teachMaxPerGroup})`;
-            }
-        }
-        const duplicate = 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 = 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>")
+    addCommand(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");
         }
@@ -220,33 +243,52 @@ export function registerTeach(plugin, cfg) {
         });
         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("问答列表", "查看问答对")
+    addCommand(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);
+            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 = 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 = await QA.select().where({
+                context_type: ctxType,
+                context_id: ctxId,
+            });
+            if (existing.length >= cfg.teachMaxPerGroup) {
+                return `该群问答数已达上限 (${cfg.teachMaxPerGroup})`;
+            }
+        }
+        const duplicate = 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}」`;
     }));
 }
 //# sourceMappingURL=teach.js.map

package/lib/teach.js.map

@@ -1 +1 @@
-{"version":3,"file":"teach.js","sourceRoot":"","sources":["../src/teach.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAe,MAAM,SAAS,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEvD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;AAE9C,SAAS,WAAW,CAAC,OAAe;IAClC,IAAI,OAAO,CAAC,MAAM,GAAG,GAAG;QAAE,OAAO,KAAK,CAAC;IACvC,IAAI,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1D,IAAI,yCAAyC,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1E,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;IAC3D,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;QAC1B,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,EAAE;YAAE,OAAO,KAAK,CAAC;IACvD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,aAAa,CACpB,MAAc,EACd,OAAqD,EACrD,KAAwB;IAExB,IAAI,MAAM,GAAG,MAAM,CAAC;IACpB,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,IAAI,GAAG,CAAC,CAAC;IACrE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7E,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7E,IAAI,KAAK,EAAE,CAAC;QACV,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,IAAI,GAAG,GAAQ,IAAI,CAAC;AAEpB,SAAS,KAAK;IACZ,OAAO,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAc,EAAE,GAAqB;IACjE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAEpE,UAAU,CAAC,UAAU,EAAE,CAAC,EAAO,EAAE,EAAE;QACjC,GAAG,GAAG,EAAE,CAAC;QACT,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE;YACpB,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;YAC3C,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;YACzC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE;YACzC,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE;YACjD,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;YACzC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;YACzC,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;YAC3C,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE;YAC1C,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;YACzC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;SAC1C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;QACvC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC;YACtC,IAAI,GAAG,GAAG,IAAI,GAAG,GAAG,CAAC,eAAe,GAAG,CAAC;gBAAE,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpE,CAAC;IACH,CAAC,EAAE,MAAM,CAAC,CAAC;IACX,SAAS,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,CAAC;IAEhD,KAAK,UAAU,SAAS,CACtB,OAAe,EACf,OAAe,EACf,KAAa;QAEb,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QACrB,MAAM,QAAQ,GAAU,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAChC,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,YAAY,KAAK,QAAQ;YAC9B,CAAC,IAAI,CAAC,YAAY,KAAK,OAAO,IAAI,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC,CAC/D,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK,OAAO;gBAAE,OAAO,IAAI,CAAC;QAC/D,CAAC;QACD,IAAI,GAAG,CAAC,eAAe,EAAE,CAAC;YACxB,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;gBAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ;oBAAE,SAAS;gBAC7B,IAAI,CAAC;oBACH,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;wBAAE,OAAO,IAAI,CAAC;gBAChE,CAAC;gBAAC,MAAM,CAAC;oBACP,SAAS;gBACX,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACpC,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5C,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,EAAE,CAAC;QAC5B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO;YAAE,OAAO,IAAI,EAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,GAAG,OAAO,CAAC,EAAE,IAAI,OAAO,IAAI,KAAK,EAAE,CAAC;QACxD,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC1C,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,GAAG,CAAC,eAAe;YAAE,OAAO,IAAI,EAAE,CAAC;QACnE,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACzC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;QACnB,IAAI,EAAE,EAAE,CAAC;YACP,IAAI,CAAC;gBACH,MAAM,EAAE,CAAC,MAAM,CAAC;oBACd,SAAS,EAAE,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC;oBACvC,UAAU,EAAE,EAAE,EAAE;iBACjB,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/B,CAAC;YAAC,MAAM,CAAC;gBACP,YAAY;YACd,CAAC;QACH,CAAC;QACD,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC5B,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,IAAI,CAAC;gBACH,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;gBAC3D,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,SAAS,CAAC,CAAC;YAC1D,CAAC;YAAC,MAAM,CAAC;gBACP,YAAY;YACd,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QACD,MAAM,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,UAAU,CACR,IAAI,cAAc,CAAC,qCAAqC,CAAC;SACtD,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAC;SAC9B,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAChC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,EAAE;YAAE,OAAO,iBAAiB,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;QAC5C,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM;YAAE,OAAO,UAAU,CAAC;QAC5C,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACnE,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,QAAQ,GAAU,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;gBAC9C,YAAY,EAAE,OAAO;gBACrB,UAAU,EAAE,KAAK;aAClB,CAAC,CAAC;YACH,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,CAAC,gBAAgB,EAAE,CAAC;gBAC5C,OAAO,cAAc,GAAG,CAAC,gBAAgB,GAAG,CAAC;YAC/C,CAAC;QACH,CAAC;QACD,MAAM,SAAS,GAAU,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;YAC/C,QAAQ;YACR,YAAY,EAAE,OAAO;YACrB,UAAU,EAAE,KAAK;SAClB,CAAC,CAAC;QACH,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;gBAClD,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;aACpB,CAAC,CAAC;YACH,OAAO,UAAU,QAAQ,MAAM,MAAM,GAAG,CAAC;QAC3C,CAAC;QACD,MAAM,EAAE,CAAC,MAAM,CAAC;YACd,QAAQ;YACR,MAAM;YACN,QAAQ,EAAE,CAAC;YACX,YAAY,EAAE,OAAO;YACrB,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE;YACrC,YAAY,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE;YACzC,SAAS,EAAE,CAAC;YACZ,UAAU,EAAE,EAAE,EAAE;YAChB,UAAU,EAAE,EAAE,EAAE;SACjB,CAAC,CAAC;QACH,OAAO,UAAU,QAAQ,SAAS,MAAM,GAAG,CAAC;IAC9C,CAAC,CAAC,CACL,CAAC;IAEF,UAAU,CACR,IAAI,cAAc,CAAC,0CAA0C,CAAC;SAC3D,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;SACvB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAChC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,EAAE;YAAE,OAAO,WAAW,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,eAAe;YAAE,OAAO,YAAY,CAAC;QAC9C,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;QAC5C,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM;YAAE,OAAO,UAAU,CAAC;QAC3C,IAAI,CAAC;YACH,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,aAAc,CAAW,CAAC,OAAO,EAAE,CAAC;QAC7C,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;YAAE,OAAO,iBAAiB,CAAC;QACpD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,EAAE,CAAC,MAAM,CAAC;YACd,QAAQ,EAAE,OAAO;YACjB,MAAM;YACN,QAAQ,EAAE,CAAC;YACX,YAAY,EAAE,OAAO;YACrB,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE;YACrC,YAAY,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,IAAI,EAAE;YACzC,SAAS,EAAE,CAAC;YACZ,UAAU,EAAE,EAAE,EAAE;YAChB,UAAU,EAAE,EAAE,EAAE;SACjB,CAAC,CAAC;QACH,OAAO,WAAW,OAAO,aAAa,MAAM,GAAG,CAAC;IAClD,CAAC,CAAC,CACL,CAAC;IAEF,UAAU,CACR,IAAI,cAAc,CAAC,wBAAwB,CAAC;SACzC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;SACrB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAChC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,EAAE;YAAE,OAAO,WAAW,CAAC;QAC5B,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;QAChD,IAAI,CAAC,QAAQ;YAAE,OAAO,WAAW,CAAC;QAClC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,KAAK,GAAU,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC;YAC3C,QAAQ;YACR,YAAY,EAAE,OAAO;YACrB,UAAU,EAAE,KAAK;SAClB,CAAC,CAAC;QACH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,UAAU,QAAQ,GAAG,CAAC;QACrD,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7C,OAAO,OAAO,QAAQ,MAAM,CAAC;IAC/B,CAAC,CAAC,CACL,CAAC;IAEF,UAAU,CACR,IAAI,cAAc,CAAC,0BAA0B,CAAC;SAC3C,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;SACrB,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAChC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,EAAE;YAAE,OAAO,WAAW,CAAC;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;QAClD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAU,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAC7C,OAAO,KAAK,QAAQ;YAClB,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE;YAC5B,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CACjD,CAAC;QACF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,aAAa,CAAC;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,aAAa,CAAC;QACjD,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;YAC/C,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC/D,OAAO,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,MAAM,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QAC7D,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC1D,OAAO,GAAG,MAAM,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,QAAQ,IAAI,UAAU,UAAU,QAAQ,CAAC,MAAM,IAAI,CAAC;IAClG,CAAC,CAAC,CACL,CAAC;AACJ,CAAC"}
+{"version":3,"file":"teach.js","sourceRoot":"","sources":["../src/teach.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-group-suite",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Zhin.js 群运营套件 — 群管、签到、统计、日常分析、问答（合并原 5 个插件）",
   "type": "module",
   "main": "./lib/index.js",
@@ -41,12 +41,12 @@
   "dependencies": {},
   "devDependencies": {
     "typescript": "^6.0.3",
-    "@zhin.js/plugin-html-renderer": "0.0.63",
-    "zhin.js": "1.0.85"
+    "zhin.js": "1.0.87",
+    "@zhin.js/plugin-html-renderer": "0.0.65"
   },
   "peerDependencies": {
-    "@zhin.js/plugin-html-renderer": "0.0.63",
-    "zhin.js": "1.0.85"
+    "zhin.js": "1.0.87",
+    "@zhin.js/plugin-html-renderer": "0.0.65"
   },
   "peerDependenciesMeta": {
     "@zhin.js/plugin-html-renderer": {

package/src/admin.ts

@@ -8,7 +8,7 @@ import { adapterAllowed } from "./shared.js";
 import type { GroupSuiteConfig } from "./config.js";
 
 export function registerAdmin(plugin: Plugin, cfg: GroupSuiteConfig): void {
-  const { addCommand, addMiddleware, addTool, logger } = plugin;
+  const { addCommand, addTool, logger } = plugin;
   const welcomeTemplate = cfg.welcome;
   const noticeAdapters = cfg.noticeAdapters;
 
@@ -73,7 +73,7 @@ export function registerAdmin(plugin: Plugin, cfg: GroupSuiteConfig): void {
 
   const keywords = new Map<string, string>();
 
-  addMiddleware(async (message, next) => {
+  plugin.root.addMiddleware(async (message, next) => {
     if (message.$channel.type !== "group") {
       await next();
       return;

package/src/checkin.ts

@@ -14,7 +14,7 @@ function randomInt(min: number, max: number): number {
 
 let _db: any = null;
 
-function getModel(): any {
+export function getCheckinModel(): any {
   return _db?.models?.get("checkin_records") ?? null;
 }
 
@@ -36,7 +36,7 @@ export function registerCheckin(plugin: Plugin, cfg: GroupSuiteConfig): void {
       created_at: { type: "text", default: "" },
       updated_at: { type: "text", default: "" },
     });
-    logger.info(formatCompact({ op: "checkin_model" }));
+    logger.info(formatCompact({ 模块: "签到", 数据模型: "已就绪" }));
   });
 
   async function getOrCreateUser(
@@ -79,7 +79,7 @@ export function registerCheckin(plugin: Plugin, cfg: GroupSuiteConfig): void {
     new MessageCommand("checkin")
       .desc("签到", "每日签到获得积分")
       .action(async (message) => {
-        const M = getModel();
+        const M = getCheckinModel();
         if (!M) return "签到数据库尚未就绪，请稍后重试";
 
         const userId = String(message.$sender?.id || "");
@@ -110,7 +110,11 @@ export function registerCheckin(plugin: Plugin, cfg: GroupSuiteConfig): void {
           last_checkin: today,
           user_name: userName,
           updated_at: ts(),
-        }).where({ id: user.id });
+        }).where({
+          user_id: userId,
+          context_type: ctxType,
+          context_id: ctxId,
+        });
 
         const lines = [`签到成功！`, `基础积分: +${base}`];
         if (bonus > 0) lines.push(`连续奖励: +${bonus} (连续${newStreak}天)`);
@@ -123,7 +127,7 @@ export function registerCheckin(plugin: Plugin, cfg: GroupSuiteConfig): void {
     new MessageCommand("mypoints")
       .desc("我的积分", "查看个人积分与签到信息")
       .action(async (message) => {
-        const M = getModel();
+        const M = getCheckinModel();
         if (!M) return "签到数据库尚未就绪";
         const userId = String(message.$sender?.id || "");
         const { type: ctxType, id: ctxId } = getMessageContextKey(message);
@@ -150,7 +154,7 @@ export function registerCheckin(plugin: Plugin, cfg: GroupSuiteConfig): void {
     new MessageCommand("rank")
       .desc("积分排行", "查看积分排行榜")
       .action(async (message) => {
-        const M = getModel();
+        const M = getCheckinModel();
         if (!M) return "签到数据库尚未就绪";
         const { type: ctxType, id: ctxId } = getMessageContextKey(message);
         const all = (await M.select().where(
@@ -183,9 +187,10 @@ export function registerCheckin(plugin: Plugin, cfg: GroupSuiteConfig): void {
 
   logger.info(
     formatCompact({
-      op: "checkin_load",
-      base_min: cfg.basePointsMin,
-      base_max: cfg.basePointsMax,
+      模块: "签到",
+      状态: "已加载",
+      基础积分最小值: cfg.basePointsMin,
+      基础积分最大值: cfg.basePointsMax,
     }),
   );
 }

package/src/index.ts

@@ -30,4 +30,4 @@ registerStats(plugin, cfg);
 registerDailyAnalysis(plugin, cfg);
 registerTeach(plugin, cfg);
 
-logger.info(formatCompact({ op: "group_suite_load" }));
+logger.info(formatCompact({ 模块: "群组套件", 状态: "已加载" }));

package/src/shared.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from "zhin.js";
+import { segment, type Message, type Plugin } from "zhin.js";
 
 export function todayStr(): string {
   const d = new Date();
@@ -9,6 +9,15 @@ export function ts(): string {
   return new Date().toISOString();
 }
 
+/** 入站纯文本（与 AI trigger 一致：segment.toString($content)，否则 $raw） */
+export function extractInboundText(message: Pick<Message, "$raw" | "$content">): string {
+  if (message.$content?.length) {
+    const fromContent = segment.toString(message.$content).trim();
+    if (fromContent) return fromContent;
+  }
+  return (message.$raw ?? "").trim();
+}
+
 /** 消息所属群/全局上下文 */
 export function getMessageContextKey(message: {
   $channel?: { type?: string; id?: string | number };

package/src/stats.ts

@@ -16,7 +16,7 @@ export function monthStartStr(): string {
 
 let _db: any = null;
 
-function getModel(): any {
+export function getStatsModel(): any {
   return _db?.models?.get("message_stats") ?? null;
 }
 
@@ -41,8 +41,8 @@ function getGroupId(message: { $channel?: { type?: string; id?: string } }): str
   return "";
 }
 
-async function flushBuffer(): Promise<void> {
-  const M = getModel();
+export async function flushStatsBuffer(): Promise<void> {
+  const M = getStatsModel();
   if (!M || buffer.size === 0) return;
   const entries = [...buffer.values()];
   buffer.clear();
@@ -58,7 +58,11 @@ async function flushBuffer(): Promise<void> {
           count: (existing[0].count || 0) + entry.count,
           user_name: entry.user_name,
           updated_at: ts(),
-        }).where({ id: existing[0].id });
+        }).where({
+          user_id: entry.user_id,
+          group_id: entry.group_id,
+          date: entry.date,
+        });
       } else {
         await M.insert({
           user_id: entry.user_id,
@@ -75,11 +79,11 @@ async function flushBuffer(): Promise<void> {
   }
 }
 
-async function queryStats(
+export async function queryStats(
   groupId: string,
   fromDate: string,
 ): Promise<Map<string, { name: string; count: number }>> {
-  const M = getModel();
+  const M = getStatsModel();
   if (!M) return new Map();
   const all: any[] = groupId
     ? await M.select().where({ group_id: groupId })
@@ -127,7 +131,7 @@ function formatRank(
 }
 
 export function registerStats(plugin: Plugin, cfg: GroupSuiteConfig): void {
-  const { logger, addCommand, addMiddleware, useContext, onDispose } = plugin;
+  const { logger, addCommand, useContext, onDispose } = plugin;
 
   useContext("database", (db: any) => {
     _db = db;
@@ -139,17 +143,17 @@ export function registerStats(plugin: Plugin, cfg: GroupSuiteConfig): void {
       count: { type: "integer", default: 0 },
       updated_at: { type: "text", default: "" },
     });
-    logger.info(formatCompact({ op: "stats_model" }));
+    logger.info(formatCompact({ 模块: "消息统计", 数据模型: "已就绪" }));
   });
 
-  const flushTimer = setInterval(flushBuffer, 10_000);
+  const flushTimer = setInterval(flushStatsBuffer, 10_000);
   onDispose(async () => {
     clearInterval(flushTimer);
-    await flushBuffer();
+    await flushStatsBuffer();
     buffer.clear();
   });
 
-  addMiddleware(async (message, next) => {
+  plugin.root.addMiddleware(async (message, next) => {
     const userId = String(message.$sender?.id || "");
     if (!userId) return next();
     const key = bufferKey(userId, getGroupId(message), todayStr());
@@ -173,7 +177,7 @@ export function registerStats(plugin: Plugin, cfg: GroupSuiteConfig): void {
     new MessageCommand("stats")
       .desc("消息统计", "查看今日消息统计")
       .action(async (message) => {
-        await flushBuffer();
+        await flushStatsBuffer();
         const groupId = getGroupId(message);
         const stats = await queryStats(groupId, todayStr());
         const title = groupId ? "今日本群消息统计" : "今日全局消息统计";
@@ -190,7 +194,7 @@ export function registerStats(plugin: Plugin, cfg: GroupSuiteConfig): void {
     new MessageCommand("stats-week")
       .desc("周消息统计", "查看本周消息统计")
       .action(async (message) => {
-        await flushBuffer();
+        await flushStatsBuffer();
         const groupId = getGroupId(message);
         const stats = await queryStats(groupId, weekStartStr());
         const title = groupId ? "本周本群消息统计" : "本周全局消息统计";
@@ -207,7 +211,7 @@ export function registerStats(plugin: Plugin, cfg: GroupSuiteConfig): void {
     new MessageCommand("stats-rank")
       .desc("话唠排行", "查看活跃度排行榜")
       .action(async (message) => {
-        await flushBuffer();
+        await flushStatsBuffer();
         const groupId = getGroupId(message);
         const stats = await queryStats(groupId, monthStartStr());
         const title = groupId ? "本月话唠排行" : "全局话唠排行";
@@ -224,8 +228,8 @@ export function registerStats(plugin: Plugin, cfg: GroupSuiteConfig): void {
     new MessageCommand("mystats")
       .desc("我的统计", "查看个人消息统计")
       .action(async (message) => {
-        await flushBuffer();
-        const M = getModel();
+        await flushStatsBuffer();
+        const M = getStatsModel();
         if (!M) return "统计数据库尚未就绪";
         const userId = String(message.$sender?.id || "");
         if (!userId) return "无法获取用户信息";
@@ -261,7 +265,7 @@ export function registerStats(plugin: Plugin, cfg: GroupSuiteConfig): void {
   );
 
   const cleanupTimer = setInterval(async () => {
-    const M = getModel();
+    const M = getStatsModel();
     if (!M) return;
     try {
       const cutoff = new Date();
@@ -269,7 +273,11 @@ export function registerStats(plugin: Plugin, cfg: GroupSuiteConfig): void {
       const cutoffStr = `${cutoff.getFullYear()}-${String(cutoff.getMonth() + 1).padStart(2, "0")}-${String(cutoff.getDate()).padStart(2, "0")}`;
       const all: any[] = await M.select();
       for (const row of all.filter((r) => r.date < cutoffStr)) {
-        await M.delete().where({ id: row.id });
+        await M.delete().where({
+          user_id: row.user_id,
+          group_id: row.group_id,
+          date: row.date,
+        });
       }
     } catch {
       /* ignore */
@@ -280,9 +288,10 @@ export function registerStats(plugin: Plugin, cfg: GroupSuiteConfig): void {
 
   logger.info(
     formatCompact({
-      op: "stats_load",
-      rank_size: cfg.rankSize,
-      retention_days: cfg.statsRetentionDays,
+      模块: "消息统计",
+      状态: "已加载",
+      排行榜大小: cfg.rankSize,
+      数据保留天数: cfg.statsRetentionDays,
     }),
   );
 }