diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-03-27 22:54:42 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-03-27 22:54:42 +0100 |
| commit | d9d48aad2d58deb5db422a5373a4dac9334a0618 (patch) | |
| tree | 63e51372ca9ace4971403928bd46440ff9e455e2 /synapse/events | |
| parent | initial WIP of a tentative preview_url endpoint - incomplete, untested, exper... (diff) | |
| parent | typo (diff) | |
| download | synapse-d9d48aad2d58deb5db422a5373a4dac9334a0618.tar.xz | |
Merge branch 'develop' into matthew/preview_urls
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/__init__.py | 4 | ||||
| -rw-r--r-- | synapse/events/snapshot.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index bbfa5a7265..abed6b5e6b 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -168,5 +168,7 @@ class FrozenEvent(EventBase): def __repr__(self): return "<FrozenEvent event_id='%s', type='%s', state_key='%s'>" % ( - self.event_id, self.type, self.get("state_key", None), + self.get("event_id", None), + self.get("type", None), + self.get("state_key", None), ) diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index f51200d18e..8a475417a6 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -20,3 +20,4 @@ class EventContext(object): self.current_state = current_state self.state_group = None self.rejected = False + self.push_actions = [] |