diff options
| author | Reverite <github@reverite.sh> | 2019-07-31 01:41:31 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-31 01:41:31 -0700 |
| commit | 7a312a38f904e853f5703a0b678d0aec83fa858c (patch) | |
| tree | eba4b787f6a617e1c2c5f7d4b5be66320212be1d /app/helpers/domain_control_helper.rb | |
| parent | 3013c6cb78358ed8a95a35d5db79608fcb06963f (diff) | |
| parent | 4ecfa8f298399d9857737f212fc8f5767ffa7c6d (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/helpers/domain_control_helper.rb')
| -rw-r--r-- | app/helpers/domain_control_helper.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/domain_control_helper.rb b/app/helpers/domain_control_helper.rb index efd328f81..067b2c2cd 100644 --- a/app/helpers/domain_control_helper.rb +++ b/app/helpers/domain_control_helper.rb @@ -12,6 +12,14 @@ module DomainControlHelper end end - DomainBlock.blocked?(domain) + if whitelist_mode? + !DomainAllow.allowed?(domain) + else + DomainBlock.blocked?(domain) + end + end + + def whitelist_mode? + Rails.configuration.x.whitelist_mode end end |