From f0c1b49ac1f0a3b39e818ea201fed83e665d5ae0 Mon Sep 17 00:00:00 2001
From: undefined <masnn0@outlook.com>
Date: Mon, 25 Jan 2021 22:37:51 +0800
Subject: [PATCH] =?UTF-8?q?core:=20=E4=BF=AE=E5=A4=8D=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=88=90=E7=BB=A9=E8=A1=A8=E8=AE=A1=E5=88=86=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/hydrojudge/package.json      | 2 +-
 packages/hydrojudge/src/service.ts    | 1 -
 packages/hydrooj/package.json         | 2 +-
 packages/hydrooj/src/model/contest.ts | 6 +++---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/hydrojudge/package.json b/packages/hydrojudge/package.json
index 4b7365ed8..628c73803 100644
--- a/packages/hydrojudge/package.json
+++ b/packages/hydrojudge/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@hydrooj/hydrojudge",
     "bin": "bin/hydrojudge.js",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "main": "package.json",
     "author": "undefined <i@undefined.moe>",
     "repository": "https://github.com/hydro-dev/Hydro.git",
diff --git a/packages/hydrojudge/src/service.ts b/packages/hydrojudge/src/service.ts
index 970554cf5..ff4ddcacc 100644
--- a/packages/hydrojudge/src/service.ts
+++ b/packages/hydrojudge/src/service.ts
@@ -71,7 +71,6 @@ async function postInit() {
     }
 
     async function cacheOpen(domainId: string, pid: string, files: any[]) {
-        console.log(files);
         const filePath = path.join(getConfig('cache_dir'), domainId, pid);
         await fs.ensureDir(filePath);
         if (!files.length) throw new SystemError('Problem data not found.');
diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 9bd092cc3..f57ec418f 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.17.1",
+    "version": "2.17.2",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",
diff --git a/packages/hydrooj/src/model/contest.ts b/packages/hydrooj/src/model/contest.ts
index d1c427e5a..6d8c47f44 100644
--- a/packages/hydrooj/src/model/contest.ts
+++ b/packages/hydrooj/src/model/contest.ts
@@ -214,7 +214,7 @@ const homework: ContestRule = {
     stat: (tdoc, journal) => {
         const effective = {};
         for (const j of journal) {
-            if (tdoc.pids.includes(j.pid) && !effective[j.pid] && j.accept) {
+            if (tdoc.pids.includes(j.pid) && (!effective[j.pid] || j.accept)) {
                 effective[j.pid] = j;
             }
         }
@@ -248,7 +248,7 @@ const homework: ContestRule = {
         }
         return {
             score: Math.sum(detail.map((d) => d.score)),
-            penaltyScore: Math.sum(detail.map((d) => d.penaltySince)),
+            penaltyScore: Math.sum(detail.map((d) => d.penaltyScore)),
             time: Math.sum(detail.map((d) => d.time)),
             detail,
         };
@@ -300,7 +300,7 @@ const homework: ContestRule = {
         const rows = [columns];
         for (const [rank, tsdoc] of rankedTsdocs) {
             const tsddict = {};
-            for (const item of tsdoc.journal || []) {
+            for (const item of tsdoc.detail || []) {
                 tsddict[item.pid] = item;
             }
             const row = [