diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 10:30:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 10:30:54 +0000 |
| commit | c1c7b398270cc19fcf9410b9159f741092e0510b (patch) | |
| tree | 28dd0adbce84dd907ea62509f37ddb74b6996c4e /synapse | |
| parent | Initial implementation of auth conflict resolution (diff) | |
| download | synapse-c1c7b398270cc19fcf9410b9159f741092e0510b.tar.xz | |
Fix bug where we changes in outlier in metadata dict propogated to other events
Diffstat (limited to '')
| -rw-r--r-- | synapse/events/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/events/builder.py | 5 | ||||
| -rw-r--r-- | synapse/events/utils.py | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index 4252e5ab5c..bf07951027 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -18,7 +18,7 @@ from synapse.util.frozenutils import freeze, unfreeze class _EventInternalMetadata(object): def __init__(self, internal_metadata_dict): - self.__dict__ = internal_metadata_dict + self.__dict__ = dict(internal_metadata_dict) def get_dict(self): return dict(self.__dict__) 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): diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 10a6b9f264..08d6d6fa47 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -88,7 +88,10 @@ def prune_event(event): if "age_ts" in event.unsigned: allowed_fields["unsigned"]["age_ts"] = event.unsigned["age_ts"] - return type(event)(allowed_fields) + return type(event)( + allowed_fields, + internal_metadata_dict=event.internal_metadata.get_dict() + ) def serialize_event(hs, e, client_event=True): |