diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-31 10:42:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-31 10:42:51 +0200 |
commit | 3381a0e6e050438680f38c97ac9332045b8d66f4 (patch) | |
tree | f64333019509573bec9799648217d8aa22fca166 /app/helpers | |
parent | 363773d0e9ffa9f4efc564603327f225193a2bf1 (diff) | |
parent | 6bdec0aec967c5c64e46136f73666c4a67d5a641 (diff) |
Merge pull request #1729 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/formatting_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/formatting_helper.rb b/app/helpers/formatting_helper.rb index 2a622ae0b..53e100dd2 100644 --- a/app/helpers/formatting_helper.rb +++ b/app/helpers/formatting_helper.rb @@ -12,6 +12,7 @@ module FormattingHelper 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) : []), content_type: status.content_type) |