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_by_username.ts
View file

@ -26,7 +26,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
const users = await User
.find({
username_lower: new RegExp(query.toLowerCase())
usernameLower: new RegExp(query.toLowerCase())
}, {
limit: limit,
skip: offset