Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Allow clients to ask for the whole of a single state event #1094

Merged
merged 2 commits into from
Sep 9, 2016
Merged

Allow clients to ask for the whole of a single state event #1094

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fc0a3b
Allow clients to specify the format a room state event is returned in
Sep 9, 2016
d271383
Filter returned events for client-facing format
Sep 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions synapse/rest/client/v1/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from synapse.api.constants import EventTypes, Membership
from synapse.api.filtering import Filter
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

import logging
Expand Down Expand Up @@ -120,6 +120,8 @@ def on_PUT_no_state_key(self, request, room_id, event_type):
@defer.inlineCallbacks
def on_GET(self, request, room_id, event_type, state_key):
requester = yield self.auth.get_user_by_req(request, allow_guest=True)
format = parse_string(request, "format", default="content",
allowed_values=["content", "event"])

msg_handler = self.handlers.message_handler
data = yield msg_handler.get_room_data(
Expand All @@ -134,7 +136,12 @@ def on_GET(self, request, room_id, event_type, state_key):
raise SynapseError(
404, "Event not found.", errcode=Codes.NOT_FOUND
)
defer.returnValue((200, data.get_dict()["content"]))

if format == "event":
event = format_event_for_client_v2(data.get_dict())
defer.returnValue((200, event))
elif format == "content":
defer.returnValue((200, data.get_dict()["content"]))

@defer.inlineCallbacks
def on_PUT(self, request, room_id, event_type, state_key, txn_id=None):
Expand Down