Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
commit
eb910cd8a1
@ -71,7 +71,7 @@ export default define(meta, async (ps, me) => {
|
|||||||
.find({
|
.find({
|
||||||
host: null,
|
host: null,
|
||||||
usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase())),
|
usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase())),
|
||||||
isSuspended: false
|
isSuspended: { $ne: true }
|
||||||
}, {
|
}, {
|
||||||
limit: ps.limit,
|
limit: ps.limit,
|
||||||
skip: ps.offset
|
skip: ps.offset
|
||||||
@ -82,7 +82,7 @@ export default define(meta, async (ps, me) => {
|
|||||||
.find({
|
.find({
|
||||||
host: { $ne: null },
|
host: { $ne: null },
|
||||||
usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase())),
|
usernameLower: new RegExp('^' + escapeRegexp(ps.query.replace('@', '').toLowerCase())),
|
||||||
isSuspended: false
|
isSuspended: { $ne: true }
|
||||||
}, {
|
}, {
|
||||||
limit: ps.limit - users.length
|
limit: ps.limit - users.length
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user