From 1fed4bbbb265e21372825fe59255ee39d21b63fb Mon Sep 17 00:00:00 2001 From: undefined Date: Sat, 16 Dec 2023 04:37:13 +0800 Subject: [PATCH] core: ignore type=generate for rejudge --- packages/hydrooj/src/handler/judge.ts | 4 ++-- packages/hydrooj/src/handler/problem.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/hydrooj/src/handler/judge.ts b/packages/hydrooj/src/handler/judge.ts index fcdf5a067..2ec93f9db 100644 --- a/packages/hydrooj/src/handler/judge.ts +++ b/packages/hydrooj/src/handler/judge.ts @@ -127,7 +127,7 @@ export async function postJudge(rdoc: RecordDoc) { const rdocs = await record.getMulti(rdoc.domainId, { pid: rdoc.pid, status: STATUS.STATUS_ACCEPTED, - contest: { $ne: new ObjectId('0'.repeat(24)) }, + contest: { $nin: [record.RECORD_GENERATE, record.RECORD_PRETEST] }, }).project({ _id: 1, contest: 1 }).toArray(); const priority = await record.submissionPriority(rdoc.uid, -5000 - rdocs.length * 5 - 50); await record.judge(rdoc.domainId, rdocs.map((r) => r._id), priority, {}, { hackRejudge: input }); @@ -275,7 +275,7 @@ class JudgeConnectionHandler extends ConnectionHandler { } async message(msg) { - if (msg.key !== 'ping' && msg.key !== 'prio') { + if (!['ping', 'prio', 'config'].includes(msg.key)) { const method = ['status', 'next'].includes(msg.key) ? 'debug' : 'info'; const keys = method === 'debug' ? ['key'] : ['key', 'subtasks', 'cases']; logger[method]('%o', omit(msg, keys)); diff --git a/packages/hydrooj/src/handler/problem.ts b/packages/hydrooj/src/handler/problem.ts index 6859e8584..74a75127a 100644 --- a/packages/hydrooj/src/handler/problem.ts +++ b/packages/hydrooj/src/handler/problem.ts @@ -442,7 +442,7 @@ export class ProblemDetailHandler extends ContestDetailBaseHandler { this.checkPerm(PERM.PERM_REJUDGE_PROBLEM); const rdocs = await record.getMulti(domainId, { pid, - contest: { $ne: new ObjectId('0'.repeat(24)) }, + contest: { $nin: [record.RECORD_GENERATE, record.RECORD_PRETEST] }, status: { $ne: STATUS.STATUS_CANCELED }, 'files.hack': { $exists: false }, }).project({ _id: 1, contest: 1 }).toArray();