From 84495615b4c0e7c27d373a4eec5f0a87db338226 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 13 Oct 2016 16:49:52 +0200
Subject: [PATCH] Shorten rendered links (strip protocol and www, truncate to
 30 chars), redirect to sign in page after sign up instead of root path which
 redirects to /about

---
 app/controllers/auth/registrations_controller.rb | 2 +-
 app/lib/formatter.rb                             | 4 +++-
 spec/lib/formatter_spec.rb                       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index 71eb0905e9..7b7f6b52df 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -17,6 +17,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   end
 
   def after_sign_up_path_for(_resource)
-    root_path
+    new_user_session_path
   end
 end
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 17d2dfc585..60bc3733eb 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -29,7 +29,9 @@ class Formatter
   end
 
   def link_urls(html)
-    auto_link(html, link: :urls, html: { rel: 'nofollow noopener' })
+    auto_link(html, link: :urls, html: { rel: 'nofollow noopener' }) do |text|
+      truncate(text.gsub(/\Ahttps?:\/\/(www\.)?/, ''), length: 30)
+    end
   end
 
   def link_mentions(html, mentions)
diff --git a/spec/lib/formatter_spec.rb b/spec/lib/formatter_spec.rb
index 36c4af7481..927211938a 100644
--- a/spec/lib/formatter_spec.rb
+++ b/spec/lib/formatter_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Formatter do
     end
 
     it 'contains a link' do
-      expect(subject).to match('<a rel="nofollow noopener" href="http://google.com">http://google.com</a>')
+      expect(subject).to match('<a rel="nofollow noopener" href="http://google.com">google.com</a>')
     end
   end