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=01d1d2274e818474e33e38d47bcf5d1a9c26bf7a;hp=746d093b180326086321bcf9a980deddb49ecc7f;hb=07d3fa7dac96e8a5eff41487d647974df8c26f8d;hpb=110a933c2724aba6a604fc5eed6372ff1e1e6144

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 746d093..01d1d22 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
@@ -1,21 +1,21 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.data.*
 import net.pterodactylus.sone.main.*
-import net.pterodactylus.sone.utils.paginate
-import net.pterodactylus.sone.utils.parameters
-import net.pterodactylus.sone.web.WebInterface
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
 import net.pterodactylus.sone.web.page.*
-import net.pterodactylus.util.template.TemplateContext
-import javax.inject.Inject
+import net.pterodactylus.util.template.*
+import javax.inject.*
 
 /**
  * This page shows all known Sones.
  */
 @MenuName("KnownSones")
 @TemplatePath("/templates/knownSones.html")
-class KnownSonesPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
-		SoneTemplatePage("knownSones.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.KnownSones.Title") {
+@ToadletPath("knownSones.html")
+class KnownSonesPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.KnownSones.Title") {
 
 	override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
 		getCurrentSone(soneRequest.toadletContext).let { currentSone ->
@@ -28,10 +28,10 @@ class KnownSonesPage @Inject constructor(webInterface: WebInterface, loaders: Lo
 					.filterNot { soneRequest.parameters["filter"] == "not-own" && it.isLocal }
 					.sortedWith(
 							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
+								"images" -> imageCountComparator
+								"name" -> niceNameComparator.reversed()
+								"posts" -> postCountComparator
+								else -> lastActivityComparator
 							}.let { comparator ->
 								when (soneRequest.parameters["order"]) {
 									"asc" -> comparator.reversed()