fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-12 18:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Idempotency-Key ignored when scheduling a post (#30084)

Browse source
This commit is contained in:
Claire 2024-04-26 15:19:02 +02:00
parent a6089cdfca
commit 70c4d70dbe
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/services/post_status_service.rb
View file

@ -137,7 +137,7 @@ class PostStatusService < BaseService
def idempotency_duplicate def idempotency_duplicate
if scheduled? if scheduled?
@account.schedule_statuses.find(@idempotency_duplicate) @account.scheduled_statuses.find(@idempotency_duplicate)
else else
@account.statuses.find(@idempotency_duplicate) @account.statuses.find(@idempotency_duplicate)
end end
@ -189,7 +189,7 @@ class PostStatusService < BaseService
end end
def scheduled_options def scheduled_options
@options.tap do |options_hash| @options.dup.tap do |options_hash|
options_hash[:in_reply_to_id] = options_hash.delete(:thread)&.id options_hash[:in_reply_to_id] = options_hash.delete(:thread)&.id
options_hash[:application_id] = options_hash.delete(:application)&.id options_hash[:application_id] = options_hash.delete(:application)&.id
options_hash[:scheduled_at] = nil options_hash[:scheduled_at] = nil

7
spec/services/post_status_service_spec.rb
View file

@ -52,6 +52,13 @@ RSpec.describe PostStatusService, type: :service do
it 'does not change statuses count' do it 'does not change statuses count' do
expect { subject.call(account, text: 'Hi future!', scheduled_at: future, thread: previous_status) }.not_to change { [account.statuses_count, previous_status.replies_count] } expect { subject.call(account, text: 'Hi future!', scheduled_at: future, thread: previous_status) }.not_to change { [account.statuses_count, previous_status.replies_count] }
end end
it 'returns existing status when used twice with idempotency key' do
account = Fabricate(:account)
status1 = subject.call(account, text: 'test', idempotency: 'meepmeep', scheduled_at: future)
status2 = subject.call(account, text: 'test', idempotency: 'meepmeep', scheduled_at: future)
expect(status2.id).to eq status1.id
end
end end
it 'creates response to the original status of boost' do it 'creates response to the original status of boost' do