diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-23 14:45:09 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-23 14:45:09 +0100 |
| commit | d4d56b8af0e85e328eb1a323816d734ca16a4176 (patch) | |
| tree | b2a307d9712e9dcd8af31f994f793c82455c70d1 | |
| parent | aa9c51a34c4ca226a68f7116573bc37cd172c8f6 (diff) | |
Fix #365, 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | app/lib/formatter.rb | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile index ebee7e35f..7fb3ab91d 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,6 @@ gem 'link_header' gem 'ostatus2' gem 'goldfinger' gem 'devise' -gem 'rails_autolink' gem 'doorkeeper' gem 'rabl' gem 'oj' diff --git a/Gemfile.lock b/Gemfile.lock index 0e720d7fb..12f6679c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -268,8 +268,6 @@ GEM rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_autolink (1.1.6) - rails (> 3.1) rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) railties (5.0.1) @@ -456,7 +454,6 @@ DEPENDENCIES rails (~> 5.0.1.0) rails-settings-cached rails_12factor - rails_autolink react-rails redis (~> 3.2) redis-rails diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index 04386d295..3565611bc 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -32,6 +32,7 @@ class Formatter html = encode(account.note) html = link_urls(html) + html = link_hashtags(html) html.html_safe # rubocop:disable Rails/OutputSafety end @@ -43,8 +44,8 @@ class Formatter end def link_urls(html) - auto_link(html, link: :urls, html: { rel: 'nofollow noopener', target: '_blank' }) do |text| - truncate(text.gsub(/\Ahttps?:\/\/(www\.)?/, ''), length: 30) + html.gsub(URI.regexp(%w(http https))) do |match| + link_html(match) end end @@ -63,6 +64,11 @@ class Formatter 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) prefix, affix = match.split('#') "#{prefix}<a href=\"#{tag_url(affix.downcase)}\" class=\"mention hashtag\">#<span>#{affix}</span></a>" |