diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-09-15 15:27:58 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-09-15 15:27:58 +0100 |
| commit | 14bc4ed59f0d98e80db96ed8232983f814082305 (patch) | |
| tree | 27e70665764b41f5f16f8662eb1328e2ba20aba7 /synapse/handlers/events.py | |
| parent | Update spec to include m.login.email.identity (diff) | |
| parent | Correctly handle the 'age' key in events and pdus (diff) | |
| download | synapse-14bc4ed59f0d98e80db96ed8232983f814082305.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes in preparation for re-merge to develop.
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index fd24a11fb8..93dcd40324 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -15,7 +15,6 @@ from twisted.internet import defer -from synapse.api.events import SynapseEvent from synapse.util.logutils import log_function from ._base import BaseHandler @@ -71,10 +70,7 @@ class EventStreamHandler(BaseHandler): auth_user, room_ids, pagin_config, timeout ) - chunks = [ - e.get_dict() if isinstance(e, SynapseEvent) else e - for e in events - ] + chunks = [self.hs.serialize_event(e) for e in events] chunk = { "chunk": chunks, @@ -92,7 +88,9 @@ class EventStreamHandler(BaseHandler): # 10 seconds of grace to allow the client to reconnect again # before we think they're gone def _later(): - logger.debug("_later stopped_user_eventstream %s", auth_user) + logger.debug( + "_later stopped_user_eventstream %s", auth_user + ) self.distributor.fire( "stopped_user_eventstream", auth_user ) |