Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-12-15 15:08:48 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'cross-signing_hidden' into cross-signing_keys

Browse source
This commit is contained in:
Hubert Chathi 2019-08-01 16:31:40 -04:00
commit 336c546d6a
298 changed files with 3414 additions and 2145 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/storage/__init__.py
View file

@ -472,7 +472,7 @@ class DataStore(
return self._simple_select_list(
table="users",
keyvalues={},
retcols=["name", "password_hash", "is_guest", "admin"],
retcols=["name", "password_hash", "is_guest", "admin", "user_type"],
desc="get_users",
)
@ -497,11 +497,11 @@ class DataStore(
orderby=order,
start=start,
limit=limit,
retcols=["name", "password_hash", "is_guest", "admin"],
retcols=["name", "password_hash", "is_guest", "admin", "user_type"],
)
count = yield self.runInteraction("get_users_paginate", self.get_user_count_txn)
retval = {"users": users, "total": count}
defer.returnValue(retval)
return retval
def search_users(self, term):
"""Function to search users list for one or more users with
@ -517,7 +517,7 @@ class DataStore(
table="users",
term=term,
col="name",
retcols=["name", "password_hash", "is_guest", "admin"],
retcols=["name", "password_hash", "is_guest", "admin", "user_type"],
desc="search_users",
)