diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-01-27 13:11:03 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-01-27 13:11:03 +0000 |
| commit | 0484d7f6e98507d7c2138aa7959e722912bb4769 (patch) | |
| tree | c567e8ea0586fa33a6ff2499855ee9b1a89a4ca4 /synapse/handlers/events.py | |
| parent | Minor changes to v2_alpha filter REST test to allow the setUp method to be sh... (diff) | |
| parent | Initial cut of a shared base class for REST unit tests (diff) | |
| download | synapse-0484d7f6e98507d7c2138aa7959e722912bb4769.tar.xz | |
Merge branch 'develop' into client_v2_filter
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index 01e67b0818..d997917cd6 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -18,6 +18,7 @@ from twisted.internet import defer from synapse.util.logcontext import PreserveLoggingContext from synapse.util.logutils import log_function from synapse.types import UserID +from synapse.events.utils import serialize_event from ._base import BaseHandler @@ -78,8 +79,10 @@ class EventStreamHandler(BaseHandler): auth_user, room_ids, pagin_config, timeout ) + time_now = self.clock.time_msec() + chunks = [ - self.hs.serialize_event(e, as_client_event) for e in events + serialize_event(e, time_now, as_client_event) for e in events ] chunk = { |