aboutsummaryrefslogtreecommitdiff
path: root/juick-www
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-03-13 10:20:13 +0300
committerGravatar Vitaly Takmazov2018-03-13 10:20:13 +0300
commitead33c2813b71b94a22e002b0ff3f018531f960a (patch)
treeb72701cee234eb806dccf6b8ec2a5ea135853742 /juick-www
parent1f5869fcfe8c537d223b750754025cb2937d4bad (diff)
www: new line before quote
Diffstat (limited to 'juick-www')
-rw-r--r--juick-www/src/main/java/com/mitchellbosecke/pebble/extension/filters/FormatMessageFilter.java3
1 files changed, 2 insertions, 1 deletions
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 14af2539..edb6c827 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,7 +35,8 @@ 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 msgTxt = msg.getRid() > 0 ? String.format("@%s, %s", msg.getTo().getName(), StringUtils.defaultString(msg.getText()))
+ String formatString = MessageUtils.replyStartsWithQuote(msg) ? "@%s,\n%s" : "@%s, %s";
+ String msgTxt = msg.getRid() > 0 ? String.format(formatString, msg.getTo().getName(), StringUtils.defaultString(msg.getText()))
: StringUtils.defaultString(msg.getText());
String formattedMessage = isCode ? MessageUtils.formatMessageCode(msgTxt)
: MessageUtils.formatMessage(msgTxt);