shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 19:17:38 +08:00
Code Issues Projects Releases Wiki Activity

严谨一点，校验下json格式的富文本，其他非xml和json的富文本 写入text

Browse Source
This commit is contained in:
scjtqs 2020-09-06 10:50:13 +08:00
parent abb9e6d636
commit e8b715ea6e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@ -4,5 +4,6 @@ go 1.14
require ( require (
github.com/golang/protobuf v1.4.2 github.com/golang/protobuf v1.4.2
github.com/tidwall/gjson v1.6.1 // indirect
google.golang.org/protobuf v1.25.0 google.golang.org/protobuf v1.25.0
) )

9
message/message.go
View File

@ -6,6 +6,7 @@ import (
"github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/client/pb/msg"
"github.com/Mrs4s/MiraiGo/utils" "github.com/Mrs4s/MiraiGo/utils"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/tidwall/gjson"
"math" "math"
"reflect" "reflect"
"regexp" "regexp"
@ -504,10 +505,14 @@ func ParseMessageElems(elems []*msg.Elem) []IMessageElement {
} }
if isOk := strings.Contains(content, "<?xml"); isOk { if isOk := strings.Contains(content, "<?xml"); isOk {
res = append(res, NewRichXml(content, int64(elem.RichMsg.ServiceId))) res = append(res, NewRichXml(content, int64(elem.RichMsg.ServiceId)))
continue
} else { } else {
res = append(res, NewRichJson(content)) if gjson.Valid(content) {
res = append(res, NewRichJson(content))
continue
}
} }
//res = append(res, NewText(content)) res = append(res, NewText(content))
} }
} }
if elem.CustomFace != nil { if elem.CustomFace != nil {