marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

include note for admin account actions in audit log

staging
multiple creatures 2019-08-03 15:07:19 -05:00
parent e1bdc82d07
commit 3e6831d7d6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/helpers/log_helper.rb
View File

@ -1,5 +1,5 @@
module LogHelper
def user_friendly_action_log(source, action, target)
def user_friendly_action_log(source, action, target, reason = nil)
source = source.username if source.is_a?(Account)
case action
@ -47,22 +47,22 @@ module LogHelper
end
when :force_sensitive
LogWorker.perform_async("\xf0\x9f\x94\x9e <#{source}> forced the media of <#{target.acct}> to be marked sensitive.")
LogWorker.perform_async("\xf0\x9f\x94\x9e <#{source}> forced the media of <#{target.acct}> to be marked sensitive.\n\n#{reason? ? "Comment: #{reason}" : ''}")
when :force_unlisted
LogWorker.perform_async("\xf0\x9f\x94\x89 <#{source}> forced the posts of <#{target.acct}> to be unlisted.")
LogWorker.perform_async("\xf0\x9f\x94\x89 <#{source}> forced the posts of <#{target.acct}> to be unlisted.\n\n#{reason? ? "Comment: #{reason}" : ''}")
when :silence
LogWorker.perform_async("\xf0\x9f\x94\x87 <#{source}> silenced <#{target.acct}>'.")
LogWorker.perform_async("\xf0\x9f\x94\x87 <#{source}> silenced <#{target.acct}>'.\n\n#{reason? ? "Comment: #{reason}" : ''}")
when :suspend
LogWorker.perform_async("\u26d4 <#{source}> suspended <#{target.acct}>.")
LogWorker.perform_async("\u26d4 <#{source}> suspended <#{target.acct}>.\n\n#{reason? ? "Comment: #{reason}" : ''}")
when :allow_nonsensitive
LogWorker.perform_async("\xf0\x9f\x86\x97 <#{source}> allowed <#{target.acct}> to post media without a sensitive flag.")
when :allow_public
LogWorker.perform_async("\xf0\x9f\x86\x8a <#{source}> allowed <#{target.acct}> to post with public visibility.")
when :unsilence
LogWorker.perform_async("\xf0\x9f\x94\x8a <#{source}> unsilenced <#{target.acct}>.")
LogWorker.perform_async("\xf0\x9f\x94\x8a <#{source}> unsilenced <#{target.acct}>.\n\n#{reason? ? "Comment: #{reason}" : ''}")
when :unsuspend
LogWorker.perform_async("\xf0\x9f\x86\x97 <#{source}> unsuspended <#{target.acct}>.")
LogWorker.perform_async("\xf0\x9f\x86\x97 <#{source}> unsuspended <#{target.acct}>.\n\n#{reason? ? "Comment: #{reason}" : ''}")
when :remove_avatar
LogWorker.perform_async("\xf0\x9f\x97\x91\xef\xb8\x8f <#{source}> removed the avatar of <#{target.acct}>.")

4
app/helpers/moderation_helper.rb
View File

@ -17,10 +17,10 @@ module ModerationHelper
if policy == 'reset'
Admin::ActionLog.create(account: @account, action: unsuspend, target: acct)
user_friendly_action_log(@account, :unsuspend, acct)
user_friendly_action_log(@account, :unsuspend, acct, reason)
else
Admin::ActionLog.create(account: @account, action: policy, target: acct)
user_friendly_action_log(@account, policy.to_sym, acct)
user_friendly_action_log(@account, policy.to_sym, acct, reason)
end
case policy