summary refs log tree commit diff
path: root/synapse/handlers/account_data.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-11-19 16:53:13 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-11-19 16:53:13 +0000
commit1cfda3d2d8f0f63099c0176b4e01907aba7ad804 (patch)
tree7691812e7aa296267978d375d006ff8a1bf66aa1 /synapse/handlers/account_data.py
parentSimplify code (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-1cfda3d2d8f0f63099c0176b4e01907aba7ad804.tar.xz
Merge branch 'develop' into daniel/forgetrooms
Diffstat (limited to '')
-rw-r--r--synapse/handlers/account_data.py (renamed from synapse/handlers/private_user_data.py)6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/private_user_data.py b/synapse/handlers/account_data.py

index 1abe45ed7b..1d35d3b7dc 100644 --- a/synapse/handlers/private_user_data.py +++ b/synapse/handlers/account_data.py
@@ -16,19 +16,19 @@ from twisted.internet import defer -class PrivateUserDataEventSource(object): +class AccountDataEventSource(object): def __init__(self, hs): self.store = hs.get_datastore() def get_current_key(self, direction='f'): - return self.store.get_max_private_user_data_stream_id() + return self.store.get_max_account_data_stream_id() @defer.inlineCallbacks def get_new_events(self, user, from_key, **kwargs): user_id = user.to_string() last_stream_id = from_key - current_stream_id = yield self.store.get_max_private_user_data_stream_id() + current_stream_id = yield self.store.get_max_account_data_stream_id() tags = yield self.store.get_updated_tags(user_id, last_stream_id) results = []