diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py index 1c681caa27..65ae1a56df 100644 --- a/synapse/federation/sender/per_destination_queue.py +++ b/synapse/federation/sender/per_destination_queue.py @@ -105,7 +105,7 @@ class PerDestinationQueue: self._instance_name = hs.get_instance_name() self._federation_shard_config = hs.config.worker.federation_shard_config self._state = hs.get_state_handler() - self.msc4354_enabled = hs.config.experimental.msc4354_enabled + self._msc4354_enabled = hs.config.experimental.msc4354_enabled self._should_send_on_this_instance = True if not self._federation_shard_config.should_handle( @@ -584,7 +584,7 @@ class PerDestinationQueue: # send. extrem_events = await self._store.get_events_as_list(extrems) - if self.msc4354_enabled: + if self._msc4354_enabled: # we also want to send sticky events that are still active in this room sticky_event_ids = ( await self._store.get_sticky_event_ids_sent_by_self( diff --git a/synapse/rest/client/room.py b/synapse/rest/client/room.py index a8fe574f32..d09425a186 100644 --- a/synapse/rest/client/room.py +++ b/synapse/rest/client/room.py @@ -210,7 +210,7 @@ class RoomStateEventRestServlet(RestServlet): self.clock = hs.get_clock() self._max_event_delay_ms = hs.config.server.max_event_delay_ms self._spam_checker_module_callbacks = hs.get_module_api_callbacks().spam_checker - self.msc4354_enabled = hs.config.experimental.msc4354_enabled + self._msc4354_enabled = hs.config.experimental.msc4354_enabled def register(self, http_server: HttpServer) -> None: # /rooms/$roomid/state/$eventtype @@ -333,7 +333,7 @@ class RoomStateEventRestServlet(RestServlet): origin_server_ts = parse_integer(request, "ts") sticky_duration_ms: int | None = None - if self.msc4354_enabled: + if self._msc4354_enabled: sticky_duration_ms = parse_integer(request, StickyEvent.QUERY_PARAM_NAME) delay = _parse_request_delay(request, self._max_event_delay_ms) @@ -410,7 +410,7 @@ class RoomSendEventRestServlet(TransactionRestServlet): self.delayed_events_handler = hs.get_delayed_events_handler() self.auth = hs.get_auth() self._max_event_delay_ms = hs.config.server.max_event_delay_ms - self.msc4354_enabled = hs.config.experimental.msc4354_enabled + self._msc4354_enabled = hs.config.experimental.msc4354_enabled def register(self, http_server: HttpServer) -> None: # /rooms/$roomid/send/$event_type[/$txn_id] @@ -432,7 +432,7 @@ class RoomSendEventRestServlet(TransactionRestServlet): origin_server_ts = parse_integer(request, "ts") sticky_duration_ms: int | None = None - if self.msc4354_enabled: + if self._msc4354_enabled: sticky_duration_ms = parse_integer(request, StickyEvent.QUERY_PARAM_NAME) delay = _parse_request_delay(request, self._max_event_delay_ms) diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py index 38ac4e68c5..b4de2e9bb3 100644 --- a/synapse/storage/databases/main/events.py +++ b/synapse/storage/databases/main/events.py @@ -264,7 +264,7 @@ class PersistEventsStore: self.database_engine = db.engine self._clock = hs.get_clock() self._instance_name = hs.get_instance_name() - self.msc4354_sticky_events = hs.config.experimental.msc4354_enabled + self._msc4354_enabled = hs.config.experimental.msc4354_enabled self._ephemeral_messages_enabled = hs.config.server.enable_ephemeral_messages self.is_mine_id = hs.is_mine_id @@ -391,7 +391,7 @@ class PersistEventsStore: # get_events_as_list and get_partial_filtered_current_state_ids to handle soft-failure # re-evaluation, so it can't do that without leaking out the txn currently, hence it # now just lives outside. - if self.msc4354_sticky_events: + if self._msc4354_enabled: # re-evaluate soft-failed sticky events. await self.store.reevaluate_soft_failed_sticky_events( room_id, @@ -1201,7 +1201,7 @@ class PersistEventsStore: sliding_sync_table_changes, ) - if self.msc4354_sticky_events: + if self._msc4354_enabled: self.store.insert_sticky_events_txn( txn, [ev for ev, _ in events_and_contexts] ) @@ -2667,7 +2667,7 @@ class PersistEventsStore: # event isn't an outlier any more. self._update_backward_extremeties(txn, [event]) - if self.msc4354_sticky_events and event.sticky_duration(): + if self._msc4354_enabled and event.sticky_duration(): # The de-outliered event is sticky. Update the sticky events table to ensure # we delivery this down /sync. self.store.insert_sticky_events_txn(txn, [event])