amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve 賢さ

Browse Source
This commit is contained in:
syuilo 2018-07-20 04:59:04 +09:00
parent 83f2926f0c
commit 9536d76b61
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/server/api/endpoints/users/search_by_username.ts
View File

@ -21,12 +21,36 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
let users = await User let users = await User
.find({ .find({
host: null, host: null,
usernameLower: new RegExp(escapeRegexp(query.toLowerCase())) usernameLower: new RegExp('^' + escapeRegexp(query.toLowerCase()))
}, { }, {
limit: limit, limit: limit,
skip: offset skip: offset
}); });
if (users.length < limit) {
const remoteUsers = await User
.find({
host: { $ne: null },
usernameLower: new RegExp('^' + escapeRegexp(query.toLowerCase()))
}, {
limit: limit - users.length
});
users = users.concat(remoteUsers);
}
if (users.length < limit) {
const remoteUsers = await User
.find({
host: null,
usernameLower: new RegExp(escapeRegexp(query.toLowerCase()))
}, {
limit: limit - users.length
});
users = users.concat(remoteUsers);
}
if (users.length < limit) { if (users.length < limit) {
const remoteUsers = await User const remoteUsers = await User
.find({ .find({