diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-29 16:41:21 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-29 16:41:21 +0000 |
| commit | 722b65f46131349c5afdcc7eb48297cdd9d9cbd6 (patch) | |
| tree | 9913ea8b1bccf900ffbad8af7a01fcb492f4ca51 /synapse/rest | |
| parent | Fix check for empty room update (diff) | |
| download | synapse-722b65f46131349c5afdcc7eb48297cdd9d9cbd6.tar.xz | |
Move typing notifs to an "emphermal" event list on the room object
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 76489e27c8..2ae2eec55d 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -66,6 +66,7 @@ class SyncRestServlet(RestServlet): } "state": [] // list of EventIDs updating the current state to // be what it should be at the end of the batch. + "ephemeral": [] }] } """ @@ -188,9 +189,8 @@ class SyncRestServlet(RestServlet): "state": state_event_ids, "limited": room.limited, "published": room.published, + "ephemeral": room.ephemeral, } - if room.typing is not None: - result["typing"] = room.typing return result |