summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-16 11:37:17 +0100
committerNeil Johnson <neil@matrix.org>2018-08-16 11:37:17 +0100
commit25d2b5d55ffc02f9fd2a4511c3d6c1d0ffff8a6a (patch)
tree64576e7083a569f13765c8d3a41fe6326ac631fa /synapse/rest/client
parentWIP impl commiting to get feedback (diff)
parentinitial cut at a room summary API (#3574) (diff)
downloadsynapse-25d2b5d55ffc02f9fd2a4511c3d6c1d0ffff8a6a.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index 8aa06faf23..1275baa1ba 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -370,6 +370,7 @@ class SyncRestServlet(RestServlet):
             ephemeral_events = room.ephemeral
             result["ephemeral"] = {"events": ephemeral_events}
             result["unread_notifications"] = room.unread_notifications
+            result["summary"] = room.summary
 
         return result