diff --git a/VERSION b/VERSION index 8b9dea59dc5796b06c058a67371c65d684c34d84..3b3e723172caef2ca393835c19c5d3ac796523b7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.1a +0.6.1b diff --git a/synapse/__init__.py b/synapse/__init__.py index 2195ad3177e4f04cfb96e4da480a8b4aca05472e..e7e27b06ec8a17754dca8578a80650cc2bc79cd9 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.6.1a" +__version__ = "0.6.1b" diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 4f4914467c039a62c6840ca93eb70ff638203c28..4ad37188bae98c59dc8b8baaa21a0084dd1ba1c7 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -98,7 +98,7 @@ def serialize_event(hs, e): d = {k: v for k, v in e.get_dict().items()} if "age_ts" in d["unsigned"]: 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"] d["user_id"] = d.pop("sender", None)