rei-mirrors
/
synapse
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Filter returned events for client-facing format

This commit is contained in:
Paul "LeoNerd" Evans 2016-09-09 14:40:15 +01:00
parent 0fc0a3bdff
commit d271383e63
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/rest/client/v1/room.py
View File

@ -22,7 +22,7 @@ from synapse.streams.config import PaginationConfig
from synapse.api.constants import EventTypes, Membership from synapse.api.constants import EventTypes, Membership
from synapse.api.filtering import Filter from synapse.api.filtering import Filter
from synapse.types import UserID, RoomID, RoomAlias from synapse.types import UserID, RoomID, RoomAlias
from synapse.events.utils import serialize_event from synapse.events.utils import serialize_event, format_event_for_client_v2
from synapse.http.servlet import parse_json_object_from_request, parse_string from synapse.http.servlet import parse_json_object_from_request, parse_string
import logging import logging
@ -138,7 +138,8 @@ class RoomStateEventRestServlet(ClientV1RestServlet):
) )
if format == "event": if format == "event":
defer.returnValue((200, data.get_dict())) event = format_event_for_client_v2(data.get_dict())
defer.returnValue((200, event))
elif format == "content": elif format == "content":
defer.returnValue((200, data.get_dict()["content"])) defer.returnValue((200, data.get_dict()["content"]))