Only cache the regex text, not the regex itself.

It is possible to cache a Regexp object, but I'm not sure what happens
if e.g. that object remains in cache across two different Ruby versions.
Caching a string seems to raise fewer questions.

diff --git a/app/models/glitch/keyword_mute.rb b/app/models/glitch/keyword_mute.rb
index a7ab3650ea71531dfe8553608361f05aad9b12b5..4c3e69de49bd99d601b194a1b1421b8a4de408df 100644 (file)
--- a/app/models/glitch/keyword_mute.rb
+++ b/app/models/glitch/keyword_mute.rb
@@ -34,23 +34,20 @@ class Glitch::KeywordMute < ApplicationRecord
 
     def initialize(account_id)
       @account_id = account_id
-      @regex = Rails.cache.fetch("keyword_mutes:regex:#{account_id}") { regex_for_account }
+      regex_text = Rails.cache.fetch("keyword_mutes:regex:#{account_id}") { regex_text_for_account }
+      @regex = /#{regex_text}/i unless regex_text.empty?
     end
 
     def keywords
-      Glitch::KeywordMute.
-        where(account_id: account_id).
-        select(:keyword, :id, :whole_word)
+      Glitch::KeywordMute.where(account_id: account_id).select(:keyword, :id, :whole_word)
     end
 
-    def regex_for_account
-      re_text = [].tap do |arr|
+    def regex_text_for_account
+      [].tap do |arr|
         keywords.find_each do |kw|
           arr << (kw.whole_word ? boundary_regex_for_keyword(kw.keyword) : Regexp.escape(kw.keyword))
         end
       end.join('|')
-
-      /#{re_text}/i unless re_text.empty?
     end
 
     def boundary_regex_for_keyword(keyword)