Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-19 17:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: 修复expire=never时无法正确设置的问题

Browse Source
This commit is contained in:
undefined committed 2020-10-31 23:33:49 +08:00
1 parent 9f64fef88d
commit 50a41e20be
3 files changed
+260 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "hydrooj",
"version": "2.13.33",
"version": "2.13.34",
"bin": "bin/hydrooj.js",
"main": "dist/loader.js",
"typings": "dist/loader.d.ts",
packages/hydrooj/src/handler/domain.ts
+4 -4
View File
@@ -212,7 +212,7 @@ class DomainJoinApplicationsHandler extends ManageHandler {
@param('method', Types.Range([domain.JOIN_METHOD_NONE, domain.JOIN_METHOD_ALL, domain.JOIN_METHOD_CODE]))
@param('role', Types.String, true)
@param('expire', Types.UnsignedInt, true)
@param('expire', Types.Int, true)
@param('invitationCode', Types.String, true)
async post(domainId: string, method: number, role: string, expire: number, invitationCode = '') {
const r = await domain.getRoles(this.domain);
@@ -222,15 +222,15 @@ class DomainJoinApplicationsHandler extends ManageHandler {
if (method === domain.JOIN_METHOD_NONE) joinSettings = null;
else {
if (!roles.includes(role)) throw new ValidationError('role');
if (!current && expire === domain.JOIN_EXPIRATION_KEEP_CURRENT) throw new ValidationError('expire');
joinSettings = { method, role };
if (expire === domain.JOIN_EXPIRATION_KEEP_CURRENT) joinSettings.expire = current.expire;
else if (expire === domain.JOIN_EXPIRATION_UNLIMITED) joinSettings.expire = null;
else if (!domain.JOIN_EXPIRATION_RANGE[expire]) throw new ValidationError('expire');
else joinSettings.expire = moment().add(expire, 'hours').toDate();
if (!current && expire === domain.JOIN_EXPIRATION_KEEP_CURRENT) throw new ValidationError('expire');
joinSettings = { method, role };
if (method === domain.JOIN_METHOD_CODE) joinSettings.code = invitationCode;
}
await domain.edit(this.domain._id, { join: joinSettings });
await domain.edit(domainId, { join: joinSettings });
this.back();
}
}