🐛 Fix NPE when post isn’t loaded

diff --git a/src/main/kotlin/net/pterodactylus/sone/text/SoneMentionDetector.kt b/src/main/kotlin/net/pterodactylus/sone/text/SoneMentionDetector.kt
index e816c8e..b688e86 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/text/SoneMentionDetector.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/text/SoneMentionDetector.kt
@@ -50,7 +50,8 @@ class SoneMentionDetector @Inject constructor(private val eventBus: EventBus, pr
                                if (postReply.text.hasLinksToLocalSones()) {
                                        postReply.post
                                                        .also { mentionedPosts += it }
                                if (postReply.text.hasLinksToLocalSones()) {
                                        postReply.post
                                                        .also { mentionedPosts += it }

-                                                       .let(::MentionOfLocalSoneFoundEvent).also(eventBus::post)
+                                                       .let(::MentionOfLocalSoneFoundEvent)
+                                                       ?.also(eventBus::post)

                                }
                        }
                }
                                }
                        }
                }

diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt b/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
index 0bb8bc9..39756f6 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
@@ -46,11 +46,11 @@ fun createPost(text: String = "", sone: Sone = remoteSone1, known: Boolean = fal
        }
 }
 
        }
 }
 

-fun emptyPostReply(text: String = "", post: Post = createPost(), sone: Sone = remoteSone1, known: Boolean = false) = object : PostReply {
+fun emptyPostReply(text: String = "", post: Post? = createPost(), sone: Sone = remoteSone1, known: Boolean = false) = object : PostReply {

        override val id = "reply-id"
        override fun getSone() = sone
        override val id = "reply-id"
        override fun getSone() = sone

-       override fun getPostId() = post.id
-       override fun getPost(): Optional<Post> = Optional.of(post)
+       override fun getPostId() = post!!.id
+       override fun getPost(): Optional<Post> = Optional.fromNullable(post)

        override fun getTime() = 1L
        override fun getText() = text
        override fun isKnown() = known
        override fun getTime() = 1L
        override fun getText() = text
        override fun isKnown() = known

diff --git a/src/test/kotlin/net/pterodactylus/sone/text/SoneMentionDetectorTest.kt b/src/test/kotlin/net/pterodactylus/sone/text/SoneMentionDetectorTest.kt
index 6ae437b..7208230 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/text/SoneMentionDetectorTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/text/SoneMentionDetectorTest.kt
@@ -32,7 +32,8 @@ import kotlin.test.*
 @Suppress("UnstableApiUsage")
 class SoneMentionDetectorTest {
 
 @Suppress("UnstableApiUsage")
 class SoneMentionDetectorTest {
 

-       private val eventBus = EventBus()
+       private val caughtExceptions = mutableListOf<Throwable>()
+       private val eventBus = EventBus { exception, _ -> caughtExceptions += exception }

        private val soneProvider = TestSoneProvider()
        private val postProvider = TestPostProvider()
        private val soneTextParser = SoneTextParser(soneProvider, postProvider)
        private val soneProvider = TestSoneProvider()
        private val postProvider = TestPostProvider()
        private val soneTextParser = SoneTextParser(soneProvider, postProvider)


@@ -143,6 +144,14 @@ class SoneMentionDetectorTest {
        }
 
        @Test
        }
 
        @Test

+       fun `detector does not emit event for reply without post`() {
+               val reply = emptyPostReply("text mentions sone://${localSone1.id} and sone://${localSone2.id}.", post = null)
+               eventBus.post(NewPostReplyFoundEvent(reply))
+               assertThat(caughtExceptions, emptyIterable())
+               assertThat(capturedFoundEvents, emptyIterable())
+       }
+
+       @Test

        fun `detector does not emit removed event when a post without mention is removed`() {
                val post = createPost()
                eventBus.post(PostRemovedEvent(post))
        fun `detector does not emit removed event when a post without mention is removed`() {
                val post = createPost()
                eventBus.post(PostRemovedEvent(post))