From 97e11e1ac9b5cf6d76a1da9501a7745792bb398c Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Wed, 10 Jan 2024 09:26:34 +0100 Subject: [PATCH] (search) Fix acknowledgement page for domain complaints rendering as plain text This was caused by incorrect usage of the renderInto() function, which was always buggy and should never be used. This method is removed with this change. --- .../nu/marginalia/renderer/MustacheRenderer.java | 13 ------------- .../search/svc/SearchSiteInfoService.java | 6 ++---- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/code/common/renderer/src/main/java/nu/marginalia/renderer/MustacheRenderer.java b/code/common/renderer/src/main/java/nu/marginalia/renderer/MustacheRenderer.java index c558a229..0dae086c 100644 --- a/code/common/renderer/src/main/java/nu/marginalia/renderer/MustacheRenderer.java +++ b/code/common/renderer/src/main/java/nu/marginalia/renderer/MustacheRenderer.java @@ -49,14 +49,6 @@ public class MustacheRenderer { return template.apply(model); } - @SneakyThrows - public Object renderInto(Response response, T model) { - - response.raw().getOutputStream().write(template.apply(model).getBytes(StandardCharsets.UTF_8)); - - return ""; - } - @SneakyThrows public String render(T model, String name, List children) { Context ctx = Context.newBuilder(model).combine(name, children).build(); @@ -70,9 +62,4 @@ public class MustacheRenderer { return template.apply(ctx); } - @SneakyThrows - public void renderInto(Response response, T model, Map children) { - Context ctx = Context.newBuilder(model).combine(children).build(); - response.raw().getOutputStream().write(template.apply(ctx).getBytes(StandardCharsets.UTF_8)); - } } diff --git a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchSiteInfoService.java b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchSiteInfoService.java index 28c5740d..23ac2843 100644 --- a/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchSiteInfoService.java +++ b/code/services-application/search-service/src/main/java/nu/marginalia/search/svc/SearchSiteInfoService.java @@ -60,8 +60,6 @@ public class SearchSiteInfoService { String domainName = request.params("site"); String view = request.queryParamOrDefault("view", "info"); - response.type("text/html"); - if (null == domainName || domainName.isBlank()) { return null; } @@ -76,7 +74,7 @@ public class SearchSiteInfoService { default -> listInfo(ctx, domainName); }; - return renderer.renderInto(response, model); + return renderer.render(model); } public Object handlePost(Request request, Response response) throws SQLException { @@ -104,7 +102,7 @@ public class SearchSiteInfoService { var model = new ReportDomain(domainName, domainId, complaints, List.of(), true); - return renderer.renderInto(response, model); + return renderer.render(model); } private Object reportSite(Context ctx, String domainName) throws SQLException {