summary refs log tree commit diff
path: root/synapse/streams
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-11-19 15:00:14 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-11-19 15:00:14 -0500
commit95c3306798e1ca6429f3f52797a5d1b6ce7d6f37 (patch)
treeb43e191ea43c44a12b4c60c5a3a2ff09bc814e79 /synapse/streams
parentIgnore forgotten rooms in v2 sync (diff)
parentMerge branch 'develop' into daniel/forgetrooms (diff)
downloadsynapse-95c3306798e1ca6429f3f52797a5d1b6ce7d6f37.tar.xz
Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into daniel/forgetrooms
Diffstat (limited to 'synapse/streams')
-rw-r--r--synapse/streams/events.py8
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)