summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-13 16:58:10 +0100
committerErik Johnston <erik@matrix.org>2015-08-13 16:58:10 +0100
commit7e77a82c5f4c2dbda1d00dace74a1aece2ab5b78 (patch)
treefb8a31ab69eec8ef0d0310b25d641b539df83aac /synapse
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary... (diff)
downloadsynapse-7e77a82c5f4c2dbda1d00dace74a1aece2ab5b78.tar.xz
Re-enable receipts
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/receipts.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/receipts.py b/synapse/handlers/receipts.py
index 415dd339f6..86c911c4bf 100644
--- a/synapse/handlers/receipts.py
+++ b/synapse/handlers/receipts.py
@@ -171,7 +171,6 @@ class ReceiptEventSource(object):
 
     @defer.inlineCallbacks
     def get_new_events_for_user(self, user, from_key, limit):
-        defer.returnValue(([], from_key))
         from_key = int(from_key)
         to_key = yield self.get_current_key()
 
@@ -194,7 +193,6 @@ class ReceiptEventSource(object):
     @defer.inlineCallbacks
     def get_pagination_rows(self, user, config, key):
         to_key = int(config.from_key)
-        defer.returnValue(([], to_key))
 
         if config.to_key:
             from_key = int(config.to_key)