From dd2f595e49965f7271d255b7ba7b50c0e3a22d6c Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Sat, 2 Apr 2022 14:29:25 +0800
Subject: [PATCH] core: submissionPriority: ignore rejudged problems

---
 packages/hydrooj/package.json          | 2 +-
 packages/hydrooj/src/model/record.ts   | 4 ++--
 packages/hydrooj/src/service/server.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 923aa7c5e..3ab98c2ff 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "3.11.2",
+    "version": "3.11.3",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",
diff --git a/packages/hydrooj/src/model/record.ts b/packages/hydrooj/src/model/record.ts
index 18ccbb82a..0e5a0ee1e 100644
--- a/packages/hydrooj/src/model/record.ts
+++ b/packages/hydrooj/src/model/record.ts
@@ -27,9 +27,9 @@ class RecordModel {
     ];
 
     static async submissionPriority(uid: number, base: number = 0) {
-        const pending = await task.count({ uid });
+        const pending = await task.count({ uid, rejudged: { $ne: true } });
         const timeRecent = await RecordModel.coll
-            .find({ _id: { $gte: Time.getObjectID(moment().add(-1, 'hour')) }, uid }).project({ time: 1 }).toArray();
+            .find({ _id: { $gte: Time.getObjectID(moment().add(-30, 'minutes')) }, uid }).project({ time: 1 }).toArray();
         return base - ((pending * 1000 + 1) * (sum(timeRecent.map((i) => i.time || 0)) / 10000));
     }
 
diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts
index 9a8ec0435..3dbb3f088 100644
--- a/packages/hydrooj/src/service/server.ts
+++ b/packages/hydrooj/src/service/server.ts
@@ -415,7 +415,7 @@ export class Handler extends HandlerCommon {
         headers: any,
         cookies: any,
         body: any,
-        files: any,
+        files: Record<string, import('formidable').File>,
         query: any,
         path: string,
         params: any,