mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-09 19:53:08 +02:00
Resolve #6110
This commit is contained in:
parent
f1fc12d9cc
commit
1471e52307
2 changed files with 7 additions and 2 deletions
|
@ -1,7 +1,6 @@
|
|||
import $ from 'cafy';
|
||||
import define from '../../define';
|
||||
import { Users } from '../../../../models';
|
||||
import { User } from '../../../../models/entities/user';
|
||||
|
||||
export const meta = {
|
||||
desc: {
|
||||
|
@ -73,14 +72,17 @@ export default define(meta, async (ps, me) => {
|
|||
q.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' })
|
||||
}
|
||||
|
||||
q.orderBy('user.updatedAt', 'DESC');
|
||||
|
||||
const users = await q.take(ps.limit!).skip(ps.offset).getMany();
|
||||
|
||||
return await Users.packMany(users, me, { detail: ps.detail });
|
||||
} else {
|
||||
} else if (ps.username) {
|
||||
let users = await Users.createQueryBuilder('user')
|
||||
.where('user.host IS NULL')
|
||||
.andWhere('user.isSuspended = FALSE')
|
||||
.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' })
|
||||
.orderBy('user.updatedAt', 'DESC')
|
||||
.take(ps.limit!)
|
||||
.skip(ps.offset)
|
||||
.getMany();
|
||||
|
@ -90,6 +92,7 @@ export default define(meta, async (ps, me) => {
|
|||
.where('user.host IS NOT NULL')
|
||||
.andWhere('user.isSuspended = FALSE')
|
||||
.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' })
|
||||
.orderBy('user.updatedAt', 'DESC')
|
||||
.take(ps.limit! - users.length)
|
||||
.getMany();
|
||||
|
||||
|
|
|
@ -74,6 +74,7 @@ export default define(meta, async (ps, me) => {
|
|||
.where('user.host IS NULL')
|
||||
.andWhere('user.isSuspended = FALSE')
|
||||
.andWhere('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
|
||||
.orderBy('user.updatedAt', 'DESC')
|
||||
.take(ps.limit!)
|
||||
.skip(ps.offset)
|
||||
.getMany();
|
||||
|
@ -83,6 +84,7 @@ export default define(meta, async (ps, me) => {
|
|||
.where('user.host IS NOT NULL')
|
||||
.andWhere('user.isSuspended = FALSE')
|
||||
.andWhere('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
|
||||
.orderBy('user.updatedAt', 'DESC')
|
||||
.take(ps.limit! - users.length)
|
||||
.getMany();
|
||||
|
||||
|
|
Loading…
Reference in a new issue