summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-09-06 15:48:02 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-09-06 15:48:02 +0100
commite1c4d2c8bacaa85712eb3a26d6b7dd2fb34585d4 (patch)
tree3d80c0dfb09a8b2c11699c3065d75e080caae43a
parentFix bogus conflict resolution (diff)
downloadsynapse-e1c4d2c8bacaa85712eb3a26d6b7dd2fb34585d4.tar.xz
Only filter on 3PID invite tokens
-rw-r--r--synapse/third_party_rules/access_rules.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/third_party_rules/access_rules.py b/synapse/third_party_rules/access_rules.py

index 0fa36ba200..2635200989 100644 --- a/synapse/third_party_rules/access_rules.py +++ b/synapse/third_party_rules/access_rules.py
@@ -569,13 +569,13 @@ class RoomAccessRules(object): # room's state, in which case we need to remove the entry from the list in order # to avoid conflicts. if event.is_state(): - def filter_out_event(state_key): - return event.state_key != state_key - - existing_members = filter(filter_out_event, existing_members) - threepid_invite_tokens = filter(filter_out_event, threepid_invite_tokens) + existing_members = existing_members + threepid_invite_tokens = filter( + lambda sk: event.state_key != sk, + threepid_invite_tokens, + ) - return list(existing_members), list(threepid_invite_tokens) + return existing_members, len(threepid_invite_tokens) @staticmethod def _is_invite_from_threepid(invite, threepid_invite_token):