From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 9 Dec 2019 20:01:46 +0000 (+0100)
Subject: ✨ Add remote-post handler to notification module
X-Git-Tag: v81^2~5^2~77
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=4b2cc51efed050a19dc2c8e27a7dbb656960321a;p=Sone.git

✨ Add remote-post handler to notification module
---

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt
index 9863013..d2ae085 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt
@@ -25,5 +25,6 @@ import javax.inject.*
  */
 @Suppress("UNUSED_PARAMETER")
 class NotificationHandler @Inject constructor(
-		markPostKnownDuringFirstStartHandler: MarkPostKnownDuringFirstStartHandler
+		markPostKnownDuringFirstStartHandler: MarkPostKnownDuringFirstStartHandler,
+		newRemotePostHandler: NewRemotePostHandler
 )
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 b843cca..279944c 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt
@@ -36,6 +36,7 @@ class NotificationHandlerModule : AbstractModule() {
 	}
 
 	@Provides
+	@Singleton
 	fun getMarkPostKnownDuringFirstStartHandler(core: Core, notificationManager: NotificationManager) =
 			MarkPostKnownDuringFirstStartHandler(notificationManager, core::markPostKnown)
 
@@ -60,4 +61,15 @@ class NotificationHandlerModule : AbstractModule() {
 	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)
+
 }
diff --git a/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt
index 76926fb..a37abd8 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModuleTest.kt
@@ -23,6 +23,7 @@ import com.google.inject.name.Names.*
 import net.pterodactylus.sone.core.*
 import net.pterodactylus.sone.core.event.*
 import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.data.Post.*
 import net.pterodactylus.sone.data.impl.*
 import net.pterodactylus.sone.main.*
 import net.pterodactylus.sone.notify.*
@@ -66,6 +67,11 @@ class NotificationHandlerModuleTest {
 	}
 
 	@Test
+	fun `mark-post-known-during-first-start handler is created as singleton`() {
+		injector.verifySingletonInstance<MarkPostKnownDuringFirstStartHandler>()
+	}
+
+	@Test
 	fun `mark-post-known-during-first-start handler is created with correct action`() {
 		notificationManager.addNotification(object : AbstractNotification("first-start-notification") {
 			override fun render(writer: Writer?) = Unit
@@ -142,4 +148,43 @@ class NotificationHandlerModuleTest {
 		assertThat(injector.getInstance<ListNotification<Sone>>(named("newSone")).isDismissable, equalTo(false))
 	}
 
+	@Test
+	fun `new-remote-post handler can be created`() {
+		assertThat(injector.getInstance<NewRemotePostHandler>(), notNullValue())
+	}
+
+	@Test
+	fun `new-remote-post handler is created as singleton`() {
+		injector.verifySingletonInstance<NewRemotePostHandler>()
+	}
+
+	@Test
+	fun `new-remote-post notification can be created`() {
+		assertThat(injector.getInstance<ListNotification<Post>>(named("newRemotePost")), notNullValue())
+	}
+
+	@Test
+	fun `new-remote-post notification is created as singleton`() {
+		injector.verifySingletonInstance<ListNotification<Post>>(named("newRemotePost"))
+	}
+
+	@Test
+	fun `new-remote-post notification has correct ID`() {
+		assertThat(injector.getInstance<ListNotification<Post>>(named("newRemotePost")).id, equalTo("new-post-notification"))
+	}
+
+	@Test
+	fun `new-remote-post notification is not dismissable`() {
+		assertThat(injector.getInstance<ListNotification<Post>>(named("newRemotePost")).isDismissable, equalTo(false))
+	}
+
+	@Test
+	fun `new-remote-post notification has correct key and template`() {
+		loaders.templates += "/templates/notify/newPostNotification.html" to "<% posts>".asTemplate()
+		val notification = injector.getInstance<ListNotification<Post>>(named("newRemotePost"))
+		val posts = listOf(EmptyPost("post1"), EmptyPost("post2"))
+		posts.forEach(notification::add)
+		assertThat(notification.render(), equalTo(posts.toString()))
+	}
+
 }