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-05 21:40:28 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-05 21:40:28 +0100
commit866496ac16b47ee17138db600519a630be833e4e (patch)
tree804bb8ba01b1ff55471cc558d72456d2b9d0aea9 /app/lib/formatter.rb
parentba6ca3cd69118a764628cc4ee0269293aedc8ee0 (diff)
parent636db1f54fbd1690d083276b18f980cc5a51bcf0 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/lib/formatter.rb')
-rw-r--r--app/lib/formatter.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 0653214f5..b9845cb45 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -19,6 +19,10 @@ class Formatter
 
     raw_content = status.text
 
+    if options[:inline_poll_options] && status.poll
+      raw_content = raw_content + '\n\n' + status.poll.options.map { |title| "[ ] #{title}" }.join('\n')
+    end
+
     return '' if raw_content.blank?
 
     unless status.local?