diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index aebca8f8..0231a77d 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "3.14.1", + "version": "3.14.2", "bin": "bin/hydrooj.js", "main": "src/loader", "module": "src/loader", diff --git a/packages/hydrooj/src/service/layers/domain.ts b/packages/hydrooj/src/service/layers/domain.ts index 1ad3f1ad..b77cb6fc 100644 --- a/packages/hydrooj/src/service/layers/domain.ts +++ b/packages/hydrooj/src/service/layers/domain.ts @@ -5,6 +5,7 @@ import token from 'hydrooj/src/model/token'; export default async (ctx, next) => { const forceDomain = /^\/d\/([^/]+)\//.exec(ctx.request.path); + ctx.originalPath = ctx.request.path; ctx.path = ctx.request.path = ctx.request.path.replace(/^\/d\/[^/]+\//, '/'); const [xff, xhost] = system.getMany(['server.xff', 'server.xhost']); const ip = ctx.request.headers[xff?.toLowerCase() || ''] as string || ctx.request.ip; diff --git a/packages/hydrooj/src/service/layers/renderer.ts b/packages/hydrooj/src/service/layers/renderer.ts index e7544fcc..bf332a15 100644 --- a/packages/hydrooj/src/service/layers/renderer.ts +++ b/packages/hydrooj/src/service/layers/renderer.ts @@ -1,6 +1,5 @@ import { ObjectID } from 'mongodb'; import avatar from 'hydrooj/src/lib/avatar'; -import * as system from 'hydrooj/src/model/system'; import type { KoaContext } from '../server'; function serializer(k: string, v: any) { @@ -66,7 +65,7 @@ export default (router, logger) => async (ctx: KoaContext, next) => { ctx.translate = (str: string) => { if (!str) return ''; const lang = ctx.HydroContext.user?.viewLang || ctx.session?.viewLang; - return str.toString().translate(lang, ...ctx.acceptsLanguages(), system.get('server.language')); + return str.toString().translate(lang, ...ctx.acceptsLanguages()); }; await next(); }; diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts index fa47de49..17a65d56 100644 --- a/packages/hydrooj/src/service/server.ts +++ b/packages/hydrooj/src/service/server.ts @@ -232,7 +232,8 @@ export class Handler extends HandlerCommon { if (!error.msg) error.msg = () => error.message; if (error instanceof UserFacingError && !process.env.DEV) error.stack = ''; if (!(error instanceof NotFoundError)) { - logger.error(`User: ${this.user._id}(${this.user.uname}) ${this.request.method}: ${this.request.path}`, error.msg(), error.params); + // eslint-disable-next-line max-len + logger.error(`User: ${this.user._id}(${this.user.uname}) ${this.request.method}: /d/${this.domain._id}${this.request.path}`, error.msg(), error.params); if (error.stack) logger.error(error.stack); } if (this.user?._id === 0 && (error instanceof PermissionError || error instanceof PrivilegeError)) {