summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authorSatsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>2019-07-17 18:59:10 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-07-17 18:59:10 +0900
commit8e4ad4b9195f168d66d3ce09a12afe736ceb481c (patch)
treebd9c6c02c18ce6fb9a4c563c11634233802949c4 /src/server/api
parentCleanup source (#5177) (diff)
downloadsharkey-8e4ad4b9195f168d66d3ce09a12afe736ceb481c.tar.gz
sharkey-8e4ad4b9195f168d66d3ce09a12afe736ceb481c.tar.bz2
sharkey-8e4ad4b9195f168d66d3ce09a12afe736ceb481c.zip
Improve usability of users view (#5176)
* Improve usability of users view Resolve #5173 * Fix query * Follow review and fix * Follow review
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/endpoints/admin/show-users.ts18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/server/api/endpoints/admin/show-users.ts b/src/server/api/endpoints/admin/show-users.ts
index 8733d87a38..89e0cf1e2a 100644
--- a/src/server/api/endpoints/admin/show-users.ts
+++ b/src/server/api/endpoints/admin/show-users.ts
@@ -49,6 +49,16 @@ export const meta = {
'remote',
]),
default: 'local'
+ },
+
+ username: {
+ validator: $.optional.str,
+ default: null
+ },
+
+ hostname: {
+ validator: $.optional.str,
+ default: null
}
}
};
@@ -70,6 +80,14 @@ export default define(meta, async (ps, me) => {
case 'remote': query.andWhere('user.host IS NOT NULL'); break;
}
+ if (ps.username) {
+ query.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' });
+ }
+
+ if (ps.hostname) {
+ query.andWhere('user.host like :hostname', { hostname: '%' + ps.hostname.toLowerCase() + '%' });
+ }
+
switch (ps.sort) {
case '+follower': query.orderBy('user.followersCount', 'DESC'); break;
case '-follower': query.orderBy('user.followersCount', 'ASC'); break;