summary refs log tree commit diff
diff options
context:
space:
mode:
authorTravis Ralston <travisr@matrix.org>2022-07-11 07:12:28 -0600
committerGitHub <noreply@github.com>2022-07-11 14:12:28 +0100
commita11301179494f5a2924dcd60069c06f5c192020f (patch)
treee9d34139394878e7806a24a317b9cc2e6aeb2116
parentEnsure portdb selects _all_ rows with negative rowids (#13226) (diff)
downloadsynapse-a11301179494f5a2924dcd60069c06f5c192020f.tar.xz
Fix appservice EDUs failing to send if the EDU doesn't have a room ID (#13236)
* Fix appservice EDUs failing to send if the EDU doesn't have a room ID

As is in the case of presence.

* changelog

* linter

* fix linter again
-rw-r--r--changelog.d/13236.bugfix1
-rw-r--r--synapse/appservice/scheduler.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/changelog.d/13236.bugfix b/changelog.d/13236.bugfix
new file mode 100644

index 0000000000..7fddc4413d --- /dev/null +++ b/changelog.d/13236.bugfix
@@ -0,0 +1 @@ +Fix appservices not receiving room-less EDUs, like presence, if enabled. \ No newline at end of file diff --git a/synapse/appservice/scheduler.py b/synapse/appservice/scheduler.py
index de5e5216c2..6c8695346f 100644 --- a/synapse/appservice/scheduler.py +++ b/synapse/appservice/scheduler.py
@@ -319,7 +319,9 @@ class _ServiceQueuer: rooms_of_interesting_users.update(event.room_id for event in events) # EDUs rooms_of_interesting_users.update( - ephemeral["room_id"] for ephemeral in ephemerals + ephemeral["room_id"] + for ephemeral in ephemerals + if ephemeral.get("room_id") is not None ) # Look up the AS users in those rooms