X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSoneModule.kt;h=97b342a9dab67c1ac04b7996fe3c54a84da292df;hp=31cc54a365a513093361f45e98393b20b66bb96a;hb=d5cd41949b7e62fdc40ef7390661dcda8c18a139;hpb=33b58cb4388ee7ca267470c0d883653e1a16dff4

diff --git a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
index 31cc54a..97b342a 100644
--- a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
@@ -1,5 +1,6 @@
 package net.pterodactylus.sone.main
 
+import com.codahale.metrics.*
 import com.google.common.base.*
 import com.google.common.eventbus.*
 import com.google.inject.*
@@ -7,9 +8,9 @@ import com.google.inject.matcher.*
 import com.google.inject.name.Names.*
 import com.google.inject.spi.*
 import freenet.l10n.*
-import net.pterodactylus.sone.core.*
 import net.pterodactylus.sone.database.*
 import net.pterodactylus.sone.database.memory.*
+import net.pterodactylus.sone.freenet.*
 import net.pterodactylus.sone.freenet.wot.*
 import net.pterodactylus.util.config.*
 import net.pterodactylus.util.config.ConfigurationException
@@ -50,8 +51,10 @@ open class SoneModule(private val sonePlugin: SonePlugin, private val eventBus:
 		bind(PluginYear::class.java).toInstance(PluginYear(sonePlugin.year))
 		bind(PluginHomepage::class.java).toInstance(PluginHomepage(sonePlugin.homepage))
 		bind(Database::class.java).to(MemoryDatabase::class.java).`in`(Singleton::class.java)
-		bind(BaseL10n::class.java).toInstance(sonePlugin.l10n().base)
+		bind(Translation::class.java).toInstance(BaseL10nTranslation(sonePlugin.l10n().base))
 		loaders?.let { bind(Loaders::class.java).toInstance(it) }
+		bind(MetricRegistry::class.java).`in`(Singleton::class.java)
+		bind(WebOfTrustConnector::class.java).to(PluginWebOfTrustConnector::class.java).`in`(Singleton::class.java)
 
 		bindListener(Matchers.any(), object : TypeListener {
 			override fun <I> hear(typeLiteral: TypeLiteral<I>, typeEncounter: TypeEncounter<I>) {
@@ -60,13 +63,6 @@ open class SoneModule(private val sonePlugin: SonePlugin, private val eventBus:
 		})
 	}
 
-	@Provides
-	@Singleton
-	fun getCore(configuration: Configuration, freenetInterface: FreenetInterface, identityManager: IdentityManager, soneDownloader: SoneDownloader, imageInserter: ImageInserter, updateChecker: UpdateChecker, webOfTrustUpdater: WebOfTrustUpdater, eventBus: EventBus, database: Database) =
-			Core(configuration, freenetInterface, identityManager, soneDownloader, imageInserter, updateChecker, webOfTrustUpdater, eventBus, database).apply {
-				debugInformation.showVersionInformation = configuration.getBooleanValue("Debug/ShowVersionInformation").getValue(false)
-			}.also(eventBus::register)
-
 }
 
 private fun String.parseVersion(): Version = Version.parse(this)