Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-22 03:45:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up http server content types

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/emu/grasscutter/server/http/handlers/AnnouncementsHandler.java
View File

@@ -8,6 +8,7 @@ import emu.grasscutter.utils.FileUtils;
import emu.grasscutter.utils.HttpUtils;
import emu.grasscutter.utils.Utils;
import io.javalin.Javalin;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import static emu.grasscutter.config.Configuration.*;
@@ -76,8 +77,8 @@ public final class AnnouncementsHandler implements Router {
try (InputStream filestream = DataLoader.load(ctx.path())) {
String possibleFilename = Utils.toFilePath(DATA(ctx.path()));
HttpUtils.MediaType fromExtension = HttpUtils.MediaType.getByExtension(possibleFilename.substring(possibleFilename.lastIndexOf(".") + 1));
ctx.contentType((fromExtension != null) ? fromExtension.getMIME() : "application/octet-stream");
ContentType fromExtension = ContentType.getContentTypeByExtension(possibleFilename.substring(possibleFilename.lastIndexOf(".") + 1));
ctx.contentType(fromExtension != null ? fromExtension : ContentType.APPLICATION_OCTET_STREAM);
ctx.result(filestream.readAllBytes());
} catch (Exception e) {
Grasscutter.getLogger().warn("File does not exist: " + ctx.path());

5
src/main/java/emu/grasscutter/server/http/handlers/GachaHandler.java
View File

@@ -11,6 +11,7 @@ import emu.grasscutter.utils.FileUtils;
import emu.grasscutter.utils.HttpUtils;
import emu.grasscutter.utils.Utils;
import io.javalin.Javalin;
import io.javalin.http.ContentType;
import io.javalin.http.Context;
import io.javalin.http.staticfiles.Location;
@@ -72,7 +73,7 @@ public final class GachaHandler implements Router {
.replace("{{DATE}}", translate(player, "gacha.records.date"))
.replace("{{ITEM}}", translate(player, "gacha.records.item"))
.replace("{{LANGUAGE}}", Utils.getLanguageCode(account.getLocale()));
ctx.contentType(HttpUtils.MediaType._html.getMIME());
ctx.contentType(ContentType.TEXT_HTML);
ctx.result(template);
}
@@ -134,7 +135,7 @@ public final class GachaHandler implements Router {
template = template.replace("{{THREE_STARS}}", "[" + String.join(",", threeStarItems) + "]");
// Done.
ctx.contentType(HttpUtils.MediaType._html.getMIME());
ctx.contentType(ContentType.TEXT_HTML);
ctx.result(template);
}
}