diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-15 13:26:05 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-15 13:26:11 +0100 |
| commit | 5bd9369a62c6d6cf677e9eef7d58096449542cdf (patch) | |
| tree | 96b9ed79f774a2fc38b5a8345385b0246197087b /synapse/api/events/__init__.py | |
| parent | BF: inviter field has moved to the room root object (diff) | |
| download | synapse-5bd9369a62c6d6cf677e9eef7d58096449542cdf.tar.xz | |
Correctly handle the 'age' key in events and pdus
Diffstat (limited to 'synapse/api/events/__init__.py')
| -rw-r--r-- | synapse/api/events/__init__.py | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/synapse/api/events/__init__.py b/synapse/api/events/__init__.py index 5f300de108..72c493db57 100644 --- a/synapse/api/events/__init__.py +++ b/synapse/api/events/__init__.py @@ -17,6 +17,18 @@ from synapse.api.errors import SynapseError, Codes from synapse.util.jsonobject import JsonEncodedObject +def serialize_event(hs, e): + # FIXME(erikj): To handle the case of presence events and the like + if not isinstance(e, SynapseEvent): + return e + + d = e.get_dict() + if "age_ts" in d: + d["age"] = int(hs.get_clock().time_msec()) - d["age_ts"] + + return d + + class SynapseEvent(JsonEncodedObject): """Base class for Synapse events. These are JSON objects which must abide @@ -43,6 +55,7 @@ class SynapseEvent(JsonEncodedObject): "content", # HTTP body, JSON "state_key", "required_power_level", + "age_ts", ] internal_keys = [ |