1 files changed, 19 insertions, 21 deletions

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 1c69db32..6de8d51d 100644
--- a/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
+++ b/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
@@ -43,7 +43,9 @@ import ru.sape.Sape;
 import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.net.URI;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -182,10 +184,9 @@ public class MessagesWWW {
             }
             model.addAttribute("nextpage", nextpage);
         }
-        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequestUri().build();
-        String queryString = builder.getQuery();
-        String requestURI = builder.toUri().getPath();
-        if (sape.isPresent() && visitor.isAnonymous() && queryString == null) {
+        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequest().build();
+        URI requestURI = builder.toUri();
+        if (sape.isPresent() && visitor.isAnonymous()) {
             String links = sape.get().getPageLinks(requestURI, sapeCookie).render();
             model.addAttribute("links", links);
         }
@@ -295,17 +296,16 @@ public class MessagesWWW {
                 nextpage += "&show=" + paramShow;
             }
             if (paramSearch != null) {
-                nextpage += "&search=" + URLEncoder.encode(paramSearch, CharEncoding.UTF_8);
+                nextpage += "&search=" + URLEncoder.encode(paramSearch, StandardCharsets.UTF_8);
             }
             if (paramTag != null) {
-                nextpage += "&tag=" + URLEncoder.encode(paramTag.getName(), CharEncoding.UTF_8);
+                nextpage += "&tag=" + URLEncoder.encode(paramTag.getName(), StandardCharsets.UTF_8);
             }
             model.addAttribute("nextpage", nextpage);
         }
-        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequestUri().build();
-        String queryString = builder.getQuery();
-        String requestURI = builder.toUri().getPath();
-        if (sape.isPresent() && visitor.isAnonymous() && queryString == null) {
+        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequest().build();
+        URI requestURI = builder.toUri();
+        if (sape.isPresent() && visitor.isAnonymous()) {
             String links = sape.get().getPageLinks(requestURI, sapeCookie).render();
             model.addAttribute("links", links);
         }
@@ -313,7 +313,7 @@ public class MessagesWWW {
     }
 
     @GetMapping("/{uname}/tags")
-    protected String doGetTags(@PathVariable String uname, ModelMap model) throws IOException {
+    protected String doGetTags(@PathVariable String uname, ModelMap model) {
         com.juick.User user = userService.getUserByName(uname);
         com.juick.User visitor = UserUtils.getCurrentUser();
         if (visitor.isBanned()) {
@@ -332,7 +332,7 @@ public class MessagesWWW {
     }
 
     @GetMapping("/{uname}/friends")
-    protected String doGetFriends(@PathVariable String uname, ModelMap model) throws IOException {
+    protected String doGetFriends(@PathVariable String uname, ModelMap model) {
         com.juick.User user = userService.getUserByName(uname);
         com.juick.User visitor = UserUtils.getCurrentUser();
         if (visitor.isBanned()) {
@@ -444,13 +444,12 @@ public class MessagesWWW {
         model.addAttribute("isSubscribed", tagService.isSubscribed(visitor, paramTag));
         model.addAttribute("isInBL", tagService.isInBL(visitor, paramTag));
         if (mids.size() >= 20) {
-            String nextpage = "/tag/" + URLEncoder.encode(paramTag.getName(), CharEncoding.UTF_8) + "?before=" + mids.get(mids.size() - 1);
+            String nextpage = "/tag/" + URLEncoder.encode(paramTag.getName(), StandardCharsets.UTF_8) + "?before=" + mids.get(mids.size() - 1);
             model.addAttribute("nextpage", nextpage);
         }
-        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequestUri().build();
-        String queryString = builder.getQuery();
-        String requestURI = builder.toUri().getPath();
-        if (sape.isPresent() && visitor.isAnonymous() && queryString == null) {
+        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequest().build();
+        URI requestURI = builder.toUri();
+        if (sape.isPresent() && visitor.isAnonymous()) {
             String links = sape.get().getPageLinks(requestURI, sapeCookie).render();
             model.addAttribute("links", links);
         }
@@ -591,10 +590,9 @@ public class MessagesWWW {
         }
         model.addAttribute("replies", replies);
         model.addAttribute("showAdv", visitor.isAnonymous());
-        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequestUri().build();
-        String queryString = builder.getQuery();
-        String requestURI = builder.toUri().getPath();
-        if (sape.isPresent() && visitor.isAnonymous() && queryString == null) {
+        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequest().build();
+        URI requestURI = builder.toUri();
+        if (sape.isPresent() && visitor.isAnonymous()) {
             String links = sape.get().getPageLinks(requestURI, sapeCookie).render();
             model.addAttribute("links", links);
         }