X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSearchPage.kt;h=69b7c8528e29dd277aaffdb207827484f35e2469;hb=e85adea97e44a7088a400dc28a8ffec46bc176d9;hp=5f402387ecd9bf19d0d842b8770a119f943932e6;hpb=8e313509a42a8c638fcac018dd73dd975bf9cb68;p=Sone.git

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 5f40238..69b7c85 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt
@@ -43,8 +43,8 @@ class SearchPage @JvmOverloads constructor(template: Template, webInterface: Web
 			1 -> phrases.first().phrase.also { word ->
 				when {
 					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("post://").let(webInterface.core::getPost) != null -> redirect("viewPost.html?post=${word.removePrefix("post://")}")
+					word.removePrefix("reply://").let(webInterface.core::getPostReply) != null -> redirect("viewPost.html?post=${word.removePrefix("reply://").let(webInterface.core::getPostReply)?.postId}")
 					word.removePrefix("album://").let(webInterface.core::getAlbum) != null -> redirect("imageBrowser.html?album=${word.removePrefix("album://")}")
 					word.removePrefix("image://").let { webInterface.core.getImage(it, false) } != null -> redirect("imageBrowser.html?image=${word.removePrefix("image://")}")
 				}
@@ -106,15 +106,12 @@ class SearchPage @JvmOverloads constructor(template: Template, webInterface: Web
 		return requiredHits * 3 + optionalHits + (requiredHits - requiredPhrases) * 5 - (forbiddenHits * 2)
 	}
 
-	private fun String.findAll(needle: String): List<Int> {
-		var nextIndex = indexOf(needle)
-		val positions = mutableListOf<Int>()
-		while (nextIndex != -1) {
-			positions += nextIndex
-			nextIndex = indexOf(needle, nextIndex + 1)
-		}
-		return positions
-	}
+	private fun String.findAll(needle: String) =
+			generateSequence(indexOf(needle).takeIf { it > -1 }) { lastPosition ->
+				lastPosition
+						.let { indexOf(needle, it + 1) }
+						.takeIf { it > -1 }
+			}.toList()
 
 	private fun String.parse() =
 			StringEscaper.parseLine(this)