koishi-plugin-aka-ai-generator 0.3.5 → 0.3.6

package/lib/index.js

@@ -1249,12 +1249,22 @@ function apply(ctx, config) {
         return { images: [], text: imgParam.trim() };
       }
       await session.send("请输入画面描述");
-      const msg = await session.prompt(3e4);
-      if (!msg) return { error: "等待超时" };
-      const elements = import_koishi.h.parse(msg);
-      const text = import_koishi.h.select(elements, "text").map((e) => e.attrs.content).join(" ").trim();
-      if (!text) return { error: "未检测到描述" };
-      return { images: [], text };
+      while (true) {
+        const msg = await session.prompt(3e4);
+        if (!msg) return { error: "等待超时" };
+        const elements = import_koishi.h.parse(msg);
+        const images = import_koishi.h.select(elements, "img");
+        if (images.length > 0) {
+          await session.send("检测到图片，请发送文字描述");
+          continue;
+        }
+        const text = import_koishi.h.select(elements, "text").map((e) => e.attrs.content).join(" ").trim();
+        if (!text) {
+          await session.send("未检测到描述，请重新发送");
+          continue;
+        }
+        return { images: [], text };
+      }
     }
     if (imgParam) {
       if (typeof imgParam === "object" && imgParam.attrs?.src) {
@@ -1367,11 +1377,25 @@ function apply(ctx, config) {
     }
     finalPrompt = finalPrompt.trim();
     if (!finalPrompt) {
-      const promptInput = await getPromptInput(session, "请发送画面描述");
-      if (!promptInput) {
-        return "未检测到描述，请重新发送";
+      await session.send("请发送画面描述");
+      while (true) {
+        const promptMsg = await session.prompt(3e4);
+        if (!promptMsg) {
+          return "未检测到描述，请重新发送";
+        }
+        const elements = import_koishi.h.parse(promptMsg);
+        const images = import_koishi.h.select(elements, "img");
+        if (images.length > 0) {
+          await session.send("检测到图片，请发送文字描述");
+          continue;
+        }
+        const text = import_koishi.h.select(elements, "text").map((e) => e.attrs.content).join(" ").trim();
+        if (text) {
+          finalPrompt = text;
+          break;
+        }
+        await session.send("未检测到有效文字描述，请重新发送");
       }
-      finalPrompt = promptInput.trim();
     }
     const providerType = requestContext?.provider || config.provider;
     const providerModelId = requestContext?.modelId || (providerType === "yunwu" ? config.yunwuModelId : config.gptgodModelId);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-aka-ai-generator",
   "description": "自用AI生成插件(GPTGod & Yunwu)",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [