treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix `/admin/accounts/:account_id/statuses/:id` for edited posts with media attachments (#30819)

main-rebase-security-fix
Claire 2024-06-24 15:11:10 +02:00 committed by GitHub
parent 61722b1b1f
commit 8827cd597e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/status_edit.rb
View File

@ -42,7 +42,7 @@ class StatusEdit < ApplicationRecord
scope :ordered, -> { order(id: :asc) } scope :ordered, -> { order(id: :asc) }
delegate :local?, :application, :edited?, :edited_at, delegate :local?, :application, :edited?, :edited_at,
:discarded?, :visibility, to: :status :discarded?, :visibility, :language, to: :status
def emojis def emojis
return @emojis if defined?(@emojis) return @emojis if defined?(@emojis)

5
spec/controllers/admin/statuses_controller_spec.rb
View File

@ -44,6 +44,11 @@ describe Admin::StatusesController do
describe 'GET #show' do describe 'GET #show' do
before do before do
status.media_attachments << Fabricate(:media_attachment, type: :image, account: status.account)
status.save!
status.snapshot!(at_time: status.created_at, rate_limit: false)
status.update!(text: 'Hello, this is an edited post')
status.snapshot!(rate_limit: false)
get :show, params: { account_id: account.id, id: status.id } get :show, params: { account_id: account.id, id: status.id }
end end