X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FViewSonePage.kt;h=e2de3e4edbb8fb1bbe7ce8351af957e9a982c268;hp=2e175afdf5567454895a126a7147fd49ea9be614;hb=110a933c2724aba6a604fc5eed6372ff1e1e6144;hpb=8e313509a42a8c638fcac018dd73dd975bf9cb68

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt
index 2e175af..e2de3e4 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt
@@ -2,32 +2,34 @@ package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.PostReply
+import net.pterodactylus.sone.main.*
 import net.pterodactylus.sone.template.SoneAccessor
 import net.pterodactylus.sone.utils.mapPresent
 import net.pterodactylus.sone.utils.paginate
 import net.pterodactylus.sone.utils.parameters
 import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
-import net.pterodactylus.util.template.Template
+import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.template.TemplateContext
 import java.net.URI
+import javax.inject.Inject
 
 /**
  * Lets the user browser another Sone.
  */
-class ViewSonePage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("viewSone.html", template, webInterface, false) {
+@TemplatePath("/templates/viewSone.html")
+class ViewSonePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+		SoneTemplatePage("viewSone.html", webInterface, loaders, templateRenderer) {
 
-	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
-		templateContext["soneId"] = freenetRequest.parameters["sone"]
-		freenetRequest.parameters["sone"]!!.let(webInterface.core::getSone)?.let { sone ->
+	override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
+		templateContext["soneId"] = soneRequest.parameters["sone"]
+		soneRequest.parameters["sone"]!!.let(soneRequest.core::getSone)?.let { sone ->
 			templateContext["sone"] = sone
 			val sonePosts = sone.posts
-			val directedPosts = webInterface.core.getDirectedPosts(sone.id)
+			val directedPosts = soneRequest.core.getDirectedPosts(sone.id)
 			(sonePosts + directedPosts)
 					.sortedByDescending(Post::getTime)
-					.paginate(webInterface.core.preferences.postsPerPage)
-					.apply { page = freenetRequest.parameters["postPage"]?.toIntOrNull() ?: 0 }
+					.paginate(soneRequest.core.preferences.postsPerPage)
+					.apply { page = soneRequest.parameters["postPage"]?.toIntOrNull() ?: 0 }
 					.also {
 						templateContext["postPagination"] = it
 						templateContext["posts"] = it.items
@@ -37,9 +39,9 @@ class ViewSonePage(template: Template, webInterface: WebInterface):
 					.distinct()
 					.minus(sonePosts)
 					.minus(directedPosts)
-					.sortedByDescending { webInterface.core.getReplies(it.id).first().time }
-					.paginate(webInterface.core.preferences.postsPerPage)
-					.apply { page = freenetRequest.parameters["repliedPostPage"]?.toIntOrNull() ?: 0 }
+					.sortedByDescending { soneRequest.core.getReplies(it.id).first().time }
+					.paginate(soneRequest.core.preferences.postsPerPage)
+					.apply { page = soneRequest.parameters["repliedPostPage"]?.toIntOrNull() ?: 0 }
 					.also {
 						templateContext["repliedPostPagination"] = it
 						templateContext["repliedPosts"] = it.items
@@ -47,11 +49,11 @@ class ViewSonePage(template: Template, webInterface: WebInterface):
 		}
 	}
 
-	override fun isLinkExcepted(link: URI?) = true
+	override fun isLinkExcepted(link: URI) = true
 
-	public override fun getPageTitle(freenetRequest: FreenetRequest): String =
-			freenetRequest.parameters["sone"]!!.let(webInterface.core::getSone)?.let { sone ->
-				"${SoneAccessor.getNiceName(sone)} - ${webInterface.l10n.getString("Page.ViewSone.Title")}"
-			} ?: webInterface.l10n.getString("Page.ViewSone.Page.TitleWithoutSone")
+	override fun getPageTitle(soneRequest: SoneRequest): String =
+			soneRequest.parameters["sone"]!!.let(soneRequest.core::getSone)?.let { sone ->
+				"${SoneAccessor.getNiceName(sone)} - ${soneRequest.l10n.getString("Page.ViewSone.Title")}"
+			} ?: soneRequest.l10n.getString("Page.ViewSone.Page.TitleWithoutSone")
 
 }