diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 923aa7c5..3ab98c2f 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 18ccbb82..0e5a0ee1 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 9a8ec043..3dbb3f08 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, query: any, path: string, params: any,