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

core: allow banReason option

Browse Source
This commit is contained in:
undefined committed 2022-12-22 22:49:31 +08:00
1 parent 5c3e2d8571
commit be0423fe93
4 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/src/handler/user.ts
+2 -2
View File
@@ -129,7 +129,7 @@ class UserLoginHandler extends Handler {
if (udoc._tfa && !verifyToken(udoc._tfa, tfa)) throw new InvalidTokenError('2FA');
udoc.checkPassword(password);
await user.setById(udoc._id, { loginat: new Date(), loginip: this.request.ip });
if (!udoc.hasPriv(PRIV.PRIV_USER_PROFILE)) throw new BlacklistedError(uname);
if (!udoc.hasPriv(PRIV.PRIV_USER_PROFILE)) throw new BlacklistedError(uname, udoc.banReason);
this.session.viewLang = '';
this.session.uid = udoc._id;
this.session.sudo = null;
@@ -471,5 +471,5 @@ export async function apply(ctx) {
ctx.Route('user_lostpass', '/lostpass', UserLostPassHandler);
ctx.Route('user_lostpass_with_code', '/lostpass/:code', UserLostPassWithCodeHandler);
ctx.Route('user_delete', '/user/delete', UserDeleteHandler, PRIV.PRIV_USER_PROFILE);
ctx.Route('user_detail', '/user/:uid', UserDetailHandler);
ctx.Route('user_detail', '/user/:uid(-?\\d+)', UserDetailHandler);
}
packages/hydrooj/src/model/setting.ts
+1
View File
@@ -152,6 +152,7 @@ AccountSetting(
'Choose the background image in your profile page.'),
Setting('setting_storage', 'unreadMsg', 0, 'number', 'Unread Message Count', null, FLAG_DISABLED | FLAG_HIDDEN),
Setting('setting_storage', 'badge', '', 'text', 'badge info', null, FLAG_DISABLED | FLAG_HIDDEN),
Setting('setting_storage', 'banReason', '', 'text', 'ban reason', null, FLAG_DISABLED | FLAG_HIDDEN),
);
DomainSetting(
packages/hydrooj/src/model/user.ts
+2 -2
View File
@@ -400,9 +400,9 @@ class UserModel {
}
@ArgMethod
static ban(uid: number) {
static ban(uid: number, reason = '') {
return Promise.all([
UserModel.setPriv(uid, PRIV.PRIV_NONE),
UserModel.setById(uid, { priv: PRIV.PRIV_NONE, banReason: reason }),
token.delByUid(uid),
]);
}
packages/ui-default/api.ts
-1
View File
@@ -27,7 +27,6 @@ import UserSelectAutoComplete from './components/autocomplete/UserSelectAutoComp
export {
load, AutoComplete, UserSelectAutoComplete, ProblemSelectAutoComplete, DomainSelectAutoComplete, CustomSelectAutoComplete,
};
export const { UserContext, UiContext } = window;
export function addPage(page: import('./misc/Page').Page | (() => Promise<void> | void)) {
window.Hydro.extraPages.push(page);
}