From e44054aa4014c6fe8286801ab929ce131919b706 Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 23 Feb 2024 07:15:57 +0800 Subject: [PATCH] core: switch to injectUI --- packages/hydrooj/src/entry/common.ts | 8 ++++---- packages/hydrooj/src/handler/contest.ts | 2 +- packages/hydrooj/src/handler/import.ts | 2 +- packages/hydrooj/src/loader.ts | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/hydrooj/src/entry/common.ts b/packages/hydrooj/src/entry/common.ts index d65913dac..995e79b46 100644 --- a/packages/hydrooj/src/entry/common.ts +++ b/packages/hydrooj/src/entry/common.ts @@ -46,7 +46,7 @@ const getLoader = (type: LoadTask, filename: string) => async function loader(pe else logger.info(`${name} init: %s`, i); } catch (e) { fail.push(i); - app.inject( + app.injectUI( 'Notification', `${name} load fail: {0}`, { args: [i], type: 'warn' }, PRIV.PRIV_VIEW_SYSTEM_NOTIFICATION, ); @@ -89,7 +89,7 @@ export async function locale(pending: string[], fail: string[]) { logger.info('Locale init: %s', i); } catch (e) { fail.push(i); - app.inject('Notification', 'Locale load fail: {0}', { args: [i], type: 'warn' }, PRIV.PRIV_VIEW_SYSTEM_NOTIFICATION); + app.injectUI('Notification', 'Locale load fail: {0}', { args: [i], type: 'warn' }, PRIV.PRIV_VIEW_SYSTEM_NOTIFICATION); logger.error('Locale Load Fail: %s', i); logger.error(e); } @@ -131,7 +131,7 @@ export async function setting(pending: string[], fail: string[], modelSetting: t } logger.info('Config load: %s', i); } catch (e) { - app.inject('Notification', 'Config load fail: {0}', { args: [i], type: 'warn' }, PRIV.PRIV_VIEW_SYSTEM_NOTIFICATION); + app.injectUI('Notification', 'Config load fail: {0}', { args: [i], type: 'warn' }, PRIV.PRIV_VIEW_SYSTEM_NOTIFICATION); logger.error('Config Load Fail: %s', i); logger.error(e); } @@ -155,7 +155,7 @@ export async function template(pending: string[], fail: string[]) { logger.info('Template init: %s', i); } catch (e) { fail.push(i); - app.inject('Notification', 'Template load fail: {0}', { args: [i], type: 'warn' }, PRIV.PRIV_VIEW_SYSTEM_NOTIFICATION); + app.injectUI('Notification', 'Template load fail: {0}', { args: [i], type: 'warn' }, PRIV.PRIV_VIEW_SYSTEM_NOTIFICATION); logger.error('Template Load Fail: %s', i); logger.error(e); } diff --git a/packages/hydrooj/src/handler/contest.ts b/packages/hydrooj/src/handler/contest.ts index 691eb018e..53ba6cff8 100644 --- a/packages/hydrooj/src/handler/contest.ts +++ b/packages/hydrooj/src/handler/contest.ts @@ -328,7 +328,7 @@ export class ContestScoreboardHandler extends ContestDetailBaseHandler { if (!realtime && this.tdoc.lockAt && !this.tdoc.unlocked) { config.lockAt = this.tdoc.lockAt; } - const allGroups = this.user.hasPerm(PERM.PERM_EDIT_CONTEST_SELF) || (this.user.own(this.tdoc) && this.user.hasPerm(PERM.PERM_EDIT_CONTEST)) + const allGroups = this.user.hasPerm(PERM.PERM_EDIT_CONTEST_SELF) || (this.user.own(this.tdoc) && this.user.hasPerm(PERM.PERM_EDIT_CONTEST)); const [[, rows, udict, pdict], groups] = await Promise.all([ contest.getScoreboard.call(this, domainId, tid, config), user.listGroup(domainId, allGroups ? undefined : this.user._id), diff --git a/packages/hydrooj/src/handler/import.ts b/packages/hydrooj/src/handler/import.ts index a9f771ac1..bf988bd96 100644 --- a/packages/hydrooj/src/handler/import.ts +++ b/packages/hydrooj/src/handler/import.ts @@ -22,5 +22,5 @@ class ProblemImportHydroHandler extends Handler { export async function apply(ctx: Context) { ctx.Route('problem_import_hydro', '/problem/import/hydro', ProblemImportHydroHandler, PERM.PERM_CREATE_PROBLEM); - ctx.inject('ProblemAdd', 'problem_import_hydro', { icon: 'copy', text: 'Import From Hydro' }); + ctx.injectUI('ProblemAdd', 'problem_import_hydro', { icon: 'copy', text: 'Import From Hydro' }); } diff --git a/packages/hydrooj/src/loader.ts b/packages/hydrooj/src/loader.ts index c4534a775..bfacacbe0 100644 --- a/packages/hydrooj/src/loader.ts +++ b/packages/hydrooj/src/loader.ts @@ -18,7 +18,6 @@ import { Context } from './context'; // eslint-disable-next-line import/no-duplicates import { sleep, unwrapExports } from './utils'; import { PRIV } from './model/builtin'; -import { inject } from './lib/ui'; const argv = cac().parse(); const logger = new Logger('loader'); @@ -130,7 +129,7 @@ export function addon(addonPath: string, prepend = false) { } catch (e) { logger.error(`Addon not found: ${addonPath}`); logger.error(e); - inject('Notification', 'Addon not found: {0}', { args: [addonPath], type: 'warn' }, PRIV.PRIV_VIEW_SYSTEM_NOTIFICATION); + app.injectUI('Notification', 'Addon not found: {0}', { args: [addonPath], type: 'warn' }, PRIV.PRIV_VIEW_SYSTEM_NOTIFICATION); } }