fix(chat): fix infinite loop when loading chat

outadoc · Oct 14, 2024 · 8b92857 · 8b92857
1 parent ed353a0
commit 8b92857
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.../src/commonMain/kotlin/fr/outadoc/justchatting/feature/chat/presentation/ChatViewModel.kt b/.../src/commonMain/kotlin/fr/outadoc/justchatting/feature/chat/presentation/ChatViewModel.kt
@@ -292,20 +292,20 @@ internal class ChatViewModel(
                 }
             }
             .distinctUntilChanged()
+            .onEach { userId ->
+                twitchRepository.markChannelAsVisited(
+                    userId = userId,
+                    visitedAt = clock.now(),
+                )
+            }
             .flatMapLatest { userId ->
                 twitchRepository.getUserById(userId)
             }
             .onEach { result ->
                 result
                     .onSuccess { user ->
-                        actions.emit(Action.UpdateUser(user))
-
-                        twitchRepository.markChannelAsVisited(
-                            channel = user,
-                            visitedAt = clock.now(),
-                        )
-
                         createShortcutForChannel(user)
+                        actions.emit(Action.UpdateUser(user))
                     }
                     .onFailure { exception ->
                         logError<ChatViewModel>(exception) { "Failed to load user" }

diff --git a/...d/src/commonMain/kotlin/fr/outadoc/justchatting/feature/shared/domain/TwitchRepository.kt b/...d/src/commonMain/kotlin/fr/outadoc/justchatting/feature/shared/domain/TwitchRepository.kt
@@ -38,7 +38,7 @@ internal interface TwitchRepository {
         timeZone: TimeZone,
     ): Flow<FullSchedule>
 
-    suspend fun markChannelAsVisited(channel: User, visitedAt: Instant)
+    suspend fun markChannelAsVisited(userId: String, visitedAt: Instant)
 
     suspend fun getGlobalBadges(): Result<List<TwitchBadge>>
 

diff --git a/...c/commonMain/kotlin/fr/outadoc/justchatting/feature/shared/domain/TwitchRepositoryImpl.kt b/...c/commonMain/kotlin/fr/outadoc/justchatting/feature/shared/domain/TwitchRepositoryImpl.kt
@@ -152,10 +152,10 @@ internal class TwitchRepositoryImpl(
         }
     }
 
-    override suspend fun markChannelAsVisited(channel: User, visitedAt: Instant) {
+    override suspend fun markChannelAsVisited(userId: String, visitedAt: Instant) {
         withContext(DispatchersProvider.io) {
             localUsersApi.saveUser(
-                userId = channel.id,
+                userId = userId,
                 visitedAt = visitedAt,
             )
         }