Merge pull request #881 from RocketChat/fix/emoji-on-message-with-quotes

[FIX] Fix emoji parsing on quote markdown

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt

@@ -138,18 +138,27 @@ class ViewModelMapper @Inject constructor(private val context: Context,
                     val quoteUrl = HttpUrl.parse(url.url)
                     val serverUrl = HttpUrl.parse(baseUrl)
                     if (quoteUrl != null && serverUrl != null) {
-                        quote = makeQuote(quoteUrl, serverUrl)
+                        quote = makeQuote(quoteUrl, serverUrl)?.let {
+                            getMessageWithoutQuoteMarkdown(it)
+                        }
                     }
                 }
             }
         }
 
-        val content = getContent(context, message, quote)
-        MessageViewModel(message = message, rawData = message, messageId = message.id,
-                avatar = avatar!!, time = time, senderName = sender,
+        val content = getContent(context, getMessageWithoutQuoteMarkdown(message), quote)
+        MessageViewModel(message = getMessageWithoutQuoteMarkdown(message), rawData = message,
+                messageId = message.id, avatar = avatar!!, time = time, senderName = sender,
                 content = content, isPinned = message.pinned)
     }
 
+    private fun getMessageWithoutQuoteMarkdown(message: Message): Message {
+        val baseUrl = settings.baseUrl()
+        return message.copy(
+                message = message.message.replace("\\[\\s\\]\\($baseUrl.*\\)".toRegex(), "").trim()
+        )
+    }
+
     private fun getSenderName(message: Message): CharSequence {
         if (!message.senderAlias.isNullOrEmpty()) {
             return message.senderAlias!!
@@ -194,7 +203,7 @@ class ViewModelMapper @Inject constructor(private val context: Context,
         var quoteViewModel: MessageViewModel? = null
         if (quote != null) {
             val quoteMessage: Message = quote
-            quoteViewModel = map(quoteMessage).first { it is MessageViewModel } as MessageViewModel
+            quoteViewModel = mapMessage(quoteMessage)
         }
         return parser.renderMarkdown(message.message, quoteViewModel, currentUsername)
     }

app/src/main/java/chat/rocket/android/helper/MessageParser.kt

@@ -59,6 +59,7 @@ class MessageParser @Inject constructor(val context: Application, private val co
             parentNode.appendChild(quoteNode)
             quoteNode.accept(QuoteMessageSenderVisitor(context, configuration, builder, senderName.length))
             quoteNode = parser.parse("> ${toLenientMarkdown(quote.rawData.message)}")
+            quoteNode.accept(EmojiVisitor(builder))
             quoteNode.accept(QuoteMessageBodyVisitor(context, configuration, builder))
         }
         parentNode.accept(LinkVisitor(builder))