diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-11-03 17:31:17 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-11-03 17:31:17 +0000 |
commit | a3bfef35fd5fc26723d377839e1200f2de733723 (patch) | |
tree | 6315a13c38c7d55defff5b8674645d57b6ca47e3 /synapse/rest/client/v2_alpha/sync.py | |
parent | Include read receipts in v2 sync (diff) | |
parent | Merge pull request #335 from matrix-org/markjh/room_tags (diff) | |
download | synapse-a3bfef35fd5fc26723d377839e1200f2de733723.tar.xz |
Merge branch 'develop' into markjh/v2_sync_receipts
Conflicts: synapse/handlers/sync.py
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
-rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 1840eef775..32a1087c91 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -220,6 +220,10 @@ class SyncRestServlet(RestServlet): ) timeline_event_ids.append(event.event_id) + private_user_data = filter.filter_room_private_user_data( + room.private_user_data + ) + result = { "event_map": event_map, "timeline": { @@ -228,6 +232,7 @@ class SyncRestServlet(RestServlet): "limited": room.timeline.limited, }, "state": {"events": state_event_ids}, + "private_user_data": {"events": private_user_data}, } if joined: |