X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSearchPage.kt;h=aff6aaf8bc0ed09c0686e8c7afd00ae755dd4f47;hp=321146a5e58cc214d403582d208a771af96d5441;hb=3cb0e2c78bb37f2d70ecde92ad4fcf642de788a3;hpb=cec099ef08feaff5332b81885ad989dbcb0fdfba diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt index 321146a..aff6aaf 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt @@ -30,9 +30,9 @@ class SearchPage @JvmOverloads constructor(template: Template, webInterface: Web private val cache: Cache, Pagination> = CacheBuilder.newBuilder().ticker(ticker).expireAfterAccess(5, MINUTES).build() - override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) { + override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) { val phrases = try { - request.parameters["query"].emptyToNull?.parse() + freenetRequest.parameters["query"].emptyToNull?.parse() } catch (te: TextException) { redirect("index.html") } @@ -53,13 +53,13 @@ class SearchPage @JvmOverloads constructor(template: Template, webInterface: Web val sonePagination = webInterface.core.sones .scoreAndPaginate(phrases) { it.allText() } - .apply { page = request.parameters["sonePage"].emptyToNull?.toIntOrNull() ?: 0 } + .apply { page = freenetRequest.parameters["sonePage"].emptyToNull?.toIntOrNull() ?: 0 } val postPagination = cache.get(phrases) { webInterface.core.sones .flatMap(Sone::getPosts) .filter { Post.FUTURE_POSTS_FILTER.apply(it) } .scoreAndPaginate(phrases) { it.allText() } - }.apply { page = request.parameters["postPage"].emptyToNull?.toIntOrNull() ?: 0 } + }.apply { page = freenetRequest.parameters["postPage"].emptyToNull?.toIntOrNull() ?: 0 } templateContext["sonePagination"] = sonePagination templateContext["soneHits"] = sonePagination.items