X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSearchPage.kt;fp=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSearchPage.kt;h=f296e03edb4ec013d30f6871c302738a357e003d;hp=577ea9021d73cdbfd74f253842ad2bf1cf709e1f;hb=e162d6ab265676e27b784b825a3c97d271635947;hpb=a9c9094ae93da0d112df6bb1a1d601cde4abe4ff

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 577ea90..f296e03 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt
@@ -9,6 +9,7 @@ import net.pterodactylus.sone.data.PostReply
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.utils.Pagination
 import net.pterodactylus.sone.utils.emptyToNull
+import net.pterodactylus.sone.utils.memoize
 import net.pterodactylus.sone.utils.paginate
 import net.pterodactylus.sone.utils.parameters
 import net.pterodactylus.sone.web.WebInterface
@@ -53,14 +54,15 @@ class SearchPage @JvmOverloads constructor(template: Template, webInterface: Web
 			}
 		}
 
+		val soneNameCache = { sone: Sone -> sone.names() }.memoize()
 		val sonePagination = webInterface.core.sones
-				.scoreAndPaginate(phrases) { it.allText() }
+				.scoreAndPaginate(phrases) { it.allText(soneNameCache) }
 				.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() }
+					.scoreAndPaginate(phrases) { it.allText(soneNameCache) }
 		}.apply { page = freenetRequest.parameters["postPage"].emptyToNull?.toIntOrNull() ?: 0 }
 
 		Logger.normal(SearchPage::class.java, "Finished search for “${freenetRequest.parameters["query"]}” in ${System.currentTimeMillis() - startTime}ms.")
@@ -78,17 +80,19 @@ class SearchPage @JvmOverloads constructor(template: Template, webInterface: Web
 					.paginate(webInterface.core.preferences.postsPerPage)
 
 	private fun Sone.names() =
-			listOf(name, profile.firstName, profile.middleName, profile.lastName)
-					.filterNotNull()
-					.joinToString("")
+			with(profile) {
+				listOf(name, firstName, middleName, lastName)
+						.filterNotNull()
+						.joinToString("")
+			}
 
-	private fun Sone.allText() =
-			(names() + profile.fields.map { "${it.name} ${it.value}" }.joinToString(" ", " ")).toLowerCase()
+	private fun Sone.allText(soneNameCache: (Sone) -> String) =
+			(soneNameCache(this) + profile.fields.map { "${it.name} ${it.value}" }.joinToString(" ", " ")).toLowerCase()
 
-	private fun Post.allText() =
-			(text + recipient.orNull()?.let { " ${it.names()}" } + webInterface.core.getReplies(id)
+	private fun Post.allText(soneNameCache: (Sone) -> String) =
+			(text + recipient.orNull()?.let { " ${soneNameCache(it)}" } + webInterface.core.getReplies(id)
 					.filter { PostReply.FUTURE_REPLY_FILTER.apply(it) }
-					.map { "${it.sone.names()} ${it.text}" }.joinToString(" ", " ")).toLowerCase()
+					.map { "${soneNameCache(it.sone)} ${it.text}" }.joinToString(" ", " ")).toLowerCase()
 
 	private fun score(text: String, phrases: Iterable<Phrase>): Double {
 		val requiredPhrases = phrases.count { it.required }