@@ -77,17 +77,11 @@ type (
7777 }
7878
7979 Sender struct {
80- Uin uint32
81- UID string
82- Nickname string
83- CardName string
84- AnonymousInfo * AnonymousInfo
85- IsFriend bool
86- }
87-
88- AnonymousInfo struct {
89- AnonymousID string
90- AnonymousNick string
80+ Uin uint32
81+ UID string
82+ Nickname string
83+ CardName string
84+ IsFriend bool
9185 }
9286
9387 IMessageElement interface {
@@ -97,10 +91,6 @@ type (
9791 ElementType int
9892)
9993
100- func (s * Sender ) IsAnonymous () bool {
101- return s .Uin == 80000000
102- }
103-
10494func ParsePrivateMessage (msg * message.PushMsgBody ) * PrivateMessage {
10595 prvMsg := & PrivateMessage {
10696 ID : msg .ContentHead .Sequence .Unwrap (),
@@ -161,26 +151,24 @@ func ParseMessageElements(msg []*message.Elem) []IMessageElement {
161151 continue
162152 }
163153 if elem .SrcMsg != nil && len (elem .SrcMsg .OrigSeqs ) != 0 {
164- r := & ReplyElement {
154+ res = append ( res , & ReplyElement {
165155 ReplySeq : elem .SrcMsg .OrigSeqs [0 ],
166156 Time : uint32 (elem .SrcMsg .Time .Unwrap ()),
167157 SenderUin : uint32 (elem .SrcMsg .SenderUin ),
168158 GroupUin : uint32 (elem .SrcMsg .ToUin .Unwrap ()),
169159 Elements : ParseMessageElements (elem .SrcMsg .Elems ),
170- }
171- res = append (res , r )
160+ })
172161 }
173162
174163 if elem .Text != nil {
175- switch {
176- case len (elem .Text .Attr6Buf ) > 0 :
164+ if len (elem .Text .Attr6Buf ) > 0 {
177165 att6 := binary .NewReader (elem .Text .Attr6Buf )
178166 att6 .SkipBytes (7 )
179167 target := att6 .ReadU32 ()
180168 at := NewAt (target , elem .Text .Str .Unwrap ())
181169 at .SubType = AtTypeGroupMember
182170 res = append (res , at )
183- default :
171+ } else {
184172 res = append (res , NewText (func () string {
185173 if strings .Contains (elem .Text .Str .Unwrap (), "\r " ) && ! strings .Contains (elem .Text .Str .Unwrap (), "\r \n " ) {
186174 return strings .ReplaceAll (elem .Text .Str .Unwrap (), "\r " , "\r \n " )
@@ -191,24 +179,25 @@ func ParseMessageElements(msg []*message.Elem) []IMessageElement {
191179 }
192180
193181 if elem .Face != nil {
194- switch {
195- case len (elem .Face .Old ) > 0 :
182+ if len (elem .Face .Old ) > 0 {
196183 faceID := elem .Face .Index
197184 if faceID .IsSome () {
198185 res = append (res , & FaceElement {FaceID : uint32 (faceID .Unwrap ())})
199186 }
200- case elem .CommonElem != nil && elem .CommonElem .ServiceType == 37 && elem .CommonElem .PbElem != nil :
201- qFace := message.QFaceExtra {}
202- if err := proto .Unmarshal (elem .CommonElem .PbElem , & qFace ); err == nil {
203- if qFace .Qsid .IsSome () {
204- res = append (res , & FaceElement {FaceID : uint32 (qFace .Qsid .Unwrap ()), isLargeFace : true })
187+ } else if elem .CommonElem != nil && elem .CommonElem .PbElem != nil {
188+ if elem .CommonElem .ServiceType == 37 {
189+ qFace := message.QFaceExtra {}
190+ if err := proto .Unmarshal (elem .CommonElem .PbElem , & qFace ); err == nil {
191+ if qFace .Qsid .IsSome () {
192+ res = append (res , & FaceElement {FaceID : uint32 (qFace .Qsid .Unwrap ()), isLargeFace : true })
193+ }
194+ }
195+ } else if elem .CommonElem .ServiceType == 33 {
196+ qFace := message.QSmallFaceExtra {}
197+ err := proto .Unmarshal (elem .CommonElem .PbElem , & qFace )
198+ if err == nil {
199+ res = append (res , & FaceElement {FaceID : qFace .FaceId , isLargeFace : false })
205200 }
206- }
207- case elem .CommonElem != nil && elem .CommonElem .ServiceType == 33 && elem .CommonElem .PbElem != nil :
208- qFace := message.QSmallFaceExtra {}
209- err := proto .Unmarshal (elem .CommonElem .PbElem , & qFace )
210- if err == nil {
211- res = append (res , & FaceElement {FaceID : qFace .FaceId , isLargeFace : false })
212201 }
213202 }
214203 }
@@ -328,7 +317,7 @@ func ParseMessageElements(msg []*message.Elem) []IMessageElement {
328317 })
329318 case 11 , 21 : // video
330319 var thumb = new (VideoThumb )
331- if ! ( len (extra .MsgInfoBody ) < 2 ) {
320+ if len (extra .MsgInfoBody ) > 1 {
332321 info := extra .MsgInfoBody [1 ].Index
333322 thumb .Size = info .Info .FileSize
334323 thumb .Width = info .Info .Width
@@ -408,7 +397,7 @@ func ParseMessageElements(msg []*message.Elem) []IMessageElement {
408397 } else {
409398 res = append (res , & XMLElement {
410399 ServiceID : 35 ,
411- Content : utils .B2S (binary . ZlibUncompress ( elem . RichMsg . Template1 [ 1 :]) ),
400+ Content : utils .B2S (xmlData ),
412401 })
413402 }
414403 }
@@ -450,8 +439,7 @@ func ParseMessageBody(body *message.MessageBody, isGroup bool) []IMessageElement
450439 if body != nil {
451440 if body .RichText != nil && body .RichText .Ptt != nil {
452441 ptt := body .RichText .Ptt
453- switch {
454- case isGroup && ptt .FileId != 0 :
442+ if isGroup && ptt .FileId != 0 {
455443 res = append (res , & VoiceElement {
456444 Name : ptt .FileName ,
457445 UUID : ptt .FileUuid ,
@@ -460,7 +448,7 @@ func ParseMessageBody(body *message.MessageBody, isGroup bool) []IMessageElement
460448 FileUuid : ptt .GroupFileKey ,
461449 },
462450 })
463- case ! isGroup :
451+ } else if ! isGroup {
464452 res = append (res , & VoiceElement {
465453 Name : ptt .FileName ,
466454 UUID : ptt .FileUuid ,
@@ -654,11 +642,9 @@ func PackElementsToBody(msgElems []IMessageElement) (msgBody *message.MessageBod
654642 RichText : & message.RichText {Elems : PackElements (msgElems )},
655643 }
656644 for _ , elem := range msgElems {
657- bd , ok := elem .(MsgContentBuilder )
658- if ! ok {
659- continue
645+ if bd , ok := elem .(MsgContentBuilder ); ok {
646+ msgBody .MsgContent = bd .BuildContent ()
660647 }
661- msgBody .MsgContent = bd .BuildContent ()
662648 }
663649 return
664650}
@@ -669,11 +655,9 @@ func PackElements(msgElems []IMessageElement) []*message.Elem {
669655 }
670656 elems := make ([]* message.Elem , 0 , len (msgElems ))
671657 for _ , elem := range msgElems {
672- bd , ok := elem .(ElementBuilder )
673- if ! ok {
674- continue
658+ if bd , ok := elem .(ElementBuilder ); ok {
659+ elems = append (elems , bd .BuildElement ()... )
675660 }
676- elems = append (elems , bd .BuildElement ()... )
677661 }
678662 return elems
679663}
0 commit comments