user thread is on pebble now

2 files changed, 47 insertions, 278 deletions

diff --git a/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java b/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java
index f62b7678..a01cbc55 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/PageTemplates.java
@@ -286,13 +286,6 @@ public class PageTemplates {
         }
     }
 
-    public String formatJSLocalTime(Date ts) {
-        return "<script type=\"text/javascript\">"
-                + "var d=new Date(" + ts.getTime() + ");"
-                + "document.write((d.getDate()<10?'0':'')+d.getDate()+'.'+(d.getMonth()<9?'0':'')+(d.getMonth()+1)+'.'+d.getFullYear()+' '+(d.getHours()<10?'0':'')+d.getHours()+':'+(d.getMinutes()<10?'0':'')+d.getMinutes());"
-                + "</script>";
-    }
-
     public String formatReplies(int replies) {
         int ld = replies % 10;
         int lh = replies % 100;
diff --git a/juick-www/src/main/java/com/juick/www/controllers/UserThread.java b/juick-www/src/main/java/com/juick/www/controllers/UserThread.java
index 543d52ad..9ab45333 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/UserThread.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/UserThread.java
@@ -17,7 +17,7 @@
 package com.juick.www.controllers;
 
 import com.juick.Message;
-import com.juick.server.helpers.TagStats;
+import com.juick.server.util.HttpForbiddenException;
 import com.juick.server.util.HttpNotFoundException;
 import com.juick.service.MessagesService;
 import com.juick.service.TagService;
@@ -28,11 +28,10 @@ import com.juick.www.WebApp;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -57,14 +56,14 @@ public class UserThread {
     PageTemplates templates;
 
     @GetMapping("/{uname}/{mid}")
-    protected void doGetThread(HttpServletRequest request, HttpServletResponse response,
-                               @PathVariable String uname,
-                               @PathVariable int mid) throws IOException {
+    protected String threadAction(ModelMap model,
+                                  @PathVariable String uname,
+                                  @PathVariable int mid,
+                                  @RequestParam(required = false, value = "view") String paramView) throws IOException {
         com.juick.User visitor = UserUtils.getCurrentUser();
 
         if (!messagesService.canViewThread(mid, visitor.getUid())) {
-            response.sendError(HttpServletResponse.SC_FORBIDDEN);
-            return;
+            throw new HttpForbiddenException();
         }
 
         com.juick.Message msg = messagesService.getMessage(mid);
@@ -75,12 +74,16 @@ public class UserThread {
 
         com.juick.User user = userService.getUserByName(uname);
         if (user.getUid() == 0 || !msg.getUser().equals(user)) {
-            response.sendRedirect(String.format("/%s/%d", msg.getUser().getName(), mid));
-            return;
+            return String.format("redirect:/%s/%d", msg.getUser().getName(), mid);
         }
+        msg.VisitorCanComment = visitor.getUid() > 0;
+        if (visitor.getUid() > 0) {
+            msg.VisitorCanComment = visitor.getUid() == msg.getUser().getUid()
+                    || !userService.isInBL(msg.getUser().getUid(), visitor.getUid());
+        }
+        model.addAttribute("msg", msg);
 
         boolean listview = false;
-        String paramView = request.getParameter("view");
         if (paramView != null) {
             if (paramView.equals("list")) {
                 listview = true;
@@ -93,136 +96,31 @@ public class UserThread {
         } else if (visitor.getUid() > 0 && userService.getUserOptionInt(visitor.getUid(), "repliesview", 0) == 1) {
             listview = true;
         }
-
+        model.addAttribute("listview", listview);
         String title = msg.getUser().getName() + ": " + msg.getTagsString();
 
-        response.setContentType("text/html; charset=UTF-8");
-        try (PrintWriter out = response.getWriter()) {
-            String headers = "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"@" + msg.getUser().getName() + "\" href=\"//rss.juick.com/" + msg.getUser().getName() + "/blog\"/>";
-            if (paramView != null) {
-                headers += "<link rel=\"canonical\" href=\"http://juick.com/" + msg.getUser().getName() + "/" + msg.getMid() + "\"/>";
-            }
-            if (msg.Hidden) {
-                headers += "<meta name=\"robots\" content=\"noindex\"/>";
-            }
-            templates.pageHead(out, visitor, title, headers);
-            templates.pageNavigation(out, visitor, null);
-
-            out.println("<section id=\"content\" data-mid=\"" + msg.getMid() + "\" style=\"margin-left: 0; width: 100%\">");
-            printMessage(out, msg, visitor);
-            printReplies(out, msg, visitor, listview);
-            out.println("</section>");
-
-            templates.pageFooter(request, out, visitor, visitor.getUid() == 0);
-
-            templates.pageEnd(out);
-        }
-    }
-
-    // when message id is not fit to int
-    @ExceptionHandler(NumberFormatException.class)
-    public ResponseEntity<String> notfound() {
-        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-    }
-
-    public com.juick.Message printMessage(PrintWriter out, com.juick.Message msg, com.juick.User visitor) {
-        msg.VisitorCanComment = visitor.getUid() > 0;
-
-        List<TagStats> tags = tagService.getMessageTags(msg.getMid());
-        String tagsStr = templates.formatTags(tags);
-        if (msg.ReadOnly) {
-            tagsStr += "<a>readonly</a>";
-            msg.VisitorCanComment = false;
-        }
-        if (msg.getPrivacy() < 0) {
-            tagsStr += "<a>friends</a>";
-        }
-
-        String txt;
-        if (msg.getTags().stream().anyMatch(t -> t.getName().equals("code"))) {
-            txt = MessageUtils.formatMessageCode(msg.getText());
-        } else {
-            txt = MessageUtils.formatMessage(msg.getText());
-        }
-
-        if (!tags.isEmpty()) {
-            tagsStr = "<div class=\"msg-tags\">" + tagsStr + "</div>";
-        }
-
-        out.println("<ul>");
-        out.println("  <li id=\"msg-" + msg.getMid() + "\" data-mid=\"" + msg.getMid() + "\" class=\"msg msgthread\">");
-        out.println("    <div class=\"msg-cont\">");
-        out.println("      <div class=\"msg-menu\"><a href=\"#\"></a></div>");
-        out.println("      <div class=\"msg-ts\">" + templates.formatJSLocalTime(msg.getDate()) + "</div>");
-        out.println("      <div class=\"msg-avatar\"><a href=\"/" + msg.getUser().getName() + "/\"><img src=\"//i.juick.com/a/" + msg.getUser().getUid() + ".png\" alt=\"" + msg.getUser().getName() + "\"/></a></div>");
-        out.println("      <div class=\"msg-header\">@<a href=\"/" + msg.getUser().getName() + "/\">" + msg.getUser().getName() + "</a>:" + tagsStr + "</div>");
-        out.println("      <div class=\"msg-txt\">" + txt + "</div>");
-
-        if (msg.getAttachmentType() != null) {
-            out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.getMid() + "." + msg.getAttachmentType() + "\"><img src=\"//i.juick.com/photos-512/" + msg.getMid() + "." + msg.getAttachmentType() + "\" alt=\"\"/></a></div>");
-        }
-
-        boolean visitorInBL = false;
-        if (visitor.getUid() > 0) {
-            if (visitor.getUid() == msg.getUser().getUid()) {
-                msg.VisitorCanComment = true;
-            } else {
-                visitorInBL = userService.isInBL(msg.getUser().getUid(), visitor.getUid());
-                if (visitorInBL) {
-                    msg.VisitorCanComment = false;
-                }
-            }
-        }
-
-        if (msg.VisitorCanComment) {
-            out.println("    <form action=\"/comment\" method=\"POST\" enctype=\"multipart/form-data\"><input type=\"hidden\" name=\"mid\" value=\"" + msg.getMid() + "\"/>");
-            out.println("      <div class=\"msg-comment\"><div class=\"ta-wrapper\"><textarea name=\"body\" rows=\"1\" class=\"reply\" placeholder=\"Написать комментарий\"></textarea></div></div>");
-            out.println("    </form>");
-        }
-
-        List<String> recomm = messagesService.getMessageRecommendations(msg.getMid());
-        if (!recomm.isEmpty()) {
-            out.print("    <div class=\"msg-recomms\">Рекомендовали (" + recomm.size() + "): ");
-            for (int i = 0; i < recomm.size(); i++) {
-                if (i > 0) {
-                    out.print(", ");
-                }
-                out.print("<a href=\"/" + recomm.get(i) + "/\">@" + recomm.get(i) + "</a>");
-            }
-            out.println("</div>");
+        model.addAttribute("title", title);
+        model.addAttribute("visitor", visitor);
+        String headers = "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"@" + msg.getUser().getName() + "\" href=\"//rss.juick.com/" + msg.getUser().getName() + "/blog\"/>";
+        if (paramView != null) {
+            headers += "<link rel=\"canonical\" href=\"http://juick.com/" + msg.getUser().getName() + "/" + msg.getMid() + "\"/>";
         }
-        out.println("    </div>");
-        out.println("  </li>");
-
-        out.println("  <li class=\"toolbar\"><ul>");
-        out.println("    <li><a href=\"/" + msg.getMid() + "\"><div style=\"background-position: -64px 0\"></div>" + msg.getMid() + "</a></li>");
-        if (visitor.getUid() > 0) {
-            if (visitor.getUid() != msg.getUser().getUid()) {
-                if (messagesService.isSubscribed(visitor.getUid(), msg.getMid())) {
-                    out.println("    <li><a href=\"/post?body=U+%23" + msg.getMid() + "\"><div style=\"background-position: -48px 0\"></div>Подписан</a></li>");
-                } else {
-                    out.println("    <li><a href=\"/post?body=S+%23" + msg.getMid() + "\"><div style=\"background-position: -16px 0\"></div>Подписаться</a></li>");
-                }
-                if (!visitorInBL) {
-                    out.println("    <li><a href=\"/post?body=%21+%23" + msg.getMid() + "\"><div style=\"background-position: -32px 0\"></div>Рекомендовать</a></li>");
-                }
-            } else {
-                out.println("    <li><a href=\"/post?body=D+%23" + msg.getMid() + "\"><div style=\"background-position: 0\"></div>Удалить</a></li>");
-            }
+        if (msg.Hidden) {
+            headers += "<meta name=\"robots\" content=\"noindex\"/>";
         }
-        out.println("  </ul></li>");
-        out.println("</ul>");
-
-        return msg;
-    }
-
-    public void printReplies(PrintWriter out, com.juick.Message msg, com.juick.User visitor, boolean listview) {
+        model.addAttribute("headers", headers);
+        model.addAttribute("contentStyle", "margin-left: 0; width: 100%");
+        model.addAttribute("isModerator", visitor.getUid() == 3694);
+        model.addAttribute("visitorSubscribed", messagesService.isSubscribed(visitor.getUid(), msg.getMid()));
+        model.addAttribute("visitorInBL",  userService.isInBL(msg.getUser().getUid(), visitor.getUid()));
+        model.addAttribute("recomm", messagesService.getMessageRecommendations(msg.getMid()));
         List<com.juick.Message> replies = messagesService.getReplies(msg.getMid());
 
-        List<Integer> blUIDs = new ArrayList<Integer>();
+        List<Integer> blUIDs = new ArrayList<>();
         for (int i = 0; i < replies.size(); i++) {
             com.juick.Message reply = replies.get(i);
-            if (reply.getUser().getUid() != msg.getUser().getUid() && !blUIDs.contains(reply.getUser().getUid())) {
+            if (reply.getUser().getUid() != msg.getUser().getUid()
+                    && !blUIDs.contains(reply.getUser().getUid())) {
                 blUIDs.add(reply.getUser().getUid());
             }
             if (reply.getReplyto() > 0) {
@@ -238,6 +136,15 @@ public class UserThread {
                     reply.setReplyto(0);
                 }
             }
+            if (visitor.getUid() > 0 && msg.getUser().getUid() == visitor.getUid()) {
+                reply.VisitorCanComment = true;
+            } else if (visitor.getUid() > 0 && msg.VisitorCanComment) {
+                List<Integer> blUIDs2 = userService.checkBL(visitor.getUid(), blUIDs);
+                reply.VisitorCanComment = reply.getUser().getUid() == visitor.getUid()
+                        || !blUIDs2.contains(reply.getUser().getUid());
+            } else {
+                reply.VisitorCanComment = false;
+            }
         }
 
         boolean foldable = false;
@@ -249,145 +156,14 @@ public class UserThread {
                 }
             }
         }
-
-        out.println("<div class=\"title2\">");
-        out.print("  <div class=\"title2-right\">");
-        if (listview) {
-            out.print("<a href=\"?view=tree\" rel=\"nofollow\">Показать деревом</a>");
-        } else {
-            if (foldable) {
-                out.print("<span id=\"unfoldall\"><a href=\"#\">Раскрыть все</a> &#183; </span>");
-            }
-            out.print("<a href=\"?view=list\" rel=\"nofollow\">Показать списком</a>");
-        }
-        out.print("</div>");
-        out.println("  <h2>Ответы (" + replies.size() + ")</h2>");
-        out.println("</div>");
-
-        out.println("<ul id=\"replies\">");
-
-        if (!replies.isEmpty()) {
-            if (visitor.getUid() > 0 && msg.getUser().getUid() == visitor.getUid()) {
-                for (Message reply : replies) {
-                    reply.VisitorCanComment = true;
-                }
-            } else if (visitor.getUid() > 0 && msg.VisitorCanComment) {
-                blUIDs = userService.checkBL(visitor.getUid(), blUIDs);
-                for (Message reply : replies) {
-                    reply.VisitorCanComment = reply.getUser().getUid() == visitor.getUid() || !blUIDs.contains(reply.getUser().getUid());
-                }
-            } else {
-                for (Message reply : replies) {
-                    reply.VisitorCanComment = false;
-                }
-            }
-
-            if (listview) {
-                printList(out, replies, visitor);
-            } else {
-                printTree(out, replies, visitor, 0, 0, false);
-            }
-
-            for (Message reply : replies) {
-                reply.cleanupChilds();
-            }
-            replies.clear();
-        }
-
-        out.println("</ul>");
+        model.addAttribute("replies", replies);
+        model.addAttribute("foldable", foldable);
+        return "views/thread";
     }
 
-    public void printTree(PrintWriter out, List<com.juick.Message> replies, com.juick.User visitor, int ReplyTo, int margin, boolean hidden) {
-        if (margin > 240) {
-            margin = 240;
-        }
-
-        for (int i = 0; i < replies.size(); i++) {
-            com.juick.Message msg = replies.get(i);
-            if (msg.getReplyto() == ReplyTo) {
-
-                out.print("  <li id=\"" + msg.getRid() + "\" class=\"msg\" style=\"");
-                if (margin > 0) {
-                    out.print("margin-left: " + margin + "px;");
-                }
-                if (hidden) {
-                    out.print("display:none;");
-                }
-                out.println("\">");
-                out.println("    <div class=\"msg-cont\">");
-                out.println("      <div class=\"msg-header\">");
-				if (!msg.getUser().isBanned()) {
-					out.println("        @<a href=\"/" + msg.getUser().getName() + "/\">" + msg.getUser().getName() + "</a>:");
-					out.println("        <div class=\"msg-avatar\"><a href=\"/" + msg.getUser().getName() + "/\"><img src=\"//i.juick.com/a/" + msg.getUser().getUid() + ".png\" alt=\"" + msg.getUser().getName() + "\"/></a></div>");
-                } else {
-					out.println("        [удалено]:");
-					out.println("        <div class=\"msg-avatar\"><img src=\"//i.juick.com/av-96.png\"/></div>");
-                }
-                out.println("        <div class=\"msg-menu\"><a href=\"#\" class=\"a-thread-links\"></a></div>");
-                out.println("        <div class=\"msg-ts\"><a href=\"/" + msg.getMid() + "#" + msg.getRid() + "\" title=\"" + templates.sdfSQL.format(msg.getDate()) + " GMT\">" + templates.formatDate(msg.TimeAgo, msg.getDate()) + "</a></div>");
-                out.println("      </div>");
-                out.println("      <div class=\"msg-txt\">" + MessageUtils.formatMessage(msg.getText()) + "</div>");
-                if (msg.getAttachmentType() != null) {
-                    out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.getMid() + "-" + msg.getRid() + "." + msg.getAttachmentType() + "\"><img src=\"//i.juick.com/photos-512/" + msg.getMid() + "-" + msg.getRid() + "." + msg.getAttachmentType() + "\" alt=\"\"/></a></div>");
-                }
-                out.print("    <div class=\"msg-links\">/" + msg.getRid());
-                if (msg.getReplyto() > 0) {
-                    out.print(" в ответ на <a href=\"#" + msg.getReplyto() + "\">/" + msg.getReplyto() + "</a>");
-                }
-                if (msg.VisitorCanComment) {
-                    out.println(" &#183; <a href=\"/post?body=%23" + msg.getMid() + "/" + msg.getRid() + "%20\" class=\"a-thread-comment\">Ответить</a></div>");
-                    out.println("    <div class=\"msg-comment\" style=\"display: none\"></div>");
-                } else if (visitor.getUid() == 0) {
-                    out.println(" &#183; <a href=\"#\" class=\"a-login\">Ответить</a></div>");
-                }
-
-                int childs = msg.getChildsCount();
-                if (ReplyTo == 0 && childs > 1 && replies.size() > 10) {
-                    out.println("    <div class=\"msg-comments\"><a href=\"#\">" + templates.formatReplies(childs) + "</a></div>");
-                }
-                out.println("    </div>");
-                out.println("  </li>");
-
-                if (ReplyTo == 0 && childs > 1 && replies.size() > 10) {
-                    printTree(out, msg.childs, visitor, msg.getRid(), margin + 20, true);
-                } else if (childs > 0) {
-                    printTree(out, msg.childs, visitor, msg.getRid(), margin + 20, hidden);
-                }
-            }
-        }
-    }
-
-    public void printList(PrintWriter out, List<com.juick.Message> replies, com.juick.User visitor) {
-        for (Message msg : replies) {
-            out.print("  <li id=\"" + msg.getRid() + "\" class=\"msg\">");
-            out.println("    <div class=\"msg-cont\">");
-            out.println("      <div class=\"msg-header\">");
-            if (!msg.getUser().isBanned()) {
-            	out.println("      @<a href=\"/" + msg.getUser().getName() + "/\">" + msg.getUser().getName() + "</a>:");
-            	out.println("      <div class=\"msg-avatar\"><a href=\"/" + msg.getUser().getName() + "/\"><img src=\"//i.juick.com/a/" + msg.getUser().getUid() + ".png\" alt=\"" + msg.getUser().getName() + "\"/></a></div>");
-            } else {
-            	out.println("      [удалено]:");
-            	out.println("      <div class=\"msg-avatar\"><img src=\"//i.juick.com/av-96.png\"/></div>");
-            }
-            out.println("        <div class=\"msg-menu\"><a href=\"#\" class=\"a-thread-links\"></a></div>");
-            out.println("        <div class=\"msg-ts\"><a href=\"/" + msg.getMid() + "#" + msg.getRid() + "\" title=\"" + PageTemplates.sdfSQL.format(msg.getDate()) + " GMT\">" + templates.formatDate(msg.TimeAgo, msg.getDate()) + "</a></div>");
-            out.println("      </div>");
-            out.println("      <div class=\"msg-txt\">" + MessageUtils.formatMessage(msg.getText()) + "</div>");
-            if (msg.getAttachmentType() != null) {
-                out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.getMid() + "-" + msg.getRid() + "." + msg.getAttachmentType() + "\"><img src=\"//i.juick.com/photos-512/" + msg.getMid() + "-" + msg.getRid() + "." + msg.getAttachmentType() + "\" alt=\"\"/></a></div>");
-            }
-            out.print("    <div class=\"msg-links\">/" + msg.getRid());
-            if (msg.getReplyto() > 0) {
-                out.print(" в ответ на <a href=\"#" + msg.getReplyto() + "\">/" + msg.getReplyto() + "</a>");
-            }
-            if (msg.VisitorCanComment) {
-                out.println(" &#183; <a href=\"#\" class=\"a-thread-comment\">Ответить</a></div>");
-                out.println("    <div class=\"msg-comment\" style=\"display: none\"></div>");
-            } else if (visitor.getUid() == 0) {
-                out.println("    <div class=\"msg-links\"><a href=\"/post?body=%23" + msg.getMid() + "/" + msg.getRid() + "%20\" class=\"a-thread-comment\">Ответить</a></div>");
-            }
-            out.println("    </div>");
-            out.println("  </li>");
-        }
+    // when message id is not fit to int
+    @ExceptionHandler(NumberFormatException.class)
+    public ResponseEntity<String> notFoundAction() {
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
     }
 }