From d4d56b8af0e85e328eb1a323816d734ca16a4176 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 23 Jan 2017 14:45:09 +0100
Subject: [PATCH] Fix #365, 1/2 of #408 - replace rails_autolink with
 URI.regexp, run link_hashtags on simplified_format

---
 Gemfile              |  1 -
 Gemfile.lock         |  3 ---
 app/lib/formatter.rb | 10 ++++++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index ebee7e35f1..7fb3ab91de 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 0e720d7fb9..12f6679c7f 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 04386d295a..3565611bc9 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>"