Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '624c024766227255c78d31bd408876c64a8b279f' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream added an optional keyword argument where glitch-soc already had one for content-type.
  Added upstream's new option while keeping glitch-soc's.
This commit is contained in:
Claire
2025-09-03 14:01:48 +02:00
parent eeb80a926c 624c024766
commit 705ea99136
45 changed files with 138 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/formatting_helper.rb
View File

@@ -27,7 +27,9 @@ module FormattingHelper
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)
quoted_status = status.quote&.quoted_status if status.local?
html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []), quoted_status: quoted_status, content_type: status.content_type)
end
def rss_status_content_format(status)