Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 16:34:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization

Browse source 
Conflicts:
	synapse/federation/transport.py
	synapse/handlers/message.py
This commit is contained in:
Erik Johnston 2014-10-27 10:20:44 +00:00
commit bb4a20174c
57 changed files with 563 additions and 6425 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/api/events/factory.py
View file

@ -66,8 +66,8 @@ class EventFactory(object):
if "event_id" not in kwargs:
kwargs["event_id"] = self.create_event_id()
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.