From cbbe8174882a0b511b64e7367877a9117a146b97 Mon Sep 17 00:00:00 2001 From: undefined Date: Sat, 16 Dec 2023 20:50:26 +0800 Subject: [PATCH] core&ui: fix typo --- packages/hydrooj/src/model/builtin.ts | 6 +++--- packages/hydrooj/src/service/layers/renderer.ts | 2 +- packages/hydrooj/src/service/layers/response.ts | 2 +- packages/hydrooj/src/service/server.ts | 2 +- packages/hydrooj/src/upgrade.ts | 2 +- packages/ui-default/templates/components/user.html | 2 +- packages/ui-default/templates/record_main_tr.html | 2 +- packages/ui-default/templates/training_detail.html | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/hydrooj/src/model/builtin.ts b/packages/hydrooj/src/model/builtin.ts index 991dda915..052f803ca 100644 --- a/packages/hydrooj/src/model/builtin.ts +++ b/packages/hydrooj/src/model/builtin.ts @@ -12,7 +12,7 @@ export const PERM = { // Domain Settings PERM_VIEW: 1n << 0n, PERM_EDIT_DOMAIN: 1n << 1n, - PREM_VIEW_DISPLAYNAME: 1n << 67n, + PERM_VIEW_DISPLAYNAME: 1n << 67n, PERM_MOD_BADGE: 1n << 2n, // Problem @@ -104,7 +104,7 @@ export const Permission = (family: string, key: BigInt, desc: string) => ({ fami export const PERMS = [ Permission('perm_general', PERM.PERM_VIEW, 'View this domain'), - Permission('perm_general', PERM.PREM_VIEW_DISPLAYNAME, 'View domain user displayname'), + Permission('perm_general', PERM.PERM_VIEW_DISPLAYNAME, 'View domain user displayname'), Permission('perm_general', PERM.PERM_EDIT_DOMAIN, 'Edit domain settings'), Permission('perm_general', PERM.PERM_MOD_BADGE, 'Show MOD badge'), Permission('perm_problem', PERM.PERM_CREATE_PROBLEM, 'Create problems'), @@ -188,7 +188,7 @@ PERM.PERM_BASIC = PERM.PERM_VIEW | PERM.PERM_VIEW_RANKING; PERM.PERM_DEFAULT = PERM.PERM_VIEW - | PERM.PREM_VIEW_DISPLAYNAME + | PERM.PERM_VIEW_DISPLAYNAME | PERM.PERM_VIEW_PROBLEM | PERM.PERM_EDIT_PROBLEM_SELF | PERM.PERM_SUBMIT_PROBLEM diff --git a/packages/hydrooj/src/service/layers/renderer.ts b/packages/hydrooj/src/service/layers/renderer.ts index 64a0d3b0a..366ad5e80 100644 --- a/packages/hydrooj/src/service/layers/renderer.ts +++ b/packages/hydrooj/src/service/layers/renderer.ts @@ -16,7 +16,7 @@ export default (router, logger) => async (ctx: KoaContext, next) => { }; const engine = global.Hydro.lib.template?.render || (() => JSON.stringify(args, serializer({ - showDisplayName: user?.hasPerm(PERM.PREM_VIEW_DISPLAYNAME), + showDisplayName: user?.hasPerm(PERM.PERM_VIEW_DISPLAYNAME), }))); return engine(templateName, { handler: ctx.handler, diff --git a/packages/hydrooj/src/service/layers/response.ts b/packages/hydrooj/src/service/layers/response.ts index 53f27d3ef..f71bf91c2 100644 --- a/packages/hydrooj/src/service/layers/response.ts +++ b/packages/hydrooj/src/service/layers/response.ts @@ -27,7 +27,7 @@ export default (logger) => async (ctx: KoaContext, next) => { response.body.UiContext = UiContext; response.body.UserContext = user; } - response.body = JSON.stringify(response.body, serializer({ showDisplayName: user?.hasPerm(PERM.PREM_VIEW_DISPLAYNAME) })); + response.body = JSON.stringify(response.body, serializer({ showDisplayName: user?.hasPerm(PERM.PERM_VIEW_DISPLAYNAME) })); } catch (e) { response.body = new SystemError('Serialize failure', e.message); } diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts index bbba1700e..eb0e660f2 100644 --- a/packages/hydrooj/src/service/server.ts +++ b/packages/hydrooj/src/service/server.ts @@ -348,7 +348,7 @@ export class ConnectionHandler extends HandlerCommon { send(data: any) { this.conn.send(JSON.stringify(data, serializer({ - showDisplayName: this.user?.hasPerm(PERM.PREM_VIEW_DISPLAYNAME), + showDisplayName: this.user?.hasPerm(PERM.PERM_VIEW_DISPLAYNAME), }))); } diff --git a/packages/hydrooj/src/upgrade.ts b/packages/hydrooj/src/upgrade.ts index d2f07372e..5626397e5 100644 --- a/packages/hydrooj/src/upgrade.ts +++ b/packages/hydrooj/src/upgrade.ts @@ -436,7 +436,7 @@ const scripts: UpgradeScript[] = [ return await iterateAllDomain(async (ddoc) => { for (const role of Object.keys(ddoc.roles)) { if (['guest', 'root'].includes(role)) return; - ddoc.roles[role] = (BigInt(ddoc.roles[role]) | PERM.PREM_VIEW_DISPLAYNAME).toString(); + ddoc.roles[role] = (BigInt(ddoc.roles[role]) | PERM.PERM_VIEW_DISPLAYNAME).toString(); } await domain.setRoles(ddoc._id, ddoc.roles); }); diff --git a/packages/ui-default/templates/components/user.html b/packages/ui-default/templates/components/user.html index 9e70f1cb7..6cbbeb1e5 100644 --- a/packages/ui-default/templates/components/user.html +++ b/packages/ui-default/templates/components/user.html @@ -5,7 +5,7 @@ {% endif %} - {% if handler.user.hasPerm(perm.PREM_VIEW_DISPLAYNAME) and udoc.displayName and udoc.displayName != udoc.uname %} + {% if handler.user.hasPerm(perm.PERM_VIEW_DISPLAYNAME) and udoc.displayName and udoc.displayName != udoc.uname %} {{ udoc.displayName }} ({{ udoc.uname }}) {% else %} {{ udoc.uname }} diff --git a/packages/ui-default/templates/record_main_tr.html b/packages/ui-default/templates/record_main_tr.html index dfe9b97f6..db02aac7e 100644 --- a/packages/ui-default/templates/record_main_tr.html +++ b/packages/ui-default/templates/record_main_tr.html @@ -28,7 +28,7 @@ - {% if handler.user.hasPerm(perm.PREM_VIEW_DISPLAYNAME) and udoc.displayName %} + {% if handler.user.hasPerm(perm.PERM_VIEW_DISPLAYNAME) and udoc.displayName %} {{ udoc.displayName }} ({{ udoc.uname }}) {% else %} {{ udoc.uname }} diff --git a/packages/ui-default/templates/training_detail.html b/packages/ui-default/templates/training_detail.html index 993854e94..495c998a5 100644 --- a/packages/ui-default/templates/training_detail.html +++ b/packages/ui-default/templates/training_detail.html @@ -18,12 +18,12 @@