mioku-plugin-admin 2.3.0 → 2.3.1

package/commands/verify.ts

@@ -2,6 +2,8 @@ import type { MiokiContext } from "mioki";
 import { getAtUserId, getMemberRole } from "../config";
 import {
   getGroupVerifyConfig,
+  MAX_EXTRA_PROMPT_LENGTH,
+  normalizeExtraPrompt,
   normalizeVerifyMode,
   upsertGroupVerifyConfig,
   type VerifyConfig,
@@ -44,7 +46,9 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
       text.startsWith("/绕过验证") ||
       text.startsWith("#绕过验证") ||
       text.startsWith("/重新验证") ||
-      text.startsWith("#重新验证");
+      text.startsWith("#重新验证") ||
+      text.startsWith("/入群提示") ||
+      text.startsWith("#入群提示");
 
     try {
       const selfId = event.self_id;
@@ -238,6 +242,48 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
         }
         return;
       }
+
+      // /入群提示 xxx
+      if (text.startsWith("/入群提示") || text.startsWith("#入群提示")) {
+        if (!(await ensureAdminPermission())) return;
+
+        const rawArg = text.replace(/^[/#]入群提示\s*/, "").trim();
+        const current = getVerifyConfig();
+        const groupCfg = getGroupVerifyConfig(current, groupId);
+
+        if (!rawArg) {
+          if (!groupCfg.extraPrompt) {
+            await event.reply("本群还没设置额外的入群提示词哦～", true);
+            return;
+          }
+          await setVerifyConfig(
+            upsertGroupVerifyConfig(current, groupId, { extraPrompt: "" }),
+          );
+          await event.reply("已清空本群额外入群提示词～", true);
+          return;
+        }
+
+        const argLength = Array.from(rawArg).length;
+        if (argLength > MAX_EXTRA_PROMPT_LENGTH) {
+          await replyAdminErrorNotice({
+            ctx,
+            event,
+            instruction: `用户想设置本群入群提示词，但内容长度 ${argLength} 超过了上限 ${MAX_EXTRA_PROMPT_LENGTH} 字，请明确告诉用户最多 ${MAX_EXTRA_PROMPT_LENGTH} 字。`,
+            fallbackMessage: `最多 ${MAX_EXTRA_PROMPT_LENGTH} 字哦～当前 ${argLength} 字`,
+          });
+          return;
+        }
+
+        const next = upsertGroupVerifyConfig(current, groupId, {
+          extraPrompt: normalizeExtraPrompt(rawArg),
+        });
+        await setVerifyConfig(next);
+        await event.reply(
+          `已设置本群额外入群提示词：${normalizeExtraPrompt(rawArg)}`,
+          true,
+        );
+        return;
+      }
     } catch (err) {
       ctx.logger.error(`[admin verify] 未捕获异常: ${String(err)}`);
       if (!isVerifyCommand) return;

package/config.md

@@ -74,9 +74,37 @@ fields:
 
   - key: verify.groups
     label: 各群入群验证配置
-    type: json
-    description: 每个群的验证配置数组，元素形如 {"groupId":123,"enabled":true,"mode":"reaction"}。推荐通过 /开启验证、/关闭验证、/切换验证模式 指令管理，直接编辑需填写合法 JSON 数组。
-    placeholder: '[]'
+    type: array
+    description: 
+    itemFields:
+      - key: groupId
+        label: 群号
+        type: number
+        description: 该配置对应的 QQ 群号，每个群只能出现一次
+        placeholder: 123456789
+
+      - key: enabled
+        label: 启用验证
+        type: switch
+        description: 是否对该群开启入群验证
+
+      - key: mode
+        label: 验证模式
+        type: select
+        options:
+          - value: reaction
+            label: 回应
+          - value: number
+            label: 数字
+          - value: chiral
+            label: 手性碳
+        description: 该群入群验证使用的模式
+
+      - key: extraPrompt
+        label: 群额外入群提示词
+        type: textarea
+        description: 拼接在该群默认验证提示词之后发送，上限 50 字。可在群里直接用 /入群提示 xxx 设置或清空。
+        placeholder: 例：本群禁止复读机器人消息，请自觉
 
   - key: verify.reactionEmojiId
     label: 回应模式表态表情ID

package/notify/welcome.ts

@@ -75,8 +75,16 @@ async function flushBatch(options: {
   members: PendingMember[];
   promptInjections?: { content: string; title?: string }[];
 }): Promise<string> {
-  const { ctx, aiService, config, selfId, groupId, groupName, members, promptInjections } =
-    options;
+  const {
+    ctx,
+    aiService,
+    config,
+    selfId,
+    groupId,
+    groupName,
+    members,
+    promptInjections,
+  } = options;
   if (!members.length) return "";
 
   const names = members.map((m) => m.memberName || String(m.userId));
@@ -106,7 +114,7 @@ async function flushBatch(options: {
       groupId,
       send: true,
       instruction: [
-        `当前有 ${members.length} 位新成员同时入群，请一次性发送一段统一的欢迎语（不要逐个 @ 欢迎、不要重复点名）。`,
+        `当前有 ${members.length} 位新成员同时入群，请一次性发送一段统一的欢迎语（不要逐个 @ 欢迎、不要重复点名）不要长篇大论，精简即可。`,
         `新成员昵称：${userList}`,
         `新成员 QQ：${userIdList}`,
         `所在群：${groupName}`,
@@ -209,87 +217,47 @@ export function registerWelcomeHandler(
 ): () => void {
   const batches = getBatchMap();
 
-  const dispose = ctx.handle("notice.group.increase" as any, async (event: any) => {
-    const cfg = getConfig();
-    const selfId = Number(event?.self_id || ctx.self_id);
-    const groupId = Number(event?.group_id || 0);
-    const userId = Number(event?.user_id || 0);
-    if (!groupId || !userId) return;
-    if (userId === selfId) return;
+  const dispose = ctx.handle(
+    "notice.group.increase" as any,
+    async (event: any) => {
+      const cfg = getConfig();
+      const selfId = Number(event?.self_id || ctx.self_id);
+      const groupId = Number(event?.group_id || 0);
+      const userId = Number(event?.user_id || 0);
+      if (!groupId || !userId) return;
+      if (userId === selfId) return;
 
-    const groupName =
-      String(event?.group?.group_name || "").trim() || String(groupId);
-
-    if (
-      shouldSuppress &&
-      (await shouldSuppress({ selfId, groupId, userId, groupName }))
-    ) {
-      return;
-    }
+      const groupName =
+        String(event?.group?.group_name || "").trim() || String(groupId);
 
-    if (!cfg.welcome.enabled) return;
-
-    const batchWindowMs = Math.max(0, Number(cfg.welcome.batchWindowMs) || 0);
-
-    if (batchWindowMs === 0) {
-      const memberName = await resolveMemberName(ctx, groupId, userId, selfId);
-      const welcomeMessage = await flushBatch({
-        ctx,
-        aiService,
-        config: cfg,
-        selfId,
-        groupId,
-        groupName,
-        members: [{ userId, memberName }],
-      });
-      if (!welcomeMessage) return;
-      const bot = ctx.pickBot(selfId);
-      if (!bot) return;
-      try {
-        await bot.sendGroupMsg(groupId, [ctx.segment.text(welcomeMessage)]);
-      } catch (error) {
-        ctx.logger.warn(`发送入群欢迎失败: ${error}`);
+      if (
+        shouldSuppress &&
+        (await shouldSuppress({ selfId, groupId, userId, groupName }))
+      ) {
+        return;
       }
-      return;
-    }
-
-    const key = batchKey(selfId, groupId);
-    let state = batches.get(key);
-    if (!state) {
-      state = { members: [], timer: null, groupName };
-      batches.set(key, state);
-    }
-    if (groupName && groupName !== String(groupId)) {
-      state.groupName = groupName;
-    }
 
-    const memberName = await resolveMemberName(ctx, groupId, userId, selfId);
-    if (!state.members.some((m) => m.userId === userId)) {
-      state.members.push({ userId, memberName });
-    }
-
-    if (state.timer) {
-      return;
-    }
+      if (!cfg.welcome.enabled) return;
 
-    state.timer = setTimeout(async () => {
-      try {
-        const pending = state;
-        batches.delete(key);
-        if (!pending || !pending.members.length) return;
+      const batchWindowMs = Math.max(0, Number(cfg.welcome.batchWindowMs) || 0);
 
-        const currentConfig = getConfig();
+      if (batchWindowMs === 0) {
+        const memberName = await resolveMemberName(
+          ctx,
+          groupId,
+          userId,
+          selfId,
+        );
         const welcomeMessage = await flushBatch({
           ctx,
           aiService,
-          config: currentConfig,
+          config: cfg,
           selfId,
           groupId,
-          groupName: pending.groupName,
-          members: pending.members,
+          groupName,
+          members: [{ userId, memberName }],
         });
         if (!welcomeMessage) return;
-
         const bot = ctx.pickBot(selfId);
         if (!bot) return;
         try {
@@ -297,11 +265,59 @@ export function registerWelcomeHandler(
         } catch (error) {
           ctx.logger.warn(`发送入群欢迎失败: ${error}`);
         }
-      } catch (error) {
-        ctx.logger.error(`admin welcome 批次处理失败: ${error}`);
+        return;
       }
-    }, batchWindowMs);
-  });
+
+      const key = batchKey(selfId, groupId);
+      let state = batches.get(key);
+      if (!state) {
+        state = { members: [], timer: null, groupName };
+        batches.set(key, state);
+      }
+      if (groupName && groupName !== String(groupId)) {
+        state.groupName = groupName;
+      }
+
+      const memberName = await resolveMemberName(ctx, groupId, userId, selfId);
+      if (!state.members.some((m) => m.userId === userId)) {
+        state.members.push({ userId, memberName });
+      }
+
+      if (state.timer) {
+        return;
+      }
+
+      state.timer = setTimeout(async () => {
+        try {
+          const pending = state;
+          batches.delete(key);
+          if (!pending || !pending.members.length) return;
+
+          const currentConfig = getConfig();
+          const welcomeMessage = await flushBatch({
+            ctx,
+            aiService,
+            config: currentConfig,
+            selfId,
+            groupId,
+            groupName: pending.groupName,
+            members: pending.members,
+          });
+          if (!welcomeMessage) return;
+
+          const bot = ctx.pickBot(selfId);
+          if (!bot) return;
+          try {
+            await bot.sendGroupMsg(groupId, [ctx.segment.text(welcomeMessage)]);
+          } catch (error) {
+            ctx.logger.warn(`发送入群欢迎失败: ${error}`);
+          }
+        } catch (error) {
+          ctx.logger.error(`admin welcome 批次处理失败: ${error}`);
+        }
+      }, batchWindowMs);
+    },
+  );
 
   return () => {
     for (const state of batches.values()) {
@@ -310,4 +326,4 @@ export function registerWelcomeHandler(
     batches.clear();
     dispose();
   };
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-admin",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "管理插件，提供事件通知与群管/个人管理指令",
   "main": "index.ts",
   "type": "module",

package/verify/chiral.ts

@@ -1,5 +1,9 @@
 import type { MiokiContext } from "mioki";
-import type { VerifyConfig } from "./config";
+import {
+  resolveVerifyPrompt,
+  type VerifyConfig,
+  type VerifyGroupConfig,
+} from "./config";
 import type { PendingVerify } from "./types";
 
 interface ChiralCaptcha {
@@ -43,6 +47,7 @@ async function fetchChiralCaptcha(
 export async function prepareChiral(
   ctx: MiokiContext,
   cfg: VerifyConfig,
+  groupCfg: VerifyGroupConfig,
   p: PendingVerify,
 ): Promise<boolean> {
   const bot = ctx.pickBot(p.selfId);
@@ -51,10 +56,11 @@ export async function prepareChiral(
     const captcha = await fetchChiralCaptcha(cfg.chiralApiUrl, cfg.chiralDifficulty);
     p.requiredRegions = captcha.regions;
     p.matchedRegions = new Set<string>();
-    const prompt = cfg.chiralPrompt.replace(
+    const basePrompt = cfg.chiralPrompt.replace(
       "{count}",
       String(captcha.regions.length),
     );
+    const prompt = resolveVerifyPrompt(basePrompt, groupCfg);
     await bot.sendGroupMsg(p.groupId, [
       ctx.segment.at(String(p.userId)),
       ctx.segment.text(` ${prompt}`),

package/verify/config.ts

@@ -1,9 +1,12 @@
 export type VerifyMode = "reaction" | "number" | "chiral";
 
+export const MAX_EXTRA_PROMPT_LENGTH = 50;
+
 export interface VerifyGroupConfig {
   groupId: number;
   enabled: boolean;
   mode: VerifyMode;
+  extraPrompt: string;
 }
 
 export interface VerifyConfig {
@@ -39,6 +42,22 @@ export const DEFAULT_VERIFY_CONFIG: VerifyConfig = {
   kickOnTimeout: true,
 };
 
+export function normalizeExtraPrompt(value: unknown): string {
+  if (typeof value !== "string") return "";
+  const trimmed = value.trim();
+  if (!trimmed) return "";
+  return Array.from(trimmed).slice(0, MAX_EXTRA_PROMPT_LENGTH).join("");
+}
+
+export function resolveVerifyPrompt(
+  basePrompt: string,
+  groupCfg: VerifyGroupConfig | undefined,
+): string {
+  const extra = String(groupCfg?.extraPrompt || "").trim();
+  if (!extra) return basePrompt;
+  return `${basePrompt}\n${extra}`;
+}
+
 export function normalizeVerifyMode(value: unknown): VerifyMode {
   const v = String(value || "").trim();
   if (v === "number" || v === "数字") return "number";
@@ -52,6 +71,7 @@ function normalizeVerifyGroup(raw: any): VerifyGroupConfig {
     groupId: groupId > 0 ? groupId : 0,
     enabled: raw?.enabled === true,
     mode: normalizeVerifyMode(raw?.mode),
+    extraPrompt: normalizeExtraPrompt(raw?.extraPrompt ?? raw?.extra_prompt),
   };
 }
 
@@ -113,7 +133,7 @@ export function getGroupVerifyConfig(
 ): VerifyGroupConfig {
   const found = config.groups.find((g) => g.groupId === groupId);
   if (found) return found;
-  return { groupId, enabled: false, mode: "reaction" };
+  return { groupId, enabled: false, mode: "reaction", extraPrompt: "" };
 }
 
 export function upsertGroupVerifyConfig(
@@ -123,14 +143,26 @@ export function upsertGroupVerifyConfig(
 ): VerifyConfig {
   const idx = config.groups.findIndex((g) => g.groupId === groupId);
   const next = { ...config };
+  const normalizedPatch: Partial<Omit<VerifyGroupConfig, "groupId">> = {
+    ...patch,
+  };
+  if (patch.extraPrompt !== undefined) {
+    normalizedPatch.extraPrompt = normalizeExtraPrompt(patch.extraPrompt);
+  }
   if (idx >= 0) {
     next.groups = config.groups.map((g, i) =>
-      i === idx ? { ...g, ...patch } : g,
+      i === idx ? { ...g, ...normalizedPatch } : g,
     );
   } else {
     next.groups = [
       ...config.groups,
-      { groupId, enabled: false, mode: "reaction", ...patch },
+      {
+        groupId,
+        enabled: false,
+        mode: "reaction",
+        extraPrompt: "",
+        ...normalizedPatch,
+      },
     ];
   }
   return next;

package/verify/index.ts

@@ -204,12 +204,12 @@ export function createVerifyController(
       const delay = skipDelay ? 0 : Math.max(0, cfg.reactionDelayMs);
       entry.delayTimer = setTimeout(() => {
         entry.delayTimer = null;
-        void sendReactionPrompt(ctx, cfg, entry);
+        void sendReactionPrompt(ctx, cfg, groupCfg, entry);
       }, delay);
     } else if (mode === "number") {
-      void sendNumberPrompt(ctx, cfg, entry);
+      void sendNumberPrompt(ctx, cfg, groupCfg, entry);
     } else if (mode === "chiral") {
-      const ok = await prepareChiral(ctx, cfg, entry);
+      const ok = await prepareChiral(ctx, cfg, groupCfg, entry);
       if (!ok) {
         // 验证服务不可用时放行，避免误伤
         removePending(key);

package/verify/number.ts

@@ -1,5 +1,9 @@
 import type { MiokiContext } from "mioki";
-import type { VerifyConfig } from "./config";
+import {
+  resolveVerifyPrompt,
+  type VerifyConfig,
+  type VerifyGroupConfig,
+} from "./config";
 import type { PendingVerify } from "./types";
 
 function genNumberQuestion(): { question: string; answer: number } {
@@ -19,13 +23,15 @@ function extractNumbers(text: string): number[] {
 export async function sendNumberPrompt(
   ctx: MiokiContext,
   cfg: VerifyConfig,
+  groupCfg: VerifyGroupConfig,
   p: PendingVerify,
 ): Promise<void> {
   const bot = ctx.pickBot(p.selfId);
   if (!bot) return;
   const { question, answer } = genNumberQuestion();
   p.numberAnswer = answer;
-  const prompt = cfg.numberPrompt.replace("{question}", question);
+  const basePrompt = cfg.numberPrompt.replace("{question}", question);
+  const prompt = resolveVerifyPrompt(basePrompt, groupCfg);
   try {
     await bot.sendGroupMsg(p.groupId, [
       ctx.segment.at(String(p.userId)),

package/verify/reaction.ts

@@ -1,19 +1,25 @@
 import type { MiokiContext } from "mioki";
-import type { VerifyConfig } from "./config";
+import {
+  resolveVerifyPrompt,
+  type VerifyConfig,
+  type VerifyGroupConfig,
+} from "./config";
 import type { PendingVerify } from "./types";
 
 export async function sendReactionPrompt(
   ctx: MiokiContext,
   cfg: VerifyConfig,
+  groupCfg: VerifyGroupConfig,
   p: PendingVerify,
 ): Promise<void> {
   const bot = ctx.pickBot(p.selfId);
   if (!bot) return;
+  const prompt = resolveVerifyPrompt(cfg.reactionPrompt, groupCfg);
   let messageId: number | undefined;
   try {
     const res = await bot.sendGroupMsg(p.groupId, [
       ctx.segment.at(String(p.userId)),
-      ctx.segment.text(` ${cfg.reactionPrompt}`),
+      ctx.segment.text(` ${prompt}`),
     ]);
     messageId = Number(res?.message_id || 0) || undefined;
   } catch (err) {