koishi-plugin-phimg2 1.0.6 → 1.0.8

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 import { Context, Schema } from 'koishi';
-export declare const name = "phimg";
+export declare const name = "phimg2";
 export declare const inject: string[];
 declare module 'koishi' {
     interface Tables {
@@ -13,6 +13,7 @@ export interface Config {
     enabledByDefault: boolean;
     useGlobalTagsByDefault: boolean;
     filterId: number;
+    showErrorLog: boolean;
 }
 export declare const Config: Schema<Config>;
 interface GroupConfig {

package/lib/index.js

@@ -27,7 +27,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
-var name = "phimg";
+var name = "phimg2";
 var inject = ["database", "http"];
 var translationTable = {
   "；": ";",
@@ -55,7 +55,8 @@ var Config = import_koishi.Schema.object({
   defaultTags: import_koishi.Schema.array(String).description("全局默认标签").default(["safe"]),
   enabledByDefault: import_koishi.Schema.boolean().description("新群聊默认启用搜图功能").default(true),
   useGlobalTagsByDefault: import_koishi.Schema.boolean().description("新群聊默认启用全局标签").default(true),
-  filterId: import_koishi.Schema.number().description("搜索使用的 Filter ID (例如 100073)").default(100073)
+  filterId: import_koishi.Schema.number().description("搜索使用的 Filter ID (例如 100073)").default(100073),
+  showErrorLog: import_koishi.Schema.boolean().description("是否在控制台输出搜图失败的日志").default(false)
 });
 function apply(ctx, config) {
   ctx.model.extend("phimg_config", {
@@ -107,7 +108,13 @@ function apply(ctx, config) {
           headers: { "User-Agent": "Phimg for Koishi" }
         });
       } else {
-        responseData = await ctx.http.post(endpoint, params, {
+        const formBody = new URLSearchParams();
+        for (const key in params) {
+          if (params[key] !== void 0 && params[key] !== null) {
+            formBody.append(key, String(params[key]));
+          }
+        }
+        responseData = await ctx.http.post(endpoint, formBody, {
           params: queryParams,
           headers: {
             "User-Agent": "Phimg for Koishi",
@@ -120,9 +127,11 @@ function apply(ctx, config) {
       }
       return responseData;
     } catch (error) {
+      if (config.showErrorLog) {
+        ctx.logger("phimg").warn(`API Error: ${error.message}`);
+      }
       if (error.response?.status === 404) throw new Error("未找到匹配的图片");
-      ctx.logger("phimg").warn(error);
-      throw new Error(`API 请求失败: ${error.message}`);
+      throw new Error(error.message || "API 请求失败");
     }
   }, "makeRequest");
   const VIDEO_TYPES = ["webm", "mp4"];
@@ -131,39 +140,38 @@ function apply(ctx, config) {
     const file = selected.representations.full;
     const url = file.endsWith(".webm") ? selected.representations.medium : selected.representations.large;
     const fileType = file.split(".").pop()?.toLowerCase() || "";
-    if (VIDEO_TYPES.includes(fileType)) {
-      return import_koishi.h.video(url);
-    }
+    if (VIDEO_TYPES.includes(fileType)) return import_koishi.h.video(url);
     return import_koishi.h.image(url);
   }, "getMediaElement");
   const searchHelp = `用法: /搜图 [tags|distance]
 
+用法说明:
+  引用图片: 进行以图搜图 (默认距离 0.25)
+  直接发图: 发送指令时附带图片进行以图搜图
+  输入文本: 进行标签搜索
+
 可选项:
   --tags             获取当前群聊内置标签列表
   --status           获取当前群聊的搜图功能状态
-  --pp [per_page]    每页结果数量，默认为50
-  --p [page]         页码，默认为1
-  --sf [sf]          排序字段，默认为score
-  --sd [sd]          排序方向，默认为desc
-  --i [index]        选择结果索引，默认为-1（即随机）
-
-提示: 
-  图搜图使用方式为引用图片，默认匹配距离为0.25`;
-  const configHelp = `用法: 搜图-c [选项]
+  --pp [num]         每页数量 (默认50)
+  --p [num]          页码 (默认1)
+  --sf [field]       排序字段 (默认score)
+  --sd [desc|asc]    排序方向 (默认desc)
+  --i [index]        选择结果索引 (默认随机)`;
+  const configHelp = `用法: /搜图-c [选项]
 
 可选项:
-  --add [tags]       添加标签，多个标签用逗号分隔
-  --rm [tags]        删除标签，多个标签用逗号分隔
-  --on               开启当前群聊的搜图功能
-  --off              关闭当前群聊的搜图功能
+  --add [tags]       添加标签
+  --rm [tags]        删除标签
+  --on               开启搜图
+  --off              关闭搜图
   --onglobal         启用全局标签
   --offglobal        关闭全局标签`;
   ctx.command("搜图 [...params]", "从图站搜索图片").option("tags", "--tags").option("status", "--status").option("pp", "--pp <per_page:number>", { fallback: 50 }).option("p", "--p <page:number>", { fallback: 1 }).option("sf", "--sf <sf:string>", { fallback: "score" }).option("sd", "--sd <sd:string>", { fallback: "desc" }).option("i", "--i <index:number>", { fallback: -1 }).action(async ({ session, options }, ...paramsArray) => {
     if (!session?.guildId) return "搜图仅限群聊使用。";
-    let params = paramsArray.join(" ").trim();
-    if (!params && !session.quote && !options.tags && !options.status) {
-      return searchHelp;
-    }
+    const rawParams = paramsArray.join(" ");
+    const hasImageInContent = !!(import_koishi.h.select(session.content, "image")[0] || import_koishi.h.select(session.content, "img")[0]);
+    if (!rawParams && !session.quote && !hasImageInContent && !options.tags && !options.status) return searchHelp;
     const groupId = session.guildId;
     const groupConfig = await getGroupConfig(groupId);
     if (options.status) {
@@ -178,8 +186,8 @@ function apply(ctx, config) {
     if (!groupConfig.enabled) {
       return '搜图未在本群开启，管理员请用 "搜图-c --on" 启动';
     }
-    params = translateText(params || "");
-    const cleanParams = params.replace(/<[^>]+>/g, "").trim();
+    const paramsText = translateText(rawParams || "");
+    const cleanParams = paramsText.replace(/<[^>]+>/g, "").trim();
     let imageUrl;
     if (session.quote) {
       const img = import_koishi.h.select(session.quote.content, "image")[0] || import_koishi.h.select(session.quote.content, "img")[0];
@@ -207,26 +215,23 @@ function apply(ctx, config) {
         };
         const data = await makeRequest("reverse", queryParams);
         const images = data.images;
-        if (images.length > 10) {
-          return `搜索到过多图片 (${images.length} 张)，请尝试减小距离参数。`;
-        }
+        if (images.length > 10) return `搜索到过多图片 (${images.length} 张)，请尝试减小距离参数。`;
         if (images.length === 0) return "未找到匹配的图片";
         const result = [(0, import_koishi.h)("at", { id: session.userId }), import_koishi.h.text(`
 distance: ${distance}
 `)];
         for (const img of images) {
           result.push(getMediaElement(img));
-          result.push(import_koishi.h.text(`
-id: ${img.id} | score: ${img.score}
+          result.push(import_koishi.h.text(` nid: ${img.id} | score: ${img.score}
 `));
         }
         return result;
       } else {
-        const userTags = cleanParams ? cleanParams.split(",").map((t) => t.trim()).filter((t) => t) : [];
+        const userTags = cleanParams ? cleanParams.split(/[,，]/).map((t) => t.trim()).filter((t) => t) : [];
         const globalTags = groupConfig.useGlobalTags ? config.defaultTags : [];
         const groupTags = groupConfig.customTags;
         const allTags = Array.from(/* @__PURE__ */ new Set([...groupTags, ...globalTags, ...userTags]));
-        if (allTags.length === 0 && !cleanParams) return "请输入搜索标签。";
+        if (allTags.length === 0) return "请输入搜索标签。";
         const queryParams = {
           q: allTags.join(", "),
           key: config.apiKey,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-phimg2",
   "description": "Koishi 插件，让机器人通过Philomena API在使用Philomena搭建的图站上使用标签（tags）搜图或图搜图",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [