diff --git a/src/Server.ts b/src/Server.ts
index 15e70b7f..729531ef 100644
--- a/src/Server.ts
+++ b/src/Server.ts
@@ -4,14 +4,17 @@ import { Authentication, GlobalRateLimit } from "./middlewares/";
import Config from "./util/Config";
import db from "./util/Database";
import i18next from "i18next";
-import i18nextMiddleware from "i18next-http-middleware";
-import { Request } from "express";
+import i18nextMiddleware, { I18next } from "i18next-http-middleware";
+import i18nextBackend from "i18next-node-fs-backend";
+import { ErrorHandler } from "./middlewares/ErrorHandler";
+import { BodyParser } from "./middlewares/BodyParser";
export interface DiscordServerOptions extends ServerOptions {}
declare global {
namespace Express {
interface Request {
+ // @ts-ignore
server: DiscordServer;
}
}
@@ -21,7 +24,8 @@ export class DiscordServer extends Server {
public options: DiscordServerOptions;
constructor(opts?: Partial<DiscordServerOptions>) {
- super({ ...opts, errorHandler: false });
+ // @ts-ignore
+ super({ ...opts, errorHandler: false, jsonBody: false });
}
async start() {
@@ -31,20 +35,28 @@ export class DiscordServer extends Server {
this.app.use(GlobalRateLimit);
this.app.use(Authentication);
- const namespaces = await fs.readdir(__dirname + "/locales/de/");
+ this.app.use(BodyParser({ inflate: true }));
+ const languages = await fs.readdir(__dirname + "/../locales/");
+ const namespaces = await fs.readdir(__dirname + "/../locales/en/");
const ns = namespaces.filter((x) => x.endsWith(".json")).map((x) => x.slice(0, x.length - 5));
- i18next.use(i18nextMiddleware.LanguageDetector).init({
- preload: ["en", "de"],
- fallbackLng: "en",
- ns,
- backend: {
- loadPath: "locales/{{lng}}/{{ns}}.json",
- },
- });
+ await i18next
+ .use(i18nextBackend)
+ .use(i18nextMiddleware.LanguageDetector)
+ .init({
+ preload: languages,
+ // debug: true,
+ fallbackLng: "en",
+ ns,
+ backend: {
+ loadPath: __dirname + "/../locales/{{lng}}/{{ns}}.json",
+ },
+ load: "all",
+ });
this.app.use(i18nextMiddleware.handle(i18next, {}));
this.routes = await this.registerRoutes(__dirname + "/routes/");
+ this.app.use(ErrorHandler);
const indexHTML = await fs.readFile(__dirname + "/../client_test/index.html");
this.app.get("*", (req, res) => {
|
