From bbfeccaacf4284415d419faa6a8de1cfff41b5cc Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Mon, 21 Aug 2017 14:29:04 +0100 Subject: [PATCH] Fix comments --- .../matrix-org/dendrite/roomserver/input/membership.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/roomserver/input/membership.go b/src/github.com/matrix-org/dendrite/roomserver/input/membership.go index 2cf9d0d4a..6eeb0914d 100644 --- a/src/github.com/matrix-org/dendrite/roomserver/input/membership.go +++ b/src/github.com/matrix-org/dendrite/roomserver/input/membership.go @@ -97,7 +97,7 @@ func updateMembership( } if old == new && new != "join" { // 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 } @@ -152,7 +152,8 @@ func updateToJoinMembership( mu types.MembershipUpdater, add *gomatrixserverlib.Event, updates []api.OutputEvent, ) ([]api.OutputEvent, error) { // 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() { _, err := mu.SetToJoin(add.Sender(), add.EventID(), true) if err != nil {