diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-31 10:42:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-31 10:42:51 +0200 |
| commit | 3381a0e6e050438680f38c97ac9332045b8d66f4 (patch) | |
| tree | f64333019509573bec9799648217d8aa22fca166 /app/lib | |
| parent | 363773d0e9ffa9f4efc564603327f225193a2bf1 (diff) | |
| parent | 6bdec0aec967c5c64e46136f73666c4a67d5a641 (diff) | |
Merge pull request #1729 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/feed_manager.rb | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 6994f00ae..02ecb403d 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -5,7 +5,6 @@ require 'singleton' class FeedManager include Singleton include Redisable - include FormattingHelper # Maximum number of items stored in a single feed MAX_ITEMS = 400 @@ -501,16 +500,8 @@ class FeedManager return false if active_filters.empty? combined_regex = Regexp.union(active_filters) - status = status.reblog if status.reblog? - combined_text = [ - extract_status_plain_text(status), - status.spoiler_text, - status.preloadable_poll ? status.preloadable_poll.options.join("\n\n") : nil, - status.ordered_media_attachments.map(&:description).join("\n\n"), - ].compact.join("\n\n") - - combined_regex.match?(combined_text) + combined_regex.match?(status.proper.searchable_text) end # Adds a status to an account's feed, returning true if a status was |