diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-17 22:31:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 22:31:21 +0100 |
| commit | c8ef003c6b40e9b7212f43f1b5706b0967fcfe8a (patch) | |
| tree | 7ab6dc75943d22b27df0ac411483b34f79e72211 /app/lib/feed_manager.rb | |
| parent | ec4f9066189fbab4368a275e9cd654dc7ad48217 (diff) | |
| parent | 41a8606627216e8ed32fb562d245327e5985ba2d (diff) | |
Merge pull request #1692 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/feed_manager.rb')
| -rw-r--r-- | app/lib/feed_manager.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 0713aa471..7f2bc42d3 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -499,7 +499,7 @@ class FeedManager return false if active_filters.empty? - combined_regex = active_filters.reduce { |memo, obj| Regexp.union(memo, obj) } + combined_regex = Regexp.union(active_filters) status = status.reblog if status.reblog? combined_text = [ |