prefs: Note that favourite confirmation applies to Glitch flavour only (#491)

app/models/glitch/keyword_mute.rb

@@ -33,74 +33,68 @@ class Glitch::KeywordMute < ApplicationRecord
     Rails.cache.delete(TagMatcher.cache_key(account_id))
   end
 
-  class CachedKeywordMute
+  class RegexpMatcher
-    attr_reader :keyword
+    attr_reader :account_id
-    attr_reader :whole_word
+    attr_reader :regex
 
-    def initialize(keyword, whole_word)
+    def initialize(account_id)
-      @keyword = keyword
+      @account_id = account_id
-      @whole_word = whole_word
+      regex_text = Rails.cache.fetch(self.class.cache_key(account_id)) { make_regex_text }
+      @regex = /#{regex_text}/
     end
 
-    def boundary_regex_for_keyword
+    protected
+
+    def keywords
+      Glitch::KeywordMute.where(account_id: account_id).pluck(:whole_word, :keyword)
+    end
+
+    def boundary_regex_for_keyword(keyword)
       sb = keyword =~ /\A[[:word:]]/ ? '\b' : ''
       eb = keyword =~ /[[:word:]]\Z/ ? '\b' : ''
 
       /(?mix:#{sb}#{Regexp.escape(keyword)}#{eb})/
     end
-
-    def matches?(str)
-      str =~ (whole_word ? boundary_regex_for_keyword : /#{Regexp.escape(keyword)}/i)
-    end
   end
 
-  class Matcher
+  class TextMatcher < RegexpMatcher
-    attr_reader :account_id
-    attr_reader :words
-
-    def initialize(account_id)
-      @account_id = account_id
-      @words = Rails.cache.fetch(self.class.cache_key(account_id)) { fetch_keywords }
-    end
-
-    protected
-
-    def fetch_keywords
-      Glitch::KeywordMute.where(account_id: account_id).pluck(:whole_word, :keyword).map do |whole_word, keyword|
-        CachedKeywordMute.new(transform_keyword(keyword), whole_word)
-      end
-    end
-
-    def transform_keyword(keyword)
-      keyword
-    end
-  end
-
-  class TextMatcher < Matcher
     def self.cache_key(account_id)
       format('keyword_mutes:regex:text:%s', account_id)
     end
 
     def matches?(str)
-      words.any? { |w| w.matches?(str) }
+      !!(regex =~ str)
+    end
+
+    private
+
+    def make_regex_text
+      kws = keywords.map! do |whole_word, keyword|
+        whole_word ? boundary_regex_for_keyword(keyword) : /(?i:#{Regexp.escape(keyword)})/
+      end
+
+      Regexp.union(kws).source
     end
   end
 
-  class TagMatcher < Matcher
+  class TagMatcher < RegexpMatcher
     def self.cache_key(account_id)
       format('keyword_mutes:regex:tag:%s', account_id)
     end
 
     def matches?(tags)
-      tags.pluck(:name).any? do |n|
+      tags.pluck(:name).any? { |n| regex =~ n }
-        words.any? { |w| w.matches?(n) }
-      end
     end
 
-    protected
+    private
 
-    def transform_keyword(kw)
+    def make_regex_text
-      Tag::HASHTAG_RE =~ kw ? $1 : kw
+      kws = keywords.map! do |whole_word, keyword|
+        term = (Tag::HASHTAG_RE =~ keyword) ? $1 : keyword
+        whole_word ? boundary_regex_for_keyword(term) : term
+      end
+
+      Regexp.union(kws).source
     end
   end
 end

config/locales/simple_form.en.yml

@@ -55,7 +55,7 @@ en:
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a toot
         setting_display_sensitive_media: Always show media marked as sensitive
-        setting_favourite_modal: Show confirmation dialog before favouriting
+        setting_favourite_modal: Show confirmation dialog before favouriting (applies to Glitch flavour only)
         setting_hide_network: Hide your network
         setting_noindex: Opt-out of search engine indexing
         setting_reduce_motion: Reduce motion in animations

spec/models/glitch/keyword_mute_spec.rb

@@ -79,18 +79,12 @@ RSpec.describe Glitch::KeywordMute, type: :model do
         expect(matcher.matches?('(hot take)')).to be_truthy
       end
 
-      it 'escapes metacharacters in whole-word keywords' do
+      it 'escapes metacharacters in keywords' do
         Glitch::KeywordMute.create!(account: alice, keyword: '(hot take)')
 
         expect(matcher.matches?('(hot take)')).to be_truthy
       end
 
-      it 'escapes metacharacters in non-whole-word keywords' do
-        Glitch::KeywordMute.create!(account: alice, keyword: '(-', whole_word: false)
-
-        expect(matcher.matches?('bad (-)')).to be_truthy
-      end
-
       it 'uses case-folding rules appropriate for more than just English' do
         Glitch::KeywordMute.create!(account: alice, keyword: 'großeltern')