summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-29 16:23:03 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-29 16:23:03 +0000
commit4d9dd9bdc02ca7b524c90ae527687e7a838acee4 (patch)
tree39ef8c8a4f999bc0688fb4ae50f20c7dfaebfb15 /synapse/handlers
parentMerge branch 'client_v2_filter' into client_v2_sync (diff)
downloadsynapse-4d9dd9bdc02ca7b524c90ae527687e7a838acee4.tar.xz
Fix v2 initial sync
Diffstat (limited to '')
-rw-r--r--synapse/handlers/sync.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index e93dfe005d..cfe2944917 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -157,7 +157,7 @@ class SyncHandler(BaseHandler):
         ))
 
     @defer.inlineCallbacks
-    def intial_sync_for_room(self, room_id, sync_config, now_token,
+    def initial_sync_for_room(self, room_id, sync_config, now_token,
                              published_room_ids):
         """Sync a room for a client which is starting without any state
         Returns:
@@ -180,6 +180,7 @@ class SyncHandler(BaseHandler):
             prev_batch=prev_batch_token,
             state=current_state_events,
             limited=True,
+            typing=None,
         ))
 
     @defer.inlineCallbacks