about summary refs log tree commit diff
path: root/app/lib/formatter.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-05 21:09:18 +0100
committerEugen Rochko <eugen@zeonfederated.com>2019-03-05 21:09:18 +0100
commit636db1f54fbd1690d083276b18f980cc5a51bcf0 (patch)
treed67c7c32e511ae307485bcbe6e3fc5da284db950 /app/lib/formatter.rb
parent7d5e2dda78414316f9cf09fcf6096d6a158da312 (diff)
When serializing polls over OStatus, serialize poll options to text (#10160)
* When serializing polls over OStatus, serialize poll options to text

* Do the same for RSS feeds

* Use “[ ] ” as a prefix for poll options instead of “- ”
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?