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

fix liking/boosting/bookmarking/voting boosted statuses in timeline (#2212)

This commit is contained in:
Konrad Pozniak 2021-06-28 21:41:18 +02:00 committed by GitHub
parent 16ffcca748
commit 9ca7e708bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,10 +335,10 @@ class TimelineViewModel @Inject constructor(
fun reblog(reblog: Boolean, position: Int): Job = viewModelScope.launch { fun reblog(reblog: Boolean, position: Int): Job = viewModelScope.launch {
val status = statuses[position].asStatusOrNull() ?: return@launch val status = statuses[position].asStatusOrNull() ?: return@launch
try { try {
timelineCases.reblog(status.id, reblog).await() timelineCases.reblog(status.actionableId, reblog).await()
} catch (t: Exception) { } catch (t: Exception) {
ifExpected(t) { ifExpected(t) {
Log.d(TAG, "Failed to reblog status " + status.id, t) Log.d(TAG, "Failed to reblog status " + status.actionableId, t)
} }
} }
} }
@ -347,10 +347,10 @@ class TimelineViewModel @Inject constructor(
val status = statuses[position].asStatusOrNull() ?: return@launch val status = statuses[position].asStatusOrNull() ?: return@launch
try { try {
timelineCases.favourite(status.id, favorite).await() timelineCases.favourite(status.actionableId, favorite).await()
} catch (t: Exception) { } catch (t: Exception) {
ifExpected(t) { ifExpected(t) {
Log.d(TAG, "Failed to favourite status " + status.id, t) Log.d(TAG, "Failed to favourite status " + status.actionableId, t)
} }
} }
} }
@ -358,10 +358,10 @@ class TimelineViewModel @Inject constructor(
fun bookmark(bookmark: Boolean, position: Int): Job = viewModelScope.launch { fun bookmark(bookmark: Boolean, position: Int): Job = viewModelScope.launch {
val status = statuses[position].asStatusOrNull() ?: return@launch val status = statuses[position].asStatusOrNull() ?: return@launch
try { try {
timelineCases.bookmark(status.id, bookmark).await() timelineCases.bookmark(status.actionableId, bookmark).await()
} catch (t: Exception) { } catch (t: Exception) {
ifExpected(t) { ifExpected(t) {
Log.d(TAG, "Failed to favourite status " + status.id, t) Log.d(TAG, "Failed to favourite status " + status.actionableId, t)
} }
} }
} }
@ -378,10 +378,10 @@ class TimelineViewModel @Inject constructor(
updatePoll(status, votedPoll) updatePoll(status, votedPoll)
try { try {
timelineCases.voteInPoll(status.id, poll.id, choices).await() timelineCases.voteInPoll(status.actionableId, poll.id, choices).await()
} catch (t: Exception) { } catch (t: Exception) {
ifExpected(t) { ifExpected(t) {
Log.d(TAG, "Failed to vote in poll: " + status.id, t) Log.d(TAG, "Failed to vote in poll: " + status.actionableId, t)
} }
} }
} }
@ -718,20 +718,20 @@ class TimelineViewModel @Inject constructor(
} }
private fun handleFavEvent(favEvent: FavoriteEvent) { private fun handleFavEvent(favEvent: FavoriteEvent) {
updateStatusById(favEvent.statusId) { updateActionableStatusById(favEvent.statusId) {
it.copy(status = it.status.copy(favourited = favEvent.favourite)) it.copy(favourited = favEvent.favourite)
} }
} }
private fun handleBookmarkEvent(bookmarkEvent: BookmarkEvent) { private fun handleBookmarkEvent(bookmarkEvent: BookmarkEvent) {
updateStatusById(bookmarkEvent.statusId) { updateActionableStatusById(bookmarkEvent.statusId) {
it.copy(status = it.status.copy(bookmarked = bookmarkEvent.bookmark)) it.copy(bookmarked = bookmarkEvent.bookmark)
} }
} }
private fun handlePinEvent(pinEvent: PinEvent) { private fun handlePinEvent(pinEvent: PinEvent) {
updateStatusById(pinEvent.statusId) { updateActionableStatusById(pinEvent.statusId) {
it.copy(status = it.status.copy(pinned = pinEvent.pinned)) it.copy(pinned = pinEvent.pinned)
} }
} }
@ -858,6 +858,21 @@ class TimelineViewModel @Inject constructor(
} }
} }
private inline fun updateActionableStatusById(
id: String,
updater: (Status) -> Status
) {
val pos = statuses.indexOfFirst { it.asStatusOrNull()?.id == id }
if (pos == -1) return
updateStatusAt(pos) {
if (it.status.reblog != null) {
it.copy(status = it.status.copy(reblog = updater(it.status.reblog)))
} else {
it.copy(status = updater(it.status))
}
}
}
private inline fun updateStatusById( private inline fun updateStatusById(
id: String, id: String,
updater: (StatusViewData.Concrete) -> StatusViewData.Concrete updater: (StatusViewData.Concrete) -> StatusViewData.Concrete

7
app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.kt
View File

@ -59,6 +59,9 @@ sealed class StatusViewData private constructor() {
val actionable: Status val actionable: Status
get() = status.actionableStatus get() = status.actionableStatus
val actionableId: String
get() = status.actionableStatus.id
val rebloggedAvatar: String? val rebloggedAvatar: String?
get() = if (status.reblog != null) { get() = if (status.reblog != null) {
status.account.avatar status.account.avatar
@ -91,10 +94,10 @@ sealed class StatusViewData private constructor() {
return replaceCrashingCharacters(content as CharSequence) as Spanned return replaceCrashingCharacters(content as CharSequence) as Spanned
} }
fun replaceCrashingCharacters(content: CharSequence?): CharSequence? { fun replaceCrashingCharacters(content: CharSequence): CharSequence? {
var replacing = false var replacing = false
var builder: SpannableStringBuilder? = null var builder: SpannableStringBuilder? = null
val length = content!!.length val length = content.length
for (index in 0 until length) { for (index in 0 until length) {
val character = content[index] val character = content[index]