From a49105285d0d7719d7f222a507af2d5ac5b4bdb1 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 15 Mar 2019 17:17:10 +0300
Subject: Correctly set webfinger content-type

---
 src/main/java/com/juick/server/api/webfinger/Resource.java      | 2 +-
 src/main/java/com/juick/server/www/controllers/MessagesWWW.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/juick/server/api/webfinger/Resource.java b/src/main/java/com/juick/server/api/webfinger/Resource.java
index 71a0ca31..4e0447f7 100644
--- a/src/main/java/com/juick/server/api/webfinger/Resource.java
+++ b/src/main/java/com/juick/server/api/webfinger/Resource.java
@@ -26,7 +26,7 @@ public class Resource {
     @Value("${ap_base_uri:http://localhost:8080/}")
     private String baseUri;
 
-    @GetMapping("/.well-known/webfinger")
+    @GetMapping(value = "/.well-known/webfinger", produces = "application/jrd+json;charset=utf-8")
     public Account getWebResource(@RequestParam String resource) {
         if (resource.startsWith("acct:")) {
             Jid account = Jid.of(resource.substring(5));
diff --git a/src/main/java/com/juick/server/www/controllers/MessagesWWW.java b/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
index 6de8d51d..4410f591 100644
--- a/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
+++ b/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
@@ -99,7 +99,7 @@ public class MessagesWWW {
             @CookieValue(name = "sape_cookie", required = false, defaultValue = StringUtils.EMPTY) String sapeCookie,
             ModelMap model) throws IOException {
         if (tag != null) {
-            return "redirect:/tag/" + URLEncoder.encode(tag, CharEncoding.UTF_8);
+            return "redirect:/tag/" + URLEncoder.encode(tag, StandardCharsets.UTF_8);
         }
         com.juick.User visitor = UserUtils.getCurrentUser();
 
-- 
cgit v1.2.3