From b11a395c46aa92179a4a6019d2ebef15877b3946 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 16 Nov 2016 12:10:32 +0300
Subject: formatMessage moved to core, remove copy-paste from juick-rss

---
 juick-www/src/main/java/com/juick/www/UserThread.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'juick-www/src/main/java/com/juick/www/UserThread.java')

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 f12e3c64..394d6712 100644
--- a/juick-www/src/main/java/com/juick/www/UserThread.java
+++ b/juick-www/src/main/java/com/juick/www/UserThread.java
@@ -21,6 +21,7 @@ import com.juick.Message;
 import com.juick.Tag;
 import com.juick.server.MessagesQueries;
 import com.juick.server.UserQueries;
+import com.juick.util.MessageUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import java.io.IOException;
@@ -106,9 +107,9 @@ public class UserThread {
 
         String txt;
         if (msg.getTags().stream().anyMatch(t -> t.getName().equals("code"))) {
-            txt = Utils.formatMessageCode(msg.getText());
+            txt = MessageUtils.formatMessageCode(msg.getText());
         } else {
-            txt = Utils.formatMessage(msg.getText());
+            txt = MessageUtils.formatMessage(msg.getText());
         }
 
         if (!tags.isEmpty()) {
@@ -290,7 +291,7 @@ public class UserThread {
                 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\">" + PageTemplates.formatDate(msg.TimeAgo, msg.getDate()) + "</a></div>");
                 out.println("      </div>");
-                out.println("      <div class=\"msg-txt\">" + Utils.formatMessage(msg.getText()) + "</div>");
+                out.println("      <div class=\"msg-txt\">" + MessageUtils.formatMessage(msg.getText()) + "</div>");
                 if (msg.AttachmentType != null) {
                     out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.getMid() + "-" + msg.getRid() + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.getMid() + "-" + msg.getRid() + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
                 }
@@ -336,7 +337,7 @@ public class UserThread {
             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\">" + PageTemplates.formatDate(msg.TimeAgo, msg.getDate()) + "</a></div>");
             out.println("      </div>");
-            out.println("      <div class=\"msg-txt\">" + Utils.formatMessage(msg.getText()) + "</div>");
+            out.println("      <div class=\"msg-txt\">" + MessageUtils.formatMessage(msg.getText()) + "</div>");
             if (msg.AttachmentType != null) {
                 out.println("    <div class=\"msg-media\"><a href=\"//i.juick.com/p/" + msg.getMid() + "-" + msg.getRid() + "." + msg.AttachmentType + "\"><img src=\"//i.juick.com/photos-512/" + msg.getMid() + "-" + msg.getRid() + "." + msg.AttachmentType + "\" alt=\"\"/></a></div>");
             }
-- 
cgit v1.2.3