Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add optional delete_media parameter to DELETE /api/v1/statuses/:id (#33988)

Browse source
This commit is contained in:
Claire 2025-02-28 14:39:01 +01:00 • committed by GitHub
parent b56e90d049
commit e71fb450e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/statuses_controller.rb
View file

@ -111,7 +111,7 @@ class Api::V1::StatusesController < Api::BaseController
@status.account.statuses_count = @status.account.statuses_count - 1 @status.account.statuses_count = @status.account.statuses_count - 1
json = render_to_body json: @status, serializer: REST::StatusSerializer, source_requested: true json = render_to_body json: @status, serializer: REST::StatusSerializer, source_requested: true
RemovalWorker.perform_async(@status.id, { 'redraft' => true }) RemovalWorker.perform_async(@status.id, { 'redraft' => !truthy_param?(:delete_media) })
render json: json render json: json
end end

2
app/javascript/mastodon/actions/statuses.js
View file

@ -138,7 +138,7 @@ export function deleteStatus(id, withRedraft = false) {
dispatch(deleteStatusRequest(id)); dispatch(deleteStatusRequest(id));
api().delete(`/api/v1/statuses/${id}`).then(response => { api().delete(`/api/v1/statuses/${id}`, { params: { delete_media: !withRedraft } }).then(response => {
dispatch(deleteStatusSuccess(id)); dispatch(deleteStatusSuccess(id));
dispatch(deleteFromTimelines(id)); dispatch(deleteFromTimelines(id));
dispatch(importFetchedAccount(response.data.account)); dispatch(importFetchedAccount(response.data.account));

19
spec/requests/api/v1/statuses_spec.rb
View file

@ -257,13 +257,30 @@ RSpec.describe '/api/v1/statuses' do
it_behaves_like 'forbidden for wrong scope', 'read read:statuses' it_behaves_like 'forbidden for wrong scope', 'read read:statuses'
it 'removes the status', :aggregate_failures do it 'discards the status and schedules removal as a redraft', :aggregate_failures do
subject subject
expect(response).to have_http_status(200) expect(response).to have_http_status(200)
expect(response.content_type) expect(response.content_type)
.to start_with('application/json') .to start_with('application/json')
expect(Status.find_by(id: status.id)).to be_nil expect(Status.find_by(id: status.id)).to be_nil
expect(RemovalWorker).to have_enqueued_sidekiq_job(status.id, { 'redraft' => true })
end
context 'when called with truthy delete_media' do
subject do
delete "/api/v1/statuses/#{status.id}?delete_media=true", headers: headers
end
it 'discards the status and schedules removal without the redraft flag', :aggregate_failures do
subject
expect(response).to have_http_status(200)
expect(response.content_type)
.to start_with('application/json')
expect(Status.find_by(id: status.id)).to be_nil
expect(RemovalWorker).to have_enqueued_sidekiq_job(status.id, { 'redraft' => false })
end
end end
end end