From b13bf24031acd68ce1b4136ebee9cc44aa9c200b Mon Sep 17 00:00:00 2001 From: undefined Date: Thu, 10 Mar 2022 22:18:28 +0800 Subject: [PATCH] core: export HomeHandler --- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/entry/cli.ts | 4 ++-- packages/hydrooj/src/handler/domain.ts | 2 +- packages/hydrooj/src/handler/home.ts | 2 +- packages/hydrooj/src/script/rating.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index ee3690497..11aeed6ad 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "3.8.2", + "version": "3.8.3", "bin": "bin/hydrooj.js", "main": "src/loader", "module": "src/loader", diff --git a/packages/hydrooj/src/entry/cli.ts b/packages/hydrooj/src/entry/cli.ts index 67720e3ac..0ba092cad 100644 --- a/packages/hydrooj/src/entry/cli.ts +++ b/packages/hydrooj/src/entry/cli.ts @@ -20,8 +20,8 @@ function parseParameters(fn: Function) { .replace(COMMENTS, '') .replace(ARR, ''); const result = code.slice(code.indexOf('(') + 1, code.indexOf(')')) - .match(/([^,]+)/g).map((i) => i.trim()); - return result === null ? [] : result; + .match(/([^,]+)/g)?.map((i) => i.trim()); + return result ?? []; } async function runScript(name: string, arg: any) { diff --git a/packages/hydrooj/src/handler/domain.ts b/packages/hydrooj/src/handler/domain.ts index ee3c20f9d..8b878d94d 100644 --- a/packages/hydrooj/src/handler/domain.ts +++ b/packages/hydrooj/src/handler/domain.ts @@ -58,7 +58,7 @@ class DomainRankHandler extends Handler { @query('page', Types.PositiveInt, true) async get(domainId: string, page = 1) { const [dudocs, upcount, ucount] = await paginate( - domain.getMultiUserInDomain(domainId, { uid: { $gt: 1 } }).sort({ rp: -1 }), + domain.getMultiUserInDomain(domainId, { uid: { $gt: 1 }, rp: { $gt: 0 } }).sort({ rp: -1 }), page, 100, ); diff --git a/packages/hydrooj/src/handler/home.ts b/packages/hydrooj/src/handler/home.ts index 7b1f1ea8d..2ddd0ea3a 100644 --- a/packages/hydrooj/src/handler/home.ts +++ b/packages/hydrooj/src/handler/home.ts @@ -30,7 +30,7 @@ import { const { geoip, useragent } = global.Hydro.lib; -class HomeHandler extends Handler { +export class HomeHandler extends Handler { uids = new Set(); collectUser(uids: number[]) { diff --git a/packages/hydrooj/src/script/rating.ts b/packages/hydrooj/src/script/rating.ts index f030e0cd0..a31c4a5ee 100644 --- a/packages/hydrooj/src/script/rating.ts +++ b/packages/hydrooj/src/script/rating.ts @@ -99,7 +99,7 @@ export const RpTypes: Record = { global.Hydro.model.rp = RpTypes; export async function calcLevel(domainId: string, report: Function) { - const filter = { rp: { $exists: true } }; + const filter = { rp: { $gt: 0 } }; const ducnt = await domain.getMultiUserInDomain(domainId, filter).count(); await domain.setMultiUserInDomain(domainId, {}, { level: 0, rank: null }); if (!ducnt) return;