From 341ec5ce86d1220060f63d2681b6e8eae11ec488 Mon Sep 17 00:00:00 2001 From: RblSb Date: Sun, 23 Apr 2023 12:34:38 +0300 Subject: Use null coalescing op --- src/server/HttpServer.hx | 4 +--- src/server/Main.hx | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/server') diff --git a/src/server/HttpServer.hx b/src/server/HttpServer.hx index 8e4cf75..4bf16c4 100644 --- a/src/server/HttpServer.hx +++ b/src/server/HttpServer.hx @@ -220,9 +220,7 @@ class HttpServer { } static function getMimeType(ext:String):String { - final contentType = mimeTypes[ext]; - if (contentType == null) return "application/octet-stream"; - return contentType; + return mimeTypes[ext] ?? return "application/octet-stream"; } static final ctrlCharacters = ~/[\u0000-\u001F\u007F-\u009F\u2000-\u200D\uFEFF]/g; diff --git a/src/server/Main.hx b/src/server/Main.hx index a525f65..2547761 100644 --- a/src/server/Main.hx +++ b/src/server/Main.hx @@ -164,9 +164,7 @@ class Main { } function generateConfigSalt():String { - if (userList.salt == null) { - userList.salt = Sha256.encode('${Math.random()}'); - } + userList.salt ??= Sha256.encode('${Math.random()}'); return userList.salt; } @@ -222,8 +220,8 @@ class Main { bans: [] }; final users:UserList = Json.parse(File.getContent(customPath)); - if (users.admins == null) users.admins = []; - if (users.bans == null) users.bans = []; + users.admins ??= []; + users.bans ??= []; for (field in users.bans) { field.toDate = Date.fromString(cast field.toDate); } -- cgit v1.2.3