koishi-plugin-dew-bot 1.0.239 → 1.0.240

package/README.md

@@ -9,7 +9,7 @@ Koishi 插件：把聊天消息交给 dew-v7 Bot 游戏服处理，再把服务
 ```yaml
 plugins:
   dew-bot:
-    服务器地址: ws://127.0.0.1:3021
+    服务器地址: ws://dew-v7-test:3021
 ```
 
 游戏服需先启动 Bot 进程（默认 WebSocket `3021`）。
@@ -18,6 +18,6 @@ plugins:
 
 | 项 | 说明 | 默认 |
 | --- | --- | --- |
-| 服务器地址 | 游戏服 WebSocket 地址 | `ws://127.0.0.1:3021` |
+| 服务器地址 | 游戏服 WebSocket 地址 | `ws://dew-v7-test:3021` |
 
 插件会忽略机器人自己发出的消息，避免回显再次上传形成循环。

package/lib/index.js

@@ -146,11 +146,11 @@ __name(layoutCard, "layoutCard");
 var escape2 = /* @__PURE__ */ __name((s) => String(s ?? "").replace(/[&<>"']/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c]), "escape");
 function leaderboardHtml(data, _headerImage, backgroundImage) {
   const rows = data.rows.slice(0, 20);
-  const row = /* @__PURE__ */ __name((r, mine = false) => `<div class="row rank-${r.rank} ${mine ? "personal" : ""}"><div class="rank">${mine ? "<small>我的排名</small>" : ""}<b>${escape2(r.rank)}</b></div><div class="avatar">${escape2(r.emoji || "👤")}</div><div class="name">${escape2(r.name)}</div><div class="value">${escape2(r.value.toLocaleString("zh-CN", { maximumFractionDigits: 2 }))}</div></div>`, "row");
+  const row = /* @__PURE__ */ __name((r, mine = false) => `<div class="row rank-${r.rank} ${mine ? "personal" : ""}"><div class="rank">${mine ? "<small>我的排名</small>" : ""}<b>${escape2(r.rank)}</b></div><div class="name">${escape2(r.name)}</div><div class="value">${escape2(r.value.toLocaleString("zh-CN", { maximumFractionDigits: 2 }))}</div></div>`, "row");
   const personal = data.mine ? row(data.mine, true) : "";
   return `<!doctype html><html lang="zh-CN"><meta charset="utf-8"><style>
 *{box-sizing:border-box}body{margin:0;width:760px;color:#242725;font-family:"Microsoft YaHei","Noto Sans CJK SC",sans-serif}
-.row{display:grid;grid-template-columns:64px 58px minmax(0,1fr) 180px;align-items:center;gap:9px;padding:12px 10px;min-height:81px;border-bottom:1px solid #d8d2c8}.rank{text-align:center;font-size:26px;font-family:Georgia,"Times New Roman",serif;color:#3f4140}.rank b{font-weight:500}.avatar{display:grid;place-items:center;width:54px;height:54px;border-radius:50%;background:#e2ded3;border:1px solid #c8bfae;font-family:"Segoe UI Emoji","Noto Color Emoji",sans-serif;font-size:30px;white-space:nowrap;overflow:hidden}
+.row{display:grid;grid-template-columns:64px minmax(0,1fr) 180px;align-items:center;gap:9px;padding:12px 10px;min-height:81px;border-bottom:1px solid #d8d2c8}.rank{text-align:center;font-size:26px;font-family:Georgia,"Times New Roman",serif;color:#3f4140}.rank b{font-weight:500}
 .name{font-size:22px;font-weight:600;line-height:1.4;overflow-wrap:anywhere}.value{text-align:right;font-size:26px;font-family:Georgia,"Times New Roman",serif;font-variant-numeric:tabular-nums;overflow-wrap:anywhere}
 .rank-1,.rank-2,.rank-3{margin-bottom:6px;border-radius:6px;border:1px solid #d8bd75;background:linear-gradient(105deg,#e6c37455,#fbefd0)}.rank-2{border-color:#bbc4cb;background:linear-gradient(105deg,#aebdce75,#f0f1f3)}.rank-3{border-color:#d4baa2;background:linear-gradient(105deg,#ba8a6355,#f3e8df)}
 .rank-1 .rank b,.rank-2 .rank b,.rank-3 .rank b{display:inline-grid;place-items:center;width:46px;height:52px;background:linear-gradient(140deg,#f6dd89,#b57b20);clip-path:polygon(50% 0,65% 12%,90% 6%,88% 34%,100% 50%,86% 70%,87% 91%,61% 90%,50% 100%,36% 88%,12% 92%,14% 67%,0 49%,13% 30%,10% 6%,35% 13%);color:white;text-shadow:0 1px 3px #513209;font-size:30px}.rank-2 .rank b{background:linear-gradient(140deg,#dceafb,#5d7d9e)}.rank-3 .rank b{background:linear-gradient(140deg,#ecc6a0,#8e5534)}.rank-1 .value{color:#9b6613}.rank-2 .value{color:#536779}.rank-3 .value{color:#945c32}
@@ -162,7 +162,7 @@ function leaderboardHtml(data, _headerImage, backgroundImage) {
 .sheet{position:relative;margin:0;padding:10px;border:1px solid #c4b89b88;border-radius:12px;background:#fcfaf5d9;box-shadow:none}
 .row:last-child{border-bottom:0}.name{display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;max-height:62px}
 .value{font-size:23px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
-#capture.has-background{padding:90px 80px}.has-background .sheet{background:rgba(250,247,238,.20);border:0}.has-background .row{grid-template-columns:48px 46px minmax(0,1fr) 142px;gap:6px;padding:10px 6px}.has-background .avatar{width:42px;height:42px;font-size:26px}.has-background .name{font-size:20px}
+#capture.has-background{padding:90px 80px}.has-background .sheet{background:rgba(250,247,238,.20);border:0}.has-background .row{grid-template-columns:48px minmax(0,1fr) 142px;gap:6px;padding:10px 6px}.has-background .name{font-size:20px}
 .has-background .row{background-color:rgba(255,253,246,.38)}
 </style><body><div id="capture" class="${backgroundImage ? "has-background" : ""}">${backgroundImage ? '<img class="board-background" alt="" src="' + escape2(backgroundImage) + '">' : ""}<h1 class="board-title">${escape2(data.title)}</h1><main class="sheet">${rows.length ? rows.map((r) => row(r)).join("") : '<div class="empty">暂无玩家上榜</div>'}${personal}</main></div></body></html>`;
 }
@@ -358,7 +358,11 @@ var handel_base = class {
       this.ctx.logger.info("session not found", data.userId, data.channelId);
       return;
     }
-    await session.send(content);
+    let finalContent = content;
+    if (session.event?.platform === "qq" && session.event?.channel?.type === 0) {
+      finalContent = "Ciallo～(∠・ω< )\n" + content;
+    }
+    await session.send(finalContent);
   }
   async start(_data) {
   }
@@ -381,7 +385,7 @@ var ImageHandler = class extends handel_base {
       content = new AnalysisMsg().parse(data);
     }
     await this.send(data, content);
-    if (rendered && (data.card || data.itemCard)) await this.send(data, new AnalysisMsg().parse(data));
+    if (rendered && data.itemCard) await this.send(data, new AnalysisMsg().parse(data));
   }
 };
 
@@ -1263,7 +1267,7 @@ __name(apply, "apply");
 var inject = { optional: ["puppeteer"] };
 var name = "dew-bot";
 var Config = import_koishi2.Schema.object({
-  服务器地址: import_koishi2.Schema.string().default("ws://127.0.0.1:3021").description("游戏服 WebSocket 地址")
+  服务器地址: import_koishi2.Schema.string().default("ws://dew-v7-test:3021").description("游戏服 WebSocket 地址")
 });
 function apply2(ctx, config) {
   ctx.plugin(apply, config);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-dew-bot",
   "description": "连游戏服，把聊天消息交给服务器处理",
-  "version": "1.0.239",
+  "version": "1.0.240",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/src/index.ts

@@ -10,7 +10,7 @@ export interface Config {
 }
 
 export const Config: Schema<Config> = Schema.object({
-  服务器地址: Schema.string().default('ws://127.0.0.1:3021').description('游戏服 WebSocket 地址'),
+  服务器地址: Schema.string().default('ws://dew-v7-test:3021').description('游戏服 WebSocket 地址'),
 })
 
 export function apply(ctx: Context, config: Config) {

package/src/plugin/leaderboardTemplate.ts

@@ -4,11 +4,11 @@ const escape = (s: unknown) => String(s ?? '').replace(/[&<>"']/g, c => ({ '&':
 export function leaderboardHtml(data: LeaderboardImageData, _headerImage?: string, backgroundImage?: string): string {
     const rows = data.rows.slice(0, 20);
 
-    const row = (r: typeof rows[number], mine = false) => `<div class="row rank-${r.rank} ${mine ? 'personal' : ''}"><div class="rank">${mine ? '<small>我的排名</small>' : ''}<b>${escape(r.rank)}</b></div><div class="avatar">${escape(r.emoji || '👤')}</div><div class="name">${escape(r.name)}</div><div class="value">${escape(r.value.toLocaleString('zh-CN', { maximumFractionDigits: 2 }))}</div></div>`;
+    const row = (r: typeof rows[number], mine = false) => `<div class="row rank-${r.rank} ${mine ? 'personal' : ''}"><div class="rank">${mine ? '<small>我的排名</small>' : ''}<b>${escape(r.rank)}</b></div><div class="name">${escape(r.name)}</div><div class="value">${escape(r.value.toLocaleString('zh-CN', { maximumFractionDigits: 2 }))}</div></div>`;
     const personal = data.mine ? row(data.mine, true) : '';
     return `<!doctype html><html lang="zh-CN"><meta charset="utf-8"><style>
 *{box-sizing:border-box}body{margin:0;width:760px;color:#242725;font-family:"Microsoft YaHei","Noto Sans CJK SC",sans-serif}
-.row{display:grid;grid-template-columns:64px 58px minmax(0,1fr) 180px;align-items:center;gap:9px;padding:12px 10px;min-height:81px;border-bottom:1px solid #d8d2c8}.rank{text-align:center;font-size:26px;font-family:Georgia,"Times New Roman",serif;color:#3f4140}.rank b{font-weight:500}.avatar{display:grid;place-items:center;width:54px;height:54px;border-radius:50%;background:#e2ded3;border:1px solid #c8bfae;font-family:"Segoe UI Emoji","Noto Color Emoji",sans-serif;font-size:30px;white-space:nowrap;overflow:hidden}
+.row{display:grid;grid-template-columns:64px minmax(0,1fr) 180px;align-items:center;gap:9px;padding:12px 10px;min-height:81px;border-bottom:1px solid #d8d2c8}.rank{text-align:center;font-size:26px;font-family:Georgia,"Times New Roman",serif;color:#3f4140}.rank b{font-weight:500}
 .name{font-size:22px;font-weight:600;line-height:1.4;overflow-wrap:anywhere}.value{text-align:right;font-size:26px;font-family:Georgia,"Times New Roman",serif;font-variant-numeric:tabular-nums;overflow-wrap:anywhere}
 .rank-1,.rank-2,.rank-3{margin-bottom:6px;border-radius:6px;border:1px solid #d8bd75;background:linear-gradient(105deg,#e6c37455,#fbefd0)}.rank-2{border-color:#bbc4cb;background:linear-gradient(105deg,#aebdce75,#f0f1f3)}.rank-3{border-color:#d4baa2;background:linear-gradient(105deg,#ba8a6355,#f3e8df)}
 .rank-1 .rank b,.rank-2 .rank b,.rank-3 .rank b{display:inline-grid;place-items:center;width:46px;height:52px;background:linear-gradient(140deg,#f6dd89,#b57b20);clip-path:polygon(50% 0,65% 12%,90% 6%,88% 34%,100% 50%,86% 70%,87% 91%,61% 90%,50% 100%,36% 88%,12% 92%,14% 67%,0 49%,13% 30%,10% 6%,35% 13%);color:white;text-shadow:0 1px 3px #513209;font-size:30px}.rank-2 .rank b{background:linear-gradient(140deg,#dceafb,#5d7d9e)}.rank-3 .rank b{background:linear-gradient(140deg,#ecc6a0,#8e5534)}.rank-1 .value{color:#9b6613}.rank-2 .value{color:#536779}.rank-3 .value{color:#945c32}
@@ -20,7 +20,7 @@ export function leaderboardHtml(data: LeaderboardImageData, _headerImage?: strin
 .sheet{position:relative;margin:0;padding:10px;border:1px solid #c4b89b88;border-radius:12px;background:#fcfaf5d9;box-shadow:none}
 .row:last-child{border-bottom:0}.name{display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;max-height:62px}
 .value{font-size:23px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
-#capture.has-background{padding:90px 80px}.has-background .sheet{background:rgba(250,247,238,.20);border:0}.has-background .row{grid-template-columns:48px 46px minmax(0,1fr) 142px;gap:6px;padding:10px 6px}.has-background .avatar{width:42px;height:42px;font-size:26px}.has-background .name{font-size:20px}
+#capture.has-background{padding:90px 80px}.has-background .sheet{background:rgba(250,247,238,.20);border:0}.has-background .row{grid-template-columns:48px minmax(0,1fr) 142px;gap:6px;padding:10px 6px}.has-background .name{font-size:20px}
 .has-background .row{background-color:rgba(255,253,246,.38)}
 </style><body><div id="capture" class="${backgroundImage ? 'has-background' : ''}">${backgroundImage ? '<img class="board-background" alt="" src="'+escape(backgroundImage)+'">' : ''}<h1 class="board-title">${escape(data.title)}</h1><main class="sheet">${rows.length ? rows.map(r => row(r)).join('') : '<div class="empty">暂无玩家上榜</div>'}${personal}</main></div></body></html>`;
 }

package/src/plugin/serverHandel/handel_base.ts

@@ -18,7 +18,12 @@ export default class handel_base {
       this.ctx.logger.info('session not found', data.userId, data.channelId)
       return
     }
-    await session.send(content)
+    // QQ 群聊添加问候语和换行，让正文从新的一行开始。
+    let finalContent = content
+    if (session.event?.platform === 'qq' && session.event?.channel?.type === 0) {
+      finalContent = 'Ciallo～(∠・ω< )\n' + content
+    }
+    await session.send(finalContent)
   }
 
   async start(_data: MsgMessage) {

package/src/plugin/serverHandel/image.ts

@@ -16,6 +16,6 @@ export default class ImageHandler extends handel_base {
       content = new AnalysisMsg().parse(data)
     }
     await this.send(data, content)
-    if (rendered && (data.card || data.itemCard)) await this.send(data, new AnalysisMsg().parse(data))
+    if (rendered && data.itemCard) await this.send(data, new AnalysisMsg().parse(data))
   }
 }