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

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..0257cb1 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,11 @@
 package net.pterodactylus.sone.web.pages
 
+import net.pterodactylus.sone.data.Sone
 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
 
@@ -13,28 +14,25 @@ import net.pterodactylus.util.template.TemplateContext
  * of all friends of the current user.
  */
 class IndexPage(template: Template, webInterface: WebInterface, private val postVisibilityFilter: PostVisibilityFilter):
-		SoneTemplatePage("index.html", template, "Page.Index.Title", webInterface, true) {
+		LoggedInPage("index.html", template, "Page.Index.Title", webInterface) {
 
-	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-		getCurrentSone(request.toadletContext)!!.let { currentSone ->
+	override fun handleRequest(freenetRequest: FreenetRequest, currentSone: Sone, templateContext: TemplateContext) {
 			(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
 						}
 					}
-		}
 	}
 
 }