Add test for DI constructability of CreatePostAjaxPage

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

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt
index c9bcf48..47535c0 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt
@@ -2,33 +2,33 @@ package net.pterodactylus.sone.web.ajax
 
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.text.TextFilter
+import net.pterodactylus.sone.utils.asOptional
 import net.pterodactylus.sone.utils.emptyToNull
 import net.pterodactylus.sone.utils.headers
 import net.pterodactylus.sone.utils.let
 import net.pterodactylus.sone.utils.parameters
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
+import javax.inject.Inject
 
 /**
  * AJAX handler that creates a new post.
  */
-class CreatePostAjaxPage(webInterface: WebInterface) : JsonPage("createPost.ajax", webInterface) {
+class CreatePostAjaxPage @Inject constructor(webInterface: WebInterface) : LoggedInJsonPage("createPost.ajax", webInterface) {
 
-       override fun createJsonObject(request: FreenetRequest) =
-                       getCurrentSone(request.toadletContext)?.let { sone ->
-                               request.parameters["text"].emptyToNull
-                                               ?.let { TextFilter.filter(request.headers["Host"], it) }
-                                               ?.let { text ->
-                                                       val sender = request.parameters["sender"].emptyToNull?.let(webInterface.core::getSone)?.orNull() ?: sone
-                                                       val recipient = request.parameters["recipient"].let(webInterface.core::getSone)
-                                                       webInterface.core.createPost(sender, recipient, text).let { post ->
-                                                               createSuccessJsonObject().apply {
-                                                                       put("postId", post.id)
-                                                                       put("sone", sender.id)
-                                                                       put("recipient", recipient.let(Sone::getId))
-                                                               }
+       override fun createJsonObject(currentSone: Sone, request: FreenetRequest) =
+                       request.parameters["text"].emptyToNull
+                                       ?.let { TextFilter.filter(request.headers["Host"], it) }
+                                       ?.let { text ->
+                                               val sender = request.parameters["sender"].emptyToNull?.let(core::getSone) ?: currentSone
+                                               val recipient = request.parameters["recipient"]?.let(core::getSone)
+                                               core.createPost(sender, recipient.asOptional(), text).let { post ->
+                                                       createSuccessJsonObject().apply {
+                                                               put("postId", post.id)
+                                                               put("sone", sender.id)
+                                                               put("recipient", recipient?.id)
                                                        }
-                                               } ?: createErrorJsonObject("text-required")
-                       } ?: createErrorJsonObject("auth-required")
+                                               }
+                                       } ?: createErrorJsonObject("text-required")
 
 }