koishi-plugin-dew-bot 1.0.261 → 1.0.263

package/src/plugin/serverHandel/qqPageMessage.ts

@@ -1,10 +1,13 @@
 import type { Session } from 'koishi'
 import { MessageType, type IMessage, type PageNavData } from '../../shared/face'
 import type { MsgMessage } from '../../shared/bot/MsgMessage'
+import { withoutMessageButtonFallbacks } from '../../shared/bot/analysisMsg'
+import { renderQQKeyboard, type QQKeyboard } from './qqMessageButtons'
 import { compactDisplayText, escapeMarkdown, renderQQTitle } from './qqMarkdownHelpers'
 import { isRewardMessage, renderRewardLine, renderRewardTitle } from './qqRewardMessage'
 import { artworkIdentity } from '../skillArtwork'
 import { battleLogLinkSpans, renderBattleLogLink } from './qqBattleLogLinks'
+import { inlineCommandSpans as bracketedCommandSpans, type InlineCommandSpan } from '../../shared/bot/inlineCommands'
 
 export { escapeMarkdown, renderQQTitle } from './qqMarkdownHelpers'
 
@@ -12,6 +15,7 @@ type QQRequest = {
   content: string
   msg_type: 2
   markdown: { content: string }
+  keyboard?: QQKeyboard
   msg_id?: string
   msg_seq?: number
 }
@@ -54,27 +58,9 @@ export function inlineCommandUrl(command: string): string {
 }
 
 
-type InlineCommandSpan = { start: number; end: number; label: string; command: string }
-
 /** Bracketed commands may appear anywhere in prose, including escaped brackets. */
 function inlineCommandSpans(content: string): InlineCommandSpan[] {
-  const spans: InlineCommandSpan[] = []
-  let depth = 0, start = 0, labelStart = 0
-  for (let index = 0; index < content.length; index++) {
-    if (content[index] === '[') {
-      if (depth === 0) {
-        start = index > 0 && content[index - 1] === '\\' ? index - 1 : index
-        labelStart = index + 1
-      }
-      depth++
-    } else if (content[index] === ']' && depth > 0 && --depth === 0) {
-      const label = content.slice(labelStart, index).replace(/\\$/, '')
-      if (!label.trim() || /[\[\]\r\n]/.test(label) || /^\d+$/.test(label.trim())) continue
-      // The refresh icon is part of the displayed label, not the command to send.
-      const command = label.split(/[+＋]/, 1)[0].trim().replace(/^🔄\s*/u, '')
-      if (command) spans.push({ start, end: index + 1, label, command })
-    }
-  }
+  const spans = bracketedCommandSpans(content)
   const logLinks = battleLogLinkSpans(content)
   return spans.filter(span => !logLinks.some(link => span.start < link.end && span.end > link.start))
 }
@@ -233,6 +219,7 @@ function renderQQInventoryMarkdown(data: IMessage, showGreeting: boolean): strin
 }
 
 export function renderQQPageMarkdown(data: IMessage, showGreeting: boolean): string {
+  data = withoutMessageButtonFallbacks(data)
   const hasEntryLabels = data.pageNav?.entries?.some(entry => entry.label !== undefined) ?? false
   if (data.task && !hasEntryLabels) return renderQQTaskMarkdown(data)
   if (!hasEntryLabels && data.pageNav && data.line.some(item => item.type === MessageType.title
@@ -375,11 +362,11 @@ export function canSendQQPage(session: Session | undefined, data: MsgMessage): s
 /** Send a native QQ Markdown page with inline command links. */
 export async function sendQQPage(session: Session, data: MsgMessage): Promise<void> {
   const markdown = renderQQPageMarkdown(data, session.event?.channel?.type === 0)
-  await sendQQMarkdown(session, markdown)
+  await sendQQMarkdown(session, markdown, renderQQKeyboard(data))
 }
 
 /** Reuse the adapter's native reply API for structured Markdown messages. */
-export async function sendQQMarkdown(session: Session, markdown: string): Promise<void> {
+export async function sendQQMarkdown(session: Session, markdown: string, keyboard?: QQKeyboard): Promise<void> {
   const internal = (session.bot as typeof session.bot & { internal: QQInternal }).internal
   const request: QQRequest = {
     // With msg_type=2, QQ requires the ordinary content field to be empty.
@@ -387,6 +374,7 @@ export async function sendQQMarkdown(session: Session, markdown: string): Promis
     msg_type: 2,
     markdown: { content: markdown },
   }
+  if (keyboard) request.keyboard = keyboard
   // Match the QQ adapter's passive-reply sequence.
   const age = Date.now() - session.timestamp
   if (session.messageId && Number.isFinite(age) && age >= 0 && age < 5 * 60 * 1000 - 2000) {

package/src/plugin/serverHandel/qqRewardMessage.ts

@@ -1,3 +1,4 @@
+import { withoutMessageButtonFallbacks } from '../../shared/bot/analysisMsg'
 import { MessageType, type IMessage } from '../../shared/face'
 import { compactDisplayText, escapeMarkdown } from './qqMarkdownHelpers'
 import { appendMissingBattleLogLinks, renderBattleLogLinkText } from './qqBattleLogLinks'
@@ -68,6 +69,7 @@ function renderQQMailMarkdown(data: IMessage): string {
 
 /** Reward cards stay compact; mail keeps its content before the attachment quote. */
 export function renderQQRewardMarkdown(data: IMessage, showGreeting: boolean): string {
+  data = withoutMessageButtonFallbacks(data)
   if (data.mail) return appendMissingBattleLogLinks(renderQQMailMarkdown(data), data)
   const rewards = data.line.filter(item => item.type === MessageType.line && item.reward)
     .map(item => renderRewardLine(item.content)).filter(Boolean)

package/src/plugin/serverHandel/qqStoryMessage.ts

@@ -1,3 +1,5 @@
+import { withoutMessageButtonFallbacks } from '../../shared/bot/analysisMsg'
+import { renderQQKeyboard } from './qqMessageButtons'
 import type { Session } from 'koishi'
 import { MessageType, type IMessage } from '../../shared/face'
 import type { MsgMessage } from '../../shared/bot/MsgMessage'
@@ -20,6 +22,7 @@ function fencedStory(content: string): string {
 
 /** Marked stories keep their complete text; settled rewards use the shared reward card. */
 export function renderQQStoryMarkdown(data: IMessage, showGreeting: boolean): string {
+  data = withoutMessageButtonFallbacks(data)
   if (data.reward === true && data.line.some(item => item.type === MessageType.line && item.reward === true && item.content.trim())) {
     const stories = data.line.filter(item => item.type === MessageType.line && item.codeBlock === true)
       .map(item => fencedStory(item.content))
@@ -75,5 +78,5 @@ export function renderQQStoryMarkdown(data: IMessage, showGreeting: boolean): st
 }
 
 export async function sendQQStory(session: Session, data: MsgMessage): Promise<void> {
-  await sendQQMarkdown(session, renderQQStoryMarkdown(data, session.event?.channel?.type === 0))
+  await sendQQMarkdown(session, renderQQStoryMarkdown(data, session.event?.channel?.type === 0), renderQQKeyboard(data))
 }

package/src/plugin/serverHandel/qqTransactionMessage.ts

@@ -1,3 +1,5 @@
+import { withoutMessageButtonFallbacks } from '../../shared/bot/analysisMsg'
+import { renderQQKeyboard } from './qqMessageButtons'
 import type { Session } from 'koishi'
 import { MessageType, type IMessage } from '../../shared/face'
 import type { MsgMessage } from '../../shared/bot/MsgMessage'
@@ -6,6 +8,7 @@ import { isRewardMessage, renderRewardLine, renderRewardTitle } from './qqReward
 
 /** Render only explicitly marked transactions; line content never enables this channel. */
 export function renderQQTransactionMarkdown(data: IMessage, showGreeting: boolean): string {
+  data = withoutMessageButtonFallbacks(data)
   const rewardMessage = isRewardMessage(data)
   const shortageMessage = data.transaction === true && data.line.some(item =>
     item.type === MessageType.title && item.content === '❌材料不足')
@@ -90,5 +93,5 @@ export function renderQQTransactionMarkdown(data: IMessage, showGreeting: boolea
 }
 
 export async function sendQQTransaction(session: Session, data: MsgMessage): Promise<void> {
-  await sendQQMarkdown(session, renderQQTransactionMarkdown(data, session.event?.channel?.type === 0))
+  await sendQQMarkdown(session, renderQQTransactionMarkdown(data, session.event?.channel?.type === 0), renderQQKeyboard(data))
 }

package/src/plugin/serverHandel/text.ts

@@ -12,7 +12,7 @@ export default class handelr_text extends handel_base {
     if (preview.markdown !== undefined && canSendQQPage(session, data)) {
       const sendStartedAt = this.timing ? performance.now() : 0
       try {
-        await sendQQMarkdown(session, preview.markdown)
+        await sendQQMarkdown(session, preview.markdown, preview.keyboard)
         if (this.timing) {
           this.timing.delivery = 'qq-markdown'
           this.timing.sendMs = performance.now() - sendStartedAt

package/src/shared/bot/analysisMsg.ts

@@ -1,5 +1,39 @@
 import { IMessage, MessageType, type PageNavData } from '../face'
+import { renderPlainInlineCommandAliases } from './inlineCommands'
 
+/** Platform-neutral button hints also work when Markdown or keyboards are unavailable. */
+export function messageButtonFallbackLines(data: Pick<IMessage, 'buttons'>): string[] {
+  return [...new Set((data.buttons ?? []).flatMap(row => row.buttons.map(button =>
+    '[' + button.command + ']' + button.label)))]
+}
+
+function matchesButtonFallback(content: string, fallback: string): boolean {
+  const bracket = fallback.indexOf(']')
+  const prefix = fallback.slice(0, bracket + 1)
+  const line = content.trim()
+  return line.startsWith(prefix) && line.slice(prefix.length).trim() === fallback.slice(prefix.length).trim()
+}
+
+export function appendMessageButtonFallbacks(content: string, data: Pick<IMessage, 'buttons'>): string {
+  const lines = content.replace(/\r\n?/g, '\n').split('\n')
+  const missing = messageButtonFallbackLines(data).filter(fallback =>
+    !lines.some(line => matchesButtonFallback(line, fallback)))
+  if (!missing.length) return content
+  return content + (content && !content.endsWith('\n') ? '\n' : '') + missing.join('\n') + '\n'
+}
+
+/** Remove only complete action hints; keep source line indexes used by page metadata. */
+export function withoutMessageButtonFallbacks<T extends IMessage>(data: T): T {
+  const fallbacks = messageButtonFallbackLines(data)
+  if (!fallbacks.length) return data
+  return { ...data, line: data.line.map(item => {
+    if (item.type !== MessageType.line || item.codeBlock || item.reward || item.mailPart !== undefined) return item
+    const lines = item.content.replace(/\r\n?/g, '\n').split('\n')
+    const kept = lines.filter(line => !fallbacks.some(fallback => matchesButtonFallback(line, fallback)))
+    return kept.length === lines.length ? item : { ...item, content: kept.join('\n') }
+  }) }
+}
+
 /** 把服务器下发的结构化行拼成纯文本；第一阶段只处理 title / line / error **/
 export class AnalysisMsg {
   parse(data: IMessage) {
@@ -31,7 +65,9 @@ export class AnalysisMsg {
             ? labeledRow.map(entry => entry.label! + (entry.description ? ' · ' + entry.description : '')
               + ` [${entry.viewCommand}]`).join('')
             : withCommandHint(item.content, commands.get(lineIndex))
-          msg += `${content}\n`
+          const plainContent = item.codeBlock || item.mailPart === 'body' || labeledRow
+            ? content : renderPlainInlineCommandAliases(content)
+          msg += `${plainContent}\n`
           break
         case MessageType.error:
           msg += `❌出错了!错误原因:${item.content},请反馈至联系开发者\n`
@@ -40,6 +76,7 @@ export class AnalysisMsg {
           break
       }
     }
+    msg = appendMessageButtonFallbacks(msg, data)
     if (haveTitle) {
       msg += '┄━════════━┄'
     }

package/src/shared/bot/inlineCommands.ts

@@ -0,0 +1,39 @@
+export type InlineCommandSpan = { start: number; end: number; label: string; command: string; aliased?: true }
+
+/** Boxed commands may use [label](command:input) to show a different action label. */
+export function inlineCommandSpans(content: string): InlineCommandSpan[] {
+  const spans: InlineCommandSpan[] = []
+  let depth = 0, start = 0, labelStart = 0
+  for (let index = 0; index < content.length; index++) {
+    if (content[index] === '[') {
+      if (depth === 0) {
+        start = index > 0 && content[index - 1] === '\\' ? index - 1 : index
+        labelStart = index + 1
+      }
+      depth++
+    } else if (content[index] === ']' && depth > 0 && --depth === 0) {
+      const label = content.slice(labelStart, index).replace(/\\$/, '')
+      if (!label.trim() || /[\[\]\r\n]/.test(label) || /^\d+$/.test(label.trim())) continue
+      const alias = /^\(command:([^()[\]\r\n]+)\)/.exec(content.slice(index + 1))
+      // Ordinary templates keep their existing command extraction rules.
+      const command = alias ? alias[1].trim() : label.split(/[+＋]/, 1)[0].trim().replace(/^🔄\s*/u, '')
+      if (!command) continue
+      const end = index + 1 + (alias?.[0].length ?? 0)
+      spans.push({ start, end, label, command, ...(alias ? { aliased: true as const } : {}) })
+      if (alias) index = end - 1
+    }
+  }
+  return spans
+}
+
+/** Keep aliased actions usable when the platform falls back to ordinary text. */
+export function renderPlainInlineCommandAliases(content: string): string {
+  let result = '', offset = 0
+  for (const span of inlineCommandSpans(content)) {
+    if (!span.aliased) continue
+    result += content.slice(offset, span.start)
+      + (span.label.trim() === span.command ? `[${span.command}]` : `${span.label}[${span.command}]`)
+    offset = span.end
+  }
+  return result + content.slice(offset)
+}

package/src/shared/bot/serviceProto.ts

@@ -25,7 +25,7 @@ export interface ServiceType {
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 37,
+    "version": 39,
     "services": [
         {
             "id": 0,
@@ -253,6 +253,18 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         "target": "messageFace/TitleCardData"
                     },
                     "optional": true
+                },
+                {
+                    "id": 17,
+                    "name": "buttons",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Reference",
+                            "target": "messageFace/MessageButtonRow"
+                        }
+                    },
+                    "optional": true
                 }
             ]
         },
@@ -709,6 +721,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         }
                     },
                     "optional": true
+                },
+                {
+                    "id": 14,
+                    "name": "explorationRank",
+                    "type": {
+                        "type": "String"
+                    },
+                    "optional": true
                 }
             ]
         },
@@ -1849,6 +1869,65 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "messageFace/MessageButtonRow": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "buttons",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Reference",
+                            "target": "messageFace/MessageButton"
+                        }
+                    }
+                }
+            ]
+        },
+        "messageFace/MessageButton": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "label",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "command",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "style",
+                    "type": {
+                        "type": "Union",
+                        "members": [
+                            {
+                                "id": 0,
+                                "type": {
+                                    "type": "Literal",
+                                    "literal": "primary"
+                                }
+                            },
+                            {
+                                "id": 1,
+                                "type": {
+                                    "type": "Literal",
+                                    "literal": "secondary"
+                                }
+                            }
+                        ]
+                    },
+                    "optional": true
+                }
+            ]
+        },
         "PtlMessage/ReqMessage": {
             "type": "Interface",
             "extends": [

package/src/shared/face/index.ts

@@ -38,7 +38,7 @@ export interface CharacterCardData {
     bloodlines: Array<{ name: string; quality: string; artworkUrl?: string }>;
     /** 当前基因锁大阶的配置名称，不包含层级；未开启时为基因锁未开启。 */
     geneLockRankName?: string;
-    /** 当前称号的图片链接；未获得称号或图片不可用时省略，客户端显示图片占位。 */
+    /** 当前称号的图片链接；未获得称号或图片不可用时省略，客户端不显示称号横幅。 */
     titleImageUrl?: string;
     /** 已获得的真实基因锁大阶（0～5）；0 表示尚未解锁。 */
     geneLockTier?: number;
@@ -46,6 +46,8 @@ export interface CharacterCardData {
     equipment?: Array<{ id: string; name: string; quality: string; slot: string; enhancement?: number }>;
     /** 当前构筑的全部技能，包括装备、递归附带与限时增益来源。 */
     skills?: Array<{ id: string; name: string; rank: number; quality?: string; type?: CompanionSkillType; artworkUrl?: string }>;
+    /** 玩家当前的轮回探索品阶（F～SSS），与角色等级、基因锁阶级分开显示。 */
+    explorationRank?: string;
 }
 export enum CompanionCardKind {
     pet = 'pet',
@@ -196,6 +198,19 @@ export interface PageNavData {
     filters?: Array<{ name: string; emoji?: string; command: string }>;
 }
 
+/** 平台无关的消息按钮；点击后发送普通指令，业务仍负责权限与状态校验。 */
+export interface MessageButton {
+    label: string;
+    command: string;
+    /** 主操作蓝色线框，次操作灰色线框；缺省为次操作。 */
+    style?: 'primary' | 'secondary';
+}
+
+/** 同一行的按钮；QQ 原生键盘最多五行，每行最多五个。 */
+export interface MessageButtonRow {
+    buttons: MessageButton[];
+}
+
 /** 下发给客户端的消息主体 **/
 export interface IMessage {
     handleType: MessageHandleType;
@@ -222,4 +237,6 @@ export interface IMessage {
     line: IMessageItem[];
     companionCard?: CompanionCardData;
     titleCard?: TitleCardData;
+    /** 通用指令按钮；不支持原生按钮的平台保留文字指令。 */
+    buttons?: MessageButtonRow[];
 }