summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-12-12 11:59:46 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-12-12 11:59:46 +0000
commitb0bb1756a9a85f476c6ebd03a7e78ad5f403311c (patch)
treeb74ea3310015bdeb5dc57fb8ff636fe831fa5bc3 /synapse
parentMerge branch 'develop' into typing_notifications (diff)
downloadsynapse-b0bb1756a9a85f476c6ebd03a7e78ad5f403311c.tar.xz
Send list of typing user IDs as 'user_ids' list within 'content', so that m.typing stream events have a toplevel content, for consistency with others
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/typing.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py
index 46a0b299a1..253fec514d 100644
--- a/synapse/handlers/typing.py
+++ b/synapse/handlers/typing.py
@@ -223,7 +223,9 @@ class TypingNotificationEventSource(object):
         return {
             "type": "m.typing",
             "room_id": room_id,
-            "typing": [u.to_string() for u in typing],
+            "content": {
+                "user_ids": [u.to_string() for u in typing],
+            },
         }
 
     def get_new_events_for_user(self, user, from_key, limit):