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 '129e72b91494f30777cf4fa8a0905de2dccedba7' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream removed OTel instrumentation around some code modified in glitch-soc
  because of the Markdown rendering feature.
  Removed the OTel instrumentation as upstream did.
This commit is contained in:
Claire
2025-06-03 18:34:37 +02:00
parent 98c9c7a9ff 129e72b914
commit 23ce6d326c
6 changed files with 54 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/helpers/formatting_helper.rb
View File

@@ -27,14 +27,7 @@ module FormattingHelper
module_function :extract_status_plain_text
def status_content_format(status)
MastodonOTELTracer.in_span('HtmlAwareFormatter rendering') do |span|
span.add_attributes(
'app.formatter.content.type' => 'status',
'app.formatter.content.origin' => status.local? ? 'local' : 'remote'
)
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
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 rss_status_content_format(status)
@@ -46,14 +39,7 @@ module FormattingHelper
end
def account_bio_format(account)
MastodonOTELTracer.in_span('HtmlAwareFormatter rendering') do |span|
span.add_attributes(
'app.formatter.content.type' => 'account_bio',
'app.formatter.content.origin' => account.local? ? 'local' : 'remote'
)
html_aware_format(account.note, account.local?)
end
html_aware_format(account.note, account.local?)
end
def account_field_value_format(field, with_rel_me: true)