From a2555e8822370e0624f70573d8697631cb45f272 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Sun, 5 May 2019 14:01:09 +0300 Subject: Carriage return in quote regex As we did not clear carriage returns now from body quote regex was broken --- src/main/java/com/juick/util/MessageUtils.java | 2 +- src/test/java/com/juick/MessageTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/java/com/juick/util/MessageUtils.java b/src/main/java/com/juick/util/MessageUtils.java index fa94e978..0afdfedb 100644 --- a/src/main/java/com/juick/util/MessageUtils.java +++ b/src/main/java/com/juick/util/MessageUtils.java @@ -93,7 +93,7 @@ public class MessageUtils { private final static String underlineRegex = "((?<=\\s)|(?<=\\A))_([^\\_\\n<>]+)_((?=\\s)|(?=\\Z)|(?=\\p{Punct}))"; - private final static String citateRegex = "(?:(?<=\\n)|(?<=\\A))(?:>|>) *(.*)?(\\n|(?=\\Z))"; + private final static String citateRegex = "(?:(?<=\\n)|(?<=\\A))(?:>|>) *(.*)?(\\r?\\n|(?=\\Z))"; public static List getEntities(Message msg) { diff --git a/src/test/java/com/juick/MessageTest.java b/src/test/java/com/juick/MessageTest.java index eabeeb0f..9153ea9c 100644 --- a/src/test/java/com/juick/MessageTest.java +++ b/src/test/java/com/juick/MessageTest.java @@ -225,7 +225,7 @@ public class MessageTest { "Вкратце: малолетний долбоёб ездил по встрече, по тротуарам, парковался где хотел и всё это выкладывал в сеть, мол, хули вы мне сделоете. Сделали. Ибо нехуй."; assertThat(MessageUtils.formatMessage(complexMessage), is(formattedMessage)); - String multiQuote = "> quote line 1\n> quote line 2\nmessage"; - assertThat(MessageUtils.formatMessage(multiQuote), is("quote line 1
\nquote line 2message")); + String multiQuoteWithCarriageReturn = "> quote line 1\r\n> quote line 2\r\nmessage"; + assertThat(MessageUtils.formatMessage(multiQuoteWithCarriageReturn), is("quote line 1
\nquote line 2message")); } } -- cgit v1.2.3