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

diff --cc app/helpers/formatting_helper.rb
index 2a622ae0b29bb0a0785559eb3c85448f412726d8,a58dd608f84dd3675acc0756e0cf34dab2c64c6c..53e100dd277931d5937d5c26b335d72e414a5028
--- 1/app/helpers/formatting_helper.rb
--- 2/app/helpers/formatting_helper.rb
+++ b/app/helpers/formatting_helper.rb
@@@ -12,9 -12,10 +12,10 @@@ module FormattingHelpe
    def extract_status_plain_text(status)
      PlainTextFormatter.new(status.text, status.local?).to_s
    end
+   module_function :extract_status_plain_text
  
    def status_content_format(status)
 -    html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []))
 +    html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []), content_type: status.content_type)
    end
  
    def account_bio_format(account)

diff --cc app/lib/feed_manager.rb
Simple merge

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