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

diff --cc app/controllers/auth/registrations_controller.rb
Simple merge

diff --cc app/helpers/application_helper.rb
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/styles/mastodon/admin.scss
Simple merge

diff --cc app/models/status.rb
Simple merge

diff --cc app/services/update_status_service.rb
index 76530a54c7d350b703bcb5c6e44b97e3b322dd01,93203bc49425adc4c067ae25e35104ead11f7e1b..6cbbd287660d26dff6c5d6123a3607c0eeeabac5
--- 1/app/services/update_status_service.rb
--- 2/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!

diff --cc app/views/layouts/modal.html.haml
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
Simple merge