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

fix updating boosts in network timeline (#4549) 

re: https://infosec.exchange/@webhat/112745609655586468

Boost were not correctly handled here, probably because they are only on
profile timelines which I rarely check. This makes sure likes and boosts
get correctly set to posts even when they are boosts.
This commit is contained in:
Konrad Pozniak 2024-07-12 08:59:43 +02:00 committed by GitHub
parent 000af7fb94
commit fcd6e9c67b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/NetworkTimelineViewModel.kt
View File

@ -295,13 +295,7 @@ class NetworkTimelineViewModel @Inject constructor(
}
private fun handleStatusChangedEvent(status: Status) {
updateStatusById(status.id) { oldViewData ->
status.toViewData(
isShowingContent = oldViewData.isShowingContent,
isExpanded = oldViewData.isExpanded,
isCollapsed = oldViewData.isCollapsed
)
}
updateStatusByActionableId(status.id) { status }
}
override fun fullReload() {
@ -311,7 +305,7 @@ class NetworkTimelineViewModel @Inject constructor(
}
override fun clearWarning(status: StatusViewData.Concrete) {
updateActionableStatusById(status.id) {
updateStatusByActionableId(status.id) {
it.copy(filtered = emptyList())
}
}
@ -399,23 +393,17 @@ class NetworkTimelineViewModel @Inject constructor(
currentSource?.invalidate()
}
private inline fun updateStatusById(
id: String,
updater: (StatusViewData.Concrete) -> StatusViewData.Concrete
) {
val pos = statusData.indexOfFirst { it.asStatusOrNull()?.id == id }
if (pos == -1) return
updateViewDataAt(pos, updater)
}
private inline fun updateActionableStatusById(id: String, updater: (Status) -> Status) {
val pos = statusData.indexOfFirst { it.asStatusOrNull()?.id == id }
if (pos == -1) return
updateViewDataAt(pos) { vd ->
if (vd.status.reblog != null) {
vd.copy(status = vd.status.copy(reblog = updater(vd.status.reblog)))
} else {
vd.copy(status = updater(vd.status))
private inline fun updateStatusByActionableId(id: String, updater: (Status) -> Status) {
// posts can be multiple times in the timeline, e.g. once the original and once as boost
statusData.forEachIndexed { index, status ->
if (status.asStatusOrNull()?.actionableId == id) {
updateViewDataAt(index) { vd ->
if (vd.status.reblog != null) {
vd.copy(status = vd.status.copy(reblog = updater(vd.status.reblog)))
} else {
vd.copy(status = updater(vd.status))
}
}
}
}
}