diff options
| author | Erik Johnston <erik@matrix.org> | 2017-04-11 11:12:37 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-11 11:12:37 +0100 |
| commit | 4902db1fc978d1c9a3681720cffc4dbb9d72dbea (patch) | |
| tree | ee78b86f62119a7605ab2fdd1bc8afd3953e7978 /synapse/visibility.py | |
| parent | Merge branch 'release-v0.19.3' of github.com:matrix-org/synapse (diff) | |
| parent | Bump changelog (diff) | |
| download | synapse-4902db1fc978d1c9a3681720cffc4dbb9d72dbea.tar.xz | |
Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse v0.20.0
Diffstat (limited to 'synapse/visibility.py')
| -rw-r--r-- | synapse/visibility.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/visibility.py b/synapse/visibility.py index 199b16d827..31659156ae 100644 --- a/synapse/visibility.py +++ b/synapse/visibility.py @@ -134,6 +134,13 @@ def filter_events_for_clients(store, user_tuples, events, event_id_to_state): if prev_membership not in MEMBERSHIP_PRIORITY: prev_membership = "leave" + # Always allow the user to see their own leave events, otherwise + # they won't see the room disappear if they reject the invite + if membership == "leave" and ( + prev_membership == "join" or prev_membership == "invite" + ): + return True + new_priority = MEMBERSHIP_PRIORITY.index(membership) old_priority = MEMBERSHIP_PRIORITY.index(prev_membership) if old_priority < new_priority: |