diff --git a/coolq/cqcode.go b/coolq/cqcode.go
index f092a5f..e15305f 100644
--- a/coolq/cqcode.go
+++ b/coolq/cqcode.go
@@ -1,9 +1,11 @@
package coolq
import (
+ "bytes"
"crypto/md5"
"encoding/base64"
"encoding/hex"
+ xml2 "encoding/xml"
"errors"
"fmt"
"github.com/Mrs4s/MiraiGo/binary"
@@ -310,7 +312,12 @@ func (bot *CQBot) ConvertStringMessage(m string, group bool) (r []message.IMessa
}
continue
}
- r = append(r, elem)
+ switch i := elem.(type) {
+ case message.IMessageElement:
+ r = append(r, i)
+ case []message.IMessageElement:
+ r = append(r, i...)
+ }
}
if si != len(m) {
r = append(r, message.NewText(CQCodeUnescapeText(m[si:])))
@@ -354,7 +361,13 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
log.Warnf("转换CQ码到MiraiGo Element时出现错误: %v 将忽略本段CQ码.", err)
return
}
- r = append(r, elem)
+ switch i := elem.(type) {
+ case message.IMessageElement:
+ r = append(r, i)
+ case []message.IMessageElement:
+ r = append(r, i...)
+ }
+
}
if m.Type == gjson.String {
return bot.ConvertStringMessage(m.Str, group)
@@ -370,7 +383,10 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, group bool) (r []message.
return
}
-func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m message.IMessageElement, err error) {
+// ToElement 将解码后的CQCode转换为Element.
+// 返回 interface{} 存在三种类型
+// message.IMessageElement []message.IMessageElement nil
+func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interface{}, err error) {
switch t {
case "text":
return message.NewText(d["text"]), nil
@@ -554,7 +570,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m messag
}}, nil
}
xml := fmt.Sprintf(`- %s%s
`,
- d["title"], d["url"], d["image"], d["audio"], d["title"], d["content"])
+ XmlEscape(d["title"]), d["url"], d["image"], d["audio"], XmlEscape(d["title"]), XmlEscape(d["content"]))
return &message.ServiceElement{
Id: 60,
Content: xml,
@@ -604,13 +620,19 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m messag
if err != nil {
return nil, errors.New("send cardimage faild")
}
- return bot.SendNewPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group)
+ return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group)
default:
return nil, errors.New("unsupported cq code: " + t)
}
return nil, nil
}
+func XmlEscape(c string) string {
+ buf := new(bytes.Buffer)
+ _ = xml2.EscapeText(buf, []byte(c))
+ return buf.String()
+}
+
func CQCodeEscapeText(raw string) string {
ret := raw
ret = strings.ReplaceAll(ret, "&", "&")
@@ -753,10 +775,10 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
return nil, errors.New("invalid image")
}
-//SendNewPic 一种xml 方式发送的群消息图片
-func (bot *CQBot) SendNewPic(elem message.IMessageElement, source string, icon string, minWidth int64, minHeight int64, maxWidth int64, maxHeight int64, group bool) (*message.ServiceElement, error) {
- var xml string
- xml = ""
+//makeShowPic 一种xml 方式发送的群消息图片
+func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon string, minWidth int64, minHeight int64, maxWidth int64, maxHeight int64, group bool) ([]message.IMessageElement, error) {
+ xml := ""
+ var suf message.IMessageElement
if i, ok := elem.(*message.ImageElement); ok {
if group == false {
gm, err := bot.Client.UploadPrivateImage(1, i.Data)
@@ -764,27 +786,32 @@ func (bot *CQBot) SendNewPic(elem message.IMessageElement, source string, icon s
log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err)
return nil, err
}
+ suf = gm
xml = fmt.Sprintf(`