Clean

2025-08-12 03:17:53 +00:00 · 2021-04-26 11:39:23 +10:00
parent 69f05dabdf
commit fdede1c656
25 changed files with 31 additions and 484 deletions
--- a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
+++ b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt
@@ -1,5 +1,6 @@
 package org.session.libsession.database

+import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.messaging.sending_receiving.attachments.*
 import org.session.libsession.messaging.threads.Address
 import org.session.libsession.messaging.utilities.DotNetAPI
@@ -37,4 +38,5 @@ interface MessageDataProvider {
    fun getAttachmentIDsFor(messageID: Long): List<Long>
    fun getLinkPreviewAttachmentIDFor(messageID: Long): Long?

+    fun getOpenGroup(threadID: Long): OpenGroup?
 }
--- a/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
@@ -0,0 +1,58 @@
+package org.session.libsession.messaging.mentions
+
+import org.session.libsession.messaging.MessagingModuleConfiguration
+import org.session.libsignal.service.loki.utilities.mentions.Mention
+
+import org.session.libsignal.service.loki.database.LokiUserDatabaseProtocol
+
+class MentionsManager(private val userPublicKey: String, private val userDatabase: LokiUserDatabaseProtocol) {
+    var userPublicKeyCache = mutableMapOf<Long, Set<String>>() // Thread ID to set of user hex encoded public keys
+
+    companion object {
+
+        public lateinit var shared: MentionsManager
+
+        public fun configureIfNeeded(userPublicKey: String, userDatabase: LokiUserDatabaseProtocol) {
+            if (::shared.isInitialized) { return; }
+            shared = MentionsManager(userPublicKey, userDatabase)
+        }
+    }
+
+    fun cache(publicKey: String, threadID: Long) {
+        val cache = userPublicKeyCache[threadID]
+        if (cache != null) {
+            userPublicKeyCache[threadID] = cache.plus(publicKey)
+        } else {
+            userPublicKeyCache[threadID] = setOf( publicKey )
+        }
+    }
+
+    fun getMentionCandidates(query: String, threadID: Long): List<Mention> {
+        // Prepare
+        val cache = userPublicKeyCache[threadID] ?: return listOf()
+        // Gather candidates
+        val publicChat = MessagingModuleConfiguration.shared.messageDataProvider.getOpenGroup(threadID)
+        var candidates: List<Mention> = cache.mapNotNull { publicKey ->
+            val displayName: String?
+            if (publicChat != null) {
+                displayName = userDatabase.getServerDisplayName(publicChat.id, publicKey)
+            } else {
+                displayName = userDatabase.getDisplayName(publicKey)
+            }
+            if (displayName == null) { return@mapNotNull null }
+            if (displayName.startsWith("Anonymous")) { return@mapNotNull null }
+            Mention(publicKey, displayName)
+        }
+        candidates = candidates.filter { it.publicKey != userPublicKey }
+        // Sort alphabetically first
+        candidates.sortedBy { it.displayName }
+        if (query.length >= 2) {
+            // Filter out any non-matching candidates
+            candidates = candidates.filter { it.displayName.toLowerCase().contains(query.toLowerCase()) }
+            // Sort based on where in the candidate the query occurs
+            candidates.sortedBy { it.displayName.toLowerCase().indexOf(query.toLowerCase()) }
+        }
+        // Return
+        return candidates
+    }
+}
--- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroup.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroup.kt
@@ -1,6 +1,5 @@
 package org.session.libsession.messaging.open_groups

-import org.session.libsignal.service.loki.api.opengroups.PublicChat
 import org.session.libsignal.utilities.JsonUtil

 data class OpenGroup(
@@ -14,9 +13,6 @@ data class OpenGroup(

    companion object {

-        @JvmStatic fun from(publicChat: PublicChat): OpenGroup =
-                OpenGroup(publicChat.channel, publicChat.server, publicChat.displayName, publicChat.isDeletable)
-
        @JvmStatic fun getId(channel: Long, server: String): String {
            return "$server.$channel"
        }
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt
@@ -8,7 +8,7 @@ import org.session.libsession.messaging.jobs.MessageReceiveJob
 import org.session.libsession.messaging.utilities.MessageWrapper
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.snode.SnodeModule
-import org.session.libsignal.service.loki.api.Snode
+import org.session.libsignal.service.loki.Snode
 import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.logging.Log
 import java.security.SecureRandom
--- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
@@ -11,7 +11,7 @@ import org.session.libsession.utilities.AESGCM
 import org.session.libsignal.utilities.logging.Log
 import org.session.libsignal.utilities.Base64
 import org.session.libsignal.utilities.*
-import org.session.libsignal.service.loki.api.Snode
+import org.session.libsignal.service.loki.Snode
 import org.session.libsignal.service.loki.api.utilities.*
 import org.session.libsession.utilities.AESGCM.EncryptionResult
 import org.session.libsignal.utilities.ThreadUtils
@@ -79,7 +79,7 @@ object OnionRequestAPI {
    )

    internal sealed class Destination {
-        class Snode(val snode: org.session.libsignal.service.loki.api.Snode) : Destination()
+        class Snode(val snode: org.session.libsignal.service.loki.Snode) : Destination()
        class Server(val host: String, val target: String, val x25519PublicKey: String) : Destination()
    }

--- a/libsession/src/main/java/org/session/libsession/snode/Snode.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/Snode.kt
@@ -1,27 +0,0 @@
-package org.session.libsession.snode
-
-class Snode(val address: String, val port: Int, val publicKeySet: KeySet?) {
-    val ip: String get() = address.removePrefix("https://")
-
-    internal enum class Method(val rawValue: String) {
-        GetSwarm("get_snodes_for_pubkey"),
-        GetMessages("retrieve"),
-        SendMessage("store")
-    }
-
-    data class KeySet(val ed25519Key: String, val x25519Key: String)
-
-    override fun equals(other: Any?): Boolean {
-        return if (other is Snode) {
-            address == other.address && port == other.port
-        } else {
-            false
-        }
-    }
-
-    override fun hashCode(): Int {
-        return address.hashCode() xor port.hashCode()
-    }
-
-    override fun toString(): String { return "$address:$port" }
-}
--- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt
@@ -7,7 +7,7 @@ import nl.komponents.kovenant.*
 import nl.komponents.kovenant.functional.bind
 import nl.komponents.kovenant.functional.map
 import org.session.libsession.snode.utilities.getRandomElement
-import org.session.libsignal.service.loki.api.Snode
+import org.session.libsignal.service.loki.Snode
 import org.session.libsignal.service.loki.api.utilities.HTTP
 import org.session.libsignal.service.loki.database.LokiAPIDatabaseProtocol
 import org.session.libsignal.service.loki.utilities.Broadcaster
--- a/libsession/src/main/java/org/session/libsession/snode/StorageProtocol.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/StorageProtocol.kt
@@ -1,5 +1,7 @@
 package org.session.libsession.snode

+import org.session.libsignal.service.loki.Snode
+
 interface SnodeStorageProtocol {

    fun getSnodePool(): Set<Snode>