about summary refs log tree commit diff
path: root/app/lib/formatter.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-03-20 17:32:39 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-20 17:32:39 +0100
commitcbf1d711ba2fab4921bfcf57e7df0b952503f568 (patch)
treea5b928c0da3b018c422b7337708d041bdb9be986 /app/lib/formatter.rb
parent803c350ef5500229eafce222370c5f97a7532e41 (diff)
parent80f0910e2141b24082b9143266a9a6cf1ef6a516 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/lib/formatter.rb')
-rw-r--r--app/lib/formatter.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 464e1ee7e..aadf03b2a 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -71,6 +71,12 @@ class Formatter
     html.html_safe # rubocop:disable Rails/OutputSafety
   end
 
+  def format_poll_option(status, option, **options)
+    html = encode(option.title)
+    html = encode_custom_emojis(html, status.emojis, options[:autoplay])
+    html.html_safe # rubocop:disable Rails/OutputSafety
+  end
+
   def format_display_name(account, **options)
     html = encode(account.display_name.presence || account.username)
     html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify]