erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
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