diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-09 13:13:26 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-09 13:13:26 +0100 |
| commit | 8bf285e08266f3035ce27ec3455ad9effef53e0e (patch) | |
| tree | d1be74830e577cc13c1211e2ae3a622f2f0d28ba /synapse/events | |
| parent | Stream ordering and out of order insertions. (diff) | |
| parent | Merge pull request #120 from matrix-org/bugs/SYN-339 (diff) | |
| download | synapse-8bf285e08266f3035ce27ec3455ad9effef53e0e.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index 64e08223b0..e4495ccf12 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -46,9 +46,10 @@ def _event_dict_property(key): class EventBase(object): def __init__(self, event_dict, signatures={}, unsigned={}, - internal_metadata_dict={}): + internal_metadata_dict={}, rejected_reason=None): self.signatures = signatures self.unsigned = unsigned + self.rejected_reason = rejected_reason self._event_dict = event_dict @@ -109,7 +110,7 @@ class EventBase(object): class FrozenEvent(EventBase): - def __init__(self, event_dict, internal_metadata_dict={}): + def __init__(self, event_dict, internal_metadata_dict={}, rejected_reason=None): event_dict = dict(event_dict) # Signatures is a dict of dicts, and this is faster than doing a @@ -128,6 +129,7 @@ class FrozenEvent(EventBase): signatures=signatures, unsigned=unsigned, internal_metadata_dict=internal_metadata_dict, + rejected_reason=rejected_reason, ) @staticmethod |