From 0dc7811a459455dd2b670eb1924df27f65c36a24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sun, 1 Dec 2019 21:01:38 +0100 Subject: [PATCH] =?utf8?q?=E2=99=BB=EF=B8=8F=20Extract=20handler=20for=20n?= =?utf8?q?ew=20remote=20posts?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../net/pterodactylus/sone/web/WebInterface.java | 6 +- .../sone/web/notification/NewRemotePostHandler.kt | 40 +++++++++++++ .../web/notification/NewRemotePostHandlerTest.kt | 69 ++++++++++++++++++++++ 3 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt create mode 100644 src/test/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandlerTest.kt diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java index 48f5d23..4ed49df 100644 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@ -695,11 +695,11 @@ public class WebInterface implements SessionProvider { boolean isLocal = post.getSone().isLocal(); if (isLocal) { localPostNotification.add(post); - } else { - newPostNotification.add(post); } if (!hasFirstStartNotification()) { - notificationManager.addNotification(isLocal ? localPostNotification : newPostNotification); + if (isLocal) { + notificationManager.addNotification(localPostNotification); + } if (!getMentionedSones(post.getText()).isEmpty() && !isLocal) { mentionNotification.add(post); notificationManager.addNotification(mentionNotification); diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt new file mode 100644 index 0000000..acf9980 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt @@ -0,0 +1,40 @@ +/** + * Sone - NewRemotePostHandler.kt - Copyright © 2019 David ‘Bombe’ Roden + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.sone.web.notification + +import com.google.common.eventbus.* +import net.pterodactylus.sone.core.event.* +import net.pterodactylus.sone.data.* +import net.pterodactylus.sone.notify.* +import net.pterodactylus.util.notify.* + +/** + * Handler for [NewPostFoundEvent]s that adds the new post to the “new posts” notification and + * displays the notification if the “first start” notification is not being shown. + */ +class NewRemotePostHandler(private val notificationManager: NotificationManager, private val notification: ListNotification) { + + @Subscribe + fun newPostFound(newPostFoundEvent: NewPostFoundEvent) { + notification.add(newPostFoundEvent.post) + if (!notificationManager.hasFirstStartNotification()) { + notificationManager.addNotification(notification) + } + } + +} diff --git a/src/test/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandlerTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandlerTest.kt new file mode 100644 index 0000000..a86bbf1 --- /dev/null +++ b/src/test/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandlerTest.kt @@ -0,0 +1,69 @@ +/** + * Sone - NewRemotePostHandlerTest.kt - Copyright © 2019 David ‘Bombe’ Roden + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.sone.web.notification + +import com.google.common.eventbus.* +import net.pterodactylus.sone.core.event.* +import net.pterodactylus.sone.data.* +import net.pterodactylus.sone.notify.* +import net.pterodactylus.util.notify.* +import net.pterodactylus.util.template.* +import org.hamcrest.MatcherAssert.* +import org.hamcrest.Matchers.* +import java.io.* +import kotlin.test.* + +/** + * Unit test for [NewRemotePostHandler]. + */ +@Suppress("UnstableApiUsage") +class NewRemotePostHandlerTest { + + private val eventBus = EventBus() + private val notificationManager = NotificationManager() + private val notification = ListNotification("", "", Template()) + private val handler = NewRemotePostHandler(notificationManager, notification) + + init { + eventBus.register(handler) + } + + @Test + fun `handler adds post to new-post notification`() { + eventBus.post(NewPostFoundEvent(post)) + assertThat(notification.elements, contains(post)) + } + + @Test + fun `handler adds notification to notification manager`() { + eventBus.post(NewPostFoundEvent(post)) + assertThat(notificationManager.notifications, contains(notification)) + } + + @Test + fun `handler does not add notification to notification manager during first start`() { + notificationManager.addNotification(object : AbstractNotification("first-start-notification") { + override fun render(writer: Writer?) = Unit + }) + eventBus.post(NewPostFoundEvent(post)) + assertThat(notificationManager.notifications, not(hasItem(notification))) + } + +} + +private val post: Post = Post.EmptyPost("post") -- 2.7.4