diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-02 15:57:59 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-02 15:57:59 +0000 |
| commit | c059c9fea5e3ef36cadc136e055284953556c4ed (patch) | |
| tree | 39faa451578ceecc16c92c390a564ebec4fc2373 /synapse/events/builder.py | |
| parent | Add basic application_services SQL, and hook up parts of the appservice store... (diff) | |
| parent | Ignore empty strings for display names & room names in notifications (diff) | |
| download | synapse-c059c9fea5e3ef36cadc136e055284953556c4ed.tar.xz | |
Merge branch 'develop' into application-services
Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py
Diffstat (limited to 'synapse/events/builder.py')
| -rw-r--r-- | synapse/events/builder.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/events/builder.py b/synapse/events/builder.py index a9b1b99a10..9d45bdb892 100644 --- a/synapse/events/builder.py +++ b/synapse/events/builder.py @@ -23,14 +23,15 @@ import copy class EventBuilder(EventBase): - def __init__(self, key_values={}): + def __init__(self, key_values={}, internal_metadata_dict={}): signatures = copy.deepcopy(key_values.pop("signatures", {})) unsigned = copy.deepcopy(key_values.pop("unsigned", {})) super(EventBuilder, self).__init__( key_values, signatures=signatures, - unsigned=unsigned + unsigned=unsigned, + internal_metadata_dict=internal_metadata_dict, ) def build(self): |