From 0b1cc7cc0bd81f93ed353a6ac67e06f91b62ab90 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 30 Jan 2015 16:24:40 +0000
Subject: Return empty list rather than None when there are no emphemeral
 events for a room

---
 synapse/handlers/sync.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'synapse/handlers/sync.py')

diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index dc69b3cfe7..962686f4bb 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -370,7 +370,7 @@ class SyncHandler(BaseHandler):
             prev_batch=prev_batch_token,
             state=state_events_delta,
             limited=limited,
-            ephemeral=typing_by_room.get(room_id, None)
+            ephemeral=typing_by_room.get(room_id, [])
         )
 
         logging.debug("Room sync: %r", room_sync)
-- 
cgit 1.4.1