From 3b06175e8f5cb9d688e8ec376dbfd88abf5f3278 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Fri, 10 May 2019 03:48:11 -0500 Subject: Moderation: add `force sensitive` and `force unlisted` actions. Accounts: add federatable `adult content` tag. Handle from remote accounts as well. --- app/helpers/admin/action_logs_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/helpers/admin') diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb index e5fbb1500..93ce447a1 100644 --- a/app/helpers/admin/action_logs_helper.rb +++ b/app/helpers/admin/action_logs_helper.rb @@ -19,7 +19,7 @@ module Admin::ActionLogsHelper elsif log.target_type == 'User' && [:change_email].include?(log.action) log.recorded_changes.slice('email', 'unconfirmed_email') elsif log.target_type == 'DomainBlock' - log.recorded_changes.slice('severity', 'reject_media') + log.recorded_changes.slice('severity', 'reject_media', 'force_sensitive') elsif log.target_type == 'Status' && log.action == :update log.recorded_changes.slice('sensitive') end @@ -55,13 +55,13 @@ module Admin::ActionLogsHelper def class_for_log_icon(log) case log.action - when :enable, :unsuspend, :unsilence, :confirm, :promote, :resolve + when :enable, :allow_public, :allow_nonsensitive, :unsuspend, :unsilence, :confirm, :promote, :resolve 'positive' when :create opposite_verbs?(log) ? 'negative' : 'positive' when :update, :reset_password, :disable_2fa, :memorialize, :change_email 'neutral' - when :demote, :silence, :disable, :suspend, :remove_avatar, :remove_header, :reopen + when :demote, :force_sensitive, :force_unlisted, :silence, :disable, :suspend, :remove_avatar, :remove_header, :reopen 'negative' when :destroy opposite_verbs?(log) ? 'positive' : 'negative' -- cgit