🔀 Merge branch 'release/v82'

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / main / SoneModule.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
index fb9156e..a95cf78 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
@@ -7,15 +7,23 @@ import com.google.inject.*
 import com.google.inject.matcher.*
 import com.google.inject.name.Names.*
 import com.google.inject.spi.*
-import freenet.l10n.*
+import net.pterodactylus.sone.core.SoneUriCreator
 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.sone.web.FreenetSessionProvider
+import net.pterodactylus.sone.web.SessionProvider
 import net.pterodactylus.util.config.*
 import net.pterodactylus.util.config.ConfigurationException
+import net.pterodactylus.util.logging.*
 import net.pterodactylus.util.version.Version
 import java.io.*
+import java.util.concurrent.*
+import java.util.concurrent.Executors.*
+import java.util.logging.*
+import javax.inject.*
+import javax.inject.Singleton
 
 open class SoneModule(private val sonePlugin: SonePlugin, private val eventBus: EventBus) : AbstractModule() {
 
@@ -52,18 +60,31 @@ open class SoneModule(private val sonePlugin: SonePlugin, private val eventBus:
                bind(PluginHomepage::class.java).toInstance(PluginHomepage(sonePlugin.homepage))
                bind(Database::class.java).to(MemoryDatabase::class.java).`in`(Singleton::class.java)
                bind(Translation::class.java).toInstance(BaseL10nTranslation(sonePlugin.l10n().base))
-               bind(BaseL10n::class.java).toInstance(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)
+               bind(TickerShutdown::class.java).`in`(Singleton::class.java)
+               bind(SoneUriCreator::class.java).`in`(Singleton::class.java)
+               bind(SessionProvider::class.java).to(FreenetSessionProvider::class.java).`in`(Singleton::class.java)
 
                bindListener(Matchers.any(), object : TypeListener {
                        override fun <I> hear(typeLiteral: TypeLiteral<I>, typeEncounter: TypeEncounter<I>) {
-                               typeEncounter.register(InjectionListener { injectee -> eventBus.register(injectee) })
+                               typeEncounter.register(InjectionListener { injectee ->
+                                       logger.fine { "Injecting $injectee..." }
+                                       eventBus.register(injectee)
+                               })
                        }
                })
        }
 
+       @Provides
+       @Singleton
+       @Named("notification")
+       fun getNotificationTicker(): ScheduledExecutorService =
+                       newSingleThreadScheduledExecutor()
+
+       private val logger: Logger = Logging.getLogger(javaClass)
+
 }
 
 private fun String.parseVersion(): Version = Version.parse(this)