Return nullable Post instead of Optional

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / ajax / BookmarkAjaxPage.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.kt
index fd22f06..35ac0e2 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.kt
@@ -1,6 +1,5 @@
 package net.pterodactylus.sone.web.ajax
 
-import net.pterodactylus.sone.utils.also
 import net.pterodactylus.sone.utils.emptyToNull
 import net.pterodactylus.sone.utils.parameters
 import net.pterodactylus.sone.web.WebInterface
@@ -11,13 +10,14 @@ import net.pterodactylus.sone.web.page.FreenetRequest
  */
 class BookmarkAjaxPage(webInterface: WebInterface) : JsonPage("bookmark.ajax", webInterface) {
 
-       override fun requiresLogin() = false
+       override val requiresLogin = false
 
        override fun createJsonObject(request: FreenetRequest) =
                        request.parameters["post"].emptyToNull
-                                       ?.let(webInterface.core::getPost)
-                                       ?.also(webInterface.core::bookmarkPost)
-                                       ?.let { createSuccessJsonObject() }
+                                       ?.let { postId ->
+                                               core.getPost(postId)?.also(core::bookmarkPost)
+                                               createSuccessJsonObject()
+                                       }
                                        ?: createErrorJsonObject("invalid-post-id")
 
 }