Merge branch 'master' into remove-union

packages/hydrooj/src/handler/contest.ts

@@ -285,6 +285,13 @@ export class ContestScoreboardHandler extends ContestDetailBaseHandler {
         const pid = (i: number) => String.fromCharCode(65 + i);
         const escape = (i: string) => i.replace(/[",]/g, '');
         const unknownSchool = this.translate('Unknown School');
+        const statusMap = {
+            [STATUS.STATUS_ACCEPTED]: 'AC',
+            [STATUS.STATUS_WRONG_ANSWER]: 'WA',
+            [STATUS.STATUS_COMPILE_ERROR]: 'CE',
+            [STATUS.STATUS_TIME_LIMIT_EXCEEDED]: 'TL',
+            [STATUS.STATUS_RUNTIME_ERROR]: 'RT',
+        };
         const submissions = teams.flatMap((i, idx) => {
             if (!i.journal) return [];
             const journal = i.journal.filter((s) => tdoc.pids.includes(s.pid));
@@ -292,7 +299,7 @@ export class ContestScoreboardHandler extends ContestDetailBaseHandler {
             return journal.map((s) => {
                 const id = pid(tdoc.pids.indexOf(s.pid));
                 c[id]++;
-                return `@s ${idx + 1},${id},${c[id]},${time(s.rid)},${s.status === STATUS.STATUS_ACCEPTED ? 'AC' : 'RJ'}`;
+                return `@s ${idx + 1},${id},${c[id]},${time(s.rid)},${statusMap[s.status] || 'RJ'}`;
             });
         });
         const res = [

packages/hydrooj/src/handler/home.ts

@@ -3,6 +3,7 @@ import { generateRegistrationOptions, verifyRegistrationResponse } from '@simple
 import yaml from 'js-yaml';
 import { pick } from 'lodash';
 import { Binary, ObjectId } from 'mongodb';
+import Parser from 'ua-parser-js';
 import { Context } from '../context';
 import {
     AuthOperationError, BlacklistedError, DomainAlreadyExistsError, InvalidTokenError,
@@ -12,7 +13,6 @@ import {
 import { DomainDoc, MessageDoc, Setting } from '../interface';
 import avatar, { validate } from '../lib/avatar';
 import * as mail from '../lib/mail';
-import * as useragent from '../lib/useragent';
 import { verifyTFA } from '../lib/verifyTFA';
 import BlackListModel from '../model/blacklist';
 import { PERM, PRIV } from '../model/builtin';
@@ -187,7 +187,11 @@ class HomeSecurityHandler extends Handler {
         for (const session of sessions) {
             session.isCurrent = session._id === this.session._id;
             session._id = md5(session._id);
-            session.updateUa = useragent.parse(session.updateUa || session.createUa || '');
+            const ua = session.updateUa || session.createUa;
+            if (ua) {
+                const parser = new Parser(ua);
+                session.updateUaInfo = parser.getResult();
+            }
             session.updateGeoip = this.ctx.geoip?.lookup?.(
                 session.updateIp || session.createIp,
                 this.translate('geoip_locale'),
@@ -202,7 +206,6 @@ class HomeSecurityHandler extends Handler {
                 'authenticatorAttachment', 'regat', 'fmt',
             ])),
             geoipProvider: this.ctx?.geoip?.provider,
-            icon: (str = '') => str.split(' ')[0].toLowerCase(),
         };
     }
 

packages/hydrooj/src/handler/user.ts

@@ -271,6 +271,7 @@ class UserRegisterWithCodeHandler extends Handler {
         if (mailDomain === 'qq.com' && !Number.isNaN(+id)) $set.avatar = `qq:${id}`;
         if (this.session.viewLang) $set.viewLang = this.session.viewLang;
         if (Object.keys($set).length) await user.setById(uid, $set);
+        if (Object.keys(this.tdoc.setInDomain || {}).length) await domain.setUserInDomain(domainId, uid, this.tdoc.setInDomain);
         if (this.tdoc.oauth) await oauth.set(this.tdoc.oauth[1], uid);
         this.context.HydroContext.user = await user.getById(domainId, uid);
         this.session.viewLang = '';
@@ -453,7 +454,7 @@ class OauthCallbackHandler extends Handler {
                     break;
                 }
             }
-            const set: Partial<Udoc> = { oauth: args.type };
+            const set: Partial<Udoc> = { ...(r.set || {}), oauth: args.type };
             if (r.bio) set.bio = r.bio;
             if (r.viewLang) set.viewLang = r.viewLang;
             if (r.avatar) set.avatar = r.avatar;
@@ -465,6 +466,7 @@ class OauthCallbackHandler extends Handler {
                     username,
                     redirect: this.domain.registerRedirect,
                     set,
+                    setInDomain: r.setInDomain,
                     oauth: [args.type, r._id],
                 },
             );