diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-18 16:30:04 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-18 16:30:04 +0100 |
| commit | 38a965b8163c015ece6100a389e38b652c2c4e6a (patch) | |
| tree | 6e27e8683e6b8c7606851a9577fb3f76741d036d /synapse/handlers/receipts.py | |
| parent | Merge pull request #225 from matrix-org/erikj/reactor_metrics (diff) | |
| parent | Rename unhelpful variable name (diff) | |
| download | synapse-38a965b8163c015ece6100a389e38b652c2c4e6a.tar.xz | |
Merge pull request #227 from matrix-org/erikj/receipts_take2
Re-enable receipts API.
Diffstat (limited to 'synapse/handlers/receipts.py')
| -rw-r--r-- | synapse/handlers/receipts.py | 2 |
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) |