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=c774cebb30c69a3f98208873bc4c6022e52cbe23;hp=d1841d495e3e7147f08cd55925f50a68755fc283;hb=d63b7445567b65ffdbd50fa8f7ffbfea1304dff9;hpb=65e3c95fe9d44b5654b2ac76fc09b9aaac50ca9c 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 d1841d4..c774ceb 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt @@ -13,16 +13,16 @@ import net.pterodactylus.util.template.TemplateContext * [PostVisibilityFilter.isPostVisible(Sone, Post)] and sorted by time. */ class NewPage(template: Template, webInterface: WebInterface): - SoneTemplatePage("new.html", template, "Page.New.Title", webInterface, false) { + SoneTemplatePage("new.html", webInterface, template, "Page.New.Title") { - override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) = - getCurrentSone(request.toadletContext).let { currentSone -> + override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) = + getCurrentSone(freenetRequest.toadletContext).let { currentSone -> (webInterface.getNewPosts(currentSone) + webInterface.getNewReplies(currentSone).mapPresent { it.post }) .distinct() .sortedByDescending { it.time } .let { posts -> Pagination(posts, webInterface.core.preferences.postsPerPage).apply { - page = request.parameters["page"]?.toIntOrNull() ?: 0 + page = freenetRequest.parameters["page"]?.toIntOrNull() ?: 0 }.let { pagination -> templateContext["pagination"] = pagination templateContext["posts"] = pagination.items