From 9e5b1ba28e1e0a87e46fd3470f1e4c61b4d230af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Sun, 19 May 2024 21:18:33 +0800 Subject: [PATCH] build: 1.3.5-re --- src/onebot11/action/msg/SendMsg/index.ts | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/onebot11/action/msg/SendMsg/index.ts b/src/onebot11/action/msg/SendMsg/index.ts index ed8ae849..85ca39aa 100644 --- a/src/onebot11/action/msg/SendMsg/index.ts +++ b/src/onebot11/action/msg/SendMsg/index.ts @@ -24,11 +24,21 @@ export interface ReturnDataType { // Normalizes a mixed type (CQCode/a single segment/segment array) into a segment array. export function normalize(message: OB11MessageMixType, autoEscape = false): OB11MessageData[] { - return typeof message === 'string' ? ( - autoEscape ? - [{ type: OB11MessageDataType.text, data: { text: message } }] : - decodeCQCode(message) - ) : Array.isArray(message) ? message : [message]; + if (typeof message === 'string') { + if (autoEscape) { + return [{ type: OB11MessageDataType.text, data: { text: message } }]; + } else { + try { + return decodeCQCode(message); + } catch { + return [{ type: OB11MessageDataType.text, data: { text: message } }]; + } + } + } else if (Array.isArray(message)) { + return message; + } else { + return [message]; + } } export { createSendElements };