Dont render custom emojis on composer and respect cursor position after a...

Dont render custom emojis on composer and respect cursor position after a custom emoji is added according to its shortname length

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt

@@ -148,9 +148,4 @@ interface ChatRoomView : LoadingView, MessageView {
      */
     fun onRoomUpdated(userCanPost: Boolean, channelIsBroadcast: Boolean, userCanMod: Boolean)
 
-    /**
-     * Open a DM with the user in the given [chatRoom] and pass the [permalink] for the message
-     * to reply.
-     */
-    fun openDirectMessage(chatRoom: ChatRoom, permalink: String)
 }

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -380,10 +380,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
-    override fun openDirectMessage(chatRoom: ChatRoom, permalink: String) {
-
-    }
-
     private val layoutChangeListener =
         View.OnLayoutChangeListener { _, _, _, _, bottom, _, _, _, oldBottom ->
             val y = oldBottom - bottom
@@ -626,28 +622,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun onEmojiAdded(emoji: Emoji) {
         val cursorPosition = text_message.selectionStart
         if (cursorPosition > -1) {
-            context?.let { ctx ->
-                launch(UI) {
-                    val parsedText = EmojiParser.parseAsync(ctx, emoji.shortname).await()
-
-                    if (parsedText is Spannable) {
-                        val spans = parsedText.getSpans(0, parsedText.length, ImageSpan::class.java)
-                        spans.forEach {
-                            if (it.drawable is GifDrawable) {
-                                it.drawable.callback = this@ChatRoomFragment
-                                (it.drawable as GifDrawable).start()
-                            }
-                        }
-
-                        text_message.text?.insert(text_message.selectionStart, parsedText)
-                        text_message.text?.insert(text_message.selectionStart, " ")
-                    }
-
-                    // If it has no url then it's not a custom emoji.
-                    if (emoji.url == null) {
-                        text_message.setSelection(cursorPosition + emoji.unicode.length)
-                    }
-                }
+            context?.let {
+                val offset = if (emoji.url == null) emoji.unicode.length else emoji.shortname.length
+                text_message.text?.insert(cursorPosition, EmojiParser.parse(it, emoji.shortname))
+                text_message.setSelection(cursorPosition + offset)
             }
         }
     }

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

@@ -169,7 +169,7 @@ class MessageParser @Inject constructor(
                 if (node is ListItem) {
                     newLine()
                     builder.append("$number$delimiter ")
-                    super.visit(node.firstChild as Paragraph)
+                    super.visitChildren(node)
                     newLine()
                 }
                 number++