mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make room summary tests pass again

Browse source
This commit is contained in:
Till Faelligen 2022-10-02 13:11:52 +02:00
parent cbfe2c9e63
commit d892a88dbe
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
syncapi/types/types.go
View file

@ -475,9 +475,15 @@ func (jr JoinResponse) MarshalJSON() ([]byte, error) {
if jr.Timeline != nil && len(jr.Timeline.Events) == 0 { if jr.Timeline != nil && len(jr.Timeline.Events) == 0 {
a.Timeline = nil a.Timeline = nil
} }
if jr.Summary != nil && len(jr.Summary.Heroes) == 0 { if jr.Summary != nil {
var nilPtr int
joinedEmpty := jr.Summary.JoinedMemberCount == nil || jr.Summary.JoinedMemberCount == &nilPtr
invitedEmpty := jr.Summary.InvitedMemberCount == nil || jr.Summary.InvitedMemberCount == &nilPtr
if joinedEmpty && invitedEmpty && len(jr.Summary.Heroes) == 0 {
a.Summary = nil a.Summary = nil
} }
}
if jr.UnreadNotifications != nil && if jr.UnreadNotifications != nil &&
jr.UnreadNotifications.NotificationCount == 0 && jr.UnreadNotifications.HighlightCount == 0 { jr.UnreadNotifications.NotificationCount == 0 && jr.UnreadNotifications.HighlightCount == 0 {
a.UnreadNotifications = nil a.UnreadNotifications = nil