summary refs log tree commit diff
path: root/synapse/handlers/typing.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-09 11:32:44 +0000
committerGitHub <noreply@github.com>2019-12-09 11:32:44 +0000
commita9b393340fb9e4bf227f5ef0ca3de708748a617c (patch)
treeb80d67d8eaf89bb1e993cf159643229b4672541a /synapse/handlers/typing.py
parentMerge pull request #6469 from matrix-org/erikj/make_database_class (diff)
parentFixup functions to consistently return deferreds (diff)
downloadsynapse-a9b393340fb9e4bf227f5ef0ca3de708748a617c.tar.xz
Merge pull request #6484 from matrix-org/erikj/port_sync_handler
Port SyncHandler to async/await
Diffstat (limited to 'synapse/handlers/typing.py')
-rw-r--r--synapse/handlers/typing.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py
index 856337b7e2..6f78454322 100644
--- a/synapse/handlers/typing.py
+++ b/synapse/handlers/typing.py
@@ -313,7 +313,7 @@ class TypingNotificationEventSource(object):
 
                 events.append(self._make_event_for(room_id))
 
-            return events, handler._latest_room_serial
+            return defer.succeed((events, handler._latest_room_serial))
 
     def get_current_key(self):
         return self.get_typing_handler()._latest_room_serial