From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 2 Mar 2022 17:02:48 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=425a6c90c44a620e5015cd659cf5d8e3bf68ee07;p=mastodon.git

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

425a6c90c44a620e5015cd659cf5d8e3bf68ee07
diff --cc app/services/update_status_service.rb
index 76530a54c,93203bc49..6cbbd2876
--- a/app/services/update_status_service.rb
+++ b/app/services/update_status_service.rb
@@@ -92,11 -91,10 +92,11 @@@ class UpdateStatusService < BaseServic
    end
  
    def update_immediate_attributes!
-     @status.text         = @options[:text].presence || @options.delete(:spoiler_text) || ''
-     @status.spoiler_text = @options[:spoiler_text] || ''
-     @status.sensitive    = @options[:sensitive] || @options[:spoiler_text].present?
+     @status.text         = @options[:text].presence || @options.delete(:spoiler_text) || '' if @options.key?(:text)
+     @status.spoiler_text = @options[:spoiler_text] || '' if @options.key?(:spoiler_text)
+     @status.sensitive    = @options[:sensitive] || @options[:spoiler_text].present? if @options.key?(:sensitive) || @options.key?(:spoiler_text)
      @status.language     = valid_locale_or_nil(@options[:language] || @status.language || @status.account.user&.preferred_posting_language || I18n.default_locale)
 +    @status.content_type = @options[:content_type] || @status.content_type
      @status.edited_at    = Time.now.utc
  
      @status.save!