Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

fix (un)muting conversations (#4525) 

closes #4523 
closes #4524
This commit is contained in:
Konrad Pozniak 2024-06-22 11:02:51 +02:00 committed by GitHub
parent 705e5b3212
commit 1c1d39443b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
View File

@ -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

2
app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt
View File

@ -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)
}

5
app/src/main/java/com/keylesspalace/tusky/usecase/TimelineCases.kt
View File

@ -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))
}
}