diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 13:45:18 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 15:36:53 +0100 |
| commit | 571d219bb917cefcca7419a0ad4e3889689d5f6a (patch) | |
| tree | 6ab91adcb2c164fd027708e58f5fb96c52474007 /app/models/domain_block.rb | |
| parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
| parent | 66436d08959998be20c6c6bf631177d8c1f3e0d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
Diffstat (limited to 'app/models/domain_block.rb')
| -rw-r--r-- | app/models/domain_block.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb index b828a9d71..1064ea7c8 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 |