diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2016-04-11 12:58:55 +0100 |
|---|---|---|
| committer | David Baker <dbkr@users.noreply.github.com> | 2016-04-11 12:58:55 +0100 |
| commit | 2547dffccc2f2ead7e0d35dafd6da5d468e6d1d8 (patch) | |
| tree | 76c9b510bdb25556553c0cbfa7072e36d11f7e75 /synapse/storage/registration.py | |
| parent | PEP8 (diff) | |
| parent | Run unsafe proces in a loop until we've caught up (diff) | |
| download | synapse-2547dffccc2f2ead7e0d35dafd6da5d468e6d1d8.tar.xz | |
Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions
Change pushers to use the event_actions table
Diffstat (limited to 'synapse/storage/registration.py')
| -rw-r--r-- | synapse/storage/registration.py | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/synapse/storage/registration.py b/synapse/storage/registration.py index 1f71773aaa..7af0cae6a5 100644 --- a/synapse/storage/registration.py +++ b/synapse/storage/registration.py @@ -20,7 +20,7 @@ from twisted.internet import defer from synapse.api.errors import StoreError, Codes from ._base import SQLBaseStore -from synapse.util.caches.descriptors import cached, cachedInlineCallbacks, cachedList +from synapse.util.caches.descriptors import cached, cachedInlineCallbacks class RegistrationStore(SQLBaseStore): @@ -319,26 +319,6 @@ class RegistrationStore(SQLBaseStore): defer.returnValue(res if res else False) - @cachedList(cached_method_name="is_guest", list_name="user_ids", num_args=1, - inlineCallbacks=True) - def are_guests(self, user_ids): - sql = "SELECT name, is_guest FROM users WHERE name IN (%s)" % ( - ",".join("?" for _ in user_ids), - ) - - rows = yield self._execute( - "are_guests", self.cursor_to_dict, sql, *user_ids - ) - - result = {user_id: False for user_id in user_ids} - - result.update({ - row["name"]: bool(row["is_guest"]) - for row in rows - }) - - defer.returnValue(result) - def _query_for_auth(self, txn, token): sql = ( "SELECT users.name, users.is_guest, access_tokens.id as token_id" |