From 8852aa149b98b3a2bdd4fcc7c05c83108ea9cf3e Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 28 May 2021 23:38:07 +0800 Subject: [PATCH] core: export record.pdomain by default --- package.json | 8 ++++---- packages/fps-importer/package.json | 2 +- packages/hydrojudge/package.json | 4 ++-- packages/hydrooj/package.json | 6 +++--- packages/hydrooj/src/model/problem.ts | 1 - packages/hydrooj/src/model/record.ts | 1 + packages/migrate-vijos/package.json | 2 +- packages/ui-default/package.json | 4 ++-- packages/utils/package.json | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index fc0f2c345..54dfb3d51 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "version": "1.0.0", "license": "AGPL-3.0-only", "devDependencies": { - "@shelf/jest-mongodb": "^1.2.4", + "@shelf/jest-mongodb": "^1.2.5", "@types/cross-spawn": "^6.0.2", "@types/jest": "^26.0.23", "@types/node": "^15.6.1", @@ -43,13 +43,13 @@ "eslint-plugin-import": "^2.23.3", "fs-extra": "^10.0.0", "globby": "^11.0.3", - "jest": "^26.6.3", + "jest": "^27.0.1", "latest-version": "^5.1.0", - "mongodb": "^3.6.8", + "mongodb": "^3.6.9", "nmls": "^3.0.0", "ora": "^5.4.0", "semver": "^7.3.5", - "ts-jest": "^26.5.6", + "ts-jest": "^27.0.1", "typedoc": "^0.20.36", "typescript": "4.2.4" } diff --git a/packages/fps-importer/package.json b/packages/fps-importer/package.json index a57514233..84cd9eb5e 100644 --- a/packages/fps-importer/package.json +++ b/packages/fps-importer/package.json @@ -11,7 +11,7 @@ "adm-zip": "^0.5.5", "decode-html": "^2.0.0", "fs-extra": "^10.0.0", - "mongodb": "^3.6.8", + "mongodb": "^3.6.9", "xml2js": "^0.4.23" }, "devDependencies": { diff --git a/packages/hydrojudge/package.json b/packages/hydrojudge/package.json index dddf166c3..72fb5e3ba 100644 --- a/packages/hydrojudge/package.json +++ b/packages/hydrojudge/package.json @@ -1,7 +1,7 @@ { "name": "@hydrooj/hydrojudge", "bin": "bin/hydrojudge.js", - "version": "2.7.1", + "version": "2.8.0", "main": "package.json", "author": "undefined ", "repository": "https://github.com/hydro-dev/Hydro.git", @@ -12,7 +12,7 @@ "fs-extra": "^10.0.0", "js-yaml": "^4.1.0", "lodash": "^4.17.21", - "mongodb": "^3.6.8", + "mongodb": "^3.6.9", "p-queue": "^6.6.2", "shell-quote": "^1.7.2", "ws": "^7.4.6" diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index e9d613129..c64731170 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.28.3", + "version": "2.28.4", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", @@ -30,7 +30,7 @@ "lru-cache": "^6.0.0", "minio": "7.0.17", "moment-timezone": "^0.5.33", - "mongodb": "^3.6.8", + "mongodb": "^3.6.9", "nodemailer": "^6.6.1", "p-queue": "^6.6.2", "reflect-metadata": "^0.1.13", @@ -42,7 +42,7 @@ "@types/adm-zip": "^0.4.34", "@types/fs-extra": "^9.0.11", "@types/js-yaml": "^4.0.1", - "@types/koa": "^2.13.1", + "@types/koa": "^2.13.2", "@types/koa-compress": "^4.0.1", "@types/koa-router": "^7.4.2", "@types/koa-static-cache": "^5.1.0", diff --git a/packages/hydrooj/src/model/problem.ts b/packages/hydrooj/src/model/problem.ts index 93b6d851f..84d93857a 100644 --- a/packages/hydrooj/src/model/problem.ts +++ b/packages/hydrooj/src/model/problem.ts @@ -266,7 +266,6 @@ export class ProblemModel { const range = { $in: parsed[task].map((i) => i.pid) }; const q: any = { $or: [{ docId: range }, { pid: range }] }; if (!getHidden) q.hidden = false; - console.log(task, parsed[task]); tasks.push(document.getMulti(task, document.TYPE_PROBLEM, q).project(buildProjection(projection)).toArray()); } const pdocs = flatten(await Promise.all(tasks)); diff --git a/packages/hydrooj/src/model/record.ts b/packages/hydrooj/src/model/record.ts index 22f8517f7..0e9edad73 100644 --- a/packages/hydrooj/src/model/record.ts +++ b/packages/hydrooj/src/model/record.ts @@ -22,6 +22,7 @@ class RecordModel { '_id', 'score', 'time', 'memory', 'lang', 'uid', 'pid', 'rejudged', 'hidden', 'progress', 'contest', 'effective', 'judger', 'judgeAt', 'status', + 'pdomain', ]; static async submissionPriority(uid: number, base: number = 0) { diff --git a/packages/migrate-vijos/package.json b/packages/migrate-vijos/package.json index 07474fb60..288727a9b 100644 --- a/packages/migrate-vijos/package.json +++ b/packages/migrate-vijos/package.json @@ -10,6 +10,6 @@ "@types/mongodb": "^3.6.16" }, "dependencies": { - "mongodb": "^3.6.8" + "mongodb": "^3.6.9" } } diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index b0d500dab..f3971cd64 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -23,9 +23,9 @@ "@babel/preset-react": "^7.13.13", "@babel/register": "^7.13.16", "@babel/runtime-corejs3": "^7.14.0", - "@blueprintjs/core": "^3.44.3", + "@blueprintjs/core": "^3.45.0", "@blueprintjs/icons": "^3.26.1", - "@blueprintjs/select": "^3.16.3", + "@blueprintjs/select": "^3.16.4", "@hydrooj/utils": "^1.0.15", "@undefined-moe/monaco-yaml": "^2.5.0", "ansi_up": "^5.0.1", diff --git a/packages/utils/package.json b/packages/utils/package.json index 02dfb2f37..8b0896656 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -11,8 +11,8 @@ "fs-extra": "^10.0.0", "js-yaml": "^4.1.0", "moment": "^2.29.1", - "mongodb": "^3.6.8", - "systeminformation": "^5.7.3" + "mongodb": "^3.6.9", + "systeminformation": "^5.7.4" }, "devDependencies": { "@types/fs-extra": "^9.0.11",