diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-31 15:53:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-31 15:53:19 +0100 |
| commit | ed7a703d4c61feaae437cd4bc11c2afea2dc4ad4 (patch) | |
| tree | 8b2e00f6849195f5d479da568a8c5051e1906e54 /synapse/api | |
| parent | Always specify state_group so that its in the cache (diff) | |
| download | synapse-ed7a703d4c61feaae437cd4bc11c2afea2dc4ad4.tar.xz | |
Handle the fact that workers can't generate state groups
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/auth.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index fcf0b0d25f..dcda40863f 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -281,11 +281,13 @@ class Auth(object): with Measure(self.clock, "check_host_in_room"): latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id) - group, curr_state_ids = yield self.state.resolve_state_groups( + entry = yield self.state.resolve_state_groups( room_id, latest_event_ids ) - ret = yield self.store.is_host_joined(room_id, host, group, curr_state_ids) + ret = yield self.store.is_host_joined( + room_id, host, entry.state_group, entry.state + ) defer.returnValue(ret) def check_event_sender_in_room(self, event, auth_events): |