diff options
Diffstat (limited to 'src/main/java/com/juick/http/www/PageTemplates.java')
-rw-r--r-- | src/main/java/com/juick/http/www/PageTemplates.java | 79 |
1 files changed, 40 insertions, 39 deletions
diff --git a/src/main/java/com/juick/http/www/PageTemplates.java b/src/main/java/com/juick/http/www/PageTemplates.java index 2b041cb2..2f9c8976 100644 --- a/src/main/java/com/juick/http/www/PageTemplates.java +++ b/src/main/java/com/juick/http/www/PageTemplates.java @@ -17,6 +17,8 @@ */ package com.juick.http.www; +import com.juick.Message; +import com.juick.Tag; import com.juick.server.MessagesQueries; import com.juick.server.UserQueries; import java.io.PrintWriter; @@ -30,6 +32,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.servlet.http.HttpServletRequest; @@ -92,7 +95,7 @@ public class PageTemplates { out.println("</ul></nav>"); out.print(" <nav id=\"actions\"><ul>"); out.print("<li><a href=\"/#post\">Написать</a></li>"); - out.print("<li><a href=\"/" + visitor.UName + "\">@" + visitor.UName + "</a></li>"); + out.print("<li><a href=\"/" + visitor.getUName() + "\">@" + visitor.getUName() + "</a></li>"); out.print("<li><a href=\"/logout\">Выйти</a></li>"); out.println("</ul></nav>"); } else { @@ -232,7 +235,7 @@ public class PageTemplates { String queryString = request.getQueryString(); String requestURI = request.getRequestURI(); - if (sapeon && sape != null && (visitor == null || visitor.UID == 1) && queryString == null) { + if (sapeon && sape != null && (visitor == null || visitor.getUID() == 1) && queryString == null) { String links = sape.getPageLinks(requestURI, request.getCookies()).render(); if (links != null && !links.isEmpty()) { out.print("<br/>Спонсоры: " + links); @@ -244,7 +247,7 @@ public class PageTemplates { if (visitor != null) { out.println("<script type=\"text/javascript\">"); - out.println("var hash=\"" + visitor.AuthHash + "\";"); + out.println("var hash=\"" + visitor.getAuthHash() + "\";"); out.println("</script>"); } @@ -272,10 +275,9 @@ public class PageTemplates { out.println("</body></html>"); } - public static String formatTags(ArrayList<com.juick.Tag> tags) { + public static String formatTags(List<Tag> tags) { String ret = ""; - for (int i = 0; i < tags.size(); i++) { - com.juick.Tag tag = tags.get(i); + for (Tag tag : tags) { String tagName = tag.Name.replaceAll("<", "<").replaceAll(">", ">"); try { ret += " *<a href=\"/tag/" + URLEncoder.encode(tag.Name, "utf-8") + "\""; @@ -290,10 +292,9 @@ public class PageTemplates { return ret; } - public static String formatTags(ArrayList<String> tags, com.juick.User user) { + public static String formatTags(List<String> tags, com.juick.User user) { String ret = ""; - for (int i = 0; i < tags.size(); i++) { - String tag = tags.get(i); + for (String tag : tags) { tag = tag.replaceAll("<", "<"); tag = tag.replaceAll(">", ">"); try { @@ -301,9 +302,9 @@ public class PageTemplates { if (user == null) { ret += "/tag/"; } else { - ret += "/" + user.UName + "/?tag="; + ret += "/" + user.getUName() + "/?tag="; } - ret += URLEncoder.encode(tags.get(i), "utf-8") + "\">" + tag + "</a>"; + ret += URLEncoder.encode(tag, "utf-8") + "\">" + tag + "</a>"; } catch (UnsupportedEncodingException e) { } } @@ -491,24 +492,24 @@ public class PageTemplates { return msg; } - public static void printMessages(PrintWriter out, Connection sql, com.juick.User user, ArrayList<Integer> mids, com.juick.User visitor, int YandexID, int ad_mid) { - ArrayList<com.juick.Message> msgs = MessagesQueries.getMessages(sql, mids); + public static void printMessages(PrintWriter out, Connection sql, com.juick.User user, List<Integer> mids, com.juick.User visitor, int YandexID, int ad_mid) { + List<com.juick.Message> msgs = MessagesQueries.getMessages(sql, mids); for (int i = 0; i < msgs.size(); i++) { com.juick.Message msg = msgs.get(i); - if (msg.MID == ad_mid) { + if (msg.getMID() == ad_mid) { msgs.remove(i); msgs.add(0, msg); break; } } - ArrayList<Integer> blUIDs = new ArrayList<Integer>(20); + List<Integer> blUIDs = new ArrayList<Integer>(20); if (visitor != null) { - for (int i = 0; i < msgs.size(); i++) { - blUIDs.add(msgs.get(i).User.UID); + for (Message msg : msgs) { + blUIDs.add(msg.getUser().getUID()); } - blUIDs = UserQueries.checkBL(sql, visitor.UID, blUIDs); + blUIDs = UserQueries.checkBL(sql, visitor.getUID(), blUIDs); } for (int i = 0; i < msgs.size(); i++) { @@ -519,7 +520,7 @@ public class PageTemplates { com.juick.Message msg = msgs.get(i); - ArrayList<com.juick.Tag> tags = MessagesQueries.getMessageTags(sql, msg.MID); + List<com.juick.Tag> tags = MessagesQueries.getMessageTags(sql, msg.getMID()); String tagsStr = formatTags(tags); if (msg.ReadOnly) { tagsStr += " *readonly"; @@ -527,23 +528,23 @@ public class PageTemplates { if (msg.Privacy < 0) { tagsStr += " *friends"; } - if (msg.MID == ad_mid) { + if (msg.getMID() == ad_mid) { tagsStr += " *реклама"; } String txt; if (!msg.Tags.isEmpty() && msg.Tags.contains("code")) { - txt = formatMessageCode(msg.Text); + txt = formatMessageCode(msg.getText()); } else { - txt = formatMessage(msg.Text); + txt = formatMessage(msg.getText()); } - out.println("<article data-mid=\"" + msg.MID + "\">"); - out.println(" <aside><a href=\"/" + msg.User.UName + "/\"><img src=\"//i.juick.com/a/" + msg.User.UID + ".png\" alt=\"" + msg.User.UName + "\"/></a></aside>"); - out.println(" <header class=\"u\">@<a href=\"/" + msg.User.UName + "/\">" + msg.User.UName + "</a>:" + tagsStr + "</header>"); - out.println(" <header class=\"t\"><a href=\"/" + msg.User.UName + "/" + msg.MID + "\"><time datetime=\"" + msg.TimestampString + "Z\" title=\"" + msg.TimestampString + " GMT\">" + formatDate(msg.TimeAgo, msg.TimestampString) + "</time></a></header>"); + out.println("<article data-mid=\"" + msg.getMID() + "\">"); + out.println(" <aside><a href=\"/" + msg.getUser().getUName() + "/\"><img src=\"//i.juick.com/a/" + msg.getUser().getUID() + ".png\" alt=\"" + msg.getUser().getUName() + "\"/></a></aside>"); + out.println(" <header class=\"u\">@<a href=\"/" + msg.getUser().getUName() + "/\">" + msg.getUser().getUName() + "</a>:" + tagsStr + "</header>"); + out.println(" <header class=\"t\"><a href=\"/" + msg.getUser().getUName() + "/" + msg.getMID() + "\"><time datetime=\"" + msg.TimestampString + "Z\" title=\"" + msg.TimestampString + " GMT\">" + formatDate(msg.TimeAgo, msg.TimestampString) + "</time></a></header>"); if (msg.AttachmentType != null) { - String fname = msg.MID + "." + msg.AttachmentType; + String fname = msg.getMID() + "." + msg.AttachmentType; out.println(" <p class=\"ir\"><a href=\"//i.juick.com/photos-512/" + fname + "\" onclick=\"return showPhotoDialog('" + fname + "')\"><img src=\"//i.juick.com/photos-512/" + fname + "\" alt=\"\"/></a></p>"); } out.println(" <p>" + txt + "</p>"); @@ -551,29 +552,29 @@ public class PageTemplates { out.println(" <div class=\"irbr\"></div>"); } out.print(" <nav class=\"l\">"); - msg.ReadOnly |= blUIDs.contains(msg.User.UID); - if (visitor == null && msg.ReadOnly == false) { + msg.ReadOnly |= blUIDs.contains(msg.getUser().getUID()); + if (visitor == null && !msg.ReadOnly) { out.print("<a href=\"#\" onclick=\"return openDialogLogin()\">Комментировать</a> "); - } else if (visitor != null && (msg.ReadOnly == false || visitor.UID == msg.User.UID)) { + } else if (visitor != null && (!msg.ReadOnly || visitor.getUID() == msg.getUser().getUID())) { out.print("<a href=\"#\" onclick=\"return showCommentFooter(this)\">Комментировать</a> "); } - out.print("<a href=\"#\" onclick=\"return likeMessage(this," + msg.MID + ")\">Мне нравится</a>"); - if (visitor != null && msg.Privacy < 0 && msg.User.UID == visitor.UID) { - out.print(" <a href=\"#\" onclick=\"return setPrivacy(this," + msg.MID + ")\">Открыть доступ</a>"); + out.print("<a href=\"#\" onclick=\"return likeMessage(this," + msg.getMID() + ")\">Мне нравится</a>"); + if (visitor != null && msg.Privacy < 0 && msg.getUser().getUID() == visitor.getUID()) { + out.print(" <a href=\"#\" onclick=\"return setPrivacy(this," + msg.getMID() + ")\">Открыть доступ</a>"); } - if (visitor != null && visitor.UID == 3694) { - out.print(" <a href=\"#\" onclick=\"return setPopular(this," + msg.MID + ",2)\">+</a>"); - out.print(" <a href=\"#\" onclick=\"return setPopular(this," + msg.MID + ",-1)\">-</a>"); - out.print(" <a href=\"#\" onclick=\"return setPopular(this," + msg.MID + ",-2)\">x</a>"); + if (visitor != null && visitor.getUID() == 3694) { + out.print(" <a href=\"#\" onclick=\"return setPopular(this," + msg.getMID() + ",2)\">+</a>"); + out.print(" <a href=\"#\" onclick=\"return setPopular(this," + msg.getMID() + ",-1)\">-</a>"); + out.print(" <a href=\"#\" onclick=\"return setPopular(this," + msg.getMID() + ",-2)\">x</a>"); } out.println("</nav>"); out.print(" <nav class=\"s\">"); if (msg.Likes > 0) { - out.print("<a href=\"/" + msg.User.UName + "/" + msg.MID + "\" class=\"likes\">" + msg.Likes + "</a>"); + out.print("<a href=\"/" + msg.getUser().getUName() + "/" + msg.getMID() + "\" class=\"likes\">" + msg.Likes + "</a>"); } if (msg.Replies > 0) { - out.print("<a href=\"/" + msg.User.UName + "/" + msg.MID + "\" class=\"replies\">" + msg.Replies + "</a>"); + out.print("<a href=\"/" + msg.getUser().getUName() + "/" + msg.getMID() + "\" class=\"replies\">" + msg.Replies + "</a>"); } out.println("</nav>"); out.print("</article>"); |