🐛 Fix new-remote-post handler

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / notification / NotificationHandlerModule.kt

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..c75cbc1 100644 (file)
--- 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,14 @@ class NotificationHandlerModule : AbstractModule() {
 
        override fun configure() {
                bind(NotificationHandler::class.java).`in`(Singleton::class.java)
+               bind<MarkPostKnownDuringFirstStartHandler>().asSingleton()
+               bind<SoneLockedOnStartupHandler>().asSingleton()
+               bind<NewSoneHandler>().asSingleton()
+               bind<NewRemotePostHandler>().asSingleton()
        }
 
        @Provides
-       @Singleton
-       fun getMarkPostKnownDuringFirstStartHandler(core: Core, notificationManager: NotificationManager) =
-                       MarkPostKnownDuringFirstStartHandler(notificationManager, core::markPostKnown)
-
-       @Provides
-       @Singleton
-       fun getSoneLockedOnStartupHandler(notificationManager: NotificationManager, @Named("soneLockedOnStartup") notification: ListNotification<Sone>) =
-                       SoneLockedOnStartupHandler(notificationManager, notification)
+       fun getMarkPostKnownHandler(core: Core): Consumer<Post> = Consumer { core.markPostKnown(it) }
 
        @Provides
        @Singleton
@@ -53,22 +52,12 @@ class NotificationHandlerModule : AbstractModule() {
                        ListNotification<Sone>("sone-locked-on-startup", "sones", loaders.loadTemplate("/templates/notify/soneLockedOnStartupNotification.html"))
 
        @Provides
-       @Singleton
-       fun getNewSoneHandler(notificationManager: NotificationManager, @Named("newSone") notification: ListNotification<Sone>) =
-                       NewSoneHandler(notificationManager, notification)
-
-       @Provides
        @Named("newSone")
        fun getNewSoneNotification(loaders: Loaders) =
                        ListNotification<Sone>("new-sone-notification", "sones", loaders.loadTemplate("/templates/notify/newSoneNotification.html"), dismissable = false)
 
        @Provides
        @Singleton
-       fun getNewRemotePostHandler(notificationManager: NotificationManager, @Named("newRemotePost") newPostNotification: ListNotification<Post>) =
-                       NewRemotePostHandler(notificationManager, newPostNotification)
-
-       @Provides
-       @Singleton
        @Named("newRemotePost")
        fun getNewPostNotification(loaders: Loaders) =
                        ListNotification<Post>("new-post-notification", "posts", loaders.loadTemplate("/templates/notify/newPostNotification.html"), dismissable = false)
@@ -84,4 +73,7 @@ class NotificationHandlerModule : AbstractModule() {
        fun getSoneLockedHandler(notificationManager: NotificationManager, @Named("soneLocked") soneLockedNotification: ListNotification<Sone>) =
                        SoneLockedHandler(notificationManager, soneLockedNotification, newScheduledThreadPool(1))
 
+       private inline fun <reified T> bind(): AnnotatedBindingBuilder<T> = bind(T::class.java)
+       private fun ScopedBindingBuilder.asSingleton() = `in`(Singleton::class.java)
+
 }