Migrate libraries/recentemojis into libraries/emoji

libraries/emoji/impl/build.gradle.kts

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+import extension.setupDependencyInjection
+import extension.testCommonDependencies
+
+plugins {
+    id("io.element.android-compose-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.emoji.impl"
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+}
+
+setupDependencyInjection()
+
+dependencies {
+    api(projects.libraries.emoji.api)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.di)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.uiStrings)
+
+    implementation(libs.kotlinx.collections.immutable)
+    implementation(libs.matrix.emojibase.bindings)
+
+    testImplementation(projects.libraries.emoji.test)
+    testImplementation(projects.libraries.matrix.test)
+    testCommonDependencies(libs)
+}

libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/DefaultEmojibaseProvider.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.impl
+
+import android.content.Context
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.SingleIn
+import io.element.android.emojibasebindings.EmojibaseDatasource
+import io.element.android.emojibasebindings.EmojibaseStore
+import io.element.android.libraries.di.annotations.ApplicationContext
+import io.element.android.libraries.emoji.api.EmojibaseProvider
+
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
+class DefaultEmojibaseProvider(@ApplicationContext val context: Context) : EmojibaseProvider {
+    override val emojibaseStore: EmojibaseStore by lazy {
+        EmojibaseDatasource().load(context)
+    }
+}

libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultAddRecentEmoji.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.impl.recentemojis
+
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.emoji.api.recentemojis.AddRecentEmoji
+import io.element.android.libraries.matrix.api.MatrixClient
+import kotlinx.coroutines.withContext
+
+@ContributesBinding(SessionScope::class)
+class DefaultAddRecentEmoji(
+    private val client: MatrixClient,
+    private val dispatchers: CoroutineDispatchers,
+) : AddRecentEmoji {
+    override suspend operator fun invoke(emoji: String): Result<Unit> = withContext(dispatchers.io) {
+        client.addRecentEmoji(emoji)
+    }
+}

libraries/emoji/impl/src/main/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultGetRecentEmojis.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.impl.recentemojis
+
+import dev.zacsweers.metro.ContributesBinding
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.emoji.api.EmojibaseProvider
+import io.element.android.libraries.emoji.api.recentemojis.GetRecentEmojis
+import io.element.android.libraries.matrix.api.MatrixClient
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.withContext
+
+@ContributesBinding(SessionScope::class)
+class DefaultGetRecentEmojis(
+    private val client: MatrixClient,
+    private val dispatchers: CoroutineDispatchers,
+    private val emojibaseProvider: EmojibaseProvider,
+) : GetRecentEmojis {
+    override suspend operator fun invoke(): Result<ImmutableList<String>> = withContext(dispatchers.io) {
+        val allEmojis = emojibaseProvider.emojibaseStore.allEmojis
+        client.getRecentEmojis()
+            .map { emojis ->
+                // Remove any possible duplicates
+                emojis.distinct()
+                    // Return only those emojis that are valid
+                    .filter { recent -> allEmojis.any { recent == it.unicode } }
+                    .toImmutableList()
+            }
+    }
+}

libraries/emoji/impl/src/test/kotlin/io/element/android/libraries/emoji/impl/recentemojis/DefaultGetRecentEmojisTest.kt

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2025 Element Creations Ltd.
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.emoji.impl.recentemojis
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.emojibasebindings.Emoji
+import io.element.android.emojibasebindings.EmojibaseCategory
+import io.element.android.emojibasebindings.EmojibaseCategory.People
+import io.element.android.libraries.emoji.test.FakeEmojibaseProvider
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.tests.testutils.testCoroutineDispatchers
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultGetRecentEmojisTest {
+    @Test
+    fun `invoke - deduplicates results`() = runTest {
+        val recentEmojiResult = persistentListOf(":)", ":D", ":)")
+        val getRecentEmojis = createDefaultGetRecentEmojis(
+            recentEmojis = { Result.success(recentEmojiResult) },
+            emojibaseContents = persistentMapOf(People to recentEmojiResult.map { emoji(it) }.toImmutableList())
+        )
+
+        assertThat(getRecentEmojis()).isEqualTo(Result.success(persistentListOf(":)", ":D")))
+    }
+
+    @Test
+    fun `invoke - removes non-standard emojis`() = runTest {
+        val recentEmojiResult = persistentListOf(":)", ":D", "Custom reaction")
+        val getRecentEmojis = createDefaultGetRecentEmojis(
+            recentEmojis = { Result.success(recentEmojiResult) },
+            emojibaseContents = persistentMapOf(
+                People to persistentListOf(emoji(":)"), emoji(":D"))
+            )
+        )
+
+        assertThat(getRecentEmojis()).isEqualTo(Result.success(persistentListOf(":)", ":D")))
+    }
+
+    private fun emoji(unicode: String) = Emoji(
+        hexcode = "",
+        label = "",
+        tags = null,
+        shortcodes = persistentListOf(),
+        unicode = unicode,
+        skins = null,
+    )
+
+    private fun TestScope.createDefaultGetRecentEmojis(
+        recentEmojis: () -> Result<List<String>> = { Result.success(emptyList()) },
+        emojibaseContents: ImmutableMap<EmojibaseCategory, ImmutableList<Emoji>> = persistentMapOf(People to persistentListOf(emoji(":)"))),
+    ) = DefaultGetRecentEmojis(
+        client = FakeMatrixClient(getRecentEmojisLambda = recentEmojis),
+        dispatchers = testCoroutineDispatchers(),
+        emojibaseProvider = FakeEmojibaseProvider(emojibaseContents),
+    )
+}