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

Fix comments

Browse source
This commit is contained in:
Brendan Abolivier 2017-08-21 14:29:04 +01:00
parent 9b3ecd5cdd
commit bbfeccaacf
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/github.com/matrix-org/dendrite/roomserver/input/membership.go
View file

@ -97,7 +97,7 @@ func updateMembership(
} }
if old == new && new != "join" { if old == new && new != "join" {
// If the membership is the same then nothing changed and we can return // If the membership is the same then nothing changed and we can return
// immediately. // immediately, unless it's a "join" update (e.g. profile update).
return updates, nil return updates, nil
} }
@ -152,7 +152,8 @@ func updateToJoinMembership(
mu types.MembershipUpdater, add *gomatrixserverlib.Event, updates []api.OutputEvent, mu types.MembershipUpdater, add *gomatrixserverlib.Event, updates []api.OutputEvent,
) ([]api.OutputEvent, error) { ) ([]api.OutputEvent, error) {
// If the user is already marked as being joined, we call SetToJoin to update // If the user is already marked as being joined, we call SetToJoin to update
// the event ID then we can return immediately. Retired is ignored as // the event ID then we can return immediately. Retired is ignored as there
// is no invite event to retire.
if mu.IsJoin() { if mu.IsJoin() {
_, err := mu.SetToJoin(add.Sender(), add.EventID(), true) _, err := mu.SetToJoin(add.Sender(), add.EventID(), true)
if err != nil { if err != nil {