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: change udoc default logic

Browse Source
This commit is contained in:
undefined committed 2021-03-26 13:04:57 +08:00
1 parent 2d1522f671
commit 5513bd6929
2 files changed
+3 -9
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.20.31", "version": "2.20.32",
"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/model/user.ts
+2 -8
View File
@@ -54,17 +54,11 @@ class User implements _User {
this.role = dudoc.role || 'default'; this.role = dudoc.role || 'default';
for (const key in setting.SETTINGS_BY_KEY) { for (const key in setting.SETTINGS_BY_KEY) {
if (udoc[key]) this[key] = udoc[key]; this[key] = udoc[key] ?? setting.SETTINGS_BY_KEY[key].value;
else if (setting.SETTINGS_BY_KEY[key].value !== null) {
this[key] = setting.SETTINGS_BY_KEY[key].value;
}
} }
for (const key in setting.DOMAIN_USER_SETTINGS_BY_KEY) { for (const key in setting.DOMAIN_USER_SETTINGS_BY_KEY) {
if (dudoc[key]) this[key] = dudoc[key]; this[key] = dudoc[key] ?? setting.DOMAIN_USER_SETTINGS_BY_KEY[key].value;
else if (setting.DOMAIN_USER_SETTINGS_BY_KEY[key].value !== null) {
this[key] = setting.DOMAIN_USER_SETTINGS_BY_KEY[key].value;
}
} }
bus.serial('user/get', this); bus.serial('user/get', this);