diff options
| author | Erik Johnston <erik@matrix.org> | 2022-07-14 14:57:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-14 13:57:02 +0000 |
| commit | 0ca4172b5df6ea5f3e30ca6b83e51d230213971c (patch) | |
| tree | 9bdd2735e11e340d1b3344b1ebbf29b4fc8576a0 /synapse/handlers | |
| parent | Allow rate limiters to passively record actions they cannot limit (#13253) (diff) | |
| download | synapse-0ca4172b5df6ea5f3e30ca6b83e51d230213971c.tar.xz | |
Don't pull out state in `compute_event_context` for unconflicted state (#13267)
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/message.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index 1980e37dae..b5fede9496 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -1444,7 +1444,12 @@ class EventCreationHandler: if state_entry.state_group in self._external_cache_joined_hosts_updates: return - joined_hosts = await self.store.get_joined_hosts(event.room_id, state_entry) + state = await state_entry.get_state( + self._storage_controllers.state, StateFilter.all() + ) + joined_hosts = await self.store.get_joined_hosts( + event.room_id, state, state_entry + ) # Note that the expiry times must be larger than the expiry time in # _external_cache_joined_hosts_updates. |