🎨 Remove template context factory from web interface API

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

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.kt
index eb8d8a0..d5595d2 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.kt
@@ -3,24 +3,26 @@ package net.pterodactylus.sone.web.ajax
 import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.utils.jsonObject
-import net.pterodactylus.sone.utils.let
 import net.pterodactylus.sone.utils.parameters
 import net.pterodactylus.sone.utils.render
 import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
+import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.template.Template
+import net.pterodactylus.util.template.TemplateContextFactory
+import javax.inject.Inject
 
 /**
  * This AJAX handler retrieves information and rendered representation of a [Post].
  */
-class GetPostAjaxPage(webInterface: WebInterface, private val postTemplate: Template) : LoggedInJsonPage("getPost.ajax", webInterface) {
+@ToadletPath("getPost.ajax")
+class GetPostAjaxPage @Inject constructor(webInterface: WebInterface, private val templateContextFactory: TemplateContextFactory, private val postTemplate: Template) : LoggedInJsonPage(webInterface) {
 
-       override fun needsFormPassword() = false
+       override val needsFormPassword = false
 
        override fun createJsonObject(currentSone: Sone, request: FreenetRequest) =
                        request.parameters["post"]
-                                       .let(webInterface.core::getPost)
-                                       .let { post ->
+                                       ?.let(core::getPost)
+                                       ?.let { post ->
                                                createSuccessJsonObject().
                                                                put("post", jsonObject(
                                                                                "id" to post.id,
@@ -32,12 +34,12 @@ class GetPostAjaxPage(webInterface: WebInterface, private val postTemplate: Temp
                                        } ?: createErrorJsonObject("invalid-post-id")
 
        private fun Post.render(currentSone: Sone, request: FreenetRequest) =
-                       webInterface.templateContextFactory.createTemplateContext().apply {
-                               set("core", webInterface.core)
+                       templateContextFactory.createTemplateContext().apply {
+                               set("core", core)
                                set("request", request)
                                set("post", this@render)
                                set("currentSone", currentSone)
-                               set("localSones", webInterface.core.localSones)
+                               set("localSones", core.localSones)
                        }.let { postTemplate.render(it) }
 
 }