fix getUserByHash usage

1 files changed, 12 insertions, 15 deletions

diff --git a/juick-www/src/main/java/com/juick/www/UserThread.java b/juick-www/src/main/java/com/juick/www/UserThread.java
index 249cf342..e3eb7186 100644
--- a/juick-www/src/main/java/com/juick/www/UserThread.java
+++ b/juick-www/src/main/java/com/juick/www/UserThread.java
@@ -40,7 +40,7 @@ public class UserThread {
     protected void doGetThread(JdbcTemplate sql, HttpServletRequest request, HttpServletResponse response, int MID) throws ServletException, IOException {
         com.juick.User visitor = Utils.getVisitorUser(sql, request, response);
 
-        if (!MessagesQueries.canViewThread(sql, MID, visitor != null ? visitor.getUID() : 0)) {
+        if (!MessagesQueries.canViewThread(sql, MID, visitor.getUID())) {
             response.sendError(403);
             return;
         }
@@ -52,25 +52,24 @@ public class UserThread {
         if (paramView != null) {
             if (paramView.equals("list")) {
                 listview = true;
-                if (visitor != null) {
+                if (visitor.getUID() > 0) {
                     UserQueries.setUserOptionInt(sql, visitor.getUID(), "repliesview", 1);
                 }
-            } else if (paramView.equals("tree") && visitor != null) {
+            } else if (paramView.equals("tree") && visitor.getUID() > 0) {
                 UserQueries.setUserOptionInt(sql, visitor.getUID(), "repliesview", 0);
             }
-        } else if (visitor != null && UserQueries.getUserOptionInt(sql, visitor.getUID(), "repliesview", 0) == 1) {
+        } else if (visitor.getUID() > 0 && UserQueries.getUserOptionInt(sql, visitor.getUID(), "repliesview", 0) == 1) {
             listview = true;
         }
 
         String title = msg.getUser().getUName() + ": " + msg.getTagsString();
 
-        if (visitor == null) {
+        if (visitor.getUID() > 0) {
             User.pageUserRefCookie(request, response, msg.getUser().getUID());
         }
 
         response.setContentType("text/html; charset=UTF-8");
-        PrintWriter out = response.getWriter();
-        try {
+        try (PrintWriter out = response.getWriter()) {
             String headers = "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"@" + msg.getUser().getUName() + "\" href=\"//rss.juick.com/" + msg.getUser().getUName() + "/blog\"/>";
             if (paramView != null) {
                 headers += "<link rel=\"canonical\" href=\"http://juick.com/" + msg.getUser().getUName() + "/" + msg.getMID() + "\"/>";
@@ -94,13 +93,11 @@ public class UserThread {
             out.println("</script>");
 
             PageTemplates.pageEnd(out);
-        } finally {
-            out.close();
         }
     }
 
     public static com.juick.Message printMessage(PrintWriter out, JdbcTemplate sql, com.juick.Message msg, com.juick.User visitor) {
-        msg.VisitorCanComment = visitor != null;
+        msg.VisitorCanComment = visitor.getUID() > 0;
 
         List<Tag> tags = MessagesQueries.getMessageTags(sql, msg.getMID());
         String tagsStr = PageTemplates.formatTags(tags);
@@ -137,7 +134,7 @@ public class UserThread {
         }
 
         boolean visitorInBL = false;
-        if (visitor != null) {
+        if (visitor.getUID() > 0) {
             if (visitor.getUID() == msg.getUser().getUID()) {
                 msg.VisitorCanComment = true;
             } else {
@@ -170,7 +167,7 @@ public class UserThread {
 
         out.println("  <li id=\"mtoolbar\"><ul>");
         out.println("    <li><a href=\"/" + msg.getMID() + "\"><div style=\"background-position: -64px 0\"></div>" + msg.getMID() + "</a></li>");
-        if (visitor != null) {
+        if (visitor.getUID() > 0) {
             if (visitor.getUID() != msg.getUser().getUID()) {
                 if (MessagesQueries.isSubscribed(sql, visitor.getUID(), msg.getMID())) {
                     out.println("    <li><a href=\"/post?body=U+%23" + msg.getMID() + "\"><div style=\"background-position: -48px 0\"></div>Подписан</a></li>");
@@ -215,11 +212,11 @@ public class UserThread {
         }
 
         if (!replies.isEmpty()) {
-            if (visitor != null && msg.getUser().getUID() == visitor.getUID()) {
+            if (visitor.getUID() > 0 && msg.getUser().getUID() == visitor.getUID()) {
                 for (Message reply : replies) {
                     reply.VisitorCanComment = true;
                 }
-            } else if (visitor != null && msg.VisitorCanComment) {
+            } else if (visitor.getUID() > 0 && msg.VisitorCanComment) {
                 blUIDs = UserQueries.checkBL(sql, visitor.getUID(), blUIDs);
                 for (Message reply : replies) {
                     reply.VisitorCanComment = reply.getUser().getUID() == visitor.getUID() || !blUIDs.contains(reply.getUser().getUID());
@@ -354,7 +351,7 @@ public class UserThread {
             if (msg.VisitorCanComment) {
                 out.println(" &#183; <a href=\"#\" onclick=\"return showCommentForm(" + msg.getMID() + "," + msg.getRID() + ")\">Ответить</a></div>");
                 out.println("    <div class=\"msg-comment\" style=\"display: none\"></div>");
-            } else if (visitor == null) {
+            } else if (visitor.getUID() == 0) {
                 out.println("    <div class=\"msg-links\"><a href=\"#\" onclick=\"return openDialogLogin()\">Ответить</a></div>");
             }
             out.println("    </div>");