mirror/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon synced 2024-11-27 14:28:24 +09:00
Code

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 committed by GitHub
parent e845594878
commit 91ca90e25b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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

@ -160,7 +160,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
@ -211,7 +211,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

@ -54,6 +54,13 @@ RSpec.describe PostStatusService do
.to not_change { account.statuses_count } .to not_change { account.statuses_count }
.and(not_change { previous_status.replies_count }) .and(not_change { 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