Fixes custom emoji alias issue

emoji/build.gradle

@@ -41,6 +41,7 @@ dependencies {
     implementation libraries.recyclerview
     implementation libraries.material
     implementation libraries.glide
+    implementation libraries.timber
     kapt libraries.glideProcessor
     implementation libraries.room
     kapt libraries.roomProcessor

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

@@ -7,13 +7,13 @@ import android.text.Spannable
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.style.ImageSpan
-import android.util.Log
 import chat.rocket.android.emoji.internal.GlideApp
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.gif.GifDrawable
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.Deferred
 import kotlinx.coroutines.experimental.async
+import timber.log.Timber
 
 class EmojiParser {
 
@@ -81,7 +81,7 @@ class EmojiParser {
 
             return spannable.also { sp ->
                 regex.findAll(spannable).iterator().forEach { match ->
-                    customEmojis.find { it.shortname.toLowerCase() == match.value.toLowerCase() }?.let { emoji ->
+                    customEmojis.find { matchEmoji(it, match.value) }?.let { emoji ->
                         emoji.url?.let { url ->
                             try {
                                 val glideRequest = if (url.endsWith("gif", true)) {
@@ -107,7 +107,7 @@ class EmojiParser {
                                     }
                                 }
                             } catch (ex: Throwable) {
-                                Log.e("EmojiParser", "", ex)
+                                Timber.e( ex)
                             }
                         }
                     }
@@ -115,6 +115,19 @@ class EmojiParser {
             }
         }
 
+        private fun matchEmoji(it: Emoji, text: String): Boolean {
+            if (it.shortname== text) {
+                return true
+            } else {
+                it.shortnameAlternates.forEach {
+                    if (":$it:" == text) {
+                        return true
+                    }
+                }
+                return false
+            }
+        }
+
         fun parseAsync(
             context: Context,
             text: CharSequence,