🐛 Merge loaded identites to have all trust values

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / freenet / wot / IdentityLoader.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoader.kt b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoader.kt
index f6e1d59..bc7dc4c 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoader.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoader.kt
@@ -35,11 +35,13 @@ class IdentityLoader @Inject constructor(private val webOfTrustConnector: WebOfT
                        time({ stopwatch, identities -> "Loaded ${identities.size} own identities in ${stopwatch.elapsed(MILLISECONDS) / 1000.0}s." }) {
                                webOfTrustConnector.loadAllOwnIdentities()
                        }.let(this::loadTrustedIdentitiesForOwnIdentities)
+                                       .mergeRemoteIdentities()
 
        fun loadAllIdentities() =
                        time({ stopwatch, identities -> "Loaded ${identities.size} own identities in ${stopwatch.elapsed(MILLISECONDS) / 1000.0}s." }) {
                                webOfTrustConnector.loadAllOwnIdentities()
                        }.let(this::loadAllIdentitiesForOwnIdentities)
+                                       .mergeRemoteIdentities()
 
        @Throws(PluginException::class)
        private fun loadTrustedIdentitiesForOwnIdentities(ownIdentities: Collection<OwnIdentity>) =
@@ -82,4 +84,17 @@ class IdentityLoader @Inject constructor(private val webOfTrustConnector: WebOfT
                                loader().also { logger.fine(logMessage(stopwatch, it)) }
                        }
 
+       private fun Map<OwnIdentity, Set<Identity>>.mergeRemoteIdentities() =
+                       values.flatten()
+                                       .groupBy { it.id }
+                                       .mapValues {
+                                               it.value.reduce { accIdentity, identity ->
+                                                       identity.trust.forEach { (ownIdentity, trust) -> accIdentity.setTrust(ownIdentity, trust) }
+                                                       accIdentity
+                                               }
+                                       }
+                                       .let { reducedIdentities ->
+                                               mapValues { it.value.map { identity -> reducedIdentities[identity.id]!! }.toSet() }
+                                       }
+
 }