summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-30 16:24:40 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-30 16:56:13 +0000
commit0b1cc7cc0bd81f93ed353a6ac67e06f91b62ab90 (patch)
treeed988323eebc0957f25838b736369ac30ca1f738 /synapse
parentFix bug where accepting invite over federation didn't work. Add logging. (diff)
downloadsynapse-0b1cc7cc0bd81f93ed353a6ac67e06f91b62ab90.tar.xz
Return empty list rather than None when there are no emphemeral events for a room
Diffstat (limited to '')
-rw-r--r--synapse/handlers/sync.py2
1 files changed, 1 insertions, 1 deletions
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)