diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-10 16:39:05 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-10 16:39:05 +0000 |
| commit | 771892b3144e5a45739a097f818e71a7ce5d8ce2 (patch) | |
| tree | eeafc4bcd6029745d2ed59832e7a606e7874ee25 | |
| parent | Pin the twisted version so that it doesn't pull in twisted 15. (diff) | |
| parent | Bump version (diff) | |
| download | synapse-771892b3144e5a45739a097f818e71a7ce5d8ce2.tar.xz | |
Merge pull request #59 from matrix-org/hotfixes-v0.6.1f v0.6.1f
Hotfixes v0.6.1f
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/events/utils.py | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/VERSION b/VERSION index 1648b8029d..f97571ce52 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.1e +0.6.1f diff --git a/synapse/__init__.py b/synapse/__init__.py index d3f1c33d3a..329138734a 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a synapse home server. """ -__version__ = "0.6.1e" +__version__ = "0.6.1f" diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 4ad37188ba..5bfa820f96 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -45,12 +45,14 @@ def prune_event(event): "membership", ] + event_dict = event.get_dict() + new_content = {} def add_fields(*fields): for field in fields: if field in event.content: - new_content[field] = event.content[field] + new_content[field] = event_dict["content"][field] if event_type == EventTypes.Member: add_fields("membership") @@ -75,7 +77,7 @@ def prune_event(event): allowed_fields = { k: v - for k, v in event.get_dict().items() + for k, v in event_dict.items() if k in allowed_keys } |