fix bbcode

app/lib/formatter.rb

@@ -33,14 +33,14 @@ def format(status, **options)
 
     mdFormatter = Formatter_Markdown.new(html)
     html = mdFormatter.formatted
-
+    
     html = "RT @#{prepend_reblog} #{html}" if prepend_reblog
     html = encode_and_link_urls(html, linkable_accounts)
     html = encode_custom_emojis(html, status.emojis) if options[:custom_emojify]
     html = simple_format(html, {}, sanitize: false)
     html = html.delete("\n")
     html = format_bbcode(html)
-
+  
     mdLinkDecoder = MDLinkDecoder.new(html)
     html = mdLinkDecoder.decode
 
@@ -222,7 +222,8 @@ def link_to_hashtag(entity)
 
   def link_html(url)
     url    = Addressable::URI.parse(url).to_s
-    prefix = url.match(/\Ahttps?:\/\/(www\.)?/).to_s
+    url = "#{url}" + " "
+    prefix = url.match(/\Ahttps?:\/\/(www\.)?+[^<>"\[\]  ]\z/).to_s
     text   = url[prefix.length, 30]
     suffix = url[prefix.length + 30..-1]
     cutoff = url[prefix.length..-1].length > 30

app/lib/formatter_markdown.rb

@@ -139,10 +139,12 @@ def highlight(text)
         def encode(html)
             HTMLEntities.new.encode(html)
         end
-    end
 
-    def encode(html)
-        HTMLEntities.new.encode(html)
+        def autolink(link, link_type)
+           links  = link.gsub(/\[\//," [/")
+            %(#{links})
+        end
+
     end
 
 end

app/lib/sanitize_config.rb

@@ -14,12 +14,6 @@ module Config
         next true if e =~ /^(h|p|u|dt|e)-/ # microformats classes
         next true if e =~ /^(mention|hashtag)$/ # semantic classes
         next true if e =~ /^(ellipsis|invisible)$/ # link formatting classes
-        next true if e =~ /^fa$/ # font awesome
-        next true if e =~ /^fa-spin$/ # font awesome
-        next true if e =~ /^pulse-loading$/ # font awesome
-        next true if e =~ /^fa-flip-(horizontal|vertical)$/ # font awesome
-        next true if e =~ /^fa-(2x|3x|4x|5x)$/ # font awesome
-# もともとreturnだったところをnextにした。 /^fa$/を含むそれより下はBBcodeなので変更いらないかも
       end
 
       node['class'] = class_list.join(' ')