diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-12-07 20:17:07 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-12-07 20:17:07 -0600 |
| commit | 5d7349f2ab41f4e68080b10a988646d0aff17e2c (patch) | |
| tree | 9d0bb152340f0ae78157ee47e507a532fca2af04 /app/helpers | |
| parent | 2765793f7dabf4a6a9758566fe02b7f31598c0a0 (diff) | |
domain policies also now get applied to subdomains
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/log_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/log_helper.rb b/app/helpers/log_helper.rb index 9dd44e72d..54c741875 100644 --- a/app/helpers/log_helper.rb +++ b/app/helpers/log_helper.rb @@ -6,7 +6,11 @@ module LogHelper case action when :create if target.is_a? DomainBlock - LogWorker.perform_async("\xf0\x9f\x9a\xab <#{source}> applied a #{target.severity}#{target.force_sensitive? ? " and force sensitive media" : ''}#{target.reject_media? ? " and reject media" : ''}#{target.reject_unknown? ? " and reject unknown accounts" : ''} policy on '#{target.domain}'\u200b.\n\nReview (moderators only): https://#{web_domain}/admin/instances/#{target.domain}\n\n#{target.reason? ? "Comment: #{target.reason}" : ''}") + if source.is_a? DomainBlock + LogWorker.perform_async("\xf0\x9f\x9a\xab Applied the existing #{target.severity}#{target.force_sensitive? ? " and force sensitive media" : ''}#{target.reject_media? ? " and reject media" : ''}#{target.reject_unknown? ? " and reject unknown accounts" : ''} policy set on '#{source.domain}' to '#{target.domain}'\u200b.\n\nReview (moderators only): https://#{web_domain}/admin/instances/#{target.domain}") + else + LogWorker.perform_async("\xf0\x9f\x9a\xab <#{source}> applied a #{target.severity}#{target.force_sensitive? ? " and force sensitive media" : ''}#{target.reject_media? ? " and reject media" : ''}#{target.reject_unknown? ? " and reject unknown accounts" : ''} policy on '#{target.domain}'\u200b.\n\nReview (moderators only): https://#{web_domain}/admin/instances/#{target.domain}\n\n#{target.reason? ? "Comment: #{target.reason}" : ''}") + end elsif target.is_a? EmailDomainBlock LogWorker.perform_async("\u26d4 <#{source}> added a registration block on email domain '#{target.domain}'.\n\nReview (moderators only): https://#{web_domain}/admin/email_domain_blocks") elsif target.is_a? CustomEmoji |