npm - koishi-plugin-meme-upload-114 - Versions diffs - 0.0.1 → 0.0.2 - Mend

koishi-plugin-meme-upload-114 0.0.1 → 0.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/lib/index.d.ts CHANGED Viewed

@@ -11,6 +11,7 @@ export interface Config {
     defaultTimeout: number;
     autoWithdrawSuccess: boolean;
     successWithdrawTime: number;
+    associations: string[][];
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js CHANGED Viewed

@@ -45,7 +45,9 @@ var Config = import_koishi.Schema.object({
   rootDir: import_koishi.Schema.path({ filters: ["directory"], allowCreate: true }).default("data/images").description("图片存储的根目录"),
   defaultTimeout: import_koishi.Schema.number().default(1e4).description("创建文件夹确认的等待时间(毫秒)"),
   autoWithdrawSuccess: import_koishi.Schema.boolean().default(true).description("是否自动撤回“上传成功”的提示"),
-  successWithdrawTime: import_koishi.Schema.number().default(1e4).description("上传成功提示的撤回延迟(毫秒)")
+  successWithdrawTime: import_koishi.Schema.number().default(1e4).description("上传成功提示的撤回延迟(毫秒)"),
+  // === 新增配置项 ===
+  associations: import_koishi.Schema.array(import_koishi.Schema.array(import_koishi.Schema.string())).default([]).description('文件夹关联/分组设置。\n点击添加一行，然后在行内添加多个文件夹名。\n例如：["1", "2"] 表示发送 1 或 2 时，会从这两个文件夹的所有图片中随机选取。')
 });
 function apply(ctx, config) {
   const root = path.resolve(ctx.baseDir, config.rootDir);
@@ -57,27 +59,30 @@ function apply(ctx, config) {
     <html>
       <head>
         <style>
-          body { font-family: sans-serif; padding: 20px; background: transparent; width: fit-content; }
+          body { font-family: "Microsoft YaHei", "SimHei", sans-serif; padding: 20px; background: transparent; width: fit-content; }
           .container {
             display: flex;
             align-items: flex-start;
-            max-width: 400px;
+            max-width: 450px;
+            min-width: 260px;
             background: #ffffff;
-            padding: 15px;
+            padding: 16px 22px;
             border-radius: 12px;
-            box-shadow: 0 4px 10px rgba(0,0,0,0.1);
+            box-shadow: 0 4px 12px rgba(0,0,0,0.1);
+            border: 1px solid #f2f2f2;
           }
           .avatar {
             width: 50px;
             height: 50px;
             border-radius: 50%;
-            margin-right: 15px;
+            margin-right: 16px;
             border: 1px solid #eee;
             flex-shrink: 0;
+            object-fit: cover;
           }
-          .content-box { display: flex; flex-direction: column; }
-          .name { font-size: 14px; color: #888; margin-bottom: 6px; font-weight: bold; }
-          .text { font-size: 17px; color: #333; line-height: 1.5; word-wrap: break-word; }
+          .content-box { display: flex; flex-direction: column; justify-content: center; min-height: 50px; }
+          .name { font-size: 15px; color: #888; margin-bottom: 6px; font-weight: bold; }
+          .text { font-size: 18px; color: #333; line-height: 1.5; word-wrap: break-word; white-space: pre-wrap; }
         </style>
       </head>
       <body>
@@ -92,32 +97,58 @@ function apply(ctx, config) {
     </html>
     `;
   }, "generateQuoteHtml");
+  const getDisplayName = /* @__PURE__ */ __name(async (session, quote) => {
+    const userId = quote.user?.id || quote.author?.id;
+    const guildId = session.guildId || quote.guildId;
+    if (guildId && userId) {
+      try {
+        const member = await session.bot.getGuildMember(guildId, userId);
+        if (member.nick && member.nick !== userId) return member.nick;
+        if (member.nickname && member.nickname !== userId) return member.nickname;
+      } catch (e) {
+      }
+    }
+    if (userId) {
+      try {
+        const user = await session.bot.getUser(userId, guildId);
+        if (user.nick && user.nick !== userId) return user.nick;
+        if (user.name && user.name !== userId) return user.name;
+        if (user.username && user.username !== userId) return user.username;
+      } catch (e) {
+      }
+    }
+    return quote.member?.nick || quote.member?.name || quote.author?.nickname || quote.author?.username || userId || "用户";
+  }, "getDisplayName");
   const getImageBuffer = /* @__PURE__ */ __name(async (session) => {
     let targetImgUrl = null;
     const currImg = session.elements.find((e) => e.type === "img" || e.type === "image");
-    if (currImg) {
-      targetImgUrl = currImg.attrs.src || currImg.attrs.url;
-    }
+    if (currImg) targetImgUrl = currImg.attrs.src || currImg.attrs.url;
     if (!targetImgUrl && session.quote) {
-      const quoteElements = session.quote.elements;
-      const quoteImg = quoteElements.find((e) => e.type === "img" || e.type === "image");
+      const quote = session.quote;
+      const quoteImg = quote.elements.find((e) => e.type === "img" || e.type === "image");
       if (quoteImg) {
         targetImgUrl = quoteImg.attrs.src || quoteImg.attrs.url;
       } else {
-        const author = session.quote.author;
-        const avatarUrl = author?.avatar || "https://koishi.chat/logo.png";
-        const username = author?.nickname || author?.username || "用户";
-        const textContent = session.quote.content || " ";
+        const userId = quote.user?.id || quote.author?.id;
+        let avatarUrl = "https://koishi.chat/logo.png";
+        if (userId && /^\d+$/.test(userId)) {
+          avatarUrl = `https://q1.qlogo.cn/g?b=qq&nk=${userId}&s=640`;
+        } else if (quote.author?.avatar) {
+          avatarUrl = quote.author.avatar;
+        }
+        const username = await getDisplayName(session, quote);
+        const textContent = quote.content || " ";
         const html = generateQuoteHtml(avatarUrl, username, textContent);
         try {
           const page = await ctx.puppeteer.page();
           await page.setContent(html);
+          await (0, import_koishi.sleep)(200);
           const element = await page.$(".container");
           const buffer = await element?.screenshot({ type: "png" });
           await page.close();
           return { buffer, ext: ".png" };
         } catch (e) {
-          ctx.logger.error("Puppeteer 生成图片失败", e);
+          ctx.logger.error("Puppeteer 截图失败", e);
           return { buffer: null, ext: "" };
         }
       }
@@ -131,7 +162,6 @@ function apply(ctx, config) {
         else if (targetImgUrl.includes(".webp")) ext = ".webp";
         return { buffer: Buffer.from(buffer), ext };
       } catch (e) {
-        ctx.logger.error("下载图片失败", e);
         return { buffer: null, ext: "" };
       }
     }
@@ -144,12 +174,10 @@ function apply(ctx, config) {
     } catch (e) {
     }
   }, "withdrawLater");
-  ctx.command("上传 <folderName>", "上传图片或引用转换").action(async ({ session }, folderName) => {
+  ctx.command("上传 <folderName>").action(async ({ session }, folderName) => {
     if (!folderName) return "请输入文件夹名称。";
     const { buffer, ext } = await getImageBuffer(session);
-    if (!buffer) {
-      return "无法获取图片。请直接附带图片，或引用含有图片/文字的消息。";
-    }
+    if (!buffer) return "无法获取图片。请附带图片或引用消息。";
     const targetDir = path.join(root, folderName);
     let shouldUpload = false;
     if (!fs.existsSync(targetDir)) {
@@ -189,21 +217,37 @@ function apply(ctx, config) {
         }
       } catch (error) {
         ctx.logger.error(error);
-        return "保存文件出错。";
+        return "保存失败。";
       }
     }
   });
   ctx.middleware(async (session, next) => {
     const content = session.content.trim();
     if (!content) return next();
-    const targetDir = path.join(root, content);
-    if (!targetDir.startsWith(root)) return next();
-    if (fs.existsSync(targetDir) && fs.statSync(targetDir).isDirectory()) {
-      const files = fs.readdirSync(targetDir).filter((file) => /\.(jpg|jpeg|png|gif|webp)$/i.test(file));
-      if (files.length === 0) return next();
-      const randomFile = files[Math.floor(Math.random() * files.length)];
-      const absPath = path.join(targetDir, randomFile);
-      return session.send(import_koishi.h.image("file://" + absPath));
+    let foldersToSearch = [content];
+    for (const group of config.associations) {
+      if (group.includes(content)) {
+        foldersToSearch = group;
+        break;
+      }
+    }
+    let allImages = [];
+    for (const folder of foldersToSearch) {
+      const dirPath = path.join(root, folder);
+      if (dirPath.startsWith(root) && fs.existsSync(dirPath) && fs.statSync(dirPath).isDirectory()) {
+        const files = fs.readdirSync(dirPath).filter((file) => /\.(jpg|jpeg|png|gif|webp)$/i.test(file));
+        files.forEach((f) => {
+          allImages.push({
+            path: path.join(dirPath, f),
+            folder
+          });
+        });
+      }
+    }
+    if (allImages.length > 0) {
+      const randomImg = allImages[Math.floor(Math.random() * allImages.length)];
+      await session.send(import_koishi.h.image("file://" + randomImg.path));
+      return;
     }
     return next();
   });

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-meme-upload-114",
   "description": "图片上传发送",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [