From 1f5869fcfe8c537d223b750754025cb2937d4bad Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 7 Mar 2018 14:53:23 +0300
Subject: drop replies tree

---
 .../pebble/extension/filters/FormatMessageFilter.java               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/juick-www/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java b/juick-www/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java
index b492f121..14af2539 100644
--- a/juick-www/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java
+++ b/juick-www/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java
@@ -35,8 +35,10 @@ public class FormatMessageFilter implements Filter {
         if (input instanceof Message) {
             Message msg = (Message) input;
             boolean isCode = msg.getTags().stream().anyMatch(t -> t.getName().equals("code"));
-            String formattedMessage = isCode ? MessageUtils.formatMessageCode(StringUtils.defaultString(msg.getText()))
-                    : MessageUtils.formatMessage(StringUtils.defaultString(msg.getText()));
+            String msgTxt = msg.getRid() > 0 ? String.format("@%s, %s", msg.getTo().getName(), StringUtils.defaultString(msg.getText()))
+                    : StringUtils.defaultString(msg.getText());
+            String formattedMessage = isCode ? MessageUtils.formatMessageCode(msgTxt)
+                    : MessageUtils.formatMessage(msgTxt);
             return new SafeString(formattedMessage);
         }
         throw new IllegalArgumentException("invalid input");
-- 
cgit v1.2.3