Clean up http server content types

This commit is contained in:
Melledy
2022-09-01 12:53:20 -07:00
parent a1c31d1779
commit fee34c515d
8 changed files with 47 additions and 756 deletions

View File

@@ -3,6 +3,7 @@ package emu.grasscutter.server.http.documentation;
import emu.grasscutter.tools.Tools;
import emu.grasscutter.utils.HttpUtils;
import emu.grasscutter.utils.Language;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import static emu.grasscutter.config.Configuration.DOCUMENT_LANGUAGE;
@@ -19,6 +20,6 @@ final class GachaMappingRequestHandler implements DocumentationHandler {
@Override
public void handle(Context ctx) {
final int langIdx = Language.TextStrings.MAP_LANGUAGES.getOrDefault(DOCUMENT_LANGUAGE, 0); // TODO: This should really be based off the client language somehow
ctx.contentType(HttpUtils.MediaType._json.getMIME()).result(gachaJsons.get(langIdx));
ctx.contentType(ContentType.APPLICATION_JSON).result(gachaJsons.get(langIdx));
}
}

View File

@@ -13,6 +13,7 @@ import emu.grasscutter.utils.FileUtils;
import emu.grasscutter.utils.HttpUtils;
import emu.grasscutter.utils.Language;
import emu.grasscutter.utils.Utils;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import java.io.File;
@@ -41,7 +42,7 @@ final class HandbookRequestHandler implements DocumentationHandler {
if (template == null) {
ctx.status(500);
} else {
ctx.contentType(HttpUtils.MediaType._html.getMIME());
ctx.contentType(ContentType.TEXT_HTML);
ctx.result(handbookHtmls.get(langIdx));
}
}

View File

@@ -7,6 +7,7 @@ import emu.grasscutter.Grasscutter;
import emu.grasscutter.utils.FileUtils;
import emu.grasscutter.utils.HttpUtils;
import emu.grasscutter.utils.Utils;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import java.io.File;
@@ -36,7 +37,7 @@ final class RootRequestHandler implements DocumentationHandler {
String content = template.replace("{{TITLE}}", translate("documentation.index.title"))
.replace("{{ITEM_HANDBOOK}}", translate("documentation.index.handbook"))
.replace("{{ITEM_GACHA_MAPPING}}", translate("documentation.index.gacha_mapping"));
ctx.contentType(HttpUtils.MediaType._html.getMIME());
ctx.contentType(ContentType.TEXT_HTML);
ctx.result(content);
}
}