diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-05 22:20:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 22:20:58 +0100 |
| commit | 772b4ba24c60e0394d25d0fad4eefb338a9befea (patch) | |
| tree | 804bb8ba01b1ff55471cc558d72456d2b9d0aea9 /app/lib/formatter.rb | |
| parent | 2a4ce7458a16c64029842fde210089453be2ede1 (diff) | |
| parent | 866496ac16b47ee17138db600519a630be833e4e (diff) | |
Merge pull request #935 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/formatter.rb')
| -rw-r--r-- | app/lib/formatter.rb | 4 |
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? |