koishi-plugin-maple-drift-bottle 0.1.1 → 0.1.3

package/lib/index.js

@@ -27,8 +27,9 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
+var import_koishi2 = require("koishi");
 var name = "maple-drift-bottle";
-var using = ["database"];
+var using = ["database", "http"];
 var Config = import_koishi.Schema.object({
   anonymousByDefault: import_koishi.Schema.boolean().default(false).description("默认是否匿名（true: 匿名，false: 不匿名）"),
   maxContentLength: import_koishi.Schema.number().default(500).min(50).max(2e3).description("漂流瓶内容最大长度（字）（50-2000）"),
@@ -74,6 +75,91 @@ function getBase64ImageSize(base64) {
   return sizeInKB;
 }
 __name(getBase64ImageSize, "getBase64ImageSize");
+function extractImageUrlFromCQCode(cqCode) {
+  const srcMatch = cqCode.match(/src="([^"]+)"/);
+  if (srcMatch && srcMatch[1]) {
+    const url = srcMatch[1];
+    if (url.startsWith("http://") || url.startsWith("https://")) {
+      return url;
+    }
+  }
+  return null;
+}
+__name(extractImageUrlFromCQCode, "extractImageUrlFromCQCode");
+async function downloadImageToBase64(url, maxSizeKB, ctx) {
+  try {
+    const response = await ctx.http.get(url, { responseType: "arraybuffer" });
+    const buffer = Buffer.from(response);
+    const sizeKB = buffer.length / 1024;
+    if (sizeKB > maxSizeKB) {
+      throw new Error(`图片太大: ${sizeKB.toFixed(2)}KB (最大允许: ${maxSizeKB}KB)`);
+    }
+    const base64 = buffer.toString("base64");
+    const base64SizeKB = base64.length * 3 / (4 * 1024);
+    if (base64SizeKB > maxSizeKB) {
+      throw new Error(`转换后图片太大: ${base64SizeKB.toFixed(2)}KB (最大允许: ${maxSizeKB}KB)`);
+    }
+    return base64;
+  } catch (error) {
+    ctx.logger("maple-drift-bottle").error("下载或转换图片失败:", error);
+    throw new Error(`图片处理失败: ${error.message}`);
+  }
+}
+__name(downloadImageToBase64, "downloadImageToBase64");
+async function processImages(session, content, config, ctx) {
+  let processedContent = content || "";
+  let imageBase64 = null;
+  if (content && content.includes("<img")) {
+    const imgMatches = content.match(/<img[^>]+>/g);
+    if (imgMatches && imgMatches.length > 0) {
+      if (imgMatches.length > 1) {
+        throw new Error("最多只能发送一张图片！");
+      }
+      if (config.maxImageSize === 0) {
+        throw new Error("当前配置不允许发送图片！");
+      }
+      const imgTag = imgMatches[0];
+      const imageUrl = extractImageUrlFromCQCode(imgTag);
+      if (imageUrl) {
+        try {
+          imageBase64 = await downloadImageToBase64(imageUrl, config.maxImageSize, ctx);
+        } catch (error) {
+          ctx.logger("maple-drift-bottle").error("处理CQ码图片失败:", error);
+          throw new Error(`图片处理失败: ${error.message}`);
+        }
+      } else {
+        throw new Error("无法从图片消息中提取有效的图片URL，请尝试直接发送图片而不是复制图片链接。");
+      }
+      processedContent = content.replace(/<img[^>]*>/g, "").trim();
+    }
+  }
+  const hasImageInElements = session.elements?.some((el) => el.type === "image");
+  if (hasImageInElements) {
+    const images = session.elements.filter((el) => el.type === "image");
+    if (images.length > 1) {
+      throw new Error("最多只能发送一张图片！");
+    }
+    if (config.maxImageSize === 0) {
+      throw new Error("当前配置不允许发送图片！");
+    }
+    const imageElement = images[0];
+    let imageUrl = imageElement.attrs.url || imageElement.attrs.file;
+    if (imageUrl && imageUrl.startsWith("base64://")) {
+      const base64Data = imageUrl.substring(9);
+      const imageSize = getBase64ImageSize(base64Data);
+      if (imageSize > config.maxImageSize) {
+        throw new Error(`图片太大了！最大允许 ${config.maxImageSize}KB（当前: ${imageSize.toFixed(2)}KB）。`);
+      }
+      imageBase64 = base64Data;
+    } else if (imageUrl) {
+      imageBase64 = await downloadImageToBase64(imageUrl, config.maxImageSize, ctx);
+    }
+  }
+  if (hasImageInElements && processedContent !== content) {
+  }
+  return { content: processedContent, imageBase64 };
+}
+__name(processImages, "processImages");
 function apply(ctx, config) {
   console.log("maple-drift-bottle 漂流瓶插件加载中...");
   ctx.model.extend("maple-drift-bottles", {
@@ -134,7 +220,7 @@ function apply(ctx, config) {
       const timeDisplay = formatTime(bottle.created);
       let textContent = bottle.content;
       if (bottle.image) {
-        textContent += "\n[图片]";
+        textContent += textContent ? "\n[图片]" : "[图片]";
       }
       let output = `【漂流瓶 #${bottle.id}】
 发送者：${senderDisplay}
@@ -153,7 +239,7 @@ ${textContent}`;
       await session.send(output);
       if (bottle.image) {
         try {
-          await session.send(`[CQ:image,file=base64://${bottle.image}]`);
+          await session.send(import_koishi2.segment.image(`base64://${bottle.image}`));
         } catch (error) {
           ctx.logger("maple-drift-bottle").error("发送图片时出错:", error);
           await session.send("（图片发送失败）");
@@ -167,43 +253,27 @@ ${textContent}`;
   });
   ctx.command("漂流瓶/扔漂流瓶 <content:text>", "扔一个漂流瓶到海里（可附带一张图片）").alias("扔漂流瓶").alias("丢漂流瓶").option("invisible", "-i  匿名发送（不显示发送者）").option("visible", "-v  公开发送（显示发送者）").example("扔漂流瓶 这是一条漂流瓶内容").example("扔漂流瓶 -i 这是一条匿名漂流瓶内容").action(async ({ session, options }, content) => {
     try {
-      const hasImage = session.elements?.some((el) => el.type === "image");
-      if (!content || content.trim().length === 0) {
-        if (!hasImage) {
-          return "漂流瓶内容不能为空！\n格式：扔漂流瓶 [-i|-v] 内容\n示例：扔漂流瓶 -i 这是一条匿名漂流瓶";
-        }
-      }
-      const trimmedContent = content ? content.trim() : "";
-      if (trimmedContent.length > config.maxContentLength) {
-        return `漂流瓶内容太长了！最多只能输入${config.maxContentLength}个字（当前: ${trimmedContent.length}）。`;
-      }
       if (options.invisible && options.visible) {
         return "选项冲突：-i（匿名）和-v（公开）不能同时使用";
       }
+      if (!content && !session.elements?.some((el) => el.type === "image")) {
+        return "格式错误！请使用：\n扔漂流瓶 [-i|-v] 内容\n例如：\n扔漂流瓶 你好世界\n扔漂流瓶 -i 匿名消息";
+      }
+      let processedContent = content || "";
       let imageBase64 = null;
-      if (hasImage) {
-        const images = session.elements.filter((el) => el.type === "image");
-        if (images.length > 1) {
-          return "最多只能发送一张图片！";
-        }
-        if (config.maxImageSize === 0) {
-          return "当前配置不允许发送图片！";
-        }
-        const imageElement = images[0];
-        let imageUrl = imageElement.attrs.url || imageElement.attrs.file;
-        if (imageUrl && imageUrl.startsWith("base64://")) {
-          imageBase64 = imageUrl.substring(9);
-          const imageSize = getBase64ImageSize(imageBase64);
-          if (imageSize > config.maxImageSize) {
-            return `图片太大了！最大允许 ${config.maxImageSize}KB（当前: ${imageSize.toFixed(2)}KB）。`;
-          }
-        } else if (imageUrl) {
-          try {
-            await session.send("正在处理图片，请稍候...");
-          } catch (error) {
-            return "图片处理失败，请稍后再试。";
-          }
-        }
+      try {
+        const result = await processImages(session, content || "", config, ctx);
+        processedContent = result.content;
+        imageBase64 = result.imageBase64;
+      } catch (error) {
+        return error.message;
+      }
+      if (!imageBase64 && (!processedContent || processedContent.trim().length === 0)) {
+        return "漂流瓶内容不能为空！\n格式：扔漂流瓶 [-i|-v] 内容\n示例：扔漂流瓶 -i 这是一条匿名漂流瓶";
+      }
+      const trimmedContent = processedContent.trim();
+      if (trimmedContent.length > config.maxContentLength) {
+        return `漂流瓶内容太长了！最多只能输入${config.maxContentLength}个字（当前: ${trimmedContent.length}）。`;
       }
       let anonymous = config.anonymousByDefault;
       if (options.invisible) {
@@ -258,9 +328,9 @@ ID: #${newBottle.id}
       currentPageBottles.forEach((bottle, index) => {
         const displayIndex = startIndex + index + 1;
         const timeDisplay = formatTime(bottle.created);
-        const anonymousText = bottle.anonymous ? "（匿名）" : "";
+        const anonymousText = bottle.anonymous ? "匿名" : "";
         const contentPreview = getContentPreview(bottle.content, !!bottle.image, config.maxPreviewLength);
-        output += `${displayIndex}. 漂流瓶 #${bottle.id} ${anonymousText} - ${timeDisplay}
+        output += `${displayIndex}. #${bottle.id} ${anonymousText} - ${timeDisplay}
    预览: ${contentPreview}
 `;
       });
@@ -303,12 +373,11 @@ ID: #${newBottle.id}
       const timeDisplay = formatTime(bottle.created);
       let textContent = bottle.content;
       if (bottle.image) {
-        textContent += "\n[图片]";
+        textContent += textContent ? "\n[图片]" : "[图片]";
       }
       let output = `【漂流瓶 #${bottle.id}】
 发送者：${senderDisplay}
 时间：${timeDisplay}
-状态：${bottle.anonymous ? "匿名" : "公开"}
 内容：
 ${textContent}`;
       if (comments.length > 0) {
@@ -323,7 +392,7 @@ ${textContent}`;
       await session.send(output);
       if (bottle.image) {
         try {
-          await session.send(`[CQ:image,file=base64://${bottle.image}]`);
+          await session.send(import_koishi2.segment.image(`base64://${bottle.image}`));
         } catch (error) {
           ctx.logger("maple-drift-bottle").error("发送图片时出错:", error);
           await session.send("（图片发送失败）");
@@ -362,13 +431,13 @@ ${textContent}`;
   });
   ctx.command("漂流瓶/评论漂流瓶 <bottleId:number> <content:text>", "对指定的漂流瓶进行评论").alias("评论漂流瓶").option("invisible", "-i  匿名评论（不显示评论者）").option("visible", "-v  公开评论（显示评论者）").example("评论漂流瓶 1 这是一条评论").example("评论漂流瓶 2 -i 这是一条匿名评论").action(async ({ session, options }, bottleId, content) => {
     try {
+      if (!bottleId || !content) {
+        return "格式错误！请使用：\n评论漂流瓶 序号 评论内容\n例如：\n评论漂流瓶 1 写得真好！\n匿名评论：\n评论漂流瓶 1 -i 匿名评论";
+      }
       const bottles = await ctx.database.get("maple-drift-bottles", { id: bottleId });
       if (bottles.length === 0) {
         return `没有找到ID为 #${bottleId} 的漂流瓶。`;
       }
-      if (!content || content.trim().length === 0) {
-        return "评论内容不能为空！";
-      }
       const trimmedContent = content.trim();
       if (trimmedContent.length > config.maxCommentLength) {
         return `评论内容太长了！最多只能输入${config.maxCommentLength}个字（当前: ${trimmedContent.length}）。`;
@@ -439,13 +508,13 @@ ${textContent}`;
             author: userId
           });
           const deletedCount = userComments.length;
-          return `已成功删除你在漂流瓶 #${bottleId} 的评论（共 ${deletedCount} 条）。`;
+          return `已成功删除你在漂流瓶 #${bottleId} 的评论。`;
         }
       }
       await ctx.database.remove("maple-drift-bottle-comments", {
         bottleId
       });
-      return `已成功删除漂流瓶 #${bottleId} 的所有评论（共 ${comments.length} 条）。`;
+      return `已成功删除漂流瓶 #${bottleId} 的所有评论。`;
     } catch (error) {
       ctx.logger("maple-drift-bottle").error("删除漂流瓶评论时出错:", error);
       return "删除漂流瓶评论时出错了，请稍后再试。";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-maple-drift-bottle",
   "description": "-",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/lib/index.d.ts

@@ -1,38 +0,0 @@
-import { Context, Schema } from 'koishi';
-export declare const name = "maple-drift-bottle";
-export declare const using: readonly ["database"];
-interface DriftBottle {
-    id: number;
-    author: string;
-    authorName: string;
-    anonymous: boolean;
-    content: string;
-    image: string | null;
-    created: Date;
-}
-interface BottleComment {
-    id: number;
-    bottleId: number;
-    author: string;
-    authorName: string;
-    anonymous: boolean;
-    content: string;
-    created: Date;
-}
-declare module 'koishi' {
-    interface Tables {
-        'maple-drift-bottles': DriftBottle;
-        'maple-drift-bottle-comments': BottleComment;
-    }
-}
-export interface Config {
-    anonymousByDefault: boolean;
-    maxContentLength: number;
-    maxPreviewLength: number;
-    maxCommentLength: number;
-    maxImageSize: number;
-    adminQQ: string[];
-}
-export declare const Config: Schema<Config>;
-export declare function apply(ctx: Context, config: Config): void;
-export {};