koishi-plugin-dew-bot 1.0.250 → 1.0.251

package/lib/index.js

@@ -749,7 +749,7 @@ function renderQQPageMarkdown(data, showGreeting) {
   const summaryLine = data.line.find((item) => item.type === 1 /* line */ && pagePattern.test(item.content));
   const summary = summaryLine && pagePattern.exec(summaryLine.content);
   const listCount = data.line.filter((item) => item.type === 1 /* line */ && listPattern.test(item.content)).length;
-  const count = summary?.[1] ?? (nav?.total === 1 ? String(listCount) : void 0);
+  const count = summary?.[1] ?? (nav?.total === 1 && listCount > 0 ? String(listCount) : void 0);
   const countUnit = summary?.[2] ?? "项";
   const isLeaderboardDirectory = !!nav?.entries?.length && /^(?:🏆)?排行榜$/u.test(compactDisplayText(title?.content ?? ""));
   const sections = [];
@@ -820,8 +820,8 @@ function renderQQPageMarkdown(data, showGreeting) {
   flush();
   if (nav && !hasPageSummary && (nav.total > 1 || nav.previousCommand || nav.nextCommand))
     pageFooter = `**第${nav.current}/${nav.total}页**`;
-  const previousLink = nav?.previousCommand ? `[上一页](${inlineCommandUrl(nav.previousCommand)})` : void 0;
-  const nextLink = nav?.nextCommand ? `[下一页](${inlineCommandUrl(nav.nextCommand)})` : void 0;
+  const previousLink = nav?.previousCommand ? `[${nav.previousCommand === "上一个" ? "上一个" : "上一页"}](${inlineCommandUrl(nav.previousCommand)})` : void 0;
+  const nextLink = nav?.nextCommand ? `[${nav.nextCommand === "下一个" ? "下一个" : "下一页"}](${inlineCommandUrl(nav.nextCommand)})` : void 0;
   const helpLink = hasHelp ? `[指令](${inlineCommandUrl("指令")})` : void 0;
   const footer = pageFooter ? [pageFooter, previousLink, nextLink, helpLink].filter(Boolean).join("·") : helpLink ? `更多操作：${helpLink}` : void 0;
   if (footer) {
@@ -895,7 +895,7 @@ function renderQQTransactionMarkdown(data, showGreeting) {
     const action = data.transaction && (item.content === "[是]确认交易" ? { command: "是", label: "确认交易" } : item.content === "[否]取消交易" ? { command: "否", label: "取消交易" } : void 0);
     if (action) {
       flushBody();
-      actions.push(`[${action.command}](${inlineCommandUrl(action.command)}) ${action.label}`);
+      actions.push(`[${action.label}](${inlineCommandUrl(action.command)})`);
       continue;
     }
     flushActions();
@@ -920,6 +920,53 @@ async function sendQQTransaction(session, data) {
 }
 __name(sendQQTransaction, "sendQQTransaction");
 
+// src/plugin/serverHandel/qqCommandMessage.ts
+function renderCommandLine(content, commandHelp) {
+  if (!commandHelp || !/^\s*\[[^\[\]\r\n]+\]/.test(content)) return escapeMarkdown(content);
+  const parts = [];
+  let offset = 0;
+  for (const match of content.matchAll(/\[([^\[\]\r\n]+)\]/g)) {
+    parts.push(escapeMarkdown(content.slice(offset, match.index)));
+    const command = match[1].split(/[+＋]/, 1)[0].trim();
+    parts.push(command ? `[${escapeMarkdown(match[1])}](${inlineCommandUrl(command)})` : escapeMarkdown(match[0]));
+    offset = match.index + match[0].length;
+  }
+  parts.push(escapeMarkdown(content.slice(offset)));
+  return parts.join("");
+}
+__name(renderCommandLine, "renderCommandLine");
+function renderQQCommandMarkdown(data, showGreeting) {
+  const sections = [];
+  const bodyLines = [];
+  const flushBody = /* @__PURE__ */ __name(() => {
+    if (bodyLines.length) sections.push(bodyLines.splice(0).join("  \n"));
+  }, "flushBody");
+  if (showGreeting) sections.push(escapeMarkdown("Ciallo～(∠・ω< )"));
+  for (const item of data.line) {
+    switch (item.type) {
+      case 0 /* title */:
+        flushBody();
+        sections.push(`**${escapeMarkdown(item.content)}**`);
+        break;
+      case 1 /* line */:
+        if (!item.content.trim()) flushBody();
+        else bodyLines.push(renderCommandLine(item.content, !!data.commandHelp));
+        break;
+      case 2 /* error */:
+        flushBody();
+        sections.push(`❌ 出错了！错误原因：${escapeMarkdown(item.content)}，请反馈至联系开发者`);
+        break;
+    }
+  }
+  flushBody();
+  return sections.join("\n\n") || " ";
+}
+__name(renderQQCommandMarkdown, "renderQQCommandMarkdown");
+async function sendQQCommand(session, data) {
+  await sendQQMarkdown(session, renderQQCommandMarkdown(data, session.event?.channel?.type === 0));
+}
+__name(sendQQCommand, "sendQQCommand");
+
 // src/plugin/serverHandel/text.ts
 var handelr_text = class extends handel_base {
   static {
@@ -928,10 +975,11 @@ var handelr_text = class extends handel_base {
   async start(data) {
     const content = new AnalysisMsg().parse(data);
     const session = sessions_default.get(sessionKey(data.botId, data.userId, data.channelId));
-    if ((data.transaction || data.pageNav) && canSendQQPage(session, data)) {
+    if ((data.commandHelp || data.transaction || data.pageNav) && canSendQQPage(session, data)) {
       const sendStartedAt = this.timing ? performance.now() : 0;
       try {
-        if (data.transaction) await sendQQTransaction(session, data);
+        if (data.commandHelp) await sendQQCommand(session, data);
+        else if (data.transaction) await sendQQTransaction(session, data);
         else await sendQQPage(session, data);
         if (this.timing) {
           this.timing.delivery = "qq-markdown";
@@ -941,7 +989,7 @@ var handelr_text = class extends handel_base {
       } catch (error) {
         this.ctx.logger.warn("QQ Markdown 发送失败，改用普通文字", error instanceof Error ? error.message : error);
       }
-      const commands = !data.transaction && data.pageNav ? pageCommandLines(data.pageNav) : [];
+      const commands = !data.commandHelp && !data.transaction && data.pageNav ? pageCommandLines(data.pageNav) : [];
       await this.send(data, commands.length ? `${content.trimEnd()}
 ${commands.join("\n")}` : content);
       return;
@@ -1014,7 +1062,7 @@ var import_tsrpc = require("tsrpc");
 
 // src/shared/bot/serviceProto.ts
 var serviceProto = {
-  "version": 12,
+  "version": 13,
   "services": [
     {
       "id": 0,
@@ -1157,6 +1205,14 @@ var serviceProto = {
           },
           "optional": true
         },
+        {
+          "id": 9,
+          "name": "commandHelp",
+          "type": {
+            "type": "Boolean"
+          },
+          "optional": true
+        },
         {
           "id": 1,
           "name": "line",

package/lib/plugin/serverHandel/qqCommandMessage.d.ts

@@ -0,0 +1,5 @@
+import type { Session } from 'koishi';
+import type { MsgMessage } from '../../shared/bot/MsgMessage';
+/** Keep help text intact while making its explicitly boxed commands clickable. */
+export declare function renderQQCommandMarkdown(data: MsgMessage, showGreeting: boolean): string;
+export declare function sendQQCommand(session: Session, data: MsgMessage): Promise<void>;

package/lib/shared/face/index.d.ts

@@ -132,6 +132,8 @@ export interface IMessage {
     pageNav?: PageNavData;
     /** 通用交易确认、结果与失败消息；客户端可使用交易 Markdown 展示。 */
     transaction?: boolean;
+    /** 指令系统与指令提示；客户端可用 Markdown 展示可点击的方框指令。 */
+    commandHelp?: boolean;
     /** 消息项列表 **/
     line: IMessageItem[];
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-dew-bot",
   "description": "基于《无限恐怖》小说改编的 RPG 机器人。踏入主神空间，与伙伴迎接轮回试炼，书写属于你的无限冒险。",
-  "version": "1.0.250",
+  "version": "1.0.251",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/src/plugin/serverHandel/qqCommandMessage.ts

@@ -0,0 +1,54 @@
+import type { Session } from 'koishi'
+import { MessageType } from '../../shared/face'
+import type { MsgMessage } from '../../shared/bot/MsgMessage'
+import { escapeMarkdown, inlineCommandUrl, sendQQMarkdown } from './qqPageMessage'
+
+function renderCommandLine(content: string, commandHelp: boolean): string {
+  // Only explicit command-description rows enable links. Unknown input and
+  // other prose remain display text, even when they contain square brackets.
+  if (!commandHelp || !/^\s*\[[^\[\]\r\n]+\]/.test(content)) return escapeMarkdown(content)
+  const parts: string[] = []
+  let offset = 0
+  for (const match of content.matchAll(/\[([^\[\]\r\n]+)\]/g)) {
+    parts.push(escapeMarkdown(content.slice(offset, match.index)))
+    const command = match[1].split(/[+＋]/, 1)[0].trim()
+    parts.push(command
+      ? `[${escapeMarkdown(match[1])}](${inlineCommandUrl(command)})`
+      : escapeMarkdown(match[0]))
+    offset = match.index! + match[0].length
+  }
+  parts.push(escapeMarkdown(content.slice(offset)))
+  return parts.join('')
+}
+
+/** Keep help text intact while making its explicitly boxed commands clickable. */
+export function renderQQCommandMarkdown(data: MsgMessage, showGreeting: boolean): string {
+  const sections: string[] = []
+  const bodyLines: string[] = []
+  const flushBody = () => {
+    if (bodyLines.length) sections.push(bodyLines.splice(0).join('  \n'))
+  }
+  if (showGreeting) sections.push(escapeMarkdown('Ciallo～(∠・ω< )'))
+  for (const item of data.line) {
+    switch (item.type) {
+      case MessageType.title:
+        flushBody()
+        sections.push(`**${escapeMarkdown(item.content)}**`)
+        break
+      case MessageType.line:
+        if (!item.content.trim()) flushBody()
+        else bodyLines.push(renderCommandLine(item.content, !!data.commandHelp))
+        break
+      case MessageType.error:
+        flushBody()
+        sections.push(`❌ 出错了！错误原因：${escapeMarkdown(item.content)}，请反馈至联系开发者`)
+        break
+    }
+  }
+  flushBody()
+  return sections.join('\n\n') || ' '
+}
+
+export async function sendQQCommand(session: Session, data: MsgMessage): Promise<void> {
+  await sendQQMarkdown(session, renderQQCommandMarkdown(data, session.event?.channel?.type === 0))
+}

package/src/plugin/serverHandel/qqPageMessage.ts

@@ -68,7 +68,7 @@ export function renderQQPageMarkdown(data: MsgMessage, showGreeting: boolean): s
   const summaryLine = data.line.find(item => item.type === MessageType.line && pagePattern.test(item.content))
   const summary = summaryLine && pagePattern.exec(summaryLine.content)
   const listCount = data.line.filter(item => item.type === MessageType.line && listPattern.test(item.content)).length
-  const count = summary?.[1] ?? (nav?.total === 1 ? String(listCount) : undefined)
+  const count = summary?.[1] ?? (nav?.total === 1 && listCount > 0 ? String(listCount) : undefined)
   const countUnit = summary?.[2] ?? '项'
   const isLeaderboardDirectory = !!nav?.entries?.length
     && /^(?:🏆)?排行榜$/u.test(compactDisplayText(title?.content ?? ''))
@@ -144,8 +144,12 @@ export function renderQQPageMarkdown(data: MsgMessage, showGreeting: boolean): s
   flush()
   if (nav && !hasPageSummary && (nav.total > 1 || nav.previousCommand || nav.nextCommand))
     pageFooter = `**第${nav.current}/${nav.total}页**`
-  const previousLink = nav?.previousCommand ? `[上一页](${inlineCommandUrl(nav.previousCommand)})` : undefined
-  const nextLink = nav?.nextCommand ? `[下一页](${inlineCommandUrl(nav.nextCommand)})` : undefined
+  const previousLink = nav?.previousCommand
+    ? `[${nav.previousCommand === '上一个' ? '上一个' : '上一页'}](${inlineCommandUrl(nav.previousCommand)})`
+    : undefined
+  const nextLink = nav?.nextCommand
+    ? `[${nav.nextCommand === '下一个' ? '下一个' : '下一页'}](${inlineCommandUrl(nav.nextCommand)})`
+    : undefined
   const helpLink = hasHelp ? `[指令](${inlineCommandUrl('指令')})` : undefined
   const footer = pageFooter
     ? [pageFooter, previousLink, nextLink, helpLink].filter(Boolean).join('·')

package/src/plugin/serverHandel/qqTransactionMessage.ts

@@ -35,7 +35,7 @@ export function renderQQTransactionMarkdown(data: MsgMessage, showGreeting: bool
       : item.content === '[否]取消交易' ? { command: '否', label: '取消交易' } : undefined)
     if (action) {
       flushBody()
-      actions.push(`[${action.command}](${inlineCommandUrl(action.command)}) ${action.label}`)
+      actions.push(`[${action.label}](${inlineCommandUrl(action.command)})`)
       continue
     }
     flushActions()

package/src/plugin/serverHandel/text.ts

@@ -4,15 +4,17 @@ import sessions, { sessionKey } from '../sessions'
 import handel_base from './handel_base'
 import { canSendQQPage, pageCommandLines, sendQQPage } from './qqPageMessage'
 import { sendQQTransaction } from './qqTransactionMessage'
+import { sendQQCommand } from './qqCommandMessage'
 
 export default class handelr_text extends handel_base {
   async start(data: MsgMessage) {
     const content = new AnalysisMsg().parse(data)
     const session = sessions.get(sessionKey(data.botId, data.userId, data.channelId))
-    if ((data.transaction || data.pageNav) && canSendQQPage(session, data)) {
+    if ((data.commandHelp || data.transaction || data.pageNav) && canSendQQPage(session, data)) {
       const sendStartedAt = this.timing ? performance.now() : 0
       try {
-        if (data.transaction) await sendQQTransaction(session, data)
+        if (data.commandHelp) await sendQQCommand(session, data)
+        else if (data.transaction) await sendQQTransaction(session, data)
         else await sendQQPage(session, data)
         if (this.timing) {
           this.timing.delivery = 'qq-markdown'
@@ -22,7 +24,7 @@ export default class handelr_text extends handel_base {
       } catch (error) {
         this.ctx.logger.warn('QQ Markdown 发送失败，改用普通文字', error instanceof Error ? error.message : error)
       }
-      const commands = !data.transaction && data.pageNav ? pageCommandLines(data.pageNav) : []
+      const commands = !data.commandHelp && !data.transaction && data.pageNav ? pageCommandLines(data.pageNav) : []
       await this.send(data, commands.length ? `${content.trimEnd()}\n${commands.join('\n')}` : content)
       return
     }

package/src/shared/bot/serviceProto.ts

@@ -20,7 +20,7 @@ export interface ServiceType {
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 12,
+    "version": 13,
     "services": [
         {
             "id": 0,
@@ -163,6 +163,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     },
                     "optional": true
                 },
+                {
+                    "id": 9,
+                    "name": "commandHelp",
+                    "type": {
+                        "type": "Boolean"
+                    },
+                    "optional": true
+                },
                 {
                     "id": 1,
                     "name": "line",
@@ -1058,4 +1066,4 @@ export const serviceProto: ServiceProto<ServiceType> = {
             ]
         }
     }
-};
+};

package/src/shared/face/index.ts

@@ -105,6 +105,8 @@ export interface IMessage {
     pageNav?: PageNavData;
     /** 通用交易确认、结果与失败消息；客户端可使用交易 Markdown 展示。 */
     transaction?: boolean;
+    /** 指令系统与指令提示；客户端可用 Markdown 展示可点击的方框指令。 */
+    commandHelp?: boolean;
     /** 消息项列表 **/
     line: IMessageItem[];
 }