koishi-plugin-node-async-bot-all 2.20.0 → 2.20.2

package/lib/index.js

@@ -34,7 +34,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/locales/zh-CN.yml
 var require_zh_CN = __commonJS({
   "src/locales/zh-CN.yml"(exports2, module2) {
-    module2.exports = { commands: { cxgame: { description: "查询服务器当前人数。", messages: { msg: "{time}{list}\n进服指南请在群公告中查看。", list: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 备注：{note}", listNoPlayer: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 备注：{note}", listFailed: "【MC 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}", timeout: "请求超时。", timeout2: "响应超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", error: "执行错误。", host: "没有到主机的路由。" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n--- 系统状态 ---\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}\n--- 机器人状态 ---\n昨日收/发消息数量：{msgCount}\n机器人版本：{version}\n运行时间：{online}", failed: "{time}\n状态获取失败。" } }, random: { description: "随机数生成器。", usage: "缺少参数时默认生成 0-10000 的随机数。\n使用示例：", examples: "random 1 128 生成1到128范围的随机数", messages: { msg: "{time}\n生成的随机数：{data}" } }, info: { description: "查询机器人信息。", messages: { msg: "{data}", failed: "{time}\n读取信息失败。" } }, rw: { description: "随机名言名句。", messages: { msg: "{time}\n{data}", error: "执行错误。", failed: "{time}\n获取失败（{data}）。" } }, randomba: { description: "随机BA图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。" } }, servertest: { description: "Ping服务器。", messages: { msg: "{time}\n== Ping {host} ==\n状态：{alive}\n丢包率：{packetLoss}\n返回IP：{ip}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\nPing 失败：{data}" } }, meme: { description: "群友的怪话！", messages: { msg: "{quote}{time}\n{image}\n{title}", failed: "{quote}{time}\n获取失败：{data}", forbidden: "{quote}{time}\n此指令不允许在本群使用。", error: "执行错误。" } }, randomcat: { description: "随机猫猫图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。", failed: "{quote}{time}\n获取失败：{data}" } }, getqqinfo: { description: "获取 QQ 号的信息。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", command: "QQ 号不正确。" } }, msg2img: { description: "引用一个消息并使用此指令，即可将消息转图。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", null: "未引用任何消息。" } } } };
+    module2.exports = { commands: { cxgame: { description: "查询服务器当前人数。", messages: { msg: "{time}{list}\n进服指南请在群公告中查看。", list: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 备注：{note}", listNoPlayer: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 备注：{note}", listFailed: "【MC 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}", timeout: "请求超时。", timeout2: "响应超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", error: "执行错误。", host: "没有到主机的路由。" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n--- 系统状态 ---\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}\n--- 机器人状态 ---\n昨日收/发消息数量：{msgCount}\n机器人版本：{version}\n运行时间：{online}", failed: "{time}\n状态获取失败。" } }, random: { description: "随机数生成器。", usage: "缺少参数时默认生成 0-10000 的随机数。\n使用示例：", examples: "random 1 128 生成1到128范围的随机数", messages: { msg: "{time}\n生成的随机数：{data}" } }, info: { description: "查询机器人信息。", messages: { msg: "{data}", failed: "{time}\n读取信息失败。" } }, rw: { description: "随机名言名句。", messages: { msg: "{time}\n{data}", error: "执行错误。", failed: "{time}\n获取失败（{data}）。" } }, randomba: { description: "随机BA图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。" } }, servertest: { description: "Ping服务器。", messages: { msg: "{time}\n== Ping {host} ==\n状态：{alive}\n丢包率：{packetLoss}\n返回IP：{ip}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\nPing 失败：{data}" } }, meme: { description: "群友的怪话！", messages: { msg: "{quote}{time}\n{image}\n{title}", failed: "{quote}{time}\n获取失败：{data}", forbidden: "{quote}{time}\n此指令不允许在本群使用。", error: "执行错误。" } }, randomcat: { description: "随机猫猫图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。", failed: "{quote}{time}\n获取失败：{data}" } }, getqqinfo: { description: "获取 QQ 号的信息。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", command: "QQ 号不正确。" } }, msg2img: { description: "引用一个消息并使用此指令，即可将消息转图。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", null: "未引用任何消息。", matroska: "{quote}禁止套娃！" } } } };
   }
 });
 
@@ -475,7 +475,7 @@ async function getRandomWord(ctx, session) {
   if (response.success) {
     msg = {
       "time": time,
-      "data": response.data,
+      "data": response.data.data,
       "success": 0
     };
     log.debug("Sent:");
@@ -691,6 +691,10 @@ async function getMsg(ctx, session) {
     log.warn("未引用任何信息");
     return 1;
   }
+  if (session.quote.user.id == session.event.selfId) {
+    await session.send(session.text(".matroska", { "quote": import_koishi2.h.quote(session.messageId) }));
+    return 1;
+  }
   const user = await session.bot.getUser(session.quote.user.id, session.channelId);
   const msg = session.quote.content;
   if (!user.name || !user.avatar) {
@@ -702,11 +706,16 @@ async function getMsg(ctx, session) {
   const html = await readUserMsgFile(user.name, user.avatar, msg);
   try {
     await page.setViewport({
-      width: 400,
-      height: 800,
+      width: 450,
+      height: 1,
       deviceScaleFactor: 2
     });
     await page.setContent(html, { waitUntil: "networkidle0" });
+    const { width, height } = await page.evaluate(() => ({
+      width: document.body.scrollWidth + 50,
+      height: document.body.scrollHeight
+    }));
+    await page.setViewport({ width, height, deviceScaleFactor: 2 });
     const element = await page.$("#target-element");
     if (element) {
       const image = await element.screenshot({
@@ -733,7 +742,7 @@ async function getMsg(ctx, session) {
 __name(getMsg, "getMsg");
 
 // package.json
-var version = "2.20.0";
+var version = "2.20.2";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer"];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "2.20.0",
+  "version": "2.20.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [

package/res/userMsg.html

@@ -1,80 +1,74 @@
 <!DOCTYPE html>
-<html lang="zh-CN">
+<html>
 <head>
   <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>UserMsg</title>
   <style>
     * { box-sizing: border-box; margin: 0; padding: 0; }
+
     body {
       font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
-      background-color: transparent; /* 背景透明 */
-      padding: 20px;
-      display: flex;
-      justify-content: flex-start;
+      background: transparent;
+      padding: 20px; /* 给截图留一点边缘留白 */
     }
 
-    /* 消息容器 */
-    .msg-container {
+    /* 核心容器 */
+    .message-card {
       display: flex;
       flex-direction: row;
       align-items: flex-start;
-      max-width: 100%;
-      background: #f5f5f5; /* 卡片背景色，如果是生成透明图可以去掉 */
-      padding: 20px;
-      border-radius: 12px;
-      /* 如果你想让图片就是气泡本身，可以去掉上面的 background 和 padding，保留下面的布局 */
+      width: 100%;
+      background: #ffffff;
+      padding: 15px;
+      box-shadow: 0 4px 12px rgba(0,0,0,0.1);
     }
 
-    /* 头像 */
+    /* 头像样式 */
     .avatar {
       width: 50px;
       height: 50px;
       border-radius: 50%;
-      background-color: #ddd;
       object-fit: cover;
-      flex-shrink: 0; /* 防止头像被压缩 */
-      margin-right: 12px;
-      box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+      flex-shrink: 0; /* 防止被长文本挤压变形 */
+      margin-right: 15px;
+      border: 1px solid #eee;
     }
 
-    /* 右侧内容区域 */
-    .content-wrapper {
+    /* 消息气泡样式 */
+    .content {
+      flex: 1;
       display: flex;
       flex-direction: column;
     }
 
-    /* 用户名 */
-    .username {
+    .user-name {
+      font-weight: bold;
       font-size: 14px;
-      color: #666;
+      color: #333;
       margin-bottom: 4px;
-      font-weight: 500;
     }
 
-    /* 消息气泡 */
-    .bubble {
-      background-color: #fff;
-      color: #333;
-      padding: 10px 14px;
-      border-radius: 0 12px 12px 12px; /* 左上角直角，其余圆角 */
-      font-size: 16px;
+    .text-bubble {
+      font-size: 15px;
       line-height: 1.5;
-      box-shadow: 0 1px 2px rgba(0,0,0,0.05);
-      position: relative;
-      word-wrap: break-word; /* 强制换行 */
+      color: #444;
+      background: #f2f3f5;
+      padding: 10px 14px;
+      border-radius: 0 12px 12px 12px; /* 类似聊天气泡的圆角 */
+
+      white-space: pre-wrap;       /* 保留换行符 */
+      word-wrap: break-word;       /* 长单词断行 */
+      overflow-wrap: break-word;
+      word-break: break-all;
     }
   </style>
 </head>
 <body>
-<!-- 目标截图元素 -->
-<div id="target-element" class="msg-container">
-  <img class="avatar" src="{userData.avatarUrl}" />
-  <div class="content-wrapper">
-    <div class="username">{userData.username}</div>
-    <div class="bubble">
-      {userData.message}
-    </div>
+<div id="target-element" class="message-card">
+  <img src="{userData.avatarUrl}" class="avatar" />
+  <div class="content">
+    <div class="user-name">{userData.username}</div>
+    <div class="text-bubble">{userData.message}</div>
   </div>
 </div>
 </body>