From e1c4d2c8bacaa85712eb3a26d6b7dd2fb34585d4 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Fri, 6 Sep 2019 15:48:02 +0100 Subject: Only filter on 3PID invite tokens --- synapse/third_party_rules/access_rules.py | 12 ++++++------ 1 file 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): -- cgit 1.5.1