mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 20:12:05 +00:00
Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop
This commit is contained in:
commit
38e3241eb7
@ -16,4 +16,4 @@
|
|||||||
""" This is a reference implementation of a Matrix home server.
|
""" This is a reference implementation of a Matrix home server.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
__version__ = "0.6.1a"
|
__version__ = "0.6.1b"
|
||||||
|
@ -106,7 +106,7 @@ def serialize_event(hs, e, client_event=True):
|
|||||||
|
|
||||||
if "age_ts" in d["unsigned"]:
|
if "age_ts" in d["unsigned"]:
|
||||||
now = int(hs.get_clock().time_msec())
|
now = int(hs.get_clock().time_msec())
|
||||||
d["unsigned"]["age"] = now - d["unsigned"]["age_ts"]
|
d["age"] = now - d["unsigned"]["age_ts"]
|
||||||
del d["unsigned"]["age_ts"]
|
del d["unsigned"]["age_ts"]
|
||||||
|
|
||||||
d["user_id"] = d.pop("sender", None)
|
d["user_id"] = d.pop("sender", None)
|
||||||
|
Loading…
Reference in New Issue
Block a user