tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix posts with edited out media attachments being returned in /api/v1/accounts/:id/statuses?only_media=true (#37363)

Browse Source
This commit is contained in:
Claire 2026-01-05 16:06:20 +01:00 committed by GitHub
parent 2d711d63d0
commit 82fb2596c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/account_statuses_filter.rb
View File

@ -70,7 +70,7 @@ class AccountStatusesFilter
end
def only_media_scope
Status.joins(:media_attachments).merge(account.media_attachments).group(Status.arel_table[:id])
Status.without_empty_attachments.joins(:media_attachments).merge(account.media_attachments).group(Status.arel_table[:id])
end
def no_replies_scope

1
app/models/status.rb
View File

@ -136,6 +136,7 @@ class Status < ApplicationRecord
scope :tagged_with_none, lambda { |tag_ids|
where('NOT EXISTS (SELECT * FROM statuses_tags forbidden WHERE forbidden.status_id = statuses.id AND forbidden.tag_id IN (?))', tag_ids)
}
scope :without_empty_attachments, -> { where(ordered_media_attachment_ids: nil).or(where.not(ordered_media_attachment_ids: [])) }
after_create_commit :trigger_create_webhooks
after_update_commit :trigger_update_webhooks

18
spec/requests/api/v1/accounts/statuses_spec.rb
View File

@ -21,12 +21,28 @@ RSpec.describe 'API V1 Accounts Statuses' do
end
context 'with only media' do
it 'returns http success' do
let(:status_attachments) { [Fabricate(:media_attachment, account: user.account)] }
let(:removed_status_attachments) { [Fabricate(:media_attachment, account: user.account)] }
let!(:status_with_unordered_attachments) { Fabricate(:status, account: user.account, media_attachments: [Fabricate(:media_attachment, account: user.account)]) }
let!(:status) { Fabricate(:status, account: user.account, media_attachments: status_attachments, ordered_media_attachment_ids: status_attachments.pluck(:id)) }
let!(:status_with_edited_out_media) { Fabricate(:status, account: user.account, media_attachments: removed_status_attachments, ordered_media_attachment_ids: removed_status_attachments.pluck(:id)) }
before do
UpdateStatusService.new.call(status_with_edited_out_media, user.account_id, text: 'edited', media_ids: [])
end
it 'returns http success with expected statuses' do
get "/api/v1/accounts/#{user.account.id}/statuses", params: { only_media: true }, headers: headers
expect(response).to have_http_status(200)
expect(response.content_type)
.to start_with('application/json')
expect(response.parsed_body)
.to have_attributes(size: 2)
.and contain_exactly(
include(id: status_with_unordered_attachments.id.to_s),
include(id: status.id.to_s)
)
end
end