mastofe

commit: 6fa4e01139a8420d96f9a3c1fcf2b3c5bd0b38a9
parent: 87830f99e7e47f19ce9368cca93b66a8c1c34517
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sun,  5 Feb 2017 15:29:16 +0100

Fix showing ellipsis even when link hasn't been cut off

Diffstat:
M
app/lib/formatter.rb
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
@@ -68,8 +68,9 @@ class Formatter
     prefix = url.match(/\Ahttps?:\/\/(www\.)?/).to_s
     text   = url[prefix.length, 30]
     suffix = url[prefix.length + 30..-1]
+    cutoff = url[prefix.length..-1].length > 30
 
-    "<a rel=\"nofollow noopener\" target=\"_blank\" href=\"#{url}\"><span class=\"invisible\">#{prefix}</span><span class=\"ellipsis\">#{text}</span><span class=\"invisible\">#{suffix}</span></a>"
+    "<a rel=\"nofollow noopener\" target=\"_blank\" href=\"#{url}\"><span class=\"invisible\">#{prefix}</span><span class=\"#{cutoff ? 'ellipsis' : ''}\">#{text}</span><span class=\"invisible\">#{suffix}</span></a>"
   end
 
   def hashtag_html(match)