diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-10-30 11:18:08 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-10-30 11:18:08 +0000 |
| commit | 0f432ba551c57cf9ae1ee3e65ca4bc5496caae08 (patch) | |
| tree | 03799a7b282f13a68e8c9f6e53524594667ac77e /synapse/events/utils.py | |
| parent | Make search API honour limit set in filter (diff) | |
| parent | Update the other place check_joined_room is called (diff) | |
| download | synapse-0f432ba551c57cf9ae1ee3e65ca4bc5496caae08.tar.xz | |
Merge pull request #337 from matrix-org/markjh/v2_sync_joining
Don't mark newly joined room timelines as limited in an incremental sync
Diffstat (limited to '')
| -rw-r--r-- | synapse/events/utils.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 48548f8c40..9989b76591 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -154,7 +154,8 @@ def serialize_event(e, time_now_ms, as_client_event=True, if "redacted_because" in e.unsigned: d["unsigned"]["redacted_because"] = serialize_event( - e.unsigned["redacted_because"], time_now_ms + e.unsigned["redacted_because"], time_now_ms, + event_format=event_format ) if token_id is not None: |