Return the raw federation event rather than adding extra keys for federation data.

2 files changed, 4 insertions, 4 deletions

diff --git a/synapse/rest/events.py b/synapse/rest/events.py
index ac1a75a559..bedcb2bcc6 100644
--- a/synapse/rest/events.py
+++ b/synapse/rest/events.py
@@ -44,11 +44,11 @@ class EventStreamRestServlet(RestServlet):
                 except ValueError:
                     raise SynapseError(400, "timeout must be in milliseconds.")
 
-            trim_events = "raw" not in request.args
+            as_client_event = "raw" not in request.args
 
             chunk = yield handler.get_stream(
                 auth_user.to_string(), pagin_config, timeout=timeout,
-                trim_events=trim_events
+                as_client_event=as_client_event
             )
         except:
             logger.exception("Event stream failed")
diff --git a/synapse/rest/initial_sync.py b/synapse/rest/initial_sync.py
index d2c0c63aa6..b13d56b286 100644
--- a/synapse/rest/initial_sync.py
+++ b/synapse/rest/initial_sync.py
@@ -27,14 +27,14 @@ class InitialSyncRestServlet(RestServlet):
     def on_GET(self, request):
         user = yield self.auth.get_user_by_req(request)
         with_feedback = "feedback" in request.args
-        trim_events = "raw" not in request.args
+        as_client_event = "raw" not in request.args
         pagination_config = PaginationConfig.from_request(request)
         handler = self.handlers.message_handler
         content = yield handler.snapshot_all_rooms(
             user_id=user.to_string(),
             pagin_config=pagination_config,
             feedback=with_feedback,
-            trim_events=trim_events
+            as_client_event=as_client_event
         )
 
         defer.returnValue((200, content))