From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 31 Mar 2022 08:36:23 +0000 (+0200)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6bdec0aec967c5c64e46136f73666c4a67d5a641;p=mastodon.git

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

6bdec0aec967c5c64e46136f73666c4a67d5a641
diff --cc app/helpers/formatting_helper.rb
index 2a622ae0b,a58dd608f..53e100dd2
--- a/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)