From 7bdb84b11b16a33abf849d9b5a9d74343c58b332 Mon Sep 17 00:00:00 2001
From: super1207 <30586004+super1207@users.noreply.github.com>
Date: Sat, 9 Mar 2024 15:04:09 +0800
Subject: [PATCH] fix cqcode format

---
 src/onebot11/cqcode.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/onebot11/cqcode.ts b/src/onebot11/cqcode.ts
index bfec38e..d343925 100644
--- a/src/onebot11/cqcode.ts
+++ b/src/onebot11/cqcode.ts
@@ -46,15 +46,22 @@ export function decodeCQCode(source: string): OB11MessageData[] {
 
 
 export function encodeCQCode(data: OB11MessageData) {
-    const CQCodeEscape = (text: string) => {
-        return text.replace(/\[/g, '&#91;')
+    const CQCodeEscapeText = (text: string) => {
+        return text.replace(/\&/g, '&amp;')
+            .replace(/\[/g, '&#91;')
+            .replace(/\]/g, '&#93;')
+            
+    };
+
+    const CQCodeEscape = (text: string) => {
+        return text.replace(/\&/g, '&amp;')
+            .replace(/\[/g, '&#91;')
             .replace(/\]/g, '&#93;')
-            .replace(/\&/g, '&amp;')
             .replace(/,/g, '&#44;');
     };
 
     if (data.type === 'text') {
-        return CQCodeEscape(data.data.text);
+        return CQCodeEscapeText(data.data.text);
     }
 
     let result = '[CQ:' + data.type;
@@ -68,4 +75,4 @@ export function encodeCQCode(data: OB11MessageData) {
 
 // const result = parseCQCode("[CQ:at,qq=114514]早上好啊[CQ:image,file=http://baidu.com/1.jpg,type=show,id=40004]")
 // const result = parseCQCode("好好好")
-// console.log(JSON.stringify(result))
\ No newline at end of file
+// console.log(JSON.stringify(result))