Fix whitespace preservation in status text

1 files changed, 2 insertions, 1 deletions

diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 5748680af..04386d295 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -15,6 +15,7 @@ class Formatter
     html = status.text
     html = encode(html)
     html = simple_format(html, sanitize: false)
+    html = html.gsub(/\n/, '')
     html = link_urls(html)
     html = link_mentions(html, status.mentions)
     html = link_hashtags(html)
@@ -42,7 +43,7 @@ class Formatter
   end
 
   def link_urls(html)
-    auto_link(html, link: :urls, html: { rel: 'nofollow noopener' }) do |text|
+    auto_link(html, link: :urls, html: { rel: 'nofollow noopener', target: '_blank' }) do |text|
       truncate(text.gsub(/\Ahttps?:\/\/(www\.)?/, ''), length: 30)
     end
   end