diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-25 14:45:14 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-25 14:45:14 +0200 |
| commit | 47ef4a6c7a74072daff8b23c4af3e300bb75ba1a (patch) | |
| tree | afa97381a3bc8bd5e5c910d873dddc3fa3b2ff4e /app/lib/feed_manager.rb | |
| parent | 66ac1bd063882f5a2f828c1c702089e37f36f217 (diff) | |
Apply filters to poll options (#11174)
* Apply filters to poll options in WebUI Fixes #11128 * Apply filters to poll options server-side * Add poll options to searchable text
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 d77cdb3a3..ed3ce6112 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -220,7 +220,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 |