From 9bae058893f6b4bce209dfa9801d40a6dc887f93 Mon Sep 17 00:00:00 2001
From: undefined <masnn0@outlook.com>
Date: Thu, 18 Feb 2021 13:19:15 +0800
Subject: [PATCH] =?UTF-8?q?core:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=AD=E9=94=AE=E5=80=BC=E5=A4=9A=E5=87=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/hydrooj/package.json          |  2 +-
 packages/hydrooj/src/handler/manage.ts | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 57a21b71b..240426ded 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.17.13",
+    "version": "2.17.14",
     "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 a1b94e194..fb27cf68d 100644
--- a/packages/hydrooj/src/handler/manage.ts
+++ b/packages/hydrooj/src/handler/manage.ts
@@ -19,16 +19,14 @@ function set(key: string, value: any) {
     if (setting.SYSTEM_SETTINGS_BY_KEY[key]) {
         const s = setting.SYSTEM_SETTINGS_BY_KEY[key];
         if (s.flag & setting.FLAG_DISABLED) return undefined;
-        if (s.flag & setting.FLAG_SECRET && !value) return undefined;
+        if ((s.flag & setting.FLAG_SECRET) && !value) return undefined;
         if (s.type === 'boolean') {
             if (value === 'on') return true;
             return false;
         }
         if (s.type === 'number') {
-            if (!Number.isSafeInteger(+value)) {
-                throw new ValidationError(key);
-            }
-            return parseInt(value, 10);
+            if (!Number.isSafeInteger(+value)) throw new ValidationError(key);
+            return +value;
         }
         return value;
     }
@@ -149,12 +147,11 @@ class SystemSettingHandler extends SystemHandler {
         for (const key in args) {
             if (typeof args[key] === 'object') {
                 for (const subkey in args[key]) {
-                    if (typeof set(`${key}.${subkey} `, args[key][subkey]) !== 'undefined') {
-                        tasks.push(system.set(`${key}.${subkey} `, set(`${key}.${subkey} `, args[key][subkey])));
+                    const val = set(`${key}.${subkey}`, args[key][subkey]);
+                    if (val !== undefined) {
+                        tasks.push(system.set(`${key}.${subkey}`, val));
                     }
                 }
-            } else if (typeof set(key, args[key]) !== 'undefined') {
-                tasks.push(system.set(key, set(key, args[key])));
             }
         }
         tasks.push(bus.parallel('system/setting', args));