diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-07-26 12:17:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 12:17:00 -0400 |
| commit | 228decfce1a71651d64c359d1cf28e10d0a69fc8 (patch) | |
| tree | e061e3a8c8cc49b0fefefb82ad586ef7229a3dbb /synapse/state/__init__.py | |
| parent | Add type hints to synapse.federation.transport.client. (#10408) (diff) | |
| download | synapse-228decfce1a71651d64c359d1cf28e10d0a69fc8.tar.xz | |
Update the MSC3083 support to verify if joins are from an authorized server. (#10254)
Diffstat (limited to 'synapse/state/__init__.py')
| -rw-r--r-- | synapse/state/__init__.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py index 6223daf522..2e15471435 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -636,16 +636,20 @@ class StateResolutionHandler: """ try: with Measure(self.clock, "state._resolve_events") as m: - v = KNOWN_ROOM_VERSIONS[room_version] - if v.state_res == StateResolutionVersions.V1: + room_version_obj = KNOWN_ROOM_VERSIONS[room_version] + if room_version_obj.state_res == StateResolutionVersions.V1: return await v1.resolve_events_with_store( - room_id, state_sets, event_map, state_res_store.get_events + room_id, + room_version_obj, + state_sets, + event_map, + state_res_store.get_events, ) else: return await v2.resolve_events_with_store( self.clock, room_id, - room_version, + room_version_obj, state_sets, event_map, state_res_store, |