X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreatePostAjaxPage.kt;h=ec65b5547063600a8590f73b9ce1ea13b7e3f11e;hb=01a5bc2eaa55131cb58e9b3ed84ec4fb5a818f57;hp=c9bcf48c7b9d9c89932d9c77db122f946c5a7347;hpb=cf4ccc7587da36e4a6ba6aa7c04394280b35e271;p=Sone.git

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..ec65b55 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt
@@ -12,23 +12,21 @@ import net.pterodactylus.sone.web.page.FreenetRequest
 /**
  * AJAX handler that creates a new post.
  */
-class CreatePostAjaxPage(webInterface: WebInterface) : JsonPage("createPost.ajax", webInterface) {
+class CreatePostAjaxPage(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)?.orNull() ?: currentSone
+						val recipient = request.parameters["recipient"].let(core::getSone)
+						core.createPost(sender, recipient, text).let { post ->
+							createSuccessJsonObject().apply {
+								put("postId", post.id)
+								put("sone", sender.id)
+								put("recipient", recipient.let(Sone::getId))
 							}
-						} ?: createErrorJsonObject("text-required")
-			} ?: createErrorJsonObject("auth-required")
+						}
+					} ?: createErrorJsonObject("text-required")
 
 }