diff options
| author | Neil Johnson <neil@matrix.org> | 2019-01-30 10:28:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 10:28:08 +0000 |
| commit | ee4df7fd7a8d4ce7732ded1736f52d200d645f25 (patch) | |
| tree | 79dfebdef9ce6951a7f6e3b2b657a768ddf86ffc /synapse/storage/roommember.py | |
| parent | define room dispositions for use in exposing room capabilities (diff) | |
| parent | Merge pull request #4486 from xperimental/workaround-4216 (diff) | |
| download | synapse-ee4df7fd7a8d4ce7732ded1736f52d200d645f25.tar.xz | |
Merge branch 'develop' into neilj/room_capabilities
Diffstat (limited to 'synapse/storage/roommember.py')
| -rw-r--r-- | synapse/storage/roommember.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 0707f9a86a..592c1bcd33 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -588,12 +588,12 @@ class RoomMemberStore(RoomMemberWorkerStore): ) # We update the local_invites table only if the event is "current", - # i.e., its something that has just happened. - # The only current event that can also be an outlier is if its an - # invite that has come in across federation. + # i.e., its something that has just happened. If the event is an + # outlier it is only current if its an "out of band membership", + # like a remote invite or a rejection of a remote invite. is_new_state = not backfilled and ( not event.internal_metadata.is_outlier() - or event.internal_metadata.is_invite_from_remote() + or event.internal_metadata.is_out_of_band_membership() ) is_mine = self.hs.is_mine_id(event.state_key) if is_new_state and is_mine: |