Merge PDUs and Events into one object

2 files changed, 8 insertions, 0 deletions

diff --git a/synapse/api/events/__init__.py b/synapse/api/events/__init__.py
index 1d8bed2906..63c0bd7ae7 100644
--- a/synapse/api/events/__init__.py
+++ b/synapse/api/events/__init__.py
@@ -117,6 +117,12 @@ class SynapseEvent(JsonEncodedObject):
         """
         raise NotImplementedError("get_content_template not implemented.")
 
+    def get_pdu_json(self):
+        pdu_json = self.get_full_dict()
+        pdu_json.pop("destination", None)
+        pdu_json.pop("outlier", None)
+        return pdu_json
+
 
 class SynapseStateEvent(SynapseEvent):
 
diff --git a/synapse/api/events/utils.py b/synapse/api/events/utils.py
index 802648f8f7..d6019d56eb 100644
--- a/synapse/api/events/utils.py
+++ b/synapse/api/events/utils.py
@@ -42,6 +42,8 @@ def prune_event(event):
         "prev_events",
         "prev_state",
         "auth_events",
+        "origin",
+        "origin_server_ts",
     ]
 
     new_content = {}