From 722b65f46131349c5afdcc7eb48297cdd9d9cbd6 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 29 Jan 2015 16:41:21 +0000
Subject: Move typing notifs to an "emphermal" event list on the room object

---
 synapse/rest/client/v2_alpha/sync.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'synapse/rest')

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
 
 
-- 
cgit 1.5.1