koishi-plugin-phimg2 1.0.5 → 1.0.6

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 import { Context, Schema } from 'koishi';
-export declare const name = "phimg2";
+export declare const name = "phimg";
 export declare const inject: string[];
 declare module 'koishi' {
     interface Tables {

package/lib/index.js

@@ -27,7 +27,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
-var name = "phimg2";
+var name = "phimg";
 var inject = ["database", "http"];
 var translationTable = {
   "；": ";",
@@ -122,7 +122,7 @@ function apply(ctx, config) {
     } catch (error) {
       if (error.response?.status === 404) throw new Error("未找到匹配的图片");
       ctx.logger("phimg").warn(error);
-      throw new Error(`${error.message}`);
+      throw new Error(`API 请求失败: ${error.message}`);
     }
   }, "makeRequest");
   const VIDEO_TYPES = ["webm", "mp4"];
@@ -179,19 +179,21 @@ function apply(ctx, config) {
       return '搜图未在本群开启，管理员请用 "搜图-c --on" 启动';
     }
     params = translateText(params || "");
+    const cleanParams = params.replace(/<[^>]+>/g, "").trim();
     let imageUrl;
-    const quote = session.quote;
-    if (quote) {
-      const imgElement = import_koishi.h.select(quote.content, "image")[0] || import_koishi.h.select(quote.content, "img")[0];
-      if (imgElement) {
-        imageUrl = imgElement.attrs.url || imgElement.attrs.src;
-      }
+    if (session.quote) {
+      const img = import_koishi.h.select(session.quote.content, "image")[0] || import_koishi.h.select(session.quote.content, "img")[0];
+      if (img) imageUrl = img.attrs.url || img.attrs.src;
+    }
+    if (!imageUrl) {
+      const img = import_koishi.h.select(session.content, "image")[0] || import_koishi.h.select(session.content, "img")[0];
+      if (img) imageUrl = img.attrs.url || img.attrs.src;
     }
     try {
       if (imageUrl) {
         let distance = 0.25;
-        if (params) {
-          const parsed = Number(params);
+        if (cleanParams) {
+          const parsed = Number(cleanParams);
           if (!isNaN(parsed)) {
             distance = parsed;
           } else {
@@ -220,11 +222,11 @@ id: ${img.id} | score: ${img.score}
         }
         return result;
       } else {
-        const userTags = params ? params.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 && !params) return "请输入搜索标签。";
+        if (allTags.length === 0 && !cleanParams) 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.5",
+  "version": "1.0.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [