From ef196c913c77338be5ebb1e02af2f6225f857080 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 31 Mar 2022 00:49:24 +0200
Subject: Fix error MethodError in Chewy::Strategy::Sidekiq::Worker (#17912)
Also refactor a bit to reduce code duplication.
---
app/lib/feed_manager.rb | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
(limited to 'app/lib')
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 709450080..085f1b274 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
@@ -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
--
cgit