Merge pull request #1062 from matrix-org/markjh/direct_to_device_synchrotron

Fix up the calls to the notifier for device messages

2 files changed, 4 insertions, 1 deletions

diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py

index b8cedc7af5..07d3d047c6 100644
--- a/synapse/app/synchrotron.py
+++ b/synapse/app/synchrotron.py
@@ -399,6 +399,9 @@ class SynchrotronServer(HomeServer):
             notify_from_stream(
                 result, "typing", "typing_key", room="room_id"
             )
+            notify_from_stream(
+                result, "to_device", "to_device_key", user="user_id"
+            )
 
         while True:
             try:
diff --git a/synapse/rest/client/v2_alpha/sendtodevice.py b/synapse/rest/client/v2_alpha/sendtodevice.py

index 7c0991ca55..9c10a99acf 100644
--- a/synapse/rest/client/v2_alpha/sendtodevice.py
+++ b/synapse/rest/client/v2_alpha/sendtodevice.py
@@ -78,7 +78,7 @@ class SendToDeviceRestServlet(servlet.RestServlet):
         stream_id = yield self.store.add_messages_to_device_inbox(local_messages)
 
         self.notifier.on_new_event(
-            "to_device", stream_id, users=local_messages.keys()
+            "to_device_key", stream_id, users=local_messages.keys()
         )
 
         response = (200, {})