Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-07-30 21:08:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into test-sqlite-memory

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2014-09-17 18:27:47 +01:00
commit 4571cf7baa
40 changed files with 1263 additions and 456 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/api/events/__init__.py
View file

@ -25,6 +25,7 @@ def serialize_event(hs, e):
d = e.get_dict()
if "age_ts" in d:
d["age"] = int(hs.get_clock().time_msec()) - d["age_ts"]
del d["age_ts"]
return d
@ -56,6 +57,7 @@ class SynapseEvent(JsonEncodedObject):
"state_key",
"required_power_level",
"age_ts",
"prev_content",
]
internal_keys = [
@ -172,10 +174,6 @@ class SynapseEvent(JsonEncodedObject):
class SynapseStateEvent(SynapseEvent):
valid_keys = SynapseEvent.valid_keys + [
"prev_content",
]
def __init__(self, **kwargs):
if "state_key" not in kwargs:
kwargs["state_key"] = ""