From 670e6a33f8eeca628707dc020e02ce32502d74a4 Mon Sep 17 00:00:00 2001
From: David Yip <yipdw@member.fsf.org>
Date: Sat, 21 Oct 2017 14:47:17 -0500
Subject: Move KeywordMute into Glitch namespace.

There are two motivations for this:

1. It looks like we're going to add other features that require
   server-side storage (e.g. user notes).

2. Namespacing glitchsoc modifications is a good idea anyway: even if we
   do not end up doing (1), if upstream introduces a keyword-mute feature
   that also uses a "KeywordMute" model, we can avoid some merge
   conflicts this way and work on the more interesting task of
   choosing which implementation to use.
---
 app/models/glitch.rb              |  7 ++++++
 app/models/glitch/keyword_mute.rb | 49 +++++++++++++++++++++++++++++++++++++++
 app/models/keyword_mute.rb        | 49 ---------------------------------------
 3 files changed, 56 insertions(+), 49 deletions(-)
 create mode 100644 app/models/glitch.rb
 create mode 100644 app/models/glitch/keyword_mute.rb
 delete mode 100644 app/models/keyword_mute.rb

(limited to 'app/models')

diff --git a/app/models/glitch.rb b/app/models/glitch.rb
new file mode 100644
index 000000000..0e497babc
--- /dev/null
+++ b/app/models/glitch.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Glitch
+  def self.table_name_prefix
+    'glitch_'
+  end
+end
diff --git a/app/models/glitch/keyword_mute.rb b/app/models/glitch/keyword_mute.rb
new file mode 100644
index 000000000..3b0b47f52
--- /dev/null
+++ b/app/models/glitch/keyword_mute.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: glitch_keyword_mutes
+#
+#  id         :integer          not null, primary key
+#  account_id :integer          not null
+#  keyword    :string           not null
+#  whole_word :boolean          default(TRUE), not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class Glitch::KeywordMute < ApplicationRecord
+  belongs_to :account, required: true
+
+  validates_presence_of :keyword
+
+  after_commit :invalidate_cached_matcher
+
+  def self.matcher_for(account_id)
+    Rails.cache.fetch("keyword_mutes:matcher:#{account_id}") { Matcher.new(account_id) }
+  end
+
+  private
+
+  def invalidate_cached_matcher
+    Rails.cache.delete("keyword_mutes:matcher:#{account_id}")
+  end
+
+  class Matcher
+    attr_reader :regex
+
+    def initialize(account_id)
+      re = [].tap do |arr|
+        Glitch::KeywordMute.where(account_id: account_id).select(:keyword, :id, :whole_word).find_each do |m|
+          boundary = m.whole_word ? '\b' : ''
+          arr << "#{boundary}#{Regexp.escape(m.keyword.strip)}#{boundary}"
+        end
+      end.join('|')
+
+      @regex = /#{re}/i unless re.empty?
+    end
+
+    def =~(str)
+      regex ? regex =~ str : false
+    end
+  end
+end
diff --git a/app/models/keyword_mute.rb b/app/models/keyword_mute.rb
deleted file mode 100644
index b0229923d..000000000
--- a/app/models/keyword_mute.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-# == Schema Information
-#
-# Table name: keyword_mutes
-#
-#  id         :integer          not null, primary key
-#  account_id :integer          not null
-#  keyword    :string           not null
-#  whole_word :boolean          default(TRUE), not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#
-
-class KeywordMute < ApplicationRecord
-  belongs_to :account, required: true
-
-  validates_presence_of :keyword
-
-  after_commit :invalidate_cached_matcher
-
-  def self.matcher_for(account_id)
-    Rails.cache.fetch("keyword_mutes:matcher:#{account_id}") { Matcher.new(account_id) }
-  end
-
-  private
-
-  def invalidate_cached_matcher
-    Rails.cache.delete("keyword_mutes:matcher:#{account_id}")
-  end
-
-  class Matcher
-    attr_reader :regex
-
-    def initialize(account_id)
-      re = [].tap do |arr|
-        KeywordMute.where(account_id: account_id).select(:keyword, :id, :whole_word).find_each do |m|
-          boundary = m.whole_word ? '\b' : ''
-          arr << "#{boundary}#{Regexp.escape(m.keyword.strip)}#{boundary}"
-        end
-      end.join('|')
-
-      @regex = /#{re}/i unless re.empty?
-    end
-
-    def =~(str)
-      regex ? regex =~ str : false
-    end
-  end
-end
-- 
cgit