From 5513bd69293b95c43d4c32de9958ac71bc7dde4f Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 26 Mar 2021 13:04:57 +0800 Subject: [PATCH] core: change udoc default logic --- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/model/user.ts | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index ad2003abf..3d77d2d75 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.20.31", + "version": "2.20.32", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/model/user.ts b/packages/hydrooj/src/model/user.ts index 6241adbf2..593200963 100644 --- a/packages/hydrooj/src/model/user.ts +++ b/packages/hydrooj/src/model/user.ts @@ -54,17 +54,11 @@ class User implements _User { this.role = dudoc.role || 'default'; for (const key in setting.SETTINGS_BY_KEY) { - if (udoc[key]) this[key] = udoc[key]; - else if (setting.SETTINGS_BY_KEY[key].value !== null) { - this[key] = setting.SETTINGS_BY_KEY[key].value; - } + this[key] = udoc[key] ?? setting.SETTINGS_BY_KEY[key].value; } for (const key in setting.DOMAIN_USER_SETTINGS_BY_KEY) { - if (dudoc[key]) this[key] = dudoc[key]; - else if (setting.DOMAIN_USER_SETTINGS_BY_KEY[key].value !== null) { - this[key] = setting.DOMAIN_USER_SETTINGS_BY_KEY[key].value; - } + this[key] = dudoc[key] ?? setting.DOMAIN_USER_SETTINGS_BY_KEY[key].value; } bus.serial('user/get', this);