diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-09-02 11:24:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-02 11:24:30 +0100 |
| commit | 2aa39db681ca7f9d5d721ed52d354c1e66583258 (patch) | |
| tree | e2cb7b2327f8de1f5aec03d0f91b461e09940541 | |
| parent | Merge pull request #1061 from matrix-org/erikj/linearize_resolution (diff) | |
| parent | Merge branch 'develop' into markjh/direct_to_device_synchrotron (diff) | |
| download | synapse-2aa39db681ca7f9d5d721ed52d354c1e66583258.tar.xz | |
Merge pull request #1062 from matrix-org/markjh/direct_to_device_synchrotron
Fix up the calls to the notifier for device messages
| -rw-r--r-- | synapse/app/synchrotron.py | 3 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/sendtodevice.py | 2 |
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, {}) |