summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-05 16:41:14 +0100
committerErik Johnston <erik@matrix.org>2021-05-05 16:41:14 +0100
commita7b7770bef3205f5d2ff9793f8eb31ad32e017c5 (patch)
treedf81be13c8892cdc152b069705dd6aa376943f8d
parentMerge branch 'erikj/smaller_events' into erikj/test_send (diff)
parentMake origin optional (diff)
downloadsynapse-a7b7770bef3205f5d2ff9793f8eb31ad32e017c5.tar.xz
Merge branch 'erikj/smaller_events' into erikj/test_send
-rw-r--r--synapse/events/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py

index c04905dfed..eb279579e7 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py
@@ -328,7 +328,7 @@ class EventBase(metaclass=abc.ABCMeta): self._encoded_dict = _encode_dict(event_dict) self.depth = event_dict["depth"] - self.origin = event_dict["origin"] + self.origin = event_dict.get("origin") self.origin_server_ts = event_dict["origin_server_ts"] self.redacts = event_dict.get("redacts") self.room_id = event_dict["room_id"]