diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-05-18 20:10:22 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-05-21 03:16:50 -0500 |
| commit | fd8e92438c29215c84caa8c58d1e9eaa5d6f5ae5 (patch) | |
| tree | 72761fbe23a4f825b42863f629fdb2c94dea7481 /app/lib | |
| parent | 1a670573e5518d999fec12b4068a945ffa46a925 (diff) | |
formatted bios + merge monsterpit markdown styles directly into glitch-soc scss
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/formatter.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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 |