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

Merge branch 'master' into hot-reload

Browse Source
This commit is contained in:
undefined committed 2022-09-27 00:00:06 +08:00
2 parents 9461499d7c 265b14236a
commit c5d165617e
13 files changed
+338 -1134
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": "3.17.10",
"version": "3.17.12",
"bin": "bin/hydrooj.js",
"main": "src/loader",
"module": "src/loader",
packages/hydrooj/src/model/contest.ts
+7 -5
View File
@@ -32,7 +32,12 @@ interface AcmDetail extends AcmJournal {
}
function buildContestRule<T>(def: ContestRule<T>): ContestRule<T> {
const _originalRule = { scoreboard: def.scoreboard, stat: def.stat };
const _originalRule = {
scoreboard: def.scoreboard,
scoreboardRow: def.scoreboardRow,
scoreboardHeader: def.scoreboardHeader,
stat: def.stat,
};
def.scoreboard = (def._originalRule?.scoreboard || def.scoreboard).bind(def);
def.scoreboardHeader = (def._originalRule?.scoreboardHeader || def.scoreboardHeader).bind(def);
def.scoreboardRow = (def._originalRule?.scoreboardRow || def.scoreboardRow).bind(def);
@@ -234,10 +239,7 @@ const oi = buildContestRule({
return columns;
},
async scoreboardRow(isExport, _, tdoc, pdict, udoc, rank, tsdoc, meta) {
const tsddict = {};
for (const item of tsdoc.journal || []) {
if (!tsddict[item.pid] || tsddict[item.pid].score < item.score || this.submitAfterAccept) tsddict[item.pid] = item;
}
const tsddict = tsdoc.detail || {};
const row: ScoreboardNode[] = [
{ type: 'rank', value: rank.toString() },
{ type: 'user', value: udoc.uname, raw: tsdoc.uid },