Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: fix user_search handler

Browse Source
This commit is contained in:
undefined committed 2021-05-04 13:24:03 +08:00
1 parent f3153993f7
commit ff6777a8c0
4 files changed
+14 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "hydrooj",
"version": "2.24.8",
"version": "2.24.9",
"bin": "bin/hydrooj.js",
"main": "dist/loader.js",
"typings": "dist/loader.d.ts",
packages/hydrooj/src/handler/user.ts
+9 -5
View File
@@ -237,12 +237,16 @@ class UserSearchHandler extends Handler {
@param('q', Types.String)
@param('exectMatch', Types.Boolean)
async get(domainId: string, q: string, exactMatch = false) {
let udoc = await user.getById(domainId, parseInt(q, 10));
let udoc = await user.getById(domainId, +q);
const udocs: User[] = udoc ? [udoc] : [];
udoc = await user.getByUname(domainId, q);
if (udoc) udocs.push(udoc);
udoc = await user.getByEmail(domainId, q);
if (udoc) udocs.push(udoc);
if (!udocs.length) {
udoc = await user.getByUname(domainId, q);
if (udoc) udocs.push(udoc);
else {
udoc = await user.getByEmail(domainId, q);
if (udoc) udocs.push(udoc);
}
}
if (!exactMatch) udocs.push(...await user.getPrefixList(domainId, q, 20));
for (const i in udocs) {
udocs[i].avatarUrl = avatar(udocs[i].avatar);
packages/hydrooj/src/model/user.ts
+4 -4
View File
@@ -276,11 +276,11 @@ class UserModel {
@ArgMethod
static async getPrefixList(domainId: string, prefix: string, limit: number = 50) {
prefix = prefix.toLowerCase();
const $regex = new RegExp(`^${escapeRegExp(prefix)}`, 'gmi');
const uids = await coll.find({ unameLower: { $regex } })
.limit(limit).map((doc) => doc._id).toArray();
const $regex = new RegExp(`\\A${escapeRegExp(prefix)}`, 'gmi');
const udocs = await coll.find({ unameLower: { $regex } })
.limit(limit).project({ _id: 1 }).toArray();
const users = [];
for (const uid of uids) users.push(UserModel.getById(domainId, uid));
for (const { _id } of udocs) users.push(UserModel.getById(domainId, _id));
return await Promise.all(users);
}