mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-23 14:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix order of checks

Browse source
This commit is contained in:
Kegan Dougal 2020-10-02 16:02:09 +01:00
parent 7b47e8456e
commit 7b1c227155
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
syncapi/routing/messages.go
View file

@ -318,10 +318,6 @@ func (r *messagesReq) filterHistoryVisible(events []gomatrixserverlib.HeaderedEv
hisVisEvent = &queryRes.StateEvents[i] hisVisEvent = &queryRes.StateEvents[i]
} }
} }
if membershipEvent == nil {
wasJoined = false
break
}
if hisVisEvent == nil { if hisVisEvent == nil {
return events // apply no filtering as it defaults to Shared. return events // apply no filtering as it defaults to Shared.
} }
@ -329,6 +325,10 @@ func (r *messagesReq) filterHistoryVisible(events []gomatrixserverlib.HeaderedEv
if hisVis == "shared" { if hisVis == "shared" {
return events // apply no filtering return events // apply no filtering
} }
if membershipEvent == nil {
wasJoined = false
break
}
membership, err := membershipEvent.Membership() membership, err := membershipEvent.Membership()
if err != nil { if err != nil {
wasJoined = false wasJoined = false