koishi-plugin-aka-ai-generator 0.4.1 → 0.4.2

package/lib/index.js

@@ -1357,22 +1357,18 @@ function apply(ctx, config) {
         return { images: [], text: imgParam.trim() };
       }
       await session.send("请输入画面描述");
-      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 };
+      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) {
+        return { error: "检测到图片，本功能仅支持文字输入" };
+      }
+      const text = import_koishi.h.select(elements, "text").map((e) => e.attrs.content).join(" ").trim();
+      if (!text) {
+        return { error: "未检测到描述，操作已取消" };
       }
+      return { images: [], text };
     }
     if (imgParam) {
       if (typeof imgParam === "object" && imgParam.attrs?.src) {
@@ -1427,8 +1423,7 @@ function apply(ctx, config) {
       }
       if (text) {
         if (collectedImages.length === 0) {
-          await session.send("未检测到图片，请先发送图片");
-          continue;
+          return { error: "未检测到图片，请重新发起指令并发送图片" };
         }
         collectedText = text;
         break;
@@ -1486,23 +1481,20 @@ function apply(ctx, config) {
     finalPrompt = finalPrompt.trim();
     if (!finalPrompt) {
       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("未检测到有效文字描述，请重新发送");
+      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) {
+        return "检测到图片，本功能仅支持文字输入";
+      }
+      const text = import_koishi.h.select(elements, "text").map((e) => e.attrs.content).join(" ").trim();
+      if (text) {
+        finalPrompt = text;
+      } else {
+        return "未检测到有效文字描述，操作已取消";
       }
     }
     const providerType = requestContext?.provider || config.provider;
@@ -1670,7 +1662,7 @@ ${infoParts.join("\n")}`;
             prompt = text;
             break;
           }
-          return "未检测到有效内容，请重新发送";
+          return "未检测到有效内容，操作已取消";
         }
         if (collectedImages.length < 2) {
           return "需要至少两张图片进行合成，请重新发送";

package/package.json

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