koishi-plugin-dew-bot 1.0.244 → 1.0.245

package/lib/index.js

@@ -721,6 +721,11 @@ function pageCommand(command) {
   return command.startsWith("/") ? command : `/${command}`;
 }
 __name(pageCommand, "pageCommand");
+function inlineCommandUrl(command) {
+  const encoded = encodeURIComponent(pageCommand(command)).replace(/[!'()*]/g, (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`);
+  return `mqqapi://aio/inlinecmd?command=${encoded}&enter=true&reply=false`;
+}
+__name(inlineCommandUrl, "inlineCommandUrl");
 function pageCommandLines(nav) {
   return [
     ...nav.previousCommand ? [`上一页：${pageCommand(nav.previousCommand)}`] : [],
@@ -729,23 +734,67 @@ function pageCommandLines(nav) {
 }
 __name(pageCommandLines, "pageCommandLines");
 function renderQQPageMarkdown(data, showGreeting, showCommands) {
+  const nav = data.pageNav;
+  const entryCommands = new Map(nav?.entries?.map((entry) => [entry.lineIndex, entry.viewCommand]) ?? []);
   const sections = [];
+  const bodyLines = [];
+  const numberedLines = [];
+  const flushBody = /* @__PURE__ */ __name(() => {
+    if (bodyLines.length) sections.push(bodyLines.splice(0).join("  \n"));
+  }, "flushBody");
+  const flushNumbered = /* @__PURE__ */ __name(() => {
+    if (numberedLines.length) sections.push(numberedLines.splice(0).join("\n"));
+  }, "flushNumbered");
+  const flush = /* @__PURE__ */ __name(() => {
+    flushNumbered();
+    flushBody();
+  }, "flush");
+  let hasPageSummary = false;
   if (showGreeting) sections.push(escapeMarkdown("Ciallo～(∠・ω< )"));
-  for (const item of data.line) {
+  for (const [lineIndex, item] of data.line.entries()) {
     switch (item.type) {
       case 0 /* title */:
+        flush();
         sections.push(`### ${escapeMarkdown(item.content)}`);
         break;
-      case 1 /* line */:
-        sections.push(escapeMarkdown(item.content));
+      case 1 /* line */: {
+        const numbered = /^\[(\d+)\]\s*([^\r\n]+)$/.exec(item.content);
+        if (numbered) {
+          flushBody();
+          const command = entryCommands.get(lineIndex);
+          const label = escapeMarkdown(numbered[2]);
+          const name2 = command ? `[${label}](${inlineCommandUrl(command)})` : label;
+          numberedLines.push(`${numbered[1]}. ${name2}`);
+          break;
+        }
+        flushNumbered();
+        if (/^\[指令\]相关指令$/.test(item.content)) {
+          flushBody();
+          sections.push(`更多操作：[指令](${inlineCommandUrl("指令")})`);
+          break;
+        }
+        const page = /^第\s*\d+\s*\/\s*\d+\s*页(?:\s*[｜|]\s*共\s*(\d+)\s*([项条]))?$/.exec(item.content);
+        if (page && nav) {
+          flushBody();
+          sections.push(`**第 ${nav.current} / ${nav.total} 页${page[1] ? ` · 共 ${page[1]} ${page[2]}` : ""}**`);
+          hasPageSummary = true;
+          break;
+        }
+        bodyLines.push(escapeMarkdown(item.content));
         break;
+      }
       case 2 /* error */:
+        flush();
         sections.push(`❌ 出错了！错误原因：${escapeMarkdown(item.content)}，请反馈至联系开发者`);
         break;
     }
   }
-  if (showCommands && data.pageNav) {
-    sections.push(...pageCommandLines(data.pageNav).map(escapeMarkdown));
+  flush();
+  if (nav && !hasPageSummary) sections.push(`**第 ${nav.current} / ${nav.total} 页**`);
+  if (showCommands && nav) {
+    const commands = pageCommandLines(nav);
+    if (commands.length) sections.push(`**翻页指令**  
+${commands.map(escapeMarkdown).join("  \n")}`);
   }
   return sections.join("\n\n") || " ";
 }
@@ -783,14 +832,16 @@ async function sendQQPage(session, data, withKeyboard) {
   const nav = data.pageNav;
   const buttons = withKeyboard ? buttonsFor(nav, data.userId, session.isDirect) : [];
   const markdown = renderQQPageMarkdown(data, session.event?.channel?.type === 0, buttons.length === 0);
+  const hasEntries = !!nav.entries?.length;
+  const hasInlineHelp = data.line.some((item) => item.type === 1 /* line */ && item.content === "[指令]相关指令");
   const request = {
     // With msg_type=2, QQ requires the ordinary content field to be empty.
     content: "",
     msg_type: 2,
     markdown: {
-      content: buttons.length && !session.isDirect ? `${markdown}
+      content: !session.isDirect && (buttons.length || hasEntries || hasInlineHelp) ? `${markdown}
 
-群聊中点击按钮后，请发送已填入的指令。` : markdown
+点击后如未自动发送，请点发送。` : markdown
     },
     ...buttons.length ? { keyboard: { content: { rows: [{ buttons }] } } } : {}
   };
@@ -912,7 +963,7 @@ var import_tsrpc = require("tsrpc");
 
 // src/shared/bot/serviceProto.ts
 var serviceProto = {
-  "version": 9,
+  "version": 10,
   "services": [
     {
       "id": 0,
@@ -1665,6 +1716,33 @@ var serviceProto = {
             "type": "String"
           },
           "optional": true
+        },
+        {
+          "id": 4,
+          "name": "entries",
+          "type": {
+            "type": "Array",
+            "elementType": {
+              "type": "Interface",
+              "properties": [
+                {
+                  "id": 0,
+                  "name": "lineIndex",
+                  "type": {
+                    "type": "Number"
+                  }
+                },
+                {
+                  "id": 1,
+                  "name": "viewCommand",
+                  "type": {
+                    "type": "String"
+                  }
+                }
+              ]
+            }
+          },
+          "optional": true
         }
       ]
     },

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

@@ -114,6 +114,11 @@ export interface PageNavData {
     total: number;
     previousCommand?: string;
     nextCommand?: string;
+    /** 可点击的列表行；lineIndex 是 IMessage.line 的零起始位置。 */
+    entries?: Array<{
+        lineIndex: number;
+        viewCommand: string;
+    }>;
 }
 /** 下发给客户端的消息主体 **/
 export interface IMessage {

package/package.json

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

package/src/plugin/serverHandel/qqPageMessage.ts

@@ -44,6 +44,14 @@ export function pageCommand(command: string): string {
   return command.startsWith('/') ? command : `/${command}`
 }
 
+function inlineCommandUrl(command: string): string {
+  // encodeURIComponent leaves parentheses unescaped, which would close the
+  // surrounding Markdown link if an item ID ever contained one.
+  const encoded = encodeURIComponent(pageCommand(command)).replace(/[!'()*]/g, character =>
+    `%${character.charCodeAt(0).toString(16).toUpperCase()}`)
+  return `mqqapi://aio/inlinecmd?command=${encoded}&enter=true&reply=false`
+}
+
 export function pageCommandLines(nav: PageNavData): string[] {
   return [
     ...(nav.previousCommand ? [`上一页：${pageCommand(nav.previousCommand)}`] : []),
@@ -52,23 +60,65 @@ export function pageCommandLines(nav: PageNavData): string[] {
 }
 
 export function renderQQPageMarkdown(data: MsgMessage, showGreeting: boolean, showCommands: boolean): string {
+  const nav = data.pageNav
+  const entryCommands = new Map(nav?.entries?.map(entry => [entry.lineIndex, entry.viewCommand]) ?? [])
   const sections: string[] = []
+  const bodyLines: string[] = []
+  const numberedLines: string[] = []
+  const flushBody = () => {
+    if (bodyLines.length) sections.push(bodyLines.splice(0).join('  \n'))
+  }
+  const flushNumbered = () => {
+    if (numberedLines.length) sections.push(numberedLines.splice(0).join('\n'))
+  }
+  const flush = () => { flushNumbered(); flushBody() }
+  let hasPageSummary = false
   if (showGreeting) sections.push(escapeMarkdown('Ciallo～(∠・ω< )'))
-  for (const item of data.line) {
+  for (const [lineIndex, item] of data.line.entries()) {
     switch (item.type) {
       case MessageType.title:
+        flush()
         sections.push(`### ${escapeMarkdown(item.content)}`)
         break
-      case MessageType.line:
-        sections.push(escapeMarkdown(item.content))
+      case MessageType.line: {
+        const numbered = /^\[(\d+)\]\s*([^\r\n]+)$/.exec(item.content)
+        if (numbered) {
+          flushBody()
+          const command = entryCommands.get(lineIndex)
+          const label = escapeMarkdown(numbered[2])
+          const name = command
+            ? `[${label}](${inlineCommandUrl(command)})`
+            : label
+          numberedLines.push(`${numbered[1]}. ${name}`)
+          break
+        }
+        flushNumbered()
+        if (/^\[指令\]相关指令$/.test(item.content)) {
+          flushBody()
+          sections.push(`更多操作：[指令](${inlineCommandUrl('指令')})`)
+          break
+        }
+        const page = /^第\s*\d+\s*\/\s*\d+\s*页(?:\s*[｜|]\s*共\s*(\d+)\s*([项条]))?$/.exec(item.content)
+        if (page && nav) {
+          flushBody()
+          sections.push(`**第 ${nav.current} / ${nav.total} 页${page[1] ? ` · 共 ${page[1]} ${page[2]}` : ''}**`)
+          hasPageSummary = true
+          break
+        }
+        bodyLines.push(escapeMarkdown(item.content))
         break
+      }
       case MessageType.error:
+        flush()
         sections.push(`❌ 出错了！错误原因：${escapeMarkdown(item.content)}，请反馈至联系开发者`)
         break
     }
   }
-  if (showCommands && data.pageNav) {
-    sections.push(...pageCommandLines(data.pageNav).map(escapeMarkdown))
+  flush()
+  if (nav && !hasPageSummary) sections.push(`**第 ${nav.current} / ${nav.total} 页**`)
+  if (showCommands && nav) {
+    const commands = pageCommandLines(nav)
+    if (commands.length) sections.push(`**翻页指令**  \n${commands.map(escapeMarkdown).join('  \n')}`)
   }
   return sections.join('\n\n') || ' '
 }
@@ -108,13 +158,15 @@ export async function sendQQPage(session: Session, data: MsgMessage, withKeyboar
   const nav = data.pageNav!
   const buttons = withKeyboard ? buttonsFor(nav, data.userId, session.isDirect) : []
   const markdown = renderQQPageMarkdown(data, session.event?.channel?.type === 0, buttons.length === 0)
+  const hasEntries = !!nav.entries?.length
+  const hasInlineHelp = data.line.some(item => item.type === MessageType.line && item.content === '[指令]相关指令')
   const request: QQRequest = {
     // With msg_type=2, QQ requires the ordinary content field to be empty.
     content: '',
     msg_type: 2,
     markdown: {
-      content: buttons.length && !session.isDirect
-        ? `${markdown}\n\n群聊中点击按钮后，请发送已填入的指令。`
+      content: !session.isDirect && (buttons.length || hasEntries || hasInlineHelp)
+        ? `${markdown}\n\n点击后如未自动发送，请点发送。`
         : markdown,
     },
     ...(buttons.length ? { keyboard: { content: { rows: [{ buttons }] } } } : {}),

package/src/shared/bot/serviceProto.ts

@@ -20,7 +20,7 @@ export interface ServiceType {
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 9,
+    "version": 10,
     "services": [
         {
             "id": 0,
@@ -773,6 +773,33 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         "type": "String"
                     },
                     "optional": true
+                },
+                {
+                    "id": 4,
+                    "name": "entries",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Interface",
+                            "properties": [
+                                {
+                                    "id": 0,
+                                    "name": "lineIndex",
+                                    "type": {
+                                        "type": "Number"
+                                    }
+                                },
+                                {
+                                    "id": 1,
+                                    "name": "viewCommand",
+                                    "type": {
+                                        "type": "String"
+                                    }
+                                }
+                            ]
+                        }
+                    },
+                    "optional": true
                 }
             ]
         },

package/src/shared/face/index.ts

@@ -89,6 +89,8 @@ export interface PageNavData {
     total: number;
     previousCommand?: string;
     nextCommand?: string;
+    /** 可点击的列表行；lineIndex 是 IMessage.line 的零起始位置。 */
+    entries?: Array<{ lineIndex: number; viewCommand: string }>;
 }
 
 /** 下发给客户端的消息主体 **/