From 719cc0570c605a65307c3ae912a1c764d701ba86 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Fri, 9 Jul 2021 17:42:24 +0800
Subject: [PATCH] core: hide nAccept in contest

---
 packages/hydrojudge/src/service.ts                | 5 +++--
 packages/hydrooj/package.json                     | 2 +-
 packages/hydrooj/src/handler/contest.ts           | 3 +++
 packages/ui-default/package.json                  | 2 +-
 packages/ui-default/templates/problem_detail.html | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/hydrojudge/src/service.ts b/packages/hydrojudge/src/service.ts
index 1ac55dfee..2d0f06202 100644
--- a/packages/hydrojudge/src/service.ts
+++ b/packages/hydrojudge/src/service.ts
@@ -37,8 +37,9 @@ async function postInit() {
     if (!global.Hydro.isFirstWorker) return;
     const judge = require('./judge');
 
-    const { task, system, setting } = global.Hydro.model;
-    const { storage } = global.Hydro.service;
+    const {
+        task, system, setting, storage,
+    } = global.Hydro.model;
     const _judge = global.Hydro.handler.judge as any;
 
     if (system.get('hydrojudge.disable')) return;
diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 2304fe1c3..4f31c673f 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.29.21",
+    "version": "2.29.22",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",
diff --git a/packages/hydrooj/src/handler/contest.ts b/packages/hydrooj/src/handler/contest.ts
index 97074f128..5dff3a915 100644
--- a/packages/hydrooj/src/handler/contest.ts
+++ b/packages/hydrooj/src/handler/contest.ts
@@ -270,10 +270,13 @@ export class ContestProblemHandler extends Handler {
         // @ts-ignore
         if (this.pdoc.domainId !== domainId) this.pdoc.docId = `${this.pdoc.domainId}:${this.pdoc.docId}`;
         this.attended = this.tsdoc && this.tsdoc.attend === 1;
+        const showAccept = contest.canShowScoreboard.call(this, this.tdoc, true);
+        if (!showAccept) this.pdoc.nAccept = 0;
         if (contest.isNotStarted(this.tdoc)) throw new ContestNotLiveError(tid);
         if (!contest.isDone(this.tdoc) && !this.attended) throw new ContestNotAttendedError(tid);
         this.response.template = 'problem_detail.html';
         this.response.body = {
+            showAccept,
             tdoc: this.tdoc,
             tsdoc: this.tsdoc,
             pdoc: this.pdoc,
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 6d1ab0f27..3a9c36d95 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.12.15",
+  "version": "4.12.16",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/templates/problem_detail.html b/packages/ui-default/templates/problem_detail.html
index ab84fbb35..7ceb850a1 100644
--- a/packages/ui-default/templates/problem_detail.html
+++ b/packages/ui-default/templates/problem_detail.html
@@ -39,13 +39,14 @@
       </div>
       <div class="section__body">
         <ul class="problem__tags">
+          <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('ID') }}: {{ pdoc.docId }}</span>
           <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Type') }}: {{ pdoc.config.type }}</span>
           {% if pdoc.config.type != 'subjective' and pdoc.config.type != 'submit_answer' %}
             <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Time') }}: {{ pdoc.config.timeMax if pdoc.config.timeMax == pdoc.config.timeMin else pdoc.config.timeMin+'~'+pdoc.config.timeMax }}ms</span>
             <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Memory') }}: {{ pdoc.config.memoryMax if pdoc.config.memoryMax == pdoc.config.memoryMin else pdoc.config.memoryMin+'~'+pdoc.config.memoryMax }}MiB</span>
           {% endif %}
           <a class="bp3-tag bp3-large bp3-minimal bp3-interactive problem__tag-item" href="{{ url('record_main', query={pid:pdoc.docId}) }}">{{ _('Tried') }}: {{ pdoc.nSubmit }}</a>
-          <a class="bp3-tag bp3-large bp3-minimal bp3-interactive problem__tag-item" href="{{ url('record_main', query={pid:pdoc.docId, status:1}) }}">{{ _('Accepted') }}: {{ pdoc.nAccept }}</a>
+          <a class="bp3-tag bp3-large bp3-minimal bp3-interactive problem__tag-item" href="{{ url('record_main', query={pid:pdoc.docId, status:1}) }}">{{ _('Accepted') }}: {{ pdoc.nAccept if ((not tdoc) or showAccept) else '?' }}</a>
           <span class="bp3-tag bp3-large bp3-minimal problem__tag-item">{{ _('Difficulty') }}: {{ pdoc['difficulty'] or _('(None)') }}</span>
           <span class="bp3-tag bp3-large bp3-minimal bp3-interactive problem__tag-item">{{ _('Uploaded By') }}: {{ user.render_inline(udoc, badge=false) }}</span>
           {% if pdoc.tag.length %}