From 0c1e4bb969a117c186e08396f9db0f747f04bdbd Mon Sep 17 00:00:00 2001
From: ysksn <bluewhale1982@gmail.com>
Date: Wed, 26 Dec 2018 14:38:42 +0900
Subject: [PATCH] Create DomainNormalizable#normalize_domain (#9631)
---
app/models/account.rb | 4 ++--
app/models/concerns/domain_normalizable.rb | 15 +++++++++++++++
app/models/domain_block.rb | 10 ++--------
app/models/email_domain_block.rb | 8 +-------
4 files changed, 20 insertions(+), 17 deletions(-)
create mode 100644 app/models/concerns/domain_normalizable.rb
diff --git a/app/models/account.rb b/app/models/account.rb
index 16ef6c187a..cf804fc678 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -59,6 +59,7 @@ class Account < ApplicationRecord
include Attachmentable
include Paginable
include AccountCounters
+ include DomainNormalizable
enum protocol: [:ostatus, :activitypub]
@@ -457,7 +458,6 @@ class Account < ApplicationRecord
end
before_create :generate_keys
- before_validation :normalize_domain
before_validation :prepare_contents, if: :local?
before_destroy :clean_feed_manager
@@ -479,7 +479,7 @@ class Account < ApplicationRecord
def normalize_domain
return if local?
- self.domain = TagManager.instance.normalize_domain(domain)
+ super
end
def emojifiable_text
diff --git a/app/models/concerns/domain_normalizable.rb b/app/models/concerns/domain_normalizable.rb
new file mode 100644
index 0000000000..dff3e5414f
--- /dev/null
+++ b/app/models/concerns/domain_normalizable.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module DomainNormalizable
+ extend ActiveSupport::Concern
+
+ included do
+ before_validation :normalize_domain
+ end
+
+ private
+
+ def normalize_domain
+ self.domain = TagManager.instance.normalize_domain(domain)
+ end
+end
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index b828a9d71c..1064ea7c8f 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -13,6 +13,8 @@
#
class DomainBlock < ApplicationRecord
+ include DomainNormalizable
+
enum severity: [:silence, :suspend, :noop]
attr_accessor :retroactive
@@ -25,12 +27,4 @@ class DomainBlock < ApplicationRecord
def self.blocked?(domain)
where(domain: domain, severity: :suspend).exists?
end
-
- before_validation :normalize_domain
-
- private
-
- def normalize_domain
- self.domain = TagManager.instance.normalize_domain(domain)
- end
end
diff --git a/app/models/email_domain_block.rb b/app/models/email_domain_block.rb
index 10490375bc..0fcd36477b 100644
--- a/app/models/email_domain_block.rb
+++ b/app/models/email_domain_block.rb
@@ -10,7 +10,7 @@
#
class EmailDomainBlock < ApplicationRecord
- before_validation :normalize_domain
+ include DomainNormalizable
validates :domain, presence: true, uniqueness: true
@@ -27,10 +27,4 @@ class EmailDomainBlock < ApplicationRecord
where(domain: domain).exists?
end
-
- private
-
- def normalize_domain
- self.domain = TagManager.instance.normalize_domain(domain)
- end
end