Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-08-20 12:34:45 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix not being able to edit quote post text (#39837)

Browse Source
This commit is contained in:
Claire
2026-07-16 11:56:53 +02:00
parent ac385af2f4
commit d7bb36a64a
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/update_status_service.rb
View File

@@ -111,7 +111,10 @@ class UpdateStatusService < BaseService
end
def update_immediate_attributes!
@status.text = @options[:text].presence || @options.delete(:spoiler_text) || '' if @options.key?(:text) && @status.quote.blank?
if @options.key?(:text)
@status.text = @options[:text].presence || ''
@status.text = @options.delete(:spoiler_text) || '' if @status.text.blank? && @status.quote.blank?
end
@status.spoiler_text = @options[:spoiler_text] || '' if @options.key?(:spoiler_text)
@status.sensitive = @options[:sensitive] || @options[:spoiler_text].present? if @options.key?(:sensitive) || @options.key?(:spoiler_text)
@status.language = valid_locale_cascade(@options[:language], @status.language, @status.account.user&.preferred_posting_language, I18n.default_locale)

31
spec/services/update_status_service_spec.rb
View File

@@ -40,6 +40,37 @@ RSpec.describe UpdateStatusService do
)
expect(status.edits.ordered.pluck(:text)).to eq %w(Foo Bar)
end
context 'when the status has a quote' do
before { Fabricate(:quote, status: status) }
it 'updates text, resets card, saves edit history' do
subject.call(status, status.account_id, text: 'Bar')
expect(status.reload)
.to have_attributes(
text: 'Bar',
preview_card: be_nil
)
expect(status.edits.ordered.pluck(:text)).to eq %w(Foo Bar)
end
end
context 'when the status has a quote and has a spoiler' do
before { Fabricate(:quote, status: status) }
it 'updates text, resets card, saves edit history' do
subject.call(status, status.account_id, spoiler_text: 'Bar', text: '')
expect(status.reload)
.to have_attributes(
text: '',
spoiler_text: 'Bar',
preview_card: be_nil
)
expect(status.edits.ordered.pluck(:text)).to eq ['Foo', '']
end
end
end
context 'when content warning changes' do