diff --git a/README-EN.md b/README-EN.md index 74b2841dc..e500e113e 100644 --- a/README-EN.md +++ b/README-EN.md @@ -37,6 +37,7 @@ Additional terms under AGPLv3 Section 7: 1. You must not remove the copyright declaration displayed in the software. (Under [AGPLv3, 7(b)](LICENSE#L356)) 2. When you distribute a modified version of the software, you must change the software name or the version number in a reasonable way in order to distinguish it from the original version. (Under [AGPLv3, 7(c)](LICENSE#360)) +3. Unless permitted, you are not allowed to use author's name, trademark or logo to promote the software. (Under [AGPLv3, 7(d)](LICENSE#L364)) ## Contributing diff --git a/README.md b/README.md index 095d4fa9b..3174b3fab 100644 --- a/README.md +++ b/README.md @@ -567,13 +567,17 @@ Telegram [@undefinedmoe](https://t.me/undefinedmoe) 1. 您可以在遵守 AGPL-3.0 许可证和下述附加条款章节的前提下免费使用这些代码: 2. 如确需闭源,您也可以联系我们购买其他授权。 -在您部署 Hydro 时,需要保留底部的 `Powered by Hydro` 字样,其中的 `Hydro` 字样需指向 `hydro.js.org/本仓库/fork` 之一的链接。 -若您对源码做出修改/扩展,同样需要以 AGPL-3.0-or-later 开源,您可以以 `Powered by Hydro, Modified by xxx` 格式在页脚注明。 - ### 附加条款 -1. 不可移除本项目的版权声明;([AGPL3 7(b)](LICENSE#L356)) +基于 AGPL3 协议第七条,您在使用本项目时,需要遵守以下额外条款: + +1. 不可移除本项目的版权声明与作者/来源署名;([AGPL3 7(b)](LICENSE#L356)) 2. 当重分发经修改后的本软件时,需要在软件名或版本号中采用可识别的方式进行注明;([AGPL3 7(c)](LICENSE#L360)) +3. 除非得到许可,不得以宣传为目的使用作者姓名;([AGPL3 7(d)](LICENSE#364)) + +即: +在您部署 Hydro 时,需要保留底部的 `Powered by Hydro` 字样,其中的 `Hydro` 字样需指向 `hydro.js.org/本仓库/fork` 之一的链接。 +若您对源码做出修改/扩展,同样需要以 AGPL-3.0-or-later 开源,您可以以 `Powered by Hydro, Modified by xxx` 格式在页脚注明。 ## 贡献代码 diff --git a/packages/hydrooj/README.md b/packages/hydrooj/README.md index 1ffabd8ed..83aaaee07 100644 --- a/packages/hydrooj/README.md +++ b/packages/hydrooj/README.md @@ -1 +1,5 @@ -这是Hydro的核心文件。 \ No newline at end of file +# Hydro Online Judge Core Package + +Copyright [@hydro-dev](https://github.com/hydro-dev) team. + +Other information please refer to [Github repository](https://github.com/hydro-dev/Hydro) and [Official document](https://hydro.js.org) . diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 534e8384b..2234f3186 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -12,10 +12,10 @@ }, "preferUnplugged": true, "dependencies": { - "@aws-sdk/client-s3": "3.485.0", - "@aws-sdk/lib-storage": "3.485.0", - "@aws-sdk/s3-presigned-post": "3.485.0", - "@aws-sdk/s3-request-presigner": "3.485.0", + "@aws-sdk/client-s3": "3.490.0", + "@aws-sdk/lib-storage": "3.490.0", + "@aws-sdk/s3-presigned-post": "3.490.0", + "@aws-sdk/s3-request-presigner": "3.490.0", "@graphql-tools/schema": "^10.0.2", "@hydrooj/utils": "workspace:*", "@simplewebauthn/server": "7.4.0", @@ -50,7 +50,6 @@ "saslprep": "^1.0.3", "schemastery": "^3.14.3", "semver": "^7.5.4", - "serialize-javascript": "^6.0.1", "superagent": "^8.1.2", "tar": "^6.2.0", "thirty-two": "^1.0.2", @@ -70,7 +69,6 @@ "@types/notp": "^2.0.5", "@types/saslprep": "^1.0.3", "@types/semver": "^7.5.6", - "@types/serialize-javascript": "^5.0.4", "@types/superagent": "^8.1.1", "@types/tar": "^6.1.10", "moment": "^2.30.1" diff --git a/packages/hydrooj/src/plugin-api.ts b/packages/hydrooj/src/plugin-api.ts index ed15c5bb8..3f16accbc 100644 --- a/packages/hydrooj/src/plugin-api.ts +++ b/packages/hydrooj/src/plugin-api.ts @@ -1,9 +1,7 @@ -import serialize from 'serialize-javascript'; import pwsh from './lib/hash.hydro'; import db from './service/db'; export { nanoid } from 'nanoid'; -export { serialize }; export * from './pipelineUtils'; export * from './error';