diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-29 22:00:33 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-29 22:00:33 +0000 |
| commit | a696c48133d9f9a94f8b078aeacce0bef0d693b4 (patch) | |
| tree | 8137f14c734d351f52af038265103f275276646a /synapse/api/auth.py | |
| parent | Update synapse/storage/events_worker.py (diff) | |
| parent | Merge pull request #4483 from matrix-org/erikj/event_v2 (diff) | |
| download | synapse-a696c48133d9f9a94f8b078aeacce0bef0d693b4.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions_eiah
Diffstat (limited to 'synapse/api/auth.py')
| -rw-r--r-- | synapse/api/auth.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 963e0e7d60..5992d30623 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -551,17 +551,6 @@ class Auth(object): return self.store.is_server_admin(user) @defer.inlineCallbacks - def add_auth_events(self, builder, context): - prev_state_ids = yield context.get_prev_state_ids(self.store) - auth_ids = yield self.compute_auth_events(builder, prev_state_ids) - - auth_events_entries = yield self.store.add_event_hashes( - auth_ids - ) - - builder.auth_events = auth_events_entries - - @defer.inlineCallbacks def compute_auth_events(self, event, current_state_ids, for_verification=False): if event.type == EventTypes.Create: defer.returnValue([]) @@ -577,7 +566,7 @@ class Auth(object): key = (EventTypes.JoinRules, "", ) join_rule_event_id = current_state_ids.get(key) - key = (EventTypes.Member, event.user_id, ) + key = (EventTypes.Member, event.sender, ) member_event_id = current_state_ids.get(key) key = (EventTypes.Create, "", ) |