From 58cab9919d036d0c0ed43d4baf8156d84d26334b Mon Sep 17 00:00:00 2001 From: panda Date: Tue, 16 May 2023 08:00:26 +0800 Subject: [PATCH] core: fix user import error (#579) --- packages/hydrooj/src/handler/manage.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/hydrooj/src/handler/manage.ts b/packages/hydrooj/src/handler/manage.ts index c08b0a62..a3d2d03f 100644 --- a/packages/hydrooj/src/handler/manage.ts +++ b/packages/hydrooj/src/handler/manage.ts @@ -226,8 +226,12 @@ class SystemUserImportHandler extends SystemHandler { for (const i in users) { const u = users[i]; if (!u.trim()) continue; - let [email, username, password, displayName, extra] = u.split(',').map((t) => t.trim()); - if (!email || !username || !password) [email, username, password, displayName, extra] = u.split('\t').map((t) => t.trim()); + let [email, username, password, displayName, extra] = u.split('\t').map((t) => t.trim()); + if (!email || !username || !password) { + const data = u.split(',').map((t) => t.trim()); + [email, username, password, displayName, extra] = data; + if (data.length > 5) extra = data.slice(4).join(','); + } if (email && username && password) { if (!Types.Email[1](email)) messages.push(`Line ${+i + 1}: Invalid email.`); else if (!Types.Username[1](username)) messages.push(`Line ${+i + 1}: Invalid username`);