Change a couple of method argument names

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / pages / KnownSonesPage.kt

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..9d6930d 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
@@ -14,35 +14,35 @@ import net.pterodactylus.util.template.TemplateContext
 class KnownSonesPage(template: Template, webInterface: WebInterface):
                SoneTemplatePage("knownSones.html", template, "Page.KnownSones.Title", webInterface, false) {
 
-       override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-               getCurrentSone(request.toadletContext).let { currentSone ->
+       override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+               getCurrentSone(freenetRequest.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 }
+                                       .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 }
+                                       ), 25).apply { page = 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"]
                }
        }