about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-07-28 11:15:04 -0500
committerFire Demon <firedemon@creature.cafe>2020-08-30 05:45:16 -0500
commite53b4dc0e34750766c2a3ce877e906b5ef362462 (patch)
treea28c19b63270c002b6df3b3ae2d0e79195ac2098 /app/lib
parent67cacb5ef8e198ad3f361399df69aa38971d0c26 (diff)
[Formatting] Allow formatted account bios
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/formatter.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 39c42c8db..d85bbf0e0 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -95,7 +95,11 @@ 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_markdown(account.note)
+    html = encode_and_link_urls(html, keep_html: true)
+    html = reformat(html, true)
     html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify]
     html.html_safe # rubocop:disable Rails/OutputSafety
   end