diff options
| author | Shay <hillerys@element.io> | 2023-03-21 17:59:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-21 17:59:55 -0700 |
| commit | 72f3f23c4db3f549a1aa060a7e98ba07812e570b (patch) | |
| tree | 38a460e811a7db23fe9158cf8d91a6e9eb71fa03 | |
| parent | Bump sentry-sdk from 1.15.0 to 1.17.0 (#15285) (diff) | |
| download | synapse-72f3f23c4db3f549a1aa060a7e98ba07812e570b.tar.xz | |
Change the parameter `immediate` of `send_device_messages` to default to `True` (#15297)
| -rw-r--r-- | changelog.d/15297.bugfix | 1 | ||||
| -rw-r--r-- | synapse/federation/send_queue.py | 2 | ||||
| -rw-r--r-- | synapse/federation/sender/__init__.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/15297.bugfix b/changelog.d/15297.bugfix new file mode 100644 index 0000000000..b5735fe4da --- /dev/null +++ b/changelog.d/15297.bugfix @@ -0,0 +1 @@ +Fix a bug introduced in Synapse v1.55.0 which could delay remote homeservers being able to decrypt encrypted messages sent by local users. diff --git a/synapse/federation/send_queue.py b/synapse/federation/send_queue.py index 3063df7990..0b7c81677e 100644 --- a/synapse/federation/send_queue.py +++ b/synapse/federation/send_queue.py @@ -244,7 +244,7 @@ class FederationRemoteSendQueue(AbstractFederationSender): self.notifier.on_new_replication_data() - def send_device_messages(self, destination: str, immediate: bool = False) -> None: + def send_device_messages(self, destination: str, immediate: bool = True) -> None: """As per FederationSender""" # We don't need to replicate this as it gets sent down a different # stream. diff --git a/synapse/federation/sender/__init__.py b/synapse/federation/sender/__init__.py index 43421a9c72..106daa9184 100644 --- a/synapse/federation/sender/__init__.py +++ b/synapse/federation/sender/__init__.py @@ -783,7 +783,7 @@ class FederationSender(AbstractFederationSender): else: queue.send_edu(edu) - def send_device_messages(self, destination: str, immediate: bool = False) -> None: + def send_device_messages(self, destination: str, immediate: bool = True) -> None: if destination == self.server_name: logger.warning("Not sending device update to ourselves") return |