From 061feb63ed852acb5d70e2678c9e63425e6ca71b Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Mon, 21 Jan 2019 20:03:04 +0100
Subject: [PATCH] Fix scheduled toot with media immediately creating a toot
(#9894)
* Add test for not persisting status when attaching media to scheduled toot
* Prevent status used for validation from being persisted to the database
Fixes #9893
Thanks to tateisu for the help investigating this.
---
app/services/post_status_service.rb | 5 ++++-
spec/services/post_status_service_spec.rb | 14 ++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index cc3453f995..1f5a3f4cf9 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -66,7 +66,10 @@ class PostStatusService < BaseService
end
def schedule_status!
- if @account.statuses.build(status_attributes).valid?
+ status_for_validation = @account.statuses.build(status_attributes)
+ if status_for_validation.valid?
+ status_for_validation.destroy
+
# The following transaction block is needed to wrap the UPDATEs to
# the media attachments when the scheduled status is created
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 3774fed6f3..680cebbcf3 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -36,6 +36,20 @@ RSpec.describe PostStatusService, type: :service do
expect(status.params['text']).to eq 'Hi future!'
end
+ it 'does not immediately create a status when scheduling a status' do
+ account = Fabricate(:account)
+ media = Fabricate(:media_attachment)
+ future = Time.now.utc + 2.hours
+
+ status = subject.call(account, text: 'Hi future!', media_ids: [media.id], scheduled_at: future)
+
+ expect(status).to be_a ScheduledStatus
+ expect(status.scheduled_at).to eq future
+ expect(status.params['text']).to eq 'Hi future!'
+ expect(media.reload.status).to be_nil
+ expect(Status.where(text: 'Hi future!').exists?).to be_falsey
+ end
+
it 'creates response to the original status of boost' do
boosted_status = Fabricate(:status)
in_reply_to_status = Fabricate(:status, reblog: boosted_status)