diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-29 14:07:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-29 14:07:23 +0000 |
| commit | b8d75ef53eae4d4922325c5f1a02e93881f36888 (patch) | |
| tree | 7eab7f65c77d0987d4ca072efb49b3c75811d896 /synapse/api/auth.py | |
| parent | Implement MSC1708 (.well-known lookups for server routing) (#4489) (diff) | |
| parent | Correctly set context.app_service (diff) | |
| download | synapse-b8d75ef53eae4d4922325c5f1a02e93881f36888.tar.xz | |
Merge pull request #4481 from matrix-org/erikj/event_builder
Refactor event building into EventBuilder
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 7b213e54c8..2d78a257d3 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, "", ) |