koishi-plugin-node-async-bot-all 2.26.0 → 2.26.1

package/lib/fun.d.ts

@@ -37,7 +37,7 @@ export declare function getMsgCount(ctx: Context): Promise<Object>;
 export declare function random(type: number | undefined, data: any, data2?: any): number;
 export declare function request<T = any>(url: string, options?: RequestInit, timeout?: number, log?: any): Promise<HttpResponse<T>>;
 export declare function readUserCardFile(userInfo: APIUserInfo): Promise<string>;
-export declare function readUserMsgFile(userName: string, userAvatar: string, msg: string, inversion: boolean | undefined): Promise<string>;
+export declare function readUserMsgFile(userName: string, userAvatar: string, msg: string, inversion: boolean | undefined, replyUserName: string | undefined, replyMsg: string | undefined): Promise<string>;
 export declare function queryA2S(host: string, log: any): Promise<serverInfo>;
 export declare function readNewsFile(info: APINews, log: any): Promise<string[]>;
 export declare function translateAPI(log: any, text: string): Promise<string>;

package/lib/index.js

@@ -253,19 +253,20 @@ async function readUserCardFile(userInfo) {
   return card;
 }
 __name(readUserCardFile, "readUserCardFile");
-async function readUserMsgFile(userName, userAvatar, msg, inversion) {
+async function readUserMsgFile(userName, userAvatar, msg, inversion, replyUserName, replyMsg) {
   let html;
   try {
     const aPath = import_path.default.resolve(__dirname, "..") + import_path.default.sep + "res" + import_path.default.sep + "userMsg.html";
     html = await import_fs.default.promises.readFile(aPath, "utf8");
-    html = html.toString().replace("{userData.avatarUrl}", userAvatar).replace("{userData.username}", userName).replace("{userData.message}", msg).replace(
+    html = html.toString().replace("{userData.avatarUrl}", userAvatar).replace("{userData.username}", userName).replace("{userData.message}", msg).replace("{replyData.username}", replyUserName).replace("{replyData.message}", replyMsg).replace(
       /<at\s+(?:id=["']([^"']*)["']\s+name=["']([^"']*)["']|name=["']([^"']*)["']\s+id=["']([^"']*)["'])\s*\/?>/g,
       (match, id1, name1, name2, id2) => {
         const name3 = name1 || name2 || id1 || id2 || match;
         return `@${name3}`;
       }
-    );
+    ).replace('<at type="all"/>', "@全体成员");
     if (inversion) html = html.replace("//// ", "");
+    if (replyUserName != void 0) html = html.replace("/**/ ", "//// ");
   } catch (error) {
     html = error.message;
   }
@@ -829,6 +830,8 @@ async function getMsg(ctx, session, inversion) {
   }
   const user = await session.bot.getUser(session.quote.user.id, session.channelId);
   const msg = session.quote.content;
+  const quoteMsg = session.quote.quote?.content;
+  const quoteUser = session.quote.quote?.user?.name;
   log.debug(msg);
   if (!user.name || !user.avatar) {
     await session.send(session.text(".failed", { "quote": import_koishi2.h.quote(session.messageId), "time": time, "data": "获取用户信息失败。" }));
@@ -836,7 +839,7 @@ async function getMsg(ctx, session, inversion) {
     return 1;
   }
   const page = await ctx.puppeteer.page();
-  const html = await readUserMsgFile(user.name, user.avatar, msg, inversion);
+  const html = await readUserMsgFile(user.name, user.avatar, msg, inversion, quoteUser, quoteMsg);
   log.debug(html);
   try {
     await page.setViewport({
@@ -931,13 +934,13 @@ __name(getNewsMsg, "getNewsMsg");
 async function getUse(ctx, session, qq, desc) {
   const log = ctx.logger("getUse");
   log.debug(`Got: {"form":"${session.platform}:${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
-  await session.send(session.text(".msg", { "at": import_koishi2.h.at(session.event.user?.id), "at2": import_koishi2.h.at(qq), "desc": desc ?? "使用" }));
+  await session.send(session.text(".msg", { "at": import_koishi2.h.at(session.event.user?.id), "at2": import_koishi2.h.at(qq), "desc": import_koishi2.h.text(desc.replace('<at type="all"/>', "")) ?? "使用" }));
   return 0;
 }
 __name(getUse, "getUse");
 
 // package.json
-var version = "2.26.0";
+var version = "2.26.1";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer", "cron"];

package/package.json

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

package/res/userMsg.html

@@ -22,6 +22,7 @@
       background: #ffffff;
       padding: 15px;
       box-shadow: 0 4px 12px rgba(0,0,0,0.1);
+      border-radius: 8px; /* 给卡片加一点圆角更好看 */
     }
 
     /* 头像样式 */
@@ -35,20 +36,51 @@
       border: 1px solid #eee;
     }
 
-    /* 消息气泡样式 */
+    /* 消息气泡及内容容器 */
     .content {
       flex: 1;
       display: flex;
       flex-direction: column;
+      min-width: 0; /* 防止长文本撑破flex容器 */
     }
 
     .user-name {
       font-weight: bold;
       font-size: 14px;
       color: #333;
-      margin-bottom: 4px;
+      margin-bottom: 6px;
     }
 
+    /* ================= 新增：回复块样式 ================= */
+    .reply-block {
+      background: #f7f8fa;
+      border-left: 3px solid #b9bbbe; /* 引用线标记 */
+      padding: 6px 10px;
+      border-radius: 0 4px 4px 0;
+      margin-bottom: 8px;
+      /**/display:none;
+    }
+
+    .reply-user {
+      font-size: 12px;
+      font-weight: 600;
+      color: #555;
+      margin-bottom: 3px;
+    }
+
+    .reply-text {
+      font-size: 13px;
+      color: #777;
+      /* 长文本截断：最多显示2行 */
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      word-break: break-all;
+    }
+    /* =================================================== */
+
     .text-bubble {
       font-size: 15px;
       line-height: 1.5;
@@ -61,14 +93,22 @@
       word-wrap: break-word;       /* 长单词断行 */
       overflow-wrap: break-word;
       word-break: break-all;
+      width: fit-content; /* 让气泡宽度适应内容 */
     }
   </style>
 </head>
 <body>
 <div id="target-element" class="message-card">
-  <img src="{userData.avatarUrl}" class="avatar" />
+  <img src="{userData.avatarUrl}" class="avatar" alt="Avatar" />
   <div class="content">
     <div class="user-name">{userData.username}</div>
+
+    <!-- 新增的回复块 -->
+    <div class="reply-block">
+      <div class="reply-user">@{replyData.username}</div>
+      <div class="reply-text">{replyData.message}</div>
+    </div>
+
     <div class="text-bubble">{userData.message}</div>
   </div>
 </div>