Merge branch 'master' into glitch-soc/merge-upstream

2019-01-25 11:37:49 +01:00
parent afec6b43eb e1ec3a9f09
commit 04e2c67389
7 changed files with 42 additions and 13 deletions
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -69,7 +69,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