koishi-plugin-cocoyyy-console 1.1.2-beta.2 → 1.1.2-beta.4

package/lib/index.js

@@ -502,6 +502,11 @@ var setuFuncMenuList = [
     name: "setu",
     description: "随机一个涩图",
     command: "setu [是否r-18] [标签1] [标签2]"
+  },
+  {
+    name: "setus",
+    description: "随机涩图",
+    command: "setus [数量(1-10)] [是否r-18] [标签1] [标签2]"
   }
 ];
 function getSetuFuncMenu(command = null) {
@@ -1688,35 +1693,42 @@ __name(is_at_bot_quote, "is_at_bot_quote");
 // src/services/himg_func/himg_service.ts
 var import_axios2 = __toESM(require("axios"));
 var import_koishi12 = require("koishi");
-async function randomHImg(keywords) {
+async function randomHImg(keywords, ...args) {
   try {
     const r18 = keywords?.[0];
-    const tags = keywords?.slice(1);
+    let tags = keywords;
     const params = new URLSearchParams();
+    params.append("excludeAI", "true");
+    params.append("size", "regular");
     const random = new import_koishi12.Random(() => Math.random());
-    let level = random.int(1, 4);
-    if (r18) {
+    if (r18.toLowerCase() === "r18") {
       params.append("r18", "1");
-      level = random.int(4, 7);
+      tags = keywords?.slice(1);
+    }
+    if (args[0]) {
+      params.append("num", args[0].toString());
     }
-    params.append("level", level.toString());
     tags.forEach((tag) => params.append("tag", tag));
-    const res = await import_axios2.default.get("https://lolisuki.cn/api/setu/v1", {
+    const res = await import_axios2.default.get("https://api.lolicon.app/setu/v2", {
       params,
       paramsSerializer: /* @__PURE__ */ __name((p) => p.toString(), "paramsSerializer")
     });
-    if (res.data) {
-      let author = res.data?.data[0].author;
-      let url = res.data?.data[0].urls.regular;
+    if (res.data?.data?.length > 0) {
+      let result_content = "";
+      for (let item of res.data?.data) {
+        let author = item.author;
+        let url = item.urls.regular;
+        result_content += "作者: " + author + "\n" + import_koishi12.h.image(url) + "\n";
+      }
       return {
-        result: "作者: " + author + "\n" + import_koishi12.h.image(url),
+        result: result_content,
         error: null
       };
     }
-    logger.error(`[randomHImg Error]: 获取${r18 ? "r-18" : "非r-18"}图片返回为空，请求url: https://lolisuki.cn/api/setu/v1?level=` + level.toString() + "&tag=" + tags.join("&tag="));
+    logger.error(`[randomHImg Error]: 获取${r18 ? "r-18" : "非r-18"}图片返回为空，请求url: https://api.lolicon.app/setu/v2?excludeAI=true&size=regular&tag=` + tags.join("&tag="));
     return {
       result: null,
-      error: "获取图片返回为空"
+      error: "未获取到图片，请使用其他标签尝试"
     };
   } catch (err) {
     return {
@@ -1740,6 +1752,23 @@ function registerHImgCommands(ctx) {
       return `获取图片失败：${exec.error}`;
     return exec.result;
   });
+  ctx.command("setus <参数>", "随机涩图").action(async ({ session }, ...args) => {
+    if (!dev_mode) {
+      if (!is_at_bot(session)) return;
+    }
+    if (!args) return "请提供正确格式，如：@bot setus [数量(1-10)] [是否r-18] [标签1] [标签2]";
+    try {
+      const num = parseInt(args[0]);
+      if (num < 1 || num > 10) throw new Error("数量范围错误");
+    } catch (e) {
+      return "请提供正确格式，如：@bot setus [数量(1-10)] [是否r-18] [标签1] [标签2]";
+    }
+    const tag = args.slice(1);
+    let exec = await randomHImg(tag, args[0]);
+    if (!exec.result)
+      return `获取图片失败：${exec.error}`;
+    return exec.result;
+  });
 }
 __name(registerHImgCommands, "registerHImgCommands");
 

package/lib/services/himg_func/himg_service.d.ts

@@ -2,5 +2,5 @@ type RandomHImgResp = {
     result: string;
     error: string | null;
 };
-declare function randomHImg(keywords: string[]): Promise<RandomHImgResp>;
+declare function randomHImg(keywords: string[], ...args: any[]): Promise<RandomHImgResp>;
 export { randomHImg };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-cocoyyy-console",
   "description": "自用koishi插件，功能包含复读，记录黑历史，*人等",
-  "version": "1.1.2-beta.2",
+  "version": "1.1.2-beta.4",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [