1
0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 19:17:38 +08:00

Merge branch 'master' of https://github.com/Mrs4s/MiraiGo into more_server

This commit is contained in:
LXY1226 2020-08-02 21:01:52 +08:00
commit 1da6a89f82

View File

@ -208,7 +208,7 @@ func ToProtoElems(elems []IMessageElement, generalFlags bool) (r []*msg.Elem) {
SenderUin: reply.Sender, SenderUin: reply.Sender,
Time: reply.Time, Time: reply.Time,
Flag: 1, Flag: 1,
Elems: ToProtoElems(reply.Elements, false), Elems: ToSrcProtoElems(reply.Elements),
RichMsg: []byte{}, RichMsg: []byte{},
PbReserve: []byte{}, PbReserve: []byte{},
SrcMsg: []byte{}, SrcMsg: []byte{},
@ -343,6 +343,22 @@ func ToProtoElems(elems []IMessageElement, generalFlags bool) (r []*msg.Elem) {
return return
} }
func ToSrcProtoElems(elems []IMessageElement) (r []*msg.Elem) {
for _, elem := range elems {
switch e := elem.(type) {
case *ImageElement, *GroupImageElement, *FriendImageElement:
r = append(r, &msg.Elem{
Text: &msg.Text{
Str: "[图片]",
},
})
default:
r = append(r, ToProtoElems([]IMessageElement{e}, false)...)
}
}
return
}
func ParseMessageElems(elems []*msg.Elem) []IMessageElement { func ParseMessageElems(elems []*msg.Elem) []IMessageElement {
var res []IMessageElement var res []IMessageElement
for _, elem := range elems { for _, elem := range elems {