usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2019-03-16 01:08:34 +09:00
parent 75131c4e8a ee29ab95be
commit eb910cd8a1
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/api/endpoints/users/search.ts
View File

@ -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
}); });