summary refs log tree commit diff
path: root/synapse/handlers/typing.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-04-15 23:09:35 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-04-15 23:09:35 +0100
commit0268d40281313c9a89e7b4356ae2e5f77a622857 (patch)
tree9a5498e9dc0b3a8257a474c7fffe04bc62563378 /synapse/handlers/typing.py
parentNeater implementation of membership change auth checks, ensuring we can't for... (diff)
downloadsynapse-0268d40281313c9a89e7b4356ae2e5f77a622857.tar.xz
Have TypingNotificationEventSource.get_new_events_for_user() return a deferred, for consistency and extensibility
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 c2762f92c7..05879fbfc6 100644
--- a/synapse/handlers/typing.py
+++ b/synapse/handlers/typing.py
@@ -252,7 +252,7 @@ class TypingNotificationEventSource(object):
             # TODO: check if user is in room
             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.handler()._latest_room_serial