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=5218ce892014df81bca0ed2c5e4011f67000c54a;hp=c774cebb30c69a3f98208873bc4c6022e52cbe23;hb=d4d31bed957e29d50bd313ab973a034eba5a07f3;hpb=d63b7445567b65ffdbd50fa8f7ffbfea1304dff9 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 c774ceb..5218ce8 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt @@ -1,7 +1,7 @@ package net.pterodactylus.sone.web.pages -import net.pterodactylus.sone.utils.Pagination 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 @@ -21,12 +21,12 @@ class NewPage(template: Template, webInterface: WebInterface): .distinct() .sortedByDescending { it.time } .let { posts -> - Pagination(posts, webInterface.core.preferences.postsPerPage).apply { - page = freenetRequest.parameters["page"]?.toIntOrNull() ?: 0 - }.let { pagination -> - templateContext["pagination"] = pagination - templateContext["posts"] = pagination.items - } + posts.paginate(webInterface.core.preferences.postsPerPage) + .turnTo(freenetRequest.parameters["page"]?.toIntOrNull() ?: 0) + .let { pagination -> + templateContext["pagination"] = pagination + templateContext["posts"] = pagination.items + } } }