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=5f402387ecd9bf19d0d842b8770a119f943932e6;hp=321146a5e58cc214d403582d208a771af96d5441;hb=8e313509a42a8c638fcac018dd73dd975bf9cb68;hpb=e7319b53b914961d59b8fce999da75adfab54009

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..5f40238 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<Iterable<Phrase>, Pagination<Post>> = 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")
 		}
@@ -42,7 +42,7 @@ class SearchPage @JvmOverloads constructor(template: Template, webInterface: Web
 			0 -> redirect("index.html")
 			1 -> phrases.first().phrase.also { word ->
 				when {
-					word.removePrefix("sone://").let(webInterface.core::getSone).isPresent -> redirect("viewSone.html?sone=${word.removePrefix("sone://")}")
+					word.removePrefix("sone://").let(webInterface.core::getSone) != null -> redirect("viewSone.html?sone=${word.removePrefix("sone://")}")
 					word.removePrefix("post://").let(webInterface.core::getPost).isPresent -> redirect("viewPost.html?post=${word.removePrefix("post://")}")
 					word.removePrefix("reply://").let(webInterface.core::getPostReply).isPresent -> redirect("viewPost.html?post=${word.removePrefix("reply://").let(webInterface.core::getPostReply).get().postId}")
 					word.removePrefix("album://").let(webInterface.core::getAlbum) != null -> redirect("imageBrowser.html?album=${word.removePrefix("album://")}")
@@ -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