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

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);
@@ -1598,11 +1622,78 @@ Prompt: ${prompt}`);
       return error.message === "命令执行超时" ? "图片合成超时，请重试" : `图片合成失败：${error.message}`;
     });
   });
-  ctx.command(`${COMMANDS.RECHARGE} [content:text]`, "为用户充值次数（仅管理员）").action(async ({ session }, content) => {
+  ctx.command(`${COMMANDS.RECHARGE} [content:text]`, "为用户充值次数（仅管理员）").option("all", "-all 对所有使用过插件的用户充值").action(async ({ session, options }, content) => {
     if (!session?.userId) return "会话无效";
     if (!isAdmin(session.userId)) {
       return "权限不足，仅管理员可操作";
     }
+    if (options?.all) {
+      const inputContent2 = content || await getPromptInput(session, "请输入充值信息，格式：\n充值次数 [备注]");
+      if (!inputContent2) return "输入超时或无效";
+      const elements2 = import_koishi.h.parse(inputContent2);
+      const textElements2 = import_koishi.h.select(elements2, "text");
+      const text2 = textElements2.map((el) => el.attrs.content).join(" ").trim();
+      const parts2 = text2.split(/\s+/).filter((p) => p);
+      if (parts2.length === 0) {
+        return "请输入充值次数";
+      }
+      const amount2 = parseInt(parts2[0]);
+      const note2 = parts2.slice(1).join(" ") || "全员充值";
+      if (!amount2 || amount2 <= 0) {
+        return "充值次数必须大于0";
+      }
+      try {
+        const usersData = await loadUsersData();
+        const rechargeHistory = await loadRechargeHistory();
+        const now = (/* @__PURE__ */ new Date()).toISOString();
+        const recordId = `recharge_${now.replace(/[-:T.]/g, "").slice(0, 14)}_${Math.random().toString(36).substr(2, 3)}`;
+        const targets = [];
+        const allUserIds = Object.keys(usersData);
+        if (allUserIds.length === 0) {
+          return "当前没有使用过插件的用户";
+        }
+        for (const userId of allUserIds) {
+          if (!userId) continue;
+          const userData = usersData[userId];
+          const userName = userData.userName || userId;
+          const beforeBalance = userData.remainingPurchasedCount;
+          userData.purchasedCount += amount2;
+          userData.remainingPurchasedCount += amount2;
+          targets.push({
+            userId,
+            userName,
+            amount: amount2,
+            beforeBalance,
+            afterBalance: userData.remainingPurchasedCount
+          });
+        }
+        await saveUsersData(usersData);
+        const record = {
+          id: recordId,
+          timestamp: now,
+          type: "batch",
+          operator: {
+            userId: session.userId,
+            userName: session.username || session.userId
+          },
+          targets,
+          totalAmount: amount2 * allUserIds.length,
+          note: note2 || "全员充值",
+          metadata: { all: true }
+        };
+        rechargeHistory.records.push(record);
+        await saveRechargeHistory(rechargeHistory);
+        return `✅ 全员充值成功
+目标用户数：${allUserIds.length}人
+充值次数：${amount2}次/人
+总充值：${record.totalAmount}次
+操作员：${record.operator.userName}
+备注：${record.note}`;
+      } catch (error) {
+        logger.error("全员充值操作失败", error);
+        return "充值失败，请稍后重试";
+      }
+    }
     const inputContent = content || await getPromptInput(session, "请输入充值信息，格式：\n@用户1 @用户2 充值次数 [备注]");
     if (!inputContent) return "输入超时或无效";
     const elements = import_koishi.h.parse(inputContent);
@@ -1610,7 +1701,7 @@ Prompt: ${prompt}`);
     const textElements = import_koishi.h.select(elements, "text");
     const text = textElements.map((el) => el.attrs.content).join(" ").trim();
     if (atElements.length === 0) {
-      return "未找到@用户，请使用@用户的方式";
+      return "未找到@用户，请使用@用户的方式，或使用 -all 参数进行全员充值";
     }
     const parts = text.split(/\s+/).filter((p) => p);
     if (parts.length === 0) {

package/package.json

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