summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-09-01 18:08:40 +0100
committerMark Haines <mark.haines@matrix.org>2016-09-01 18:08:40 +0100
commit7ed5acacf4eeba4e5c0fb03f0ed433c0461c968b (patch)
tree3d430217895ca4bc88c7928e26527efe4e2a2747
parentReturn the current stream position from add_messages_to_device_inbox (diff)
downloadsynapse-7ed5acacf4eeba4e5c0fb03f0ed433c0461c968b.tar.xz
Fix up the calls to the notifier for device messages
-rw-r--r--synapse/app/synchrotron.py3
-rw-r--r--synapse/rest/client/v2_alpha/sendtodevice.py2
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, {})