diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-30 11:10:46 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 01:02:20 -0600 |
| commit | b4d97bc26baff0a9867f1e510a7630dd34b8049d (patch) | |
| tree | 4637f1ead39e9e0748066445f94798b0d5f38fd4 /app/helpers | |
| parent | 08f6b74097aacb2cf1c3894d4a58c0b2272a9fa5 (diff) | |
port tootsuite#11292 to monsterfork: Add whitelist mode
Diffstat (limited to 'app/helpers')
| -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 |