diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-11-03 16:45:53 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-11-03 16:45:53 +0000 |
| commit | 6797fcd9aba8cb9d4f2bf36a5b26846cca684b31 (patch) | |
| tree | 919e47f9b059936785ce21a04001ef1454b5faef /synapse/rest/client/v2_alpha/sync.py | |
| parent | Merge pull request #338 from matrix-org/daniel/fixdb (diff) | |
| parent | That TODO was done (diff) | |
| download | synapse-6797fcd9aba8cb9d4f2bf36a5b26846cca684b31.tar.xz | |
Merge pull request #335 from matrix-org/markjh/room_tags
Add APIs for adding and removing tags from rooms
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: |