Fix error MethodError in Chewy::Strategy::Sidekiq::Worker (#17912)
Also refactor a bit to reduce code duplication.
This commit is contained in:
parent
8c7223f4ea
commit
ef196c913c
4 changed files with 12 additions and 11 deletions
|
@ -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
|
||||
|
@ -443,16 +442,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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue