diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-24 18:33:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 18:33:27 +0000 |
| commit | 80bcca659e42a8c3ec22cea855c5a007370fe5ad (patch) | |
| tree | ee6b549cc63f08ac6e251ed7d2a9eff4e0873581 /synapse/storage | |
| parent | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2 (diff) | |
| parent | Update make_membership_event docs (diff) | |
| download | synapse-80bcca659e42a8c3ec22cea855c5a007370fe5ad.tar.xz | |
Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invites
Store rejected remote invite events as outliers
Diffstat (limited to 'synapse/storage')
| -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: |