Merge branch 'beta' into fix/create-channel-fragment

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

@@ -131,7 +131,7 @@ class MessageParser @Inject constructor(
         private val builder: SpannableBuilder
     ) : SpannableMarkdownVisitor(configuration, builder) {
 
-        private val emojiSize = context.resources.getDimensionPixelSize(R.dimen.radius_mention)
+        private val emojiSize = context.resources.getDimensionPixelSize(R.dimen.custom_emoji_small)
 
         override fun visit(document: Document) {
             val spannable = EmojiParser.parse(context, builder.text())

emoji/src/main/java/chat/rocket/android/emoji/EmojiParser.kt

@@ -79,10 +79,10 @@ class EmojiParser {
 
             val px = context.resources.getDimensionPixelSize(R.dimen.custom_emoji_small)
 
-            return spannable.also {
+            return spannable.also { sp ->
                 regex.findAll(spannable).iterator().forEach { match ->
-                    customEmojis.find { it.shortname.toLowerCase() == match.value.toLowerCase() }?.let {
-                        it.url?.let { url ->
+                    customEmojis.find { it.shortname.toLowerCase() == match.value.toLowerCase() }?.let { emoji ->
+                        emoji.url?.let { url ->
                             try {
                                 val glideRequest = if (url.endsWith("gif", true)) {
                                     GlideApp.with(context).asGif()