From 3b926c638ec74eaf41e54463de6e85629f4e1be8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sun, 1 Dec 2019 20:13:34 +0100 Subject: [PATCH] =?utf8?q?=E2=99=BB=EF=B8=8F=20Extract=20a=20handler=20for?= =?utf8?q?=20new=20posts=20during=20first=20start?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../net/pterodactylus/sone/web/WebInterface.java | 2 - .../net/pterodactylus/sone/notify/Notifications.kt | 32 +++++++++++ .../MarkPostKnownDuringFirstStartHandler.kt | 40 ++++++++++++++ .../MarkPostKnownDuringFirstStartHandlerTest.kt | 62 ++++++++++++++++++++++ 4 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 src/main/kotlin/net/pterodactylus/sone/notify/Notifications.kt create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandler.kt create mode 100644 src/test/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandlerTest.kt diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java index 58c9d19..48f5d23 100644 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@ -704,8 +704,6 @@ public class WebInterface implements SessionProvider { mentionNotification.add(post); notificationManager.addNotification(mentionNotification); } - } else { - getCore().markPostKnown(post); } } diff --git a/src/main/kotlin/net/pterodactylus/sone/notify/Notifications.kt b/src/main/kotlin/net/pterodactylus/sone/notify/Notifications.kt new file mode 100644 index 0000000..329eedd --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/notify/Notifications.kt @@ -0,0 +1,32 @@ +/** + * Sone - Notifications.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.notify + +import net.pterodactylus.util.notify.* + +/** + * Returns whether the notification manager contains a notification with the given ID. + */ +operator fun NotificationManager.contains(id: String) = + getNotification(id) != null + +/** + * Returns whether the notification manager currently has a “first start” notification. + */ +fun NotificationManager.hasFirstStartNotification() = + "first-start-notification" in this diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandler.kt new file mode 100644 index 0000000..ddeaac5 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandler.kt @@ -0,0 +1,40 @@ +/** + * Sone - MarkPostKnownDuringFirstStartHandler.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 that marks a [new][NewPostFoundEvent] [post][Post] as known while + * the [notification manager][NotificationManager] shows a [first start notification] + * [NotificationManager.hasFirstStartNotification]. + */ +class MarkPostKnownDuringFirstStartHandler(private val notificationManager: NotificationManager, private val markPostAsKnown: (Post) -> Unit) { + + @Subscribe + fun newPostFound(newPostFoundEvent: NewPostFoundEvent) { + if (notificationManager.hasFirstStartNotification()) { + markPostAsKnown(newPostFoundEvent.post) + } + } + +} diff --git a/src/test/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandlerTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandlerTest.kt new file mode 100644 index 0000000..746eb47 --- /dev/null +++ b/src/test/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandlerTest.kt @@ -0,0 +1,62 @@ +/** + * Sone - MarkPostKnownDuringFirstStartHandlerTest.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.util.notify.* +import org.hamcrest.MatcherAssert.* +import org.hamcrest.Matchers.* +import java.io.* +import java.util.concurrent.atomic.* +import kotlin.test.* + +/** + * Unit test for [MarkPostKnownDuringFirstStartHandler]. + */ +@Suppress("UnstableApiUsage") +class MarkPostKnownDuringFirstStartHandlerTest { + + private val eventBus = EventBus() + private val notificationManager = NotificationManager() + private val markedPostAsKnown = AtomicBoolean() + private val handler = MarkPostKnownDuringFirstStartHandler(notificationManager) { if (it == post) markedPostAsKnown.set(true) } + + init { + eventBus.register(handler) + } + + @Test + fun `post is not marked as known if not during first start`() { + eventBus.post(NewPostFoundEvent(post)) + assertThat(markedPostAsKnown.get(), equalTo(false)) + } + + @Test + fun `new post is marked as known during first start`() { + notificationManager.addNotification(object : AbstractNotification("first-start-notification") { + override fun render(writer: Writer?) = Unit + }) + eventBus.post(NewPostFoundEvent(post)) + assertThat(markedPostAsKnown.get(), equalTo(true)) + } + +} + +private val post: Post = Post.EmptyPost("post") -- 2.7.4