修复无法匹配换行消息

Author: Chenhe

app/src/main/java/cc/chenhe/qqnotifyevo/core/NotificationProcessor.kt

@@ -58,7 +58,7 @@ abstract class NotificationProcessor(context: Context) {
          * 限制：昵称不能包含英文括号 `()`.
          */
         @VisibleForTesting
-        val groupMsgPattern: Pattern = Pattern.compile("^(.+?)\\((.+)\\):(.+)$")
+        val groupMsgPattern: Pattern = Pattern.compile("^(.+?)\\((.+)\\):([\\s\\S]+)$")
 
         // 私聊消息
         // title: 昵称 | 昵称 (x条新消息) //特别关心前缀：[特别关心]
@@ -71,7 +71,7 @@ abstract class NotificationProcessor(context: Context) {
          * Group: 1昵称, 2消息内容
          */
         @VisibleForTesting
-        val msgPattern: Pattern = Pattern.compile("^(.+?): (.+)$")
+        val msgPattern: Pattern = Pattern.compile("^(.+?): ([\\s\\S]+)$")
 
         /**
          * 匹配私聊消息 Title.

app/src/test/java/cc/chenhe/qqnotifyevo/core/NotificationProcessorTest.kt

@@ -36,6 +36,17 @@ class NotificationProcessorTest {
         matcher.group(3)!! shouldBeEqualTo "Hello~"
     }
 
+    @Test
+    fun group_ticker_match_multiLines() {
+        val ticker = generateGroupTicker("Bob", "Family(1)", "Hello\nhere\nyep")
+        val matcher = NotificationProcessor.groupMsgPattern.matcher(ticker)
+        matcher.matches().shouldBeTrue()
+
+        matcher.group(1)!! shouldBeEqualTo "Bob"
+        matcher.group(2)!! shouldBeEqualTo "Family(1)"
+        matcher.group(3)!! shouldBeEqualTo "Hello\nhere\nyep"
+    }
+
     @Test
     fun group_ticker_mismatch_friend() {
         val ticker = generateFriendTicker("Bob", "Hello~")
@@ -53,6 +64,16 @@ class NotificationProcessorTest {
         matcher.group(2)!! shouldBeEqualTo "hi"
     }
 
+    @Test
+    fun friend_ticker_match_multiLines() {
+        val ticker = generateFriendTicker("Alice", "hi\nok\nthanks")
+        val matcher = NotificationProcessor.msgPattern.matcher(ticker)
+        matcher.matches().shouldBeTrue()
+
+        matcher.group(1)!! shouldBeEqualTo "Alice"
+        matcher.group(2)!! shouldBeEqualTo "hi\nok\nthanks"
+    }
+
     @Test
     fun friend_ticker_mismatch_group() {
         val ticker = generateGroupTicker("Alice", "group", "hi")