From 87a3244f014faa7813570503458e911729670c30 Mon Sep 17 00:00:00 2001 From: undefined Date: Thu, 24 Oct 2024 07:33:54 +0800 Subject: [PATCH] bump version --- README.md | 2 +- framework/framework/package.json | 2 +- framework/framework/validator.ts | 4 +++- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/handler/home.ts | 2 +- packages/ui-default/package.json | 2 +- packages/ui-default/templates/home_domain.html | 2 +- .../templates/partials/homepage/starred_problems.html | 2 +- packages/ui-default/templates/partials/problem_list.html | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 161fbebe7..426d21a1b 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ Hydro 用户群:1085853538

更新日志(点击展开)

-## Hydro 4.17.1 / UI 4.55.1 +## Hydro 4.17.2 / UI 4.55.2 - core: 限制显示名长度 - core: 支持调整代码长度限制 diff --git a/framework/framework/package.json b/framework/framework/package.json index 9848d03d5..e1c59bdca 100644 --- a/framework/framework/package.json +++ b/framework/framework/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/framework", - "version": "0.1.1", + "version": "0.1.2", "main": "index.ts", "license": "MIT", "peerDependencies": { diff --git a/framework/framework/validator.ts b/framework/framework/validator.ts index d66f5f23a..261866183 100644 --- a/framework/framework/validator.ts +++ b/framework/framework/validator.ts @@ -26,6 +26,7 @@ export interface Types { Role: Type; Title: Type; Emoji: Type; + ShortString: Type; String: Type; // Number outputs @@ -75,7 +76,7 @@ const saslprepString = (regex?: RegExp, cb?: (i: string) => boolean, export const Types: Types = { Content: [(v) => v.toString().trim(), (v) => v?.toString()?.trim() && v.toString().trim().length < 65536], - Key: saslprepString(/^[a-zA-Z0-9-_]+$/), + Key: saslprepString(/^[a-zA-Z0-9-_]{1,255}$/), /** @deprecated */ Name: saslprepString(/^.{1,255}$/), Filename: saslprepString(/^[^\\/?#~!|*]{1,255}$/, (i) => sanitize(i) === i), @@ -87,6 +88,7 @@ export const Types: Types = { DomainId: saslprepString(/^[a-zA-Z][a-zA-Z0-9_]{3,31}$/), Role: saslprepString(/^[_0-9A-Za-z\u4e00-\u9fa5]{1,31}$/i), Title: basicString(/^.{1,64}$/, (i) => !!i.trim()), + ShortString: basicString(/^.{1,255}$/), String: basicString(), Int: [(v) => +v, (v) => /^[+-]?[0-9]+$/.test(v.toString().trim()) && isSafeInteger(+v)], diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index ae596ef9e..e2039d52e 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "4.17.1", + "version": "4.17.2", "bin": "bin/hydrooj.js", "main": "src/plugin-api", "module": "src/plugin-api", diff --git a/packages/hydrooj/src/handler/home.ts b/packages/hydrooj/src/handler/home.ts index cadc156c4..04b4f4a57 100644 --- a/packages/hydrooj/src/handler/home.ts +++ b/packages/hydrooj/src/handler/home.ts @@ -372,7 +372,7 @@ function set(s: Setting, key: string, value: any) { if (!Types.Content[1](value)) throw new ValidationError(key); } if (s.type === 'text') { - if (!Types.String[1](value)) throw new ValidationError(key); + if (!Types.ShortString[1](value)) throw new ValidationError(key); } if (s.subType === 'yaml') { try { diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index b0dcf4ff3..4f7eb182c 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.55.1", + "version": "4.55.2", "author": "undefined ", "license": "AGPL-3.0", "main": "index.ts", diff --git a/packages/ui-default/templates/home_domain.html b/packages/ui-default/templates/home_domain.html index 1080e4744..c1c858f7e 100644 --- a/packages/ui-default/templates/home_domain.html +++ b/packages/ui-default/templates/home_domain.html @@ -33,7 +33,7 @@ {% set _show = handler.user.pinnedDomains.includes(ddoc._id) %} - + {{ ddoc['name'] }} ({{ ddoc['_id'] }}) diff --git a/packages/ui-default/templates/partials/homepage/starred_problems.html b/packages/ui-default/templates/partials/homepage/starred_problems.html index 16cf1e755..7d0f41a86 100644 --- a/packages/ui-default/templates/partials/homepage/starred_problems.html +++ b/packages/ui-default/templates/partials/homepage/starred_problems.html @@ -6,7 +6,7 @@
{%- for pdoc in pdocs -%} -

+

{{ problem.render_problem_title(pdoc, show_tags=false, show_invisible_flag=false) }}

{%- endfor -%} diff --git a/packages/ui-default/templates/partials/problem_list.html b/packages/ui-default/templates/partials/problem_list.html index c1c8b6edf..fb305774e 100644 --- a/packages/ui-default/templates/partials/problem_list.html +++ b/packages/ui-default/templates/partials/problem_list.html @@ -54,7 +54,7 @@ {% endif %} {% endif %} - + {{ problem.render_problem_title(pdoc) }} {{ pdoc.nAccept }} / {{ pdoc.nSubmit }}