diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:07:05 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:07:05 +0100 |
| commit | 4b63b06cad3e72e3d3dee66d3d6c7801e4a7abaf (patch) | |
| tree | 37b368d6039d986d70f153fb69d6345d1019d64a /synapse/storage/__init__.py | |
| parent | fix a few pyflakes errors (diff) | |
| parent | Fix pyflakes errors (diff) | |
| download | synapse-4b63b06cad3e72e3d3dee66d3d6c7801e4a7abaf.tar.xz | |
Merge branch 'develop' into storage_transactions
Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 63afca9ad7..5e52e9fecf 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -16,8 +16,9 @@ from twisted.internet import defer from synapse.api.events.room import ( - RoomMemberEvent, MessageEvent, RoomTopicEvent, FeedbackEvent, - RoomConfigEvent, RoomNameEvent, + RoomMemberEvent, RoomTopicEvent, FeedbackEvent, +# RoomConfigEvent, + RoomNameEvent, ) from synapse.util.logutils import log_function @@ -116,6 +117,11 @@ class DataStore(RoomMemberStore, RoomStore, if stream_ordering is not None: vals["stream_ordering"] = stream_ordering + if hasattr(event, "outlier"): + vals["outlier"] = event.outlier + else: + vals["outlier"] = False + unrec = { k: v for k, v in event.get_full_dict().items() |