sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-18 03:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use or clause for display name and username search (#12820)

Browse source 
* use or clause for display name and username search

* update styling

* More style fix

* update comment and regex
This commit is contained in:
jbusa22 2020-11-30 14:05:58 -05:00 committed by GitHub
parent 3ce182d0dc
commit f077e40c4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
website/server/controllers/api-v3/members.js
View file

@ -322,9 +322,12 @@ function _getMembersForItem (type) {
}
if (req.query.search) {
// Creates a RegExp expression when querying for profile.name
// Creates a RegExp expression when querying for profile.name and auth.local.username
const escapedSearch = escapeRegExp(req.query.search);
query['profile.name'] = { $regex: new RegExp(escapedSearch, 'i') };
query.$or = [
{ 'profile.name': { $regex: new RegExp(escapedSearch, 'i') } },
{ 'auth.local.username': { $regex: new RegExp(req.query.search, 'i') } },
];
}
} else if (type === 'group-invites') {
if (group.type === 'guild') { // eslint-disable-line no-lonely-if