From: Lanius Trolling <lanius@laniustrolling.dev>
Date: Thu, 2 Mar 2023 16:07:53 +0000 (-0500)
Subject: Lambda parameter renaming
X-Git-Url: https://gitweb.starshipfights.net/?a=commitdiff_plain;h=34c9d58a945e34c9feb7a3a512d37ccfae0373a2;p=factbooks

Lambda parameter renaming
---

diff --git a/src/main/kotlin/info/mechyrdia/data/nations.kt b/src/main/kotlin/info/mechyrdia/data/nations.kt
index 417836a..ef28bdf 100644
--- a/src/main/kotlin/info/mechyrdia/data/nations.kt
+++ b/src/main/kotlin/info/mechyrdia/data/nations.kt
@@ -37,8 +37,8 @@ data class NationData(
 				.getNation(id.id)
 				.shards(NationShard.NAME, NationShard.FLAG_URL)
 				.executeSuspend()
-				?.let {
-					NationData(id = Id(it.id), name = it.name, flag = it.flagUrl)
+				?.let { nation ->
+					NationData(id = Id(nation.id), name = nation.name, flag = nation.flagUrl)
 				} ?: unknown(id)
 		}
 	}
@@ -48,8 +48,8 @@ val CallNationCacheAttribute = AttributeKey<MutableMap<Id<NationData>, NationDat
 
 val ApplicationCall.nationCache: MutableMap<Id<NationData>, NationData>
 	get() = attributes.getOrNull(CallNationCacheAttribute)
-		?: mutableMapOf<Id<NationData>, NationData>().also {
-			attributes.put(CallNationCacheAttribute, it)
+		?: mutableMapOf<Id<NationData>, NationData>().also { cache ->
+			attributes.put(CallNationCacheAttribute, cache)
 		}
 
 suspend fun MutableMap<Id<NationData>, NationData>.getNation(id: Id<NationData>): NationData {
diff --git a/src/main/kotlin/info/mechyrdia/lore/article_listing.kt b/src/main/kotlin/info/mechyrdia/lore/article_listing.kt
index 5d4b78d..e578b5d 100644
--- a/src/main/kotlin/info/mechyrdia/lore/article_listing.kt
+++ b/src/main/kotlin/info/mechyrdia/lore/article_listing.kt
@@ -14,8 +14,8 @@ fun File.toArticleNode(): ArticleNode = ArticleNode(
 		.orEmpty()
 		.map { it.toArticleNode() }
 		.sortedBy { it.name }
-		.sortedBy {
-			if (it.subNodes.isNotEmpty())
+		.sortedBy { node ->
+			if (node.subNodes.isNotEmpty())
 				0
 			else
 				1
@@ -24,12 +24,12 @@ fun File.toArticleNode(): ArticleNode = ArticleNode(
 
 fun List<ArticleNode>.renderInto(list: UL, base: String? = null) {
 	val prefix = base?.let { "$it/" } ?: ""
-	forEach {
+	forEach { node ->
 		list.li {
-			a(href = "/lore/$prefix${it.name}") { +it.name }
-			if (it.subNodes.isNotEmpty())
+			a(href = "/lore/$prefix${node.name}") { +node.name }
+			if (node.subNodes.isNotEmpty())
 				ul {
-					it.subNodes.renderInto(this, "$prefix${it.name}")
+					node.subNodes.renderInto(this, "$prefix${node.name}")
 				}
 		}
 	}
diff --git a/src/main/kotlin/info/mechyrdia/lore/view_bar.kt b/src/main/kotlin/info/mechyrdia/lore/view_bar.kt
index 4859c25..5a9346b 100644
--- a/src/main/kotlin/info/mechyrdia/lore/view_bar.kt
+++ b/src/main/kotlin/info/mechyrdia/lore/view_bar.kt
@@ -11,9 +11,9 @@ abstract class Sidebar {
 data class PageNavSidebar(val contents: List<NavItem>) : Sidebar() {
 	override fun TagConsumer<*>.display() {
 		div(classes = "list") {
-			for (it in contents) {
+			for (content in contents) {
 				div(classes = "item") {
-					it.displayIn(this)
+					content.displayIn(this)
 				}
 			}
 		}
diff --git a/src/main/kotlin/info/mechyrdia/lore/view_nav.kt b/src/main/kotlin/info/mechyrdia/lore/view_nav.kt
index f71bcd9..d6c8a32 100644
--- a/src/main/kotlin/info/mechyrdia/lore/view_nav.kt
+++ b/src/main/kotlin/info/mechyrdia/lore/view_nav.kt
@@ -22,11 +22,11 @@ suspend fun ApplicationCall.standardNavBar(path: List<String>? = null) = listOf(
 }.orEmpty() + listOf(
 	NavHead("Client Preferences"),
 	NavLink("/change-theme", "Light/Dark Mode"),
-) + (currentNation()?.let {
+) + (currentNation()?.let { data ->
 	listOf(
-		NavHead(it.name),
-		NavLink("/user/${it.id}", "Your User Page"),
-		NavLink("https://nationstates.net/${it.id}", "Your NationStates Page"),
+		NavHead(data.name),
+		NavLink("/user/${data.id}", "Your User Page"),
+		NavLink("https://nationstates.net/${data.id}", "Your NationStates Page"),
 		NavLink("/auth/logout", "Log Out", linkAttributes = mapOf("data-method" to "post", "data-csrf-token" to createCsrfToken("/auth/logout")))
 	)
 } ?: listOf(