diff options
author | ThibG <thib@sitedethib.com> | 2021-01-26 23:21:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-26 23:21:32 +0100 |
commit | 52ff3ca675ecac0ff32990b6321fb5e349e6dc59 (patch) | |
tree | eeeeeead25872b19b34b31e3ccbd543d3e2fd9b8 /app/lib/feed_manager.rb | |
parent | ca6c62068e35537251cc650c8b2d03a1a2163d06 (diff) | |
parent | 00e55445b9aa5a399a9f8b76e42fde9da2c399fd (diff) |
Merge pull request #1491 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/feed_manager.rb')
-rw-r--r-- | app/lib/feed_manager.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index ddd975c5f..2e70c2ce9 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -454,8 +454,8 @@ class FeedManager active_filters.map! do |filter| if filter.whole_word - sb = filter.phrase =~ /\A[[:word:]]/ ? '\b' : '' - eb = filter.phrase =~ /[[:word:]]\z/ ? '\b' : '' + sb = /\A[[:word:]]/.match?(filter.phrase) ? '\b' : '' + eb = /[[:word:]]\z/.match?(filter.phrase) ? '\b' : '' /(?mix:#{sb}#{Regexp.escape(filter.phrase)}#{eb})/ else @@ -475,7 +475,7 @@ class FeedManager status.media_attachments.map(&:description).join("\n\n"), ].compact.join("\n\n") - !combined_regex.match(combined_text).nil? + combined_regex.match?(combined_text) end # Adds a status to an account's feed, returning true if a status was |