X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FKnownSonesPage.kt;h=92a856aca2043d40fe14ca4152bfb07a54f86b1b;hp=53941fc70e6fedc4567c39e6d1f96786fa2e2518;hb=1557106d0e373f7efc15faed65f69eb567613a45;hpb=b50431949441894198b9f310cd07f2bdcf7231de

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
index 53941fc..92a856a 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
@@ -1,48 +1,50 @@
 package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.utils.Pagination
+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.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
+import javax.inject.Inject
 
 /**
  * This page shows all known Sones.
  */
-class KnownSonesPage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("knownSones.html", template, "Page.KnownSones.Title", webInterface, false) {
+class KnownSonesPage @Inject constructor(template: Template, webInterface: WebInterface):
+		SoneTemplatePage("knownSones.html", webInterface, template, "Page.KnownSones.Title") {
 
-	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-		getCurrentSone(request.toadletContext).let { currentSone ->
-			Pagination(webInterface.core.sones
-					.filterNot { request.parameters["filter"] == "followed" && currentSone != null && !currentSone.hasFriend(it.id) }
-					.filterNot { request.parameters["filter"] == "not-followed" && currentSone != null && currentSone.hasFriend(it.id) }
-					.filterNot { request.parameters["filter"] == "new" && it.isKnown }
-					.filterNot { request.parameters["filter"] == "not-new" && !it.isKnown }
-					.filterNot { request.parameters["filter"] == "own" && !it.isLocal }
-					.filterNot { request.parameters["filter"] == "not-own" && it.isLocal }
+	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+		getCurrentSone(freenetRequest.toadletContext).let { currentSone ->
+			webInterface.core.sones.asSequence()
+					.filterNot { freenetRequest.parameters["filter"] == "followed" && currentSone != null && !currentSone.hasFriend(it.id) }
+					.filterNot { freenetRequest.parameters["filter"] == "not-followed" && currentSone != null && currentSone.hasFriend(it.id) }
+					.filterNot { freenetRequest.parameters["filter"] == "new" && it.isKnown }
+					.filterNot { freenetRequest.parameters["filter"] == "not-new" && !it.isKnown }
+					.filterNot { freenetRequest.parameters["filter"] == "own" && !it.isLocal }
+					.filterNot { freenetRequest.parameters["filter"] == "not-own" && it.isLocal }
 					.sortedWith(
-							when (request.parameters["sort"]) {
+							when (freenetRequest.parameters["sort"]) {
 								"images" -> Sone.IMAGE_COUNT_COMPARATOR
 								"name" -> Sone.NICE_NAME_COMPARATOR.reversed()
 								"posts" -> Sone.POST_COUNT_COMPARATOR
 								else -> Sone.LAST_ACTIVITY_COMPARATOR
 							}.let { comparator ->
-								when (request.parameters["order"]) {
+								when (freenetRequest.parameters["order"]) {
 									"asc" -> comparator.reversed()
 									else -> comparator
 								}
 							}
-					), 25).apply { page = request.parameters["page"]?.toIntOrNull() ?: 0 }
+					).paginate(25)
+					.turnTo(freenetRequest.parameters["page"]?.toIntOrNull() ?: 0)
 					.let { pagination ->
 						templateContext["pagination"] = pagination
 						templateContext["knownSones"] = pagination.items
 					}
-			templateContext["sort"] = request.parameters["sort"].let { sort -> if (sort in listOf("images", "name", "posts")) sort else "activity" }
-			templateContext["order"] = request.parameters["order"].let { order -> if (order == "asc") "asc" else "desc" }
-			templateContext["filter"] = request.parameters["filter"]
+			templateContext["sort"] = freenetRequest.parameters["sort"].let { sort -> if (sort in listOf("images", "name", "posts")) sort else "activity" }
+			templateContext["order"] = freenetRequest.parameters["order"].let { order -> if (order == "asc") "asc" else "desc" }
+			templateContext["filter"] = freenetRequest.parameters["filter"]
 		}
 	}