From 3761a5c77db9d466ff42e6ff0b9563ac483ea9d3 Mon Sep 17 00:00:00 2001 From: undefined Date: Wed, 30 Jun 2021 17:18:46 +0800 Subject: [PATCH] core: add showSelfRecord for contest --- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/handler/record.ts | 7 ++++++- packages/hydrooj/src/interface.ts | 1 + packages/hydrooj/src/model/contest.ts | 13 ++++++++++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index ab009401c..3d13152a0 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.29.7", + "version": "2.29.8", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/handler/record.ts b/packages/hydrooj/src/handler/record.ts index 9b566c431..675c1427b 100644 --- a/packages/hydrooj/src/handler/record.ts +++ b/packages/hydrooj/src/handler/record.ts @@ -95,7 +95,12 @@ class RecordDetailHandler extends Handler { if (!rdoc) throw new RecordNotFoundError(rid); if (rdoc.contest) { const tdoc = await contest.get(domainId, rdoc.contest.tid, rdoc.contest.type); - if (!contest.canShowRecord.call(this, tdoc, true)) throw new PermissionError(rid); + if ( + (rdoc.uid !== this.user._id && !contest.canShowRecord.call(this, tdoc, true)) + || (rdoc.uid === this.user._id && !contest.canShowSelfRecord.call(this, tdoc, true)) + ) { + throw new PermissionError(rid); + } } if (rdoc.uid !== this.user._id && !this.user.hasPriv(PRIV.PRIV_READ_RECORD_CODE)) { if (!this.user.hasPerm(PERM.PERM_READ_RECORD_CODE)) rdoc.code = null; diff --git a/packages/hydrooj/src/interface.ts b/packages/hydrooj/src/interface.ts index ae2fba629..acfaac7d4 100644 --- a/packages/hydrooj/src/interface.ts +++ b/packages/hydrooj/src/interface.ts @@ -441,6 +441,7 @@ export interface ContestRule { check: (args: any) => any; statusSort: any; showScoreboard: (tdoc: Tdoc<30 | 60>, now: Date) => boolean; + showSelfRecord: (tdoc: Tdoc<30 | 60>, now: Date) => boolean; showRecord: (tdoc: Tdoc<30 | 60>, now: Date) => boolean; stat: (tdoc: Tdoc<30 | 60>, journal: any[]) => ContestStat; scoreboard: ( diff --git a/packages/hydrooj/src/model/contest.ts b/packages/hydrooj/src/model/contest.ts index 8da090d4e..2b5ca4bcc 100644 --- a/packages/hydrooj/src/model/contest.ts +++ b/packages/hydrooj/src/model/contest.ts @@ -23,6 +23,7 @@ const acm: ContestRule = { check: () => { }, statusSort: { accept: -1, time: 1 }, showScoreboard: () => true, + showSelfRecord: () => true, showRecord: (tdoc, now) => now > tdoc.endAt, stat: (tdoc, journal) => { const naccept = {}; @@ -152,6 +153,7 @@ const oi: ContestRule = { return { score, detail }; }, showScoreboard: (tdoc, now) => now > tdoc.endAt, + showSelfRecord: (tdoc, now) => now > tdoc.endAt, showRecord: (tdoc, now) => now > tdoc.endAt, async scoreboard(isExport, _, tdoc, pdict, cursor, page) { const [rankedTsdocs, nPages] = await ranked(cursor, (a, b) => a.score === b.score, page); @@ -244,7 +246,8 @@ const oi: ContestRule = { const ioi: ContestRule = { ...oi, TEXT: 'IOI', - showRecord: () => true, + showRecord: (tdoc, now) => now > tdoc.endAt, + showSelfRecord: () => true, showScoreboard: () => true, }; @@ -293,6 +296,7 @@ const homework: ContestRule = { }; }, showScoreboard: () => true, + showSelfRecord: () => true, showRecord: () => true, async scoreboard(isExport, _, tdoc, pdict, cursor, page) { const [rankedTsdocs, nPages] = await ranked(cursor, (a, b) => a.score === b.score, page); @@ -595,6 +599,12 @@ export function canShowRecord(tdoc: Tdoc<30 | 60>, allowPermOverride = true) { return false; } +export function canShowSelfRecord(tdoc: Tdoc<30 | 60>, allowPermOverride = true) { + if (RULES[tdoc.rule].showSelfRecord(tdoc, new Date())) return true; + if (allowPermOverride && canViewHiddenScoreboard.call(this)) return true; + return false; +} + export function canShowScoreboard(tdoc: Tdoc<30 | 60>, allowPermOverride = true) { if (RULES[tdoc.rule].showScoreboard(tdoc, new Date())) return true; if (allowPermOverride && canViewHiddenScoreboard.call(this)) return true; @@ -650,6 +660,7 @@ global.Hydro.model.contest = { getAndListStatus, recalcStatus, canShowRecord, + canShowSelfRecord, canShowScoreboard, canViewHiddenScoreboard, getScoreboard,