Merge branch 'main' into glitch-soc/merge-upstream

2022-03-04 01:07:49 +01:00
parent 3637a0101e 2ea754b861
commit d9c3109bb6
24 changed files with 66 additions and 57 deletions
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -90,6 +90,8 @@ class Formatter
  end

  def simplified_format(account, **options)
+    return '' if account.note.blank?
+
    html = account.local? ? linkify(account.note) : reformat(account.note)
    html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify]
    html.html_safe # rubocop:disable Rails/OutputSafety