Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: 修复系统设置中键值多出空格的问题

Browse Source
This commit is contained in:
undefined committed 2021-02-18 13:19:15 +08:00
1 parent af70df2a5d
commit 9bae058893
2 files changed
+7 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "2.17.13", "version": "2.17.14",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "dist/loader.js", "main": "dist/loader.js",
"typings": "dist/loader.d.ts", "typings": "dist/loader.d.ts",
packages/hydrooj/src/handler/manage.ts
+6 -9
View File
@@ -19,16 +19,14 @@ function set(key: string, value: any) {
if (setting.SYSTEM_SETTINGS_BY_KEY[key]) { if (setting.SYSTEM_SETTINGS_BY_KEY[key]) {
const s = 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_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 (s.type === 'boolean') {
if (value === 'on') return true; if (value === 'on') return true;
return false; return false;
} }
if (s.type === 'number') { if (s.type === 'number') {
if (!Number.isSafeInteger(+value)) { if (!Number.isSafeInteger(+value)) throw new ValidationError(key);
throw new ValidationError(key); return +value;
}
return parseInt(value, 10);
} }
return value; return value;
} }
@@ -149,12 +147,11 @@ class SystemSettingHandler extends SystemHandler {
for (const key in args) { for (const key in args) {
if (typeof args[key] === 'object') { if (typeof args[key] === 'object') {
for (const subkey in args[key]) { for (const subkey in args[key]) {
if (typeof set(`${key}.${subkey} `, args[key][subkey]) !== 'undefined') { const val = set(`${key}.${subkey}`, args[key][subkey]);
tasks.push(system.set(`${key}.${subkey} `, 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)); tasks.push(bus.parallel('system/setting', args));