Skip to content
This repository was archived by the owner on May 23, 2025. It is now read-only.

4986 - Add delete_media parameter support when deleting statuses #5082

Merged
connyduck merged 1 commit into from
Apr 28, 2025
Merged

4986 - Add delete_media parameter support when deleting statuses #5082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ class SearchViewModel @Inject constructor(
hashtagsPagingSourceFactory.newSearch(query)
}

fun removeItem(statusViewData: StatusViewData.Concrete) {
fun removeItem(statusViewData: StatusViewData.Concrete, deleteMedia: Boolean) {
viewModelScope.launch {
if (timelineCases.delete(statusViewData.id).isSuccess) {
if (timelineCases.delete(statusViewData.id, deleteMedia).isSuccess) {
if (loadedStatuses.remove(statusViewData)) {
statusesPagingSourceFactory.invalidate()
}
Expand Down Expand Up @@ -207,9 +207,9 @@ class SearchViewModel @Inject constructor(
}
}

fun deleteStatusAsync(id: String): Deferred<NetworkResult<DeletedStatus>> {
fun deleteStatusAsync(id: String, deleteMedia: Boolean): Deferred<NetworkResult<DeletedStatus>> {
return viewModelScope.async {
timelineCases.delete(id)
timelineCases.delete(id, deleteMedia)
}
}

Expand Down
12 changes: 6 additions & 6 deletions ...c/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,9 @@ class SearchStatusesFragment : SearchFragment<StatusViewData.Concrete>(), Status

override fun clearWarningAction(position: Int) {}

private fun removeItem(position: Int) {
private fun removeItem(position: Int, deleteMedia: Boolean) {
adapter?.peek(position)?.let {
viewModel.removeItem(it)
viewModel.removeItem(it, deleteMedia)
}
}

Expand Down Expand Up @@ -578,8 +578,8 @@ class SearchStatusesFragment : SearchFragment<StatusViewData.Concrete>(), Status
MaterialAlertDialogBuilder(it)
.setMessage(R.string.dialog_delete_post_warning)
.setPositiveButton(android.R.string.ok) { _, _ ->
viewModel.deleteStatusAsync(id)
removeItem(position)
viewModel.deleteStatusAsync(id, true)
removeItem(position, true)
}
.setNegativeButton(android.R.string.cancel, null)
.show()
Expand All @@ -592,9 +592,9 @@ class SearchStatusesFragment : SearchFragment<StatusViewData.Concrete>(), Status
.setMessage(R.string.dialog_redraft_post_warning)
.setPositiveButton(android.R.string.ok) { _, _ ->
viewLifecycleOwner.lifecycleScope.launch {
viewModel.deleteStatusAsync(id).await().fold(
viewModel.deleteStatusAsync(id, false).await().fold(
{ deletedStatus ->
removeItem(position)
removeItem(position, false)

val redraftStatus = if (deletedStatus.isEmpty) {
status.toDeletedStatus()
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ abstract class SFragment(@LayoutRes contentLayoutId: Int) : Fragment(contentLayo
.setMessage(R.string.dialog_delete_post_warning)
.setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
viewLifecycleOwner.lifecycleScope.launch {
val result = timelineCases.delete(id).exceptionOrNull()
val result = timelineCases.delete(id, true).exceptionOrNull()
if (result != null) {
Log.w("SFragment", "error deleting status", result)
Toast.makeText(requireContext(), R.string.error_generic, Toast.LENGTH_SHORT).show()
Expand All @@ -456,7 +456,7 @@ abstract class SFragment(@LayoutRes contentLayoutId: Int) : Fragment(contentLayo
.setMessage(R.string.dialog_redraft_post_warning)
.setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
viewLifecycleOwner.lifecycleScope.launch {
timelineCases.delete(id).fold(
timelineCases.delete(id, false).fold(
{ deletedStatus ->
removeItem(position)
val sourceStatus = if (deletedStatus.isEmpty) {
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,10 @@ interface MastodonApi {
): Response<List<TimelineAccount>>

@DELETE("api/v1/statuses/{id}")
suspend fun deleteStatus(@Path("id") statusId: String): NetworkResult<DeletedStatus>
suspend fun deleteStatus(
@Path("id") statusId: String,
@Query("delete_media") deleteMedia: Boolean? = null
): NetworkResult<DeletedStatus>

@FormUrlEncoded
@POST("api/v1/statuses/{id}/reblog")
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/keylesspalace/tusky/usecase/TimelineCases.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ class TimelineCases @Inject constructor(
}
}

suspend fun delete(statusId: String): NetworkResult<DeletedStatus> {
return mastodonApi.deleteStatus(statusId)
suspend fun delete(statusId: String, deleteMedia: Boolean): NetworkResult<DeletedStatus> {
return mastodonApi.deleteStatus(statusId, deleteMedia)
.onSuccess { eventHub.dispatch(StatusDeletedEvent(statusId)) }
.onFailure { Log.w(TAG, "Failed to delete status", it) }
}
Expand Down