X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fnotification%2FNotificationHandlerModule.kt;h=522e9833ace512e8c84c08d9bd8845ae762bbfee;hb=0831ce844d421828bd9a4dc12f33ba58f9990c25;hp=7571f67c2fe1ad346491981d2b63cf81f2e2e557;hpb=b2952fda6d34528489d7fa4e26e09133099c978f;p=Sone.git diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt index 7571f67..522e983 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt @@ -18,12 +18,14 @@ package net.pterodactylus.sone.web.notification import com.google.inject.* +import com.google.inject.binder.* import net.pterodactylus.sone.core.* import net.pterodactylus.sone.data.* import net.pterodactylus.sone.main.* import net.pterodactylus.sone.notify.* import net.pterodactylus.util.notify.* import java.util.concurrent.Executors.* +import java.util.function.* import javax.inject.* import javax.inject.Singleton @@ -34,17 +36,13 @@ class NotificationHandlerModule : AbstractModule() { override fun configure() { bind(NotificationHandler::class.java).`in`(Singleton::class.java) + bind().asSingleton() + bind().asSingleton() + bind().asSingleton() } @Provides - @Singleton - fun getMarkPostKnownDuringFirstStartHandler(core: Core, notificationManager: NotificationManager) = - MarkPostKnownDuringFirstStartHandler(notificationManager, core::markPostKnown) - - @Provides - @Singleton - fun getSoneLockedOnStartupHandler(notificationManager: NotificationManager, @Named("soneLockedOnStartup") notification: ListNotification) = - SoneLockedOnStartupHandler(notificationManager, notification) + fun getMarkPostKnownHandler(core: Core): Consumer = Consumer { core.markPostKnown(it) } @Provides @Singleton @@ -53,11 +51,6 @@ class NotificationHandlerModule : AbstractModule() { ListNotification("sone-locked-on-startup", "sones", loaders.loadTemplate("/templates/notify/soneLockedOnStartupNotification.html")) @Provides - @Singleton - fun getNewSoneHandler(notificationManager: NotificationManager, @Named("newSone") notification: ListNotification) = - NewSoneHandler(notificationManager, notification) - - @Provides @Named("newSone") fun getNewSoneNotification(loaders: Loaders) = ListNotification("new-sone-notification", "sones", loaders.loadTemplate("/templates/notify/newSoneNotification.html"), dismissable = false) @@ -84,4 +77,7 @@ class NotificationHandlerModule : AbstractModule() { fun getSoneLockedHandler(notificationManager: NotificationManager, @Named("soneLocked") soneLockedNotification: ListNotification) = SoneLockedHandler(notificationManager, soneLockedNotification, newScheduledThreadPool(1)) + private inline fun bind(): AnnotatedBindingBuilder = bind(T::class.java) + private fun ScopedBindingBuilder.asSingleton() = `in`(Singleton::class.java) + }