diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-27 16:43:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 16:43:55 +0200 |
| commit | 2f95adc06fbfae22e8f9b4df212938108f5e295c (patch) | |
| tree | 13ff1b5ae743f3d147eb58dfa4a790ef1a7c049d /app/lib/feed_manager.rb | |
| parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
| parent | 6ab7051b48dcb1d45c377a129350db1fdeaf11b8 (diff) | |
Merge pull request #1142 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/feed_manager.rb')
| -rw-r--r-- | app/lib/feed_manager.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 4bc75dae8..ddcbdf6da 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -221,7 +221,8 @@ class FeedManager status = status.reblog if status.reblog? !combined_regex.match(Formatter.instance.plaintext(status)).nil? || - (status.spoiler_text.present? && !combined_regex.match(status.spoiler_text).nil?) + (status.spoiler_text.present? && !combined_regex.match(status.spoiler_text).nil?) || + (status.preloadable_poll && !combined_regex.match(status.preloadable_poll.options.join("\n\n")).nil?) end # Adds a status to an account's feed, returning true if a status was |