Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/server/api/endpoints/users/search.ts
View file

@ -41,7 +41,7 @@ async function byNative(res, rej, me, query, offset, max) {
const users = await User
.find({
$or: [{
username_lower: new RegExp(escapedQuery.replace('@', '').toLowerCase())
usernameLower: new RegExp(escapedQuery.replace('@', '').toLowerCase())
}, {
name: new RegExp(escapedQuery)
}]