Merge pull request #889 from ThibG/glitch-soc/merge-upstream

Merge upstream changes (v2.7.0)

1 files changed, 2 insertions, 0 deletions

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 2ca92dc50..68cffe915 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -52,6 +52,8 @@ class PostStatusService < BaseService
     @visibility   = :unlisted if @visibility == :public && @account.silenced
     @scheduled_at = @options[:scheduled_at]&.to_datetime
     @scheduled_at = nil if scheduled_in_the_past?
+  rescue ArgumentError
+    raise ActiveRecord::RecordInvalid
   end
 
   def process_status!