diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-08-25 06:15:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-25 06:15:55 +0200 |
| commit | 4be626734dfe5d5bb550b117d966aa3f93d0ef38 (patch) | |
| tree | ab558edfd645052e92881137fdd95a66c1e4eb03 /app/models/concerns/account_interactions.rb | |
| parent | 5a3d09dc8e30198b4d8d921ef0b1ba0a35fe01d9 (diff) | |
| parent | 448ed92f76981f40d6faf48ed9d798ee716a04b2 (diff) | |
Merge pull request #1827 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns/account_interactions.rb')
| -rw-r--r-- | app/models/concerns/account_interactions.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb index a7401362f..9b358d338 100644 --- a/app/models/concerns/account_interactions.rb +++ b/app/models/concerns/account_interactions.rb @@ -249,15 +249,7 @@ module AccountInteractions def status_matches_filters(status) active_filters = CustomFilter.cached_filters_for(id) - - filter_matches = active_filters.filter_map do |filter, rules| - next if rules[:keywords].blank? - - match = rules[:keywords].match(status.proper.searchable_text) - FilterResultPresenter.new(filter: filter, keyword_matches: [match.to_s]) unless match.nil? - end - - filter_matches + CustomFilter.apply_cached_filters(active_filters, status) end def followers_for_local_distribution |