Merge branch 'main' into yamada-ika/brush-up-timetable-item-card

DroidKaigi · Aug 5, 2024 · ac30606 · ac30606
2 parents 4ce6e75 + 41b7d01
commit ac30606
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/...mmonMain/kotlin/io/github/droidkaigi/confsched/data/contributors/ContributorsApiClient.kt b/...mmonMain/kotlin/io/github/droidkaigi/confsched/data/contributors/ContributorsApiClient.kt
@@ -8,12 +8,11 @@ import de.jensklingenberg.ktorfit.http.GET
 import io.github.droidkaigi.confsched.data.NetworkService
 import io.github.droidkaigi.confsched.data.contributors.response.ContributorsResponse
 import io.github.droidkaigi.confsched.model.Contributor
-import io.github.droidkaigi.confsched.model.fakes
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
 
 internal interface ContributorApi {
-    @GET("/events/droidkaigi2023/contributors")
+    @GET("/events/droidkaigi2024/contributors")
     suspend fun getContributors(): ContributorsResponse
 }
 
@@ -24,11 +23,9 @@ public class DefaultContributorsApiClient(
 
     private val contributorApi = ktorfit.create<ContributorApi>()
     public override suspend fun contributors(): PersistentList<Contributor> {
-        // FIXME: When the API is ready, remove the comments below and return the actual data.
-        return Contributor.fakes()
-//        return networkService {
-//            contributorApi.getContributors()
-//        }.toContributorList()
+        return networkService {
+            contributorApi.getContributors()
+        }.toContributorList()
     }
 }