mioku-plugin-admin 2.3.2 → 2.3.3

package/commands/verify.ts

@@ -29,6 +29,13 @@ const VERIFY_MODE_LABELS: Record<string, string> = {
   chiral: "手性碳",
 };
 
+async function extractQuoteImageUrls(event: any): Promise<string[]> {
+  if (!event || typeof event.getQuoteMsg !== "function") return [];
+  const quoteMsg = await event.getQuoteMsg().catch(() => null);
+  if (!quoteMsg || !Array.isArray(quoteMsg.message)) return [];
+  return extractImageUrls(quoteMsg.message);
+}
+
 export function registerVerifyCommands(options: VerifyCommandOptions) {
   const { ctx, getVerifyConfig, setVerifyConfig, verifyController } = options;
 
@@ -250,29 +257,32 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
 
       // /入群提示 xxx
       // /入群提示 关闭
-      // /入群提示（带图片）— 仅图片也可
+      // /入群提示（带图片，可来自当前消息或引用消息）— 仅图片也可
       if (text.startsWith("/入群提示") || text.startsWith("#入群提示")) {
         if (!(await ensureAdminPermission())) return;
 
         const rawArg = text.replace(/^[/#]入群提示\s*/, "").trim();
         const current = getVerifyConfig();
         const groupCfg = getGroupVerifyConfig(current, groupId);
-        const imageUrls = extractImageUrls(event.message);
+        const directImageUrls = extractImageUrls(event.message);
+        const quoteImageUrls = await extractQuoteImageUrls(event).catch(() => []);
+        const imageUrls =
+          directImageUrls.length > 0 ? directImageUrls : quoteImageUrls;
 
         if (rawArg === "关闭" || rawArg === "清空" || rawArg === "关") {
           if (!hasCustomPrompt(groupCfg)) {
             await event.reply("本群还没设置自定义入群提示哦～", true);
             return;
           }
-          const removedFiles = [...groupCfg.promptImages];
+          const removedFile = groupCfg.promptImage;
           const next = upsertGroupVerifyConfig(current, groupId, {
             customPrompt: "",
-            promptImages: [],
+            promptImage: "",
           });
           await setVerifyConfig(next);
           await pruneGroupPromptImages(groupId, []).catch(() => {});
           ctx.logger.info(
-            `admin verify 关闭群 ${groupId} 自定义入群提示，清理图片 ${removedFiles.join(", ")}`,
+            `admin verify 关闭群 ${groupId} 自定义入群提示，清理图片 ${removedFile}`,
           );
           await event.reply("已关闭本群自定义入群提示～", true);
           return;
@@ -281,23 +291,26 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
         if (!rawArg && !imageUrls.length) {
           if (!hasCustomPrompt(groupCfg)) {
             await event.reply(
-              "用法：/入群提示 xxx（最多 50 字），可附带图片一起发送；/入群提示 关闭 关闭自定义提示～",
+              "用法：/入群提示 xxx（最多 50 字），可附带图片（当前消息或引用消息中的图片）一起发送；/入群提示 关闭 关闭自定义提示～",
               true,
             );
             return;
           }
-          const summary = [
-            `已开启本群自定义入群提示`,
+          const lines = ["已开启本群自定义入群提示"];
+          lines.push(
             groupCfg.customPrompt
               ? `文字：${groupCfg.customPrompt}`
               : "文字：（未设置）",
-            `图片：${groupCfg.promptImages.length} 张`,
-          ].join("\n");
-          await event.reply(summary, true);
+          );
+          lines.push(
+            groupCfg.promptImage
+              ? `图片：已设置（filename=${groupCfg.promptImage}）`
+              : "图片：（未设置）",
+          );
+          await event.reply(lines.join("\n"), true);
           return;
         }
 
-        let nextPrompt = groupCfg.customPrompt;
         if (rawArg) {
           const argLength = Array.from(rawArg).length;
           if (argLength > MAX_CUSTOM_PROMPT_LENGTH) {
@@ -309,39 +322,46 @@ export function registerVerifyCommands(options: VerifyCommandOptions) {
             });
             return;
           }
-          nextPrompt = normalizeCustomPrompt(rawArg);
         }
+        const nextPrompt = rawArg
+          ? normalizeCustomPrompt(rawArg)
+          : groupCfg.customPrompt;
 
-        const saved: string[] = [];
-        const failed: number = imageUrls.length;
-        for (const url of imageUrls) {
-          const savedImage = await saveRemoteImageAsPrompt(groupId, url);
-          if (savedImage) saved.push(savedImage.filename);
+        let nextImage = groupCfg.promptImage;
+        let imageNote = "";
+        if (imageUrls.length) {
+          const targetUrl = imageUrls[0];
+          const savedImage = await saveRemoteImageAsPrompt(groupId, targetUrl);
+          if (savedImage) {
+            const previousImage = groupCfg.promptImage;
+            nextImage = savedImage.filename;
+            imageNote = previousImage
+              ? `图片已替换（旧文件 ${previousImage} 已删除）`
+              : `图片已设置（${savedImage.filename}）`;
+            if (previousImage) {
+              ctx.logger.info(
+                `admin verify 替换群 ${groupId} 入群提示图片：${previousImage} -> ${savedImage.filename}`,
+              );
+            }
+          } else {
+            imageNote = "图片下载失败，请稍后重试";
+          }
         }
 
-        const nextImages = imageUrls.length
-          ? [...groupCfg.promptImages, ...saved]
-          : groupCfg.promptImages;
-
         const next = upsertGroupVerifyConfig(current, groupId, {
           customPrompt: nextPrompt,
-          promptImages: nextImages,
+          promptImage: nextImage,
         });
         await setVerifyConfig(next);
-        await pruneGroupPromptImages(groupId, nextImages).catch(() => {});
+        await pruneGroupPromptImages(groupId, nextImage ? [nextImage] : []).catch(
+          () => {},
+        );
 
-        const lines: string[] = ["已更新本群自定义入群提示～"];
+        const lines = ["已更新本群自定义入群提示"];
         if (rawArg) lines.push(`文字：${nextPrompt}`);
         else if (groupCfg.customPrompt)
           lines.push(`文字（保持）：${groupCfg.customPrompt}`);
-        if (imageUrls.length) {
-          lines.push(
-            saved.length
-              ? `新增图片 ${saved.length} 张${failed > saved.length ? `，${failed - saved.length} 张保存失败` : ""}`
-              : `图片保存失败 ${failed} 张，请稍后重试`,
-          );
-        }
-        lines.push(`当前共 ${nextImages.length} 张图片`);
+        if (imageUrls.length && imageNote) lines.push(imageNote);
         await event.reply(lines.join("\n"), true);
         return;
       }

package/config.md

@@ -106,11 +106,11 @@ fields:
         description: 一旦设置该群将跳过 AI 生成欢迎，验证通过后直接发送这段文字（可附带本地图片一起）。上限 50 字，建议在群里直接用 /入群提示 xxx 设置或 /入群提示 关闭 关闭。
         placeholder: 例：欢迎来到本群，请先看群公告～
 
-      - key: promptImages
+      - key: promptImage
         label: 群自定义入群提示图片
-        type: textarea
-        description: 图片文件名列表（保存在 data/admin/<群号>/prompt-images/），与文字一起发送。在群里发送 /入群提示 xxx 时附带图片即可追加；/入群提示 关闭 会一并清空图片。
-        placeholder: 例：["prompt-l8t9a-3f2c.png"]
+        type: text
+        description: 单张图片文件名（保存在 data/admin/<群号>/prompt-images/），与文字一起发送。在群里发送 /入群提示 时附带图片（当前消息或引用消息中的图片均可）即可替换；/入群提示 关闭 会一并清空。
+        placeholder: 例：prompt-l8t9a-3f2c.png
 
   - key: verify.reactionEmojiId
     label: 回应模式表态表情ID

package/package.json

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

package/verify/config.ts

@@ -7,7 +7,7 @@ export interface VerifyGroupConfig {
   enabled: boolean;
   mode: VerifyMode;
   customPrompt: string;
-  promptImages: string[];
+  promptImage: string;
 }
 
 export interface VerifyConfig {
@@ -50,25 +50,16 @@ export function normalizeCustomPrompt(value: unknown): string {
   return Array.from(trimmed).slice(0, MAX_CUSTOM_PROMPT_LENGTH).join("");
 }
 
-export function normalizePromptImages(value: unknown): string[] {
-  if (!Array.isArray(value)) return [];
-  const seen = new Set<string>();
-  const result: string[] = [];
-  for (const item of value) {
-    if (typeof item !== "string") continue;
-    const name = item.trim();
-    if (!name || seen.has(name)) continue;
-    seen.add(name);
-    result.push(name);
-  }
-  return result;
+export function normalizePromptImage(value: unknown): string {
+  if (typeof value !== "string") return "";
+  return value.trim();
 }
 
 export function hasCustomPrompt(groupCfg: VerifyGroupConfig | undefined): boolean {
   if (!groupCfg) return false;
   return (
     Boolean(groupCfg.customPrompt && groupCfg.customPrompt.trim()) ||
-    groupCfg.promptImages.length > 0
+    Boolean(groupCfg.promptImage && groupCfg.promptImage.trim())
   );
 }
 
@@ -81,6 +72,11 @@ export function normalizeVerifyMode(value: unknown): VerifyMode {
 
 function normalizeVerifyGroup(raw: any): VerifyGroupConfig {
   const groupId = Number(raw?.groupId || raw?.group_id || 0);
+  const promptImageRaw =
+    raw?.promptImage ??
+    raw?.prompt_image ??
+    (Array.isArray(raw?.promptImages) ? raw.promptImages[0] : undefined) ??
+    (Array.isArray(raw?.images) ? raw.images[0] : undefined);
   return {
     groupId: groupId > 0 ? groupId : 0,
     enabled: raw?.enabled === true,
@@ -88,9 +84,7 @@ function normalizeVerifyGroup(raw: any): VerifyGroupConfig {
     customPrompt: normalizeCustomPrompt(
       raw?.customPrompt ?? raw?.custom_prompt ?? raw?.extraPrompt,
     ),
-    promptImages: normalizePromptImages(
-      raw?.promptImages ?? raw?.prompt_images ?? raw?.images,
-    ),
+    promptImage: normalizePromptImage(promptImageRaw),
   };
 }
 
@@ -157,7 +151,7 @@ export function getGroupVerifyConfig(
     enabled: false,
     mode: "reaction",
     customPrompt: "",
-    promptImages: [],
+    promptImage: "",
   };
 }
 
@@ -174,8 +168,8 @@ export function upsertGroupVerifyConfig(
   if (patch.customPrompt !== undefined) {
     normalizedPatch.customPrompt = normalizeCustomPrompt(patch.customPrompt);
   }
-  if (patch.promptImages !== undefined) {
-    normalizedPatch.promptImages = normalizePromptImages(patch.promptImages);
+  if (patch.promptImage !== undefined) {
+    normalizedPatch.promptImage = normalizePromptImage(patch.promptImage);
   }
   if (idx >= 0) {
     next.groups = config.groups.map((g, i) =>
@@ -189,7 +183,7 @@ export function upsertGroupVerifyConfig(
         enabled: false,
         mode: "reaction",
         customPrompt: "",
-        promptImages: [],
+        promptImage: "",
         ...normalizedPatch,
       },
     ];

package/verify/index.ts

@@ -367,15 +367,16 @@ export function createVerifyController(
     if (prompt) {
       segments.push(ctx.segment.text(prompt));
     }
-    for (const filename of groupCfg.promptImages) {
+    const filename = String(groupCfg.promptImage || "").trim();
+    if (filename) {
       const imagePath = getGroupPromptImagePath(info.groupId, filename);
       if (!existsSync(imagePath)) {
         ctx.logger.warn(
           `admin verify 自定义入群提示图片缺失: ${imagePath}`,
         );
-        continue;
+      } else {
+        segments.push(ctx.segment.image(`file://${imagePath}`));
       }
-      segments.push(ctx.segment.image(`file://${imagePath}`));
     }
     if (!segments.length) return false;
     try {