diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 17:21:03 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2015-11-19 17:21:03 +0000 |
| commit | dd11bf8a795ed9c20ce694cd0cd12cf47c00fd25 (patch) | |
| tree | f1647aaf46015d8da38d7ed1c6192cc835f13192 /synapse/streams | |
| parent | Put back the 'state.events' subobject (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-dd11bf8a795ed9c20ce694cd0cd12cf47c00fd25.tar.xz | |
Merge branch 'develop' into rav/flatten_sync_response
Diffstat (limited to 'synapse/streams')
| -rw-r--r-- | synapse/streams/events.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/streams/events.py b/synapse/streams/events.py index f0d68b5bf2..cfa7d30fa5 100644 --- a/synapse/streams/events.py +++ b/synapse/streams/events.py @@ -21,7 +21,7 @@ from synapse.handlers.presence import PresenceEventSource from synapse.handlers.room import RoomEventSource from synapse.handlers.typing import TypingNotificationEventSource from synapse.handlers.receipts import ReceiptEventSource -from synapse.handlers.private_user_data import PrivateUserDataEventSource +from synapse.handlers.account_data import AccountDataEventSource class EventSources(object): @@ -30,7 +30,7 @@ class EventSources(object): "presence": PresenceEventSource, "typing": TypingNotificationEventSource, "receipt": ReceiptEventSource, - "private_user_data": PrivateUserDataEventSource, + "account_data": AccountDataEventSource, } def __init__(self, hs): @@ -54,8 +54,8 @@ class EventSources(object): receipt_key=( yield self.sources["receipt"].get_current_key() ), - private_user_data_key=( - yield self.sources["private_user_data"].get_current_key() + account_data_key=( + yield self.sources["account_data"].get_current_key() ), ) defer.returnValue(token) |