Improving the speed of contains

app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -72,6 +72,7 @@ import com.vitorpamplona.quartz.events.ZapSplitSetup
 import com.vitorpamplona.quartz.signers.NostrSigner
 import com.vitorpamplona.quartz.signers.NostrSignerExternal
 import com.vitorpamplona.quartz.signers.NostrSignerInternal
+import com.vitorpamplona.quartz.utils.DualCase
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableSet
@@ -338,6 +339,7 @@ class Account(
         val hiddenUsers: ImmutableSet<String>,
         val spammers: ImmutableSet<String>,
         val hiddenWords: ImmutableSet<String>,
+        val hiddenWordsCase: List<DualCase>,
         val showSensitiveContent: Boolean?
     )
 
@@ -349,30 +351,35 @@ class Account(
         ) { localLive, blockList, muteList ->
             checkNotInMainThread()
 
-            val resultBlockList = (blockList.note.event as? PeopleListEvent)?.let {
-                withTimeoutOrNull(1000) {
-                    suspendCancellableCoroutine { continuation ->
-                        it.publicAndPrivateUsersAndWords(signer) {
-                            continuation.resume(it)
+            val resultBlockList =
+                (blockList.note.event as? PeopleListEvent)?.let {
+                    withTimeoutOrNull(1000) {
+                        suspendCancellableCoroutine { continuation ->
+                            it.publicAndPrivateUsersAndWords(signer) {
+                                continuation.resume(it)
+                            }
                         }
                     }
-                }
-            } ?: PeopleListEvent.UsersAndWords()
+                } ?: PeopleListEvent.UsersAndWords()
 
-            val resultMuteList = (muteList.note.event as? MuteListEvent)?.let {
-                withTimeoutOrNull(1000) {
-                    suspendCancellableCoroutine { continuation ->
-                        it.publicAndPrivateUsersAndWords(signer) {
-                            continuation.resume(it)
+            val resultMuteList =
+                (muteList.note.event as? MuteListEvent)?.let {
+                    withTimeoutOrNull(1000) {
+                        suspendCancellableCoroutine { continuation ->
+                            it.publicAndPrivateUsersAndWords(signer) {
+                                continuation.resume(it)
+                            }
                         }
                     }
-                }
-            } ?: PeopleListEvent.UsersAndWords()
+                } ?: PeopleListEvent.UsersAndWords()
+
+            val hiddenWords = resultBlockList.words + resultMuteList.words
 
             emit(
                 LiveHiddenUsers(
                     hiddenUsers = (resultBlockList.users + resultMuteList.users).toPersistentSet(),
-                    hiddenWords = (resultBlockList.words + resultMuteList.words).toPersistentSet(),
+                    hiddenWords = hiddenWords.toPersistentSet(),
+                    hiddenWordsCase = hiddenWords.map { DualCase(it.lowercase(), it.uppercase()) },
                     spammers = localLive.account.transientHiddenUsers,
                     showSensitiveContent = localLive.account.showSensitiveContent
                 )
@@ -383,6 +390,7 @@ class Account(
             LiveHiddenUsers(
                 hiddenUsers = persistentSetOf(),
                 hiddenWords = persistentSetOf(),
+                hiddenWordsCase = emptyList(),
                 spammers = transientHiddenUsers,
                 showSensitiveContent = showSensitiveContent
             )

app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt

@@ -42,6 +42,7 @@ import com.vitorpamplona.quartz.events.RepostEvent
 import com.vitorpamplona.quartz.events.WrappedEvent
 import com.vitorpamplona.quartz.signers.NostrSigner
 import com.vitorpamplona.quartz.utils.TimeUtils
+import com.vitorpamplona.quartz.utils.containsAny
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import java.math.BigDecimal
@@ -726,7 +727,7 @@ open class Note(val idHex: String) {
 
         val isHiddenByWord = if (thisEvent is BaseTextNoteEvent) {
             accountChoices.hiddenWords.any {
-                thisEvent.content.contains(it, true)
+                thisEvent.content.containsAny(accountChoices.hiddenWordsCase)
             }
         } else {
             false

benchmark/src/androidTest/java/com/vitorpamplona/amethyst/benchmark/ContainsBenchmark.kt

@@ -0,0 +1,97 @@
+package com.vitorpamplona.amethyst.benchmark
+
+import androidx.benchmark.junit4.BenchmarkRule
+import androidx.benchmark.junit4.measureRepeated
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.vitorpamplona.quartz.utils.DualCase
+import com.vitorpamplona.quartz.utils.containsAny
+import com.vitorpamplona.quartz.utils.containsIgnoreCase
+import junit.framework.TestCase.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ContainsBenchmark {
+    @get:Rule
+    val benchmarkRule = BenchmarkRule()
+
+    private val test = """Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.
+
+The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.
+""".intern()
+
+    val atTheMiddle = DualCase("Lorem Ipsum".lowercase(), "Lorem Ipsum".uppercase())
+    val atTheBeginning = DualCase("contrAry".lowercase(), "contrAry".uppercase())
+
+    val atTheEndCase = DualCase("h. rackham".lowercase(), "h. rackham".uppercase())
+
+    val lastCase = listOf(
+        DualCase("my mom".lowercase(), "my mom".uppercase()),
+        DualCase("my dad".lowercase(), "my dad".uppercase()),
+        DualCase("h. rackham".lowercase(), "h. rackham".uppercase())
+    )
+
+    @Test
+    fun middleCaseKotlin() {
+        benchmarkRule.measureRepeated {
+            assertTrue(test.contains(atTheMiddle.lowercase, true))
+        }
+    }
+
+    @Test
+    fun middleCaseOurs() {
+        val list = listOf(atTheMiddle)
+        benchmarkRule.measureRepeated {
+            assertTrue(test.containsAny(list))
+        }
+    }
+
+    @Test
+    fun atTheBeginningKotlin() {
+        benchmarkRule.measureRepeated {
+            assertTrue(test.contains(atTheBeginning.lowercase, true))
+        }
+    }
+
+    @Test
+    fun atTheBeginningOurs() {
+        val list = listOf(atTheBeginning)
+        benchmarkRule.measureRepeated {
+            assertTrue(test.containsAny(list))
+        }
+    }
+
+    @Test
+    fun atTheEndKotlin() {
+        benchmarkRule.measureRepeated {
+            assertTrue(test.contains(atTheEndCase.lowercase, true))
+        }
+    }
+
+    @Test
+    fun atTheEndOurs() {
+        val list = listOf(atTheEndCase)
+        benchmarkRule.measureRepeated {
+            assertTrue(test.containsAny(list))
+        }
+    }
+
+    @Test
+    fun theLastAtTheEndKotlin() {
+        benchmarkRule.measureRepeated {
+            assertTrue(
+                lastCase.any {
+                    test.contains(it.lowercase, true)
+                }
+            )
+        }
+    }
+
+    @Test
+    fun theLastAtTheEndOurs() {
+        benchmarkRule.measureRepeated {
+            assertTrue(test.containsAny(lastCase))
+        }
+    }
+}

quartz/src/main/java/com/vitorpamplona/quartz/events/EventFactory.kt

@@ -35,8 +35,9 @@ class EventFactory {
             ChannelMuteUserEvent.kind -> ChannelMuteUserEvent(id, pubKey, createdAt, tags, content, sig)
             ChatMessageEvent.kind -> {
                 if (id.isBlank()) {
-                    val id = Event.generateId(pubKey, createdAt, kind, tags, content).toHexKey()
-                    ChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
+                    val newId = Event.generateId(pubKey, createdAt, kind, tags, content).toHexKey()
+                    ChatMessageEvent(
+                        newId, pubKey, createdAt, tags, content, sig)
                 } else {
                     ChatMessageEvent(id, pubKey, createdAt, tags, content, sig)
                 }

quartz/src/main/java/com/vitorpamplona/quartz/utils/StringUtils.kt

@@ -0,0 +1,48 @@
+package com.vitorpamplona.quartz.utils
+
+import kotlin.math.min
+
+fun String.containsIgnoreCase(term: String): Boolean {
+    if (term.isEmpty()) return true // Empty string is contained
+
+    val whatUppercase = term.uppercase()
+    val whatLowercase = term.lowercase()
+
+    return containsIgnoreCase(whatLowercase, whatUppercase)
+}
+
+fun String.containsIgnoreCase(whatLowercase: String, whatUppercase: String): Boolean {
+    var myOffset: Int
+    var whatOffset: Int
+    val termLength = min(whatUppercase.length, whatLowercase.length)
+
+    for (i in 0 .. this.length - termLength) {
+        if (this[i] != whatLowercase[0] && this[i] != whatUppercase[0]) continue
+
+        myOffset = i+1
+        whatOffset = 1
+        while (whatOffset < termLength) {
+            if (this[myOffset] != whatUppercase[whatOffset] && this[myOffset] != whatLowercase[whatOffset]) {
+                break
+            }
+            myOffset++
+            whatOffset++
+        }
+        if (whatOffset == termLength) return true
+    }
+    return false
+}
+
+fun String.containsAny(terms: List<DualCase>): Boolean {
+    if (terms.isEmpty()) return true // Empty string is contained
+
+    if (terms.size == 1) {
+        return containsIgnoreCase(terms[0].lowercase, terms[0].uppercase)
+    }
+
+    return terms.any {
+        containsIgnoreCase(it.lowercase, it.uppercase)
+    }
+}
+
+class DualCase(val lowercase: String, val uppercase: String)