From c250c8e925db595ec7fc6c327e71714344104267 Mon Sep 17 00:00:00 2001
From: undefined <masnn0@outlook.com>
Date: Sat, 27 Mar 2021 11:17:04 +0800
Subject: [PATCH] core: user_import: rename to draft

---
 packages/hydrooj/package.json           | 2 +-
 packages/hydrooj/src/handler/manage.ts  | 6 +++---
 packages/hydrooj/src/handler/problem.ts | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 6ed862933..2b26fe0c2 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.20.37",
+    "version": "2.20.38",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",
diff --git a/packages/hydrooj/src/handler/manage.ts b/packages/hydrooj/src/handler/manage.ts
index ce3074a8e..cdddb0cee 100644
--- a/packages/hydrooj/src/handler/manage.ts
+++ b/packages/hydrooj/src/handler/manage.ts
@@ -186,8 +186,8 @@ class SystemUserImportHandler extends SystemHandler {
     }
 
     @param('users', Types.String)
-    @param('confirm', Types.Boolean)
-    async post(domainId: string, _users: string, confirm: boolean) {
+    @param('draft', Types.Boolean)
+    async post(domainId: string, _users: string, draft: boolean) {
         const users = _users.split('\n');
         const udocs = [];
         const tasks = [];
@@ -203,7 +203,7 @@ class SystemUserImportHandler extends SystemHandler {
                     udocs.push({
                         email, username, password, displayName,
                     });
-                    if (!confirm) {
+                    if (!draft) {
                         tasks.push(
                             (async () => {
                                 const uid = await user.create(email, username, password);
diff --git a/packages/hydrooj/src/handler/problem.ts b/packages/hydrooj/src/handler/problem.ts
index eaf50c827..5ca88aa48 100644
--- a/packages/hydrooj/src/handler/problem.ts
+++ b/packages/hydrooj/src/handler/problem.ts
@@ -74,6 +74,10 @@ export class ProblemMainHandler extends ProblemHandler {
             page,
             system.get('pagination.problem'),
         );
+        if (q && +q) {
+            const pdoc = await problem.get(domainId, +q, this.user._id, problem.PROJECTION_LIST);
+            if (pdoc) pdocs.unshift(pdoc);
+        }
         if (this.user.hasPriv(PRIV.PRIV_USER_PROFILE)) {
             psdict = await problem.getListStatus(
                 domainId, this.user._id, pdocs.map((pdoc) => pdoc.docId),