From fd8e92438c29215c84caa8c58d1e9eaa5d6f5ae5 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Sat, 18 May 2019 20:10:22 -0500 Subject: formatted bios + merge monsterpit markdown styles directly into glitch-soc scss --- app/lib/formatter.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/lib') diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index ccaf71e7b..64afc843c 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -251,7 +251,9 @@ class Formatter end def simplified_format(account, **options) - html = account.local? ? linkify(account.note) : reformat(account.note) + return reformat(account.note) unless account.local? + html = format_bbdown(account.note) + html = encode_and_link_urls(html, keep_html: true) html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify] html.html_safe # rubocop:disable Rails/OutputSafety end -- cgit