krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
1 changed files with 5 additions and 2 deletions
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) { 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); 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') { } else if (type === 'group-invites') {
if (group.type === 'guild') { // eslint-disable-line no-lonely-if if (group.type === 'guild') { // eslint-disable-line no-lonely-if