summary refs log tree commit diff
path: root/synapse/storage/registration.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-05-01 15:04:20 +0100
committerDavid Baker <dave@matrix.org>2015-05-01 15:04:37 +0100
commiteb9bd2d9491e550fa2abcd70efa22e56c282f9e1 (patch)
tree0b8ead8a1afcee0b40717a7321566c521ef1bf40 /synapse/storage/registration.py
parentThat wasn't a deferred (diff)
downloadsynapse-eb9bd2d9491e550fa2abcd70efa22e56c282f9e1.tar.xz
user_id now in user_threepids
Diffstat (limited to 'synapse/storage/registration.py')
-rw-r--r--synapse/storage/registration.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py

index 530bbe6b45..90e2606be2 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py
@@ -202,15 +202,15 @@ class RegistrationStore(SQLBaseStore): defer.returnValue(ret) @defer.inlineCallbacks - def get_user_by_threepid(self, medium, address): + def get_user_id_by_threepid(self, medium, address): ret = yield self._simple_select_one( "user_threepids", { "medium": medium, "address": address }, - ['user'], True, 'get_user_by_threepid' + ['user_id'], True, 'get_user_id_by_threepid' ) if ret: - defer.returnValue(ret['user']) + defer.returnValue(ret['user_id']) defer.returnValue(None)