diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
index 84124af965..63aefd07f5 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -114,10 +114,10 @@ class Mailer:
self.send_email_handler = hs.get_send_email_handler()
self.store = self.hs.get_datastores().main
- self.state_storage = self.hs.get_storage().state
+ self._state_storage_controller = self.hs.get_storage_controllers().state
self.macaroon_gen = self.hs.get_macaroon_generator()
self.state_handler = self.hs.get_state_handler()
- self.storage = hs.get_storage()
+ self._storage_controllers = hs.get_storage_controllers()
self.app_name = app_name
self.email_subjects: EmailSubjectConfig = hs.config.email.email_subjects
@@ -456,7 +456,7 @@ class Mailer:
}
the_events = await filter_events_for_client(
- self.storage, user_id, results.events_before
+ self._storage_controllers, user_id, results.events_before
)
the_events.append(notif_event)
@@ -494,7 +494,7 @@ class Mailer:
)
else:
# Attempt to check the historical state for the room.
- historical_state = await self.state_storage.get_state_for_event(
+ historical_state = await self._state_storage_controller.get_state_for_event(
event.event_id, StateFilter.from_types((type_state_key,))
)
sender_state_event = historical_state.get(type_state_key)
@@ -767,8 +767,10 @@ class Mailer:
member_event_ids.append(sender_state_event_id)
else:
# Attempt to check the historical state for the room.
- historical_state = await self.state_storage.get_state_for_event(
- event_id, StateFilter.from_types((type_state_key,))
+ historical_state = (
+ await self._state_storage_controller.get_state_for_event(
+ event_id, StateFilter.from_types((type_state_key,))
+ )
)
sender_state_event = historical_state.get(type_state_key)
if sender_state_event:
|
