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

core: fix change language

Browse Source
This commit is contained in:
undefined committed 2021-09-30 07:42:39 +08:00
1 parent 5b9601f8c3
commit b776155993
4 files changed
+9 -4
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", "name": "hydrooj",
"version": "2.39.8", "version": "2.39.9",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "src/loader", "main": "src/loader",
"module": "src/loader", "module": "src/loader",
packages/hydrooj/src/handler/home.ts
+1
View File
@@ -253,6 +253,7 @@ class HomeSettingsHandler extends Handler {
} }
for (const key in booleanKeys) if (!args[key]) $set[key] = false; for (const key in booleanKeys) if (!args[key]) $set[key] = false;
await setter($set); await setter($set);
if (args.viewLang && args.viewLang !== this.session.viewLang) this.session.viewLang = '';
this.back(); this.back();
} }
} }
packages/hydrooj/src/handler/user.ts
+6 -1
View File
@@ -83,6 +83,7 @@ class UserLoginHandler extends Handler {
udoc.checkPassword(password); udoc.checkPassword(password);
await user.setById(udoc._id, { loginat: new Date(), loginip: this.request.ip }); 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);
this.session.viewLang = '';
this.session.uid = udoc._id; this.session.uid = udoc._id;
this.session.scope = PERM.PERM_ALL.toString(); this.session.scope = PERM.PERM_ALL.toString();
this.session.save = rememberme; this.session.save = rememberme;
@@ -175,7 +176,11 @@ class UserRegisterWithCodeHandler extends Handler {
const uid = await user.create(tdoc.mail, uname, password, undefined, this.request.ip); const uid = await user.create(tdoc.mail, uname, password, undefined, this.request.ip);
await token.del(code, token.TYPE_REGISTRATION); await token.del(code, token.TYPE_REGISTRATION);
const [id, domain] = tdoc.mail.split('@'); const [id, domain] = tdoc.mail.split('@');
if (domain === 'qq.com' && !Number.isNaN(+id)) await user.setById(uid, { avatar: `qq:${id}` }); const $set: any = {};
if (domain === 'qq.com' && !Number.isNaN(+id)) $set.avatar = `qq:${id}`;
if (this.session.viewLang) $set.viewLang = this.session.viewLang;
if (Object.keys($set).length) await user.setById(uid, $set);
this.session.viewLang = '';
this.session.uid = uid; this.session.uid = uid;
this.session.scpoe = PERM.PERM_ALL.toString(); this.session.scpoe = PERM.PERM_ALL.toString();
this.response.redirect = this.url('home_settings', { category: 'preference' }); this.response.redirect = this.url('home_settings', { category: 'preference' });
packages/hydrooj/src/service/server.ts
+1 -2
View File
@@ -527,8 +527,7 @@ export class Handler extends HandlerCommon {
this.session.scope = PERM.PERM_ALL.toString(); this.session.scope = PERM.PERM_ALL.toString();
this.user = await user.getById(domainId, this.session.uid, this.session.scope); this.user = await user.getById(domainId, this.session.uid, this.session.scope);
} }
if (this.user._id !== 0 && this.session.viewLang) this.user.viewLang = this.session.viewLang; if (this.user._id === 0) delete this.user.viewLang;
else if (this.user._id === 0) delete this.user.viewLang;
this.user.avatarUrl = avatar(this.user.avatar, 128); this.user.avatarUrl = avatar(this.user.avatar, 128);
this.csrfToken = this.getCsrfToken(this.session._id || String.random(32)); this.csrfToken = this.getCsrfToken(this.session._id || String.random(32));
this.UiContext.csrfToken = this.csrfToken; this.UiContext.csrfToken = this.csrfToken;