X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FNewPage.kt;h=8b4218d2459105b8646377d622f3f2305aaafd92;hp=2f9f1bb4ca26c8fec06d1edc6c59779c3e500b1e;hb=cd72add62ab407336b471d4b7cda8e33dd2df5c6;hpb=acf40290db822d7cbdaed590850f692953f51ac1

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt
index 2f9f1bb..8b4218d 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt
@@ -4,7 +4,7 @@ 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.sone.web.page.*
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
 import javax.inject.Inject
@@ -16,14 +16,14 @@ import javax.inject.Inject
 class NewPage @Inject constructor(  template: Template, webInterface: WebInterface):
 		SoneTemplatePage("new.html", webInterface, template, "Page.New.Title") {
 
-	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) =
-			getCurrentSone(freenetRequest.toadletContext).let { currentSone ->
-				(webInterface.getNewPosts(currentSone) + webInterface.getNewReplies(currentSone).mapPresent { it.post })
+	override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) =
+			getCurrentSone(soneRequest.toadletContext).let { currentSone ->
+				(soneRequest.webInterface.getNewPosts(currentSone) + soneRequest.webInterface.getNewReplies(currentSone).mapPresent { it.post })
 						.distinct()
 						.sortedByDescending { it.time }
 						.let { posts ->
-							posts.paginate(webInterface.core.preferences.postsPerPage)
-									.turnTo(freenetRequest.parameters["page"]?.toIntOrNull() ?: 0)
+							posts.paginate(soneRequest.core.preferences.postsPerPage)
+									.turnTo(soneRequest.parameters["page"]?.toIntOrNull() ?: 0)
 									.let { pagination ->
 										templateContext["pagination"] = pagination
 										templateContext["posts"] = pagination.items