diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:33:58 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:33:58 +0100 |
| commit | dc3c2823ac425c9b5bbe6883b7d33a12059a08fb (patch) | |
| tree | 22d02a68df93c3f98b0be7de8a07040268420369 /synapse/federation/pdu_codec.py | |
| parent | Rename 'meta' to 'unsigned' (diff) | |
| parent | keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating ... (diff) | |
| download | synapse-dc3c2823ac425c9b5bbe6883b7d33a12059a08fb.tar.xz | |
Merge branch 'develop' into event_signing
Conflicts: synapse/federation/replication.py
Diffstat (limited to 'synapse/federation/pdu_codec.py')
| -rw-r--r-- | synapse/federation/pdu_codec.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/pdu_codec.py b/synapse/federation/pdu_codec.py index 7e574f451d..991aae2a56 100644 --- a/synapse/federation/pdu_codec.py +++ b/synapse/federation/pdu_codec.py @@ -95,8 +95,8 @@ class PduCodec(object): if k not in ["event_id", "room_id", "type"] }) - 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()) pdu = Pdu(**kwargs) pdu = add_event_pdu_content_hash(pdu) |