diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-16 08:50:53 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-16 08:50:53 +0200 |
| commit | faee41c303c51f2d0ba9392643e67a8d100fbfa9 (patch) | |
| tree | a586ca2ca460de50eb37c301409ccd97f9f40abf /synapse/api/events/factory.py | |
| parent | Filter room where the user has been banned (diff) | |
| parent | Fix bug where we didn't always get 'prev_content' key (diff) | |
| download | synapse-faee41c303c51f2d0ba9392643e67a8d100fbfa9.tar.xz | |
Merge remote-tracking branch 'origin/develop' into webclient_data_centralisation
Diffstat (limited to 'synapse/api/events/factory.py')
| -rw-r--r-- | synapse/api/events/factory.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/api/events/factory.py b/synapse/api/events/factory.py index 5e38cdbc44..d3d96d73eb 100644 --- a/synapse/api/events/factory.py +++ b/synapse/api/events/factory.py @@ -59,6 +59,14 @@ class EventFactory(object): if "ts" not in kwargs: kwargs["ts"] = int(self.clock.time_msec()) + # The "age" key is a delta timestamp that should be converted into an + # absolute timestamp the minute we see it. + if "age" in kwargs: + kwargs["age_ts"] = int(self.clock.time_msec()) - int(kwargs["age"]) + del kwargs["age"] + elif "age_ts" not in kwargs: + kwargs["age_ts"] = int(self.clock.time_msec()) + if etype in self._event_list: handler = self._event_list[etype] else: |