X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FKnownSonesPage.kt;fp=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FKnownSonesPage.kt;h=ae0d7d1082a805eb47cec06e24b8f40bdcdae96c;hp=9d6930d84d81e4ded76fda3bb305713c2124d7c1;hb=03cec6a6772c2d836d94864adddaf544cbe9d72f;hpb=6f1f26e3998cfef155b0cf59152827accea70d30

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 9d6930d..ae0d7d1 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,52 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.data.Sone
-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.template.Template
-import net.pterodactylus.util.template.TemplateContext
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.main.*
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.sone.web.page.*
+import net.pterodactylus.util.template.*
+import javax.inject.*
 
 /**
  * This page shows all known Sones.
  */
-class KnownSonesPage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("knownSones.html", template, "Page.KnownSones.Title", webInterface, false) {
+@MenuName("KnownSones")
+@TemplatePath("/templates/knownSones.html")
+@ToadletPath("knownSones.html")
+class KnownSonesPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.KnownSones.Title") {
 
-	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
-		getCurrentSone(freenetRequest.toadletContext).let { currentSone ->
-			Pagination(webInterface.core.sones
-					.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 }
+	override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
+		getCurrentSone(soneRequest.toadletContext).let { currentSone ->
+			soneRequest.core.sones.asSequence()
+					.filterNot { soneRequest.parameters["filter"] == "followed" && currentSone != null && !currentSone.hasFriend(it.id) }
+					.filterNot { soneRequest.parameters["filter"] == "not-followed" && currentSone != null && currentSone.hasFriend(it.id) }
+					.filterNot { soneRequest.parameters["filter"] == "new" && it.isKnown }
+					.filterNot { soneRequest.parameters["filter"] == "not-new" && !it.isKnown }
+					.filterNot { soneRequest.parameters["filter"] == "own" && !it.isLocal }
+					.filterNot { soneRequest.parameters["filter"] == "not-own" && it.isLocal }
 					.sortedWith(
-							when (freenetRequest.parameters["sort"]) {
+							when (soneRequest.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 (freenetRequest.parameters["order"]) {
+								when (soneRequest.parameters["order"]) {
 									"asc" -> comparator.reversed()
 									else -> comparator
 								}
 							}
-					), 25).apply { page = freenetRequest.parameters["page"]?.toIntOrNull() ?: 0 }
+					).paginate(25)
+					.turnTo(soneRequest.parameters["page"]?.toIntOrNull() ?: 0)
 					.let { pagination ->
 						templateContext["pagination"] = pagination
 						templateContext["knownSones"] = pagination.items
 					}
-			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"]
+			templateContext["sort"] = soneRequest.parameters["sort"].let { sort -> if (sort in listOf("images", "name", "posts")) sort else "activity" }
+			templateContext["order"] = soneRequest.parameters["order"].let { order -> if (order == "asc") "asc" else "desc" }
+			templateContext["filter"] = soneRequest.parameters["filter"]
 		}
 	}