Updated to new S3 backed contributors list

Author: StefanOltmann

app/src/commonMain/kotlin/service/DefaultWebClient.kt

@@ -62,6 +62,7 @@ const val FIND_URL = "https://oni-data.stefanoltmann.de"
 
 const val SEARCH_INDEX_URL = "https://oni-search.stefanoltmann.de"
 const val COUNT_URL = "$SEARCH_INDEX_URL/count"
+const val CONTRIBUTORS_URL = "$SEARCH_INDEX_URL/contributors"
 
 const val INGEST_SERVER_URL = "https://ingest.mapsnotincluded.org"
 const val REQUEST_URL = "$INGEST_SERVER_URL/request-coordinate"
@@ -472,9 +473,9 @@ object DefaultWebClient : WebClient {
         return success
     }
 
-    override suspend fun findContributors(): List<Contributor> {
+    override suspend fun findContributors(): Map<String, Long> {
 
-        val response = httpClient.get("$INGEST_SERVER_URL/contributors") {
+        val response = httpClient.get(CONTRIBUTORS_URL) {
             accept(ContentType.Application.Json)
         }
 
@@ -483,7 +484,7 @@ object DefaultWebClient : WebClient {
 
         try {
 
-            val contributors: List<Contributor> = response.body()
+            val contributors: Map<String, Long> = response.body()
 
             println("[WEBCLIENT] Found ${contributors.size} contributors.")
 

app/src/commonMain/kotlin/service/WebClient.kt

@@ -55,7 +55,7 @@ interface WebClient {
 
     suspend fun setUsername(username: String): Boolean
 
-    suspend fun findContributors(): List<Contributor>
+    suspend fun findContributors(): Map<String, Long>
 
     suspend fun getLastModifiedMillis(url: String): Long?
 

app/src/commonMain/kotlin/ui/LeaderboardViewList.kt

@@ -38,9 +38,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -54,11 +52,8 @@ import io.github.stefanoltmann.app.generated.resources.uiLeaderBoardExplainer
 import io.github.stefanoltmann.app.generated.resources.uiLeaderBoardRank
 import io.github.stefanoltmann.app.generated.resources.uiLeaderBoardUsername
 import io.github.stefanoltmann.app.generated.resources.uiLoading
-import kotlin.time.Clock
 import kotlin.time.ExperimentalTime
 import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.isActive
 import org.jetbrains.compose.resources.stringResource
 import service.DefaultWebClient
 import ui.theme.DefaultSpacer
@@ -68,9 +63,6 @@ import ui.theme.defaultPadding
 import ui.theme.defaultRoundedCornerShape
 import ui.theme.doubleSpacing
 import ui.theme.lightGray
-import util.formatDate
-
-const val CONTRIBUTOR_LIST_UPDATE_INTERVAL_MS: Long = 60000
 
 private val contributorListFontSize = 20.sp
 
@@ -81,24 +73,15 @@ fun LeaderboardViewList(
     errorMessage: MutableState<String?>
 ) {
 
-    val lastRefreshTime = remember { mutableStateOf(0L) }
-
     val contributorsState = produceState(emptyList()) {
 
         try {
 
-            while (isActive) {
-
-                lastRefreshTime.value = Clock.System.now().toEpochMilliseconds()
-
-                value = DefaultWebClient.findContributors().map {
-                    it.copy(
-                        username = steamIdToUsernameMap[it.steamIdHash]
-                    )
+            value = DefaultWebClient.findContributors()
+                .map {
+                    it.key to it.value
                 }
-
-                delay(CONTRIBUTOR_LIST_UPDATE_INTERVAL_MS)
-            }
+                .sortedByDescending { it.second }
 
         } catch (_: CancellationException) {
 
@@ -144,21 +127,6 @@ fun LeaderboardViewList(
 
         DefaultSpacer()
 
-        Text(
-            text = formatDate(lastRefreshTime.value),
-            style = MaterialTheme.typography.bodyMedium,
-            color = lightGray,
-            textAlign = TextAlign.Center,
-            modifier = Modifier
-                .background(
-                    Color.Black,
-                    defaultRoundedCornerShape
-                )
-                .defaultPadding()
-        )
-
-        DefaultSpacer()
-
         Row {
 
             FillSpacer()
@@ -215,7 +183,7 @@ fun LeaderboardViewList(
                 modifier = Modifier.padding(doubleSpacing)
             ) {
 
-                itemsIndexed(contributors) { index, contributor ->
+                itemsIndexed(contributors) { index, entry ->
 
                     val rank = index + 1
 
@@ -239,11 +207,13 @@ fun LeaderboardViewList(
 
                         DoubleSpacer()
 
+                        val name = steamIdToUsernameMap[entry.first] ?: "Anonymous"
+
                         Text(
-                            text = contributor.username ?: "Anonymous",
+                            text = name,
                             style = MaterialTheme.typography.bodyLarge,
                             fontSize = contributorListFontSize,
-                            color = if (contributor.username == null)
+                            color = if (name == "Anonymous")
                                 lightGray.copy(0.3F)
                             else
                                 lightGray,
@@ -255,7 +225,7 @@ fun LeaderboardViewList(
                         DoubleSpacer()
 
                         Text(
-                            text = contributor.mapCount.toString(),
+                            text = entry.second.toString(),
                             style = MaterialTheme.typography.bodyLarge,
                             fontSize = contributorListFontSize,
                             color = lightGray,