Improves the order of search results

commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/Note.kt

@@ -890,7 +890,7 @@ open class Note(
                 return true
             }
 
-            if (author?.containsAny(accountChoices.hiddenWordsCase) == true) return true
+            if (author?.metadataOrNull()?.anyPropertyContains(accountChoices.hiddenWordsCase) == true) return true
         }
 
         return false

commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/User.kt

@@ -36,7 +36,6 @@ import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent
 import com.vitorpamplona.quartz.nip19Bech32.entities.NProfile
 import com.vitorpamplona.quartz.nip19Bech32.toNpub
 import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
-import com.vitorpamplona.quartz.utils.DualCase
 import com.vitorpamplona.quartz.utils.Hex
 
 interface UserDependencies
@@ -141,8 +140,6 @@ class User(
     fun relayStateOrNull(): UserRelaysCache? = relays
 
     fun relayState(): UserRelaysCache = relays ?: UserRelaysCache().also { relays = it }
-
-    fun containsAny(hiddenWordsCase: List<DualCase>) = metadataOrNull()?.containsAny(hiddenWordsCase) == true
 }
 
 fun Set<User>.toHexSet() = mapTo(LinkedHashSet(size)) { it.pubkeyHex }

commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip01Core/UserMetadataCache.kt

@@ -28,7 +28,6 @@ import com.vitorpamplona.quartz.nip01Core.metadata.UserMetadata
 import com.vitorpamplona.quartz.nip39ExtIdentities.IdentityClaimTag
 import com.vitorpamplona.quartz.nip39ExtIdentities.identityClaims
 import com.vitorpamplona.quartz.utils.DualCase
-import com.vitorpamplona.quartz.utils.containsAny
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
 
@@ -60,48 +59,16 @@ class UserMetadataCache {
 
     fun shouldUpdateWith(event: MetadataEvent) = event.createdAt > (flow.value?.createdAt ?: 0)
 
-    fun anyNameStartsWith(username: String): Boolean = flow.value?.info?.anyNameStartsWith(username) ?: false
+    fun anyNameOrAddressContains(terms: List<DualCase>): Boolean = flow.value?.info?.anyNameOrAddressContains(terms) ?: false
 
-    fun containsAny(hiddenWordsCase: List<DualCase>): Boolean {
+    fun anyNameStartsWith(terms: List<DualCase>): Boolean = flow.value?.info?.anyNameStartsWith(terms) ?: false
+
+    fun anyAddressStartsWith(terms: List<DualCase>): Boolean = flow.value?.info?.anyAddressStartsWith(terms) ?: false
+
+    fun anyPropertyContains(hiddenWordsCase: List<DualCase>): Boolean {
         if (hiddenWordsCase.isEmpty()) return false
 
-        flow.value?.let { userInfo ->
-            val info = userInfo.info
-
-            if (info.name?.containsAny(hiddenWordsCase) == true) {
-                return true
-            }
-
-            if (info.displayName?.containsAny(hiddenWordsCase) == true) {
-                return true
-            }
-
-            if (info.picture?.containsAny(hiddenWordsCase) == true) {
-                return true
-            }
-
-            if (info.banner?.containsAny(hiddenWordsCase) == true) {
-                return true
-            }
-
-            if (info.about?.containsAny(hiddenWordsCase) == true) {
-                return true
-            }
-
-            if (info.lud06?.containsAny(hiddenWordsCase) == true) {
-                return true
-            }
-
-            if (info.lud16?.containsAny(hiddenWordsCase) == true) {
-                return true
-            }
-
-            if (info.nip05?.containsAny(hiddenWordsCase) == true) {
-                return true
-            }
-        }
-
-        return false
+        return flow.value?.info?.anyPropertyContains(hiddenWordsCase) ?: false
     }
 
     fun bestName(): String? = flow.value?.info?.bestName()