Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 10:46:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

More tests

Browse source
This commit is contained in:
Kegan Dougal 2016-11-22 09:59:27 +00:00
parent 53b27bbf06
commit 0a8b0eeca1
2 changed files with 60 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
synapse/events/utils.py
View file

@ -229,7 +229,7 @@ def format_event_for_client_v2_without_room_id(d):
def serialize_event(e, time_now_ms, as_client_event=True,
event_format=format_event_for_client_v1,
token_id=None, event_fields=None):
token_id=None, only_event_fields=None):
# FIXME(erikj): To handle the case of presence events and the like
if not isinstance(e, EventBase):
return e
@ -258,7 +258,8 @@ def serialize_event(e, time_now_ms, as_client_event=True,
if as_client_event:
d = event_format(d)
if isinstance(event_fields, list):
d = only_fields(d, event_fields)
if (isinstance(only_event_fields, list) and
all(isinstance(f, basestring) for f in only_event_fields)):
d = only_fields(d, only_event_fields)
return d