gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
KMY 2024-07-05 06:56:14 +09:00
parent ae7ec2bbd9
commit f3ac508cf7
3 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Gemfile.lock
View file

@ -326,7 +326,7 @@ GEM
httplog (1.6.3) httplog (1.6.3)
rack (>= 2.0) rack (>= 2.0)
rainbow (>= 2.0.0) rainbow (>= 2.0.0)
i18n (1.14.5) i18n (1.14.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
i18n-tasks (1.0.13) i18n-tasks (1.0.13)
activesupport (>= 4.0.2) activesupport (>= 4.0.2)
@ -427,7 +427,6 @@ GEM
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2024.0305) mime-types-data (3.2024.0305)
mini_mime (1.1.5) mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.22.3) minitest (5.22.3)
msgpack (1.7.2) msgpack (1.7.2)
multi_json (1.15.0) multi_json (1.15.0)
@ -447,10 +446,8 @@ GEM
timeout timeout
net-smtp (0.5.0) net-smtp (0.5.0)
net-protocol net-protocol
net-ssh (7.1.0)
nio4r (2.7.3) nio4r (2.7.3)
nokogiri (1.16.6) nokogiri (1.16.6-x86_64-linux)
mini_portile2 (~> 2.8.2)
racc (~> 1.4) racc (~> 1.4)
nsa (0.3.0) nsa (0.3.0)
activesupport (>= 4.2, < 7.2) activesupport (>= 4.2, < 7.2)
@ -541,10 +538,11 @@ GEM
rack (~> 2.2, >= 2.2.4) rack (~> 2.2, >= 2.2.4)
rack-proxy (0.7.7) rack-proxy (0.7.7)
rack rack
rack-session (1.0.2)
rack (< 3)
rack-test (2.1.0) rack-test (2.1.0)
rack (>= 1.3) rack (>= 1.3)
rackup (1.0.0)
rack (< 3)
webrick
rails (7.1.3.2) rails (7.1.3.2)
actioncable (= 7.1.3.2) actioncable (= 7.1.3.2)
actionmailbox (= 7.1.3.2) actionmailbox (= 7.1.3.2)
@ -576,7 +574,8 @@ GEM
railties (7.1.3.2) railties (7.1.3.2)
actionpack (= 7.1.3.2) actionpack (= 7.1.3.2)
activesupport (= 7.1.3.2) activesupport (= 7.1.3.2)
method_source irb
rackup (>= 1.0.0)
rake (>= 12.2) rake (>= 12.2)
thor (~> 1.0, >= 1.2.2) thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6) zeitwerk (~> 2.6)
@ -737,7 +736,7 @@ GEM
terminal-table (3.0.2) terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3) unicode-display_width (>= 1.1.1, < 3)
terrapin (1.0.1) terrapin (1.0.1)
climate_control (>= 0.0.3, < 1.0) climate_control
test-prof (1.3.3) test-prof (1.3.3)
thor (1.3.1) thor (1.3.1)
tilt (2.3.0) tilt (2.3.0)
@ -809,7 +808,7 @@ GEM
zeitwerk (2.6.16) zeitwerk (2.6.16)
PLATFORMS PLATFORMS
ruby x86_64-linux
DEPENDENCIES DEPENDENCIES
active_model_serializers (~> 0.10) active_model_serializers (~> 0.10)

4
app/models/status_edit.rb
View file

@ -42,8 +42,8 @@ class StatusEdit < ApplicationRecord
scope :ordered, -> { order(id: :asc) } scope :ordered, -> { order(id: :asc) }
delegate :local?, :application, :edited?, :edited_at, :language, 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