mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use rails built-in `tag` methods in `TextFormatter.shortened_link` (#28976)

pull/2674/head
Matt Jankowski 2024-03-13 05:19:54 -04:00 committed by GitHub
parent 7e6eb64f1e
commit 2c0441acd7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/lib/text_formatter.rb
View File

@ -50,6 +50,7 @@ class TextFormatter
class << self class << self
include ERB::Util include ERB::Util
include ActionView::Helpers::TagHelper
def shortened_link(url, rel_me: false) def shortened_link(url, rel_me: false)
url = Addressable::URI.parse(url).to_s url = Addressable::URI.parse(url).to_s
@ -60,9 +61,11 @@ class TextFormatter
suffix = url[prefix.length + 30..] suffix = url[prefix.length + 30..]
cutoff = url[prefix.length..].length > 30 cutoff = url[prefix.length..].length > 30
<<~HTML.squish.html_safe # rubocop:disable Rails/OutputSafety tag.a href: url, target: '_blank', rel: rel.join(' '), translate: 'no' do
<a href="#{h(url)}" target="_blank" rel="#{rel.join(' ')}" translate="no"><span class="invisible">#{h(prefix)}</span><span class="#{cutoff ? 'ellipsis' : ''}">#{h(display_url)}</span><span class="invisible">#{h(suffix)}</span></a> tag.span(prefix, class: 'invisible') +
HTML tag.span(display_url, class: (cutoff ? 'ellipsis' : '')) +
tag.span(suffix, class: 'invisible')
end
rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
h(url) h(url)
end end