nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #365, 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format

This commit is contained in:
Eugen Rochko 2017-01-23 14:45:09 +01:00
parent aa9c51a34c
commit d4d56b8af0
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -31,7 +31,6 @@ gem 'link_header'
gem 'ostatus2' gem 'ostatus2'
gem 'goldfinger' gem 'goldfinger'
gem 'devise' gem 'devise'
gem 'rails_autolink'
gem 'doorkeeper' gem 'doorkeeper'
gem 'rabl' gem 'rabl'
gem 'oj' gem 'oj'

3
Gemfile.lock
View File

@ -268,8 +268,6 @@ GEM
rails_12factor (0.0.3) rails_12factor (0.0.3)
rails_serve_static_assets rails_serve_static_assets
rails_stdout_logging rails_stdout_logging
rails_autolink (1.1.6)
rails (> 3.1)
rails_serve_static_assets (0.0.5) rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5) rails_stdout_logging (0.0.5)
railties (5.0.1) railties (5.0.1)
@ -456,7 +454,6 @@ DEPENDENCIES
rails (~> 5.0.1.0) rails (~> 5.0.1.0)
rails-settings-cached rails-settings-cached
rails_12factor rails_12factor
rails_autolink
react-rails react-rails
redis (~> 3.2) redis (~> 3.2)
redis-rails redis-rails

10
app/lib/formatter.rb
View File

@ -32,6 +32,7 @@ class Formatter
html = encode(account.note) html = encode(account.note)
html = link_urls(html) html = link_urls(html)
html = link_hashtags(html)
html.html_safe # rubocop:disable Rails/OutputSafety html.html_safe # rubocop:disable Rails/OutputSafety
end end
@ -43,8 +44,8 @@ class Formatter
end end
def link_urls(html) def link_urls(html)
auto_link(html, link: :urls, html: { rel: 'nofollow noopener', target: '_blank' }) do |text| html.gsub(URI.regexp(%w(http https))) do |match|
truncate(text.gsub(/\Ahttps?:\/\/(www\.)?/, ''), length: 30) link_html(match)
end end
end end
@ -63,6 +64,11 @@ class Formatter
end end
end end
def link_html(url)
link_text = truncate(url.gsub(/\Ahttps?:\/\/(www\.)?/, ''), length: 30)
"<a rel=\"nofollow noopener\" target=\"_blank\" href=\"#{url}\">#{link_text}</a>"
end
def hashtag_html(match) def hashtag_html(match)
prefix, affix = match.split('#') prefix, affix = match.split('#')
"#{prefix}<a href=\"#{tag_url(affix.downcase)}\" class=\"mention hashtag\">#<span>#{affix}</span></a>" "#{prefix}<a href=\"#{tag_url(affix.downcase)}\" class=\"mention hashtag\">#<span>#{affix}</span></a>"