diff options
author | David Yip <yipdw@member.fsf.org> | 2017-10-21 14:47:17 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-10-21 14:54:36 -0500 |
commit | 670e6a33f8eeca628707dc020e02ce32502d74a4 (patch) | |
tree | 527043ee2b85d5a18dc5c51acd7277fc560b3e78 /app/models | |
parent | cd04e3df58c09b0faca81ccc820b2cd5e12c2890 (diff) |
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.
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/glitch.rb | 7 | ||||
-rw-r--r-- | app/models/glitch/keyword_mute.rb (renamed from app/models/keyword_mute.rb) | 6 |
2 files changed, 10 insertions, 3 deletions
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/keyword_mute.rb b/app/models/glitch/keyword_mute.rb index b0229923d..3b0b47f52 100644 --- a/app/models/keyword_mute.rb +++ b/app/models/glitch/keyword_mute.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # == Schema Information # -# Table name: keyword_mutes +# Table name: glitch_keyword_mutes # # id :integer not null, primary key # account_id :integer not null @@ -11,7 +11,7 @@ # updated_at :datetime not null # -class KeywordMute < ApplicationRecord +class Glitch::KeywordMute < ApplicationRecord belongs_to :account, required: true validates_presence_of :keyword @@ -33,7 +33,7 @@ class KeywordMute < ApplicationRecord def initialize(account_id) re = [].tap do |arr| - KeywordMute.where(account_id: account_id).select(:keyword, :id, :whole_word).find_each do |m| + 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 |