From 1c1d39443bc80d71c48c4cc39ef52b76ae601a5e Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sat, 22 Jun 2024 11:02:51 +0200
Subject: [PATCH] fix (un)muting conversations (#4525)

closes #4523
closes #4524
---
 app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt | 1 -
 .../tusky/components/timeline/viewmodel/TimelineViewModel.kt | 2 --
 .../java/com/keylesspalace/tusky/usecase/TimelineCases.kt    | 5 ++---
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt b/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
index cf2046359..490c874bc 100644
--- a/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
@@ -8,7 +8,6 @@ import com.keylesspalace.tusky.entity.ScheduledStatus
 import com.keylesspalace.tusky.entity.Status
 
 data class StatusChangedEvent(val status: Status) : Event
-data class MuteConversationEvent(val statusId: String, val mute: Boolean) : Event
 data class UnfollowEvent(val accountId: String) : Event
 data class BlockEvent(val accountId: String) : Event
 data class MuteEvent(val accountId: String) : Event
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt
index 180e90385..c7a3a38c0 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt
@@ -27,7 +27,6 @@ import at.connyduck.calladapter.networkresult.getOrThrow
 import com.keylesspalace.tusky.appstore.Event
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.FilterUpdatedEvent
-import com.keylesspalace.tusky.appstore.MuteConversationEvent
 import com.keylesspalace.tusky.appstore.PreferenceChangedEvent
 import com.keylesspalace.tusky.components.preference.PreferencesFragment.ReadingOrder
 import com.keylesspalace.tusky.components.timeline.util.ifExpected
@@ -227,7 +226,6 @@ abstract class TimelineViewModel(
 
     private fun handleEvent(event: Event) {
         when (event) {
-            is MuteConversationEvent -> fullReload()
             is PreferenceChangedEvent -> {
                 onPreferenceChanged(event.preferenceKey)
             }
diff --git a/app/src/main/java/com/keylesspalace/tusky/usecase/TimelineCases.kt b/app/src/main/java/com/keylesspalace/tusky/usecase/TimelineCases.kt
index cb12229b2..805b73669 100644
--- a/app/src/main/java/com/keylesspalace/tusky/usecase/TimelineCases.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/usecase/TimelineCases.kt
@@ -22,7 +22,6 @@ import at.connyduck.calladapter.networkresult.onFailure
 import at.connyduck.calladapter.networkresult.onSuccess
 import com.keylesspalace.tusky.appstore.BlockEvent
 import com.keylesspalace.tusky.appstore.EventHub
-import com.keylesspalace.tusky.appstore.MuteConversationEvent
 import com.keylesspalace.tusky.appstore.MuteEvent
 import com.keylesspalace.tusky.appstore.PollVoteEvent
 import com.keylesspalace.tusky.appstore.StatusChangedEvent
@@ -86,8 +85,8 @@ class TimelineCases @Inject constructor(
             mastodonApi.muteConversation(statusId)
         } else {
             mastodonApi.unmuteConversation(statusId)
-        }.onSuccess {
-            eventHub.dispatch(MuteConversationEvent(statusId, mute))
+        }.onSuccess { status ->
+            eventHub.dispatch(StatusChangedEvent(status))
         }
     }