diff options
| author | Erik Johnston <erik@matrix.org> | 2017-02-04 08:28:56 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-02-04 08:28:56 +0000 |
| commit | fad3a8433535d7de321350bbd17373138c6fd3ec (patch) | |
| tree | 70fe66754b86a7a6b1466030dcc8d7e260063f4d /synapse/events/__init__.py | |
| parent | Bump version and changelog (diff) | |
| parent | Bump changelog and version (diff) | |
| download | synapse-fad3a8433535d7de321350bbd17373138c6fd3ec.tar.xz | |
Merge branch 'release-v0.19.0' of github.com:matrix-org/synapse v0.19.0
Diffstat (limited to 'synapse/events/__init__.py')
| -rw-r--r-- | synapse/events/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index da9f3ad436..e673e96cc0 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -79,7 +79,6 @@ class EventBase(object): auth_events = _event_dict_property("auth_events") depth = _event_dict_property("depth") content = _event_dict_property("content") - event_id = _event_dict_property("event_id") hashes = _event_dict_property("hashes") origin = _event_dict_property("origin") origin_server_ts = _event_dict_property("origin_server_ts") @@ -88,8 +87,6 @@ class EventBase(object): redacts = _event_dict_property("redacts") room_id = _event_dict_property("room_id") sender = _event_dict_property("sender") - state_key = _event_dict_property("state_key") - type = _event_dict_property("type") user_id = _event_dict_property("sender") @property @@ -162,6 +159,11 @@ class FrozenEvent(EventBase): else: frozen_dict = event_dict + self.event_id = event_dict["event_id"] + self.type = event_dict["type"] + if "state_key" in event_dict: + self.state_key = event_dict["state_key"] + super(FrozenEvent, self).__init__( frozen_dict, signatures=signatures, |