X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FIndexPage.kt;h=e5685efd0b77f727195f2be650a6e96be284bb51;hp=7753b4054c72af08e889f900bf91a3f414cb540a;hb=8e313509a42a8c638fcac018dd73dd975bf9cb68;hpb=cc13ef909d3b9e265918e396466c320ce63235ae

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt
index 7753b40..e5685ef 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt
@@ -1,10 +1,10 @@
 package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.notify.PostVisibilityFilter
+import net.pterodactylus.sone.utils.Pagination
 import net.pterodactylus.sone.utils.parameters
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
-import net.pterodactylus.util.collection.Pagination
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
 
@@ -15,21 +15,20 @@ import net.pterodactylus.util.template.TemplateContext
 class IndexPage(template: Template, webInterface: WebInterface, private val postVisibilityFilter: PostVisibilityFilter):
 		SoneTemplatePage("index.html", template, "Page.Index.Title", webInterface, true) {
 
-	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-		getCurrentSone(request.toadletContext)!!.let { currentSone ->
+	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+		getCurrentSone(freenetRequest.toadletContext)!!.let { currentSone ->
 			(currentSone.posts +
 					currentSone.friends
-							.map { webInterface.core.getSone(it) }
-							.filter { it.isPresent }
-							.map { it.get() }
+							.mapNotNull(webInterface.core::getSone)
 							.flatMap { it.posts } +
 					webInterface.core.getDirectedPosts(currentSone.id)
 					).distinct()
 					.filter { postVisibilityFilter.isVisible(currentSone).apply(it) }
 					.sortedByDescending { it.time }
 					.let { posts ->
-						Pagination(posts, webInterface.core.preferences.postsPerPage)
-								.setPage(request.parameters["page"]?.toIntOrNull() ?: 0).let { pagination ->
+						Pagination(posts, webInterface.core.preferences.postsPerPage).apply {
+							page = freenetRequest.parameters["page"]?.toIntOrNull() ?: 0
+						}.let { pagination ->
 							templateContext["pagination"] = pagination
 							templateContext["posts"] = pagination.items
 						}