1 files changed, 38 insertions, 61 deletions
diff --git a/juick-www/src/main/java/com/juick/www/controllers/User.java b/juick-www/src/main/java/com/juick/www/controllers/User.java
index b66c6fa1..8e22c654 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/User.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/User.java
@@ -39,10 +39,7 @@ import org.springframework.web.util.UriComponents;
 import ru.sape.Sape;
 
 import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.net.URLEncoder;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -152,7 +149,7 @@ public class User {
         model.addAttribute("statsReplies", userService.getStatsReplies(user.getUid()));
         model.addAttribute("iread", userService.getUserReadLeastPopular(user.getUid(), 8));
         model.addAttribute("tagStats", tagService.getUserTagStats(user.getUid())
-                .stream().map(t -> t.getTag().getName()).collect(Collectors.toList()));
+                .stream().sorted((e1, e2) -> Integer.compare(e2.getUsageCount(), e1.getUsageCount())).limit(20).map(t -> t.getTag().getName()).collect(Collectors.toList()));
         model.addAttribute("paramTag", paramTag);
         List<com.juick.Message> msgs = messagesService.getMessages(mids);
 
@@ -218,76 +215,56 @@ public class User {
     }
 
     @GetMapping("/{uname}/friends")
-    protected void doGetFriends(HttpServletRequest request, HttpServletResponse response,
-                                @PathVariable String uname) throws IOException {
+    protected String doGetFriends(@PathVariable String uname, ModelMap model) throws IOException {
         com.juick.User user = userService.getUserByName(uname);
         com.juick.User visitor = UserUtils.getCurrentUser();
         if (visitor.isBanned()) {
-            throw new HttpForbiddenException();
+            throw new HttpNotFoundException();
         }
+        model.addAttribute("title", "Подписки " + user.getName());
+        model.addAttribute("headers", "<meta name=\"robots\" content=\"noindex\"/>");
+        model.addAttribute("visitor", visitor);
+        model.addAttribute("user", user);
+        model.addAttribute("readonly", messagesService.isReadonly());
+        model.addAttribute("isSubscribed", userService.isSubscribed(visitor.getUid(), user.getUid()));
+        model.addAttribute("isInBL", userService.isInBL(visitor.getUid(), user.getUid()));
+        model.addAttribute("isInBLAny", userService.isInBLAny(user.getUid(), visitor.getUid()));
+        model.addAttribute("statsIRead", userService.getStatsIRead(user.getUid()));
+        model.addAttribute("statsMyReaders", userService.getStatsMyReaders(user.getUid()));
+        model.addAttribute("statsMessages", userService.getStatsMessages(user.getUid()));
+        model.addAttribute("statsReplies", userService.getStatsReplies(user.getUid()));
+        model.addAttribute("iread", userService.getUserReadLeastPopular(user.getUid(), 8));
+        model.addAttribute("tagStats", tagService.getUserTagStats(user.getUid())
+                .stream().map(t -> t.getTag().getName()).collect(Collectors.toList()));
+        model.addAttribute("users", userService.getUserFriends(user.getUid()));
 
-        response.setContentType("text/html; charset=UTF-8");
-        try (PrintWriter out = response.getWriter()) {
-            String head = "<meta name=\"robots\" content=\"noindex\"/>";
-            templates.pageHead(out, visitor, "Подписки " + user.getName(), head);
-            templates.pageNavigation(out, visitor, null);
-            //pageUserColumn(out, user, visitor);
-
-            out.println("<section id=\"content\">");
-            out.println("<table class=\"users\"><tr>");
-
-            List<com.juick.User> friends = userService.getUserFriends(user.getUid());
-            for (int i = 0; i < friends.size(); i++) {
-                if (i % 3 == 0 && i > 0) {
-                    out.print("</tr><tr>");
-                }
-                out.print("<td><a href=\"/" + friends.get(i).getName()
-                        + "/\"><img src=\"//i.juick.com/as/" + friends.get(i).getUid() + ".png\"/>"
-                        + friends.get(i).getName() + "</a></td>");
-            }
-
-            out.println("</tr></table>");
-            out.println("</section>");
-
-            templates.pageFooter(request, out, visitor, false);
-            templates.pageEnd(out);
-        }
+        return "views/users";
     }
 
     @GetMapping("/{uname}/readers")
-    protected void doGetReaders(HttpServletRequest request, HttpServletResponse response,
-                                @PathVariable String uname) throws IOException {
+    protected String doGetReaders(@PathVariable String uname, ModelMap model) throws IOException {
         com.juick.User user = userService.getUserByName(uname);
         com.juick.User visitor = UserUtils.getCurrentUser();
         if (visitor.isBanned()) {
             throw new HttpForbiddenException();
         }
+        model.addAttribute("title", "Читатели " + user.getName());
+        model.addAttribute("headers", "<meta name=\"robots\" content=\"noindex\"/>");
+        model.addAttribute("visitor", visitor);
+        model.addAttribute("user", user);
+        model.addAttribute("readonly", messagesService.isReadonly());
+        model.addAttribute("isSubscribed", userService.isSubscribed(visitor.getUid(), user.getUid()));
+        model.addAttribute("isInBL", userService.isInBL(visitor.getUid(), user.getUid()));
+        model.addAttribute("isInBLAny", userService.isInBLAny(user.getUid(), visitor.getUid()));
+        model.addAttribute("statsIRead", userService.getStatsIRead(user.getUid()));
+        model.addAttribute("statsMyReaders", userService.getStatsMyReaders(user.getUid()));
+        model.addAttribute("statsMessages", userService.getStatsMessages(user.getUid()));
+        model.addAttribute("statsReplies", userService.getStatsReplies(user.getUid()));
+        model.addAttribute("iread", userService.getUserReadLeastPopular(user.getUid(), 8));
+        model.addAttribute("tagStats", tagService.getUserTagStats(user.getUid())
+                .stream().map(t -> t.getTag().getName()).collect(Collectors.toList()));
+        model.addAttribute("users", userService.getUserReaders(user.getUid()));
 
-        response.setContentType("text/html; charset=UTF-8");
-        try (PrintWriter out = response.getWriter()) {
-            String head = "<meta name=\"robots\" content=\"noindex\"/>";
-            templates.pageHead(out, visitor, "Читатели " + user.getName(), head);
-            templates.pageNavigation(out, visitor, null);
-            //pageUserColumn(out, user, visitor);
-
-            out.println("<section id=\"content\">");
-            out.println("<table class=\"users\"><tr>");
-
-            List<com.juick.User> readers = userService.getUserReaders(user.getUid());
-            for (int i = 0; i < readers.size(); i++) {
-                if (i % 3 == 0 && i > 0) {
-                    out.print("</tr><tr>");
-                }
-                out.print("<td><a href=\"/" + readers.get(i).getName()
-                        + "/\"><img src=\"//i.juick.com/as/" + readers.get(i).getUid() + ".png\"/>"
-                        + readers.get(i).getName() + "</a></td>");
-            }
-
-            out.println("</tr></table>");
-            out.println("</section>");
-
-            templates.pageFooter(request, out, visitor, false);
-            templates.pageEnd(out);
-        }
+        return "views/users";
     }
 }