diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-06-04 00:09:17 +0300 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-06-04 00:09:17 +0300 |
| commit | 28f09fcdd51796dd5036cb74e62b7a74d753f4be (patch) | |
| tree | 40f098938d04cf93c8f7bb7aa82af879479b3334 /synapse/event_auth.py | |
| parent | more comments (diff) | |
| parent | Merge pull request #3317 from thegcat/feature/3312-add_ipv6_to_blacklist_exam... (diff) | |
| download | synapse-28f09fcdd51796dd5036cb74e62b7a74d753f4be.tar.xz | |
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/event_auth.py')
| -rw-r--r-- | synapse/event_auth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/event_auth.py b/synapse/event_auth.py index cd5627e36a..eaf9cecde6 100644 --- a/synapse/event_auth.py +++ b/synapse/event_auth.py @@ -471,14 +471,14 @@ def _check_power_levels(event, auth_events): ] old_list = current_state.content.get("users", {}) - for user in set(old_list.keys() + user_list.keys()): + for user in set(list(old_list) + list(user_list)): levels_to_check.append( (user, "users") ) old_list = current_state.content.get("events", {}) new_list = event.content.get("events", {}) - for ev_id in set(old_list.keys() + new_list.keys()): + for ev_id in set(list(old_list) + list(new_list)): levels_to_check.append( (ev_id, "events") ) |