diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:12:25 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:12:25 +0100 |
| commit | f5cf7ac25b311fda8a2d553f07437b3648c66f6c (patch) | |
| tree | 62d43c8acf91281f59239f331745e9796a0f827e /synapse/api/events | |
| parent | SPEC-7: Don't stamp event contents with 'hsob_ts' (diff) | |
| download | synapse-f5cf7ac25b311fda8a2d553f07437b3648c66f6c.tar.xz | |
SPEC-7: Rename 'ts' to 'origin_server_ts'
Diffstat (limited to 'synapse/api/events')
| -rw-r--r-- | synapse/api/events/factory.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/api/events/factory.py b/synapse/api/events/factory.py index 0d94850cec..74d0ef77f4 100644 --- a/synapse/api/events/factory.py +++ b/synapse/api/events/factory.py @@ -58,8 +58,8 @@ class EventFactory(object): random_string(10), self.hs.hostname ) - if "ts" not in kwargs: - kwargs["ts"] = int(self.clock.time_msec()) + if "origin_server_ts" not in kwargs: + kwargs["origin_server_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. |