LenPayne
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Show remote reports in admin UI as coming from domain rather than user (#7347) 

Fix #6994
This commit is contained in:
Eugen Rochko 2018-05-04 13:26:25 +02:00 committed by GitHub
parent a78b27c7cc
commit 251bbf9728
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/admin/reports/_report.html.haml
View File

@ -4,7 +4,10 @@
%td.target %td.target
= admin_account_link_to report.target_account = admin_account_link_to report.target_account
%td.reporter %td.reporter
- if report.account.local?
= admin_account_link_to report.account = admin_account_link_to report.account
- else
= report.account.domain
%td %td
%div{ title: report.comment } %div{ title: report.comment }
= truncate(report.comment, length: 30, separator: ' ') = truncate(report.comment, length: 30, separator: ' ')

3
app/views/admin/reports/show.html.haml
View File

@ -26,9 +26,12 @@
%td= table_link_to 'file', pluralize(@report.target_account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.target_account.id) %td= table_link_to 'file', pluralize(@report.target_account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.target_account.id)
%tr %tr
%th= t('admin.reports.reported_by') %th= t('admin.reports.reported_by')
- if @report.account.local?
%td= admin_account_link_to @report.account %td= admin_account_link_to @report.account
%td= table_link_to 'flag', pluralize(@report.account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: @report.account.id) %td= table_link_to 'flag', pluralize(@report.account.targeted_reports.count, t('admin.reports.account.report')), admin_reports_path(target_account_id: @report.account.id)
%td= table_link_to 'file', pluralize(@report.account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.account.id) %td= table_link_to 'file', pluralize(@report.account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.account.id)
- else
%td{ colspan: 3 }= @report.account.domain
%tr %tr
%th= t('admin.reports.created_at') %th= t('admin.reports.created_at')
%td{ colspan: 3 } %td{ colspan: 3 }

2
app/views/admin_mailer/new_report.text.erb
View File

@ -1,5 +1,5 @@
<%= raw t('application_mailer.salutation', name: display_name(@me)) %> <%= raw t('application_mailer.salutation', name: display_name(@me)) %>
<%= raw t('admin_mailer.new_report.body', target: @report.target_account.acct, reporter: @report.account.acct) %> <%= raw(@report.account.local? ? t('admin_mailer.new_report.body', target: @report.target_account.acct, reporter: @report.account.acct) : t('admin_mailer.new_report.body_remote', target: @report.target_account.acct, domain: @report.account.domain)) %>
<%= raw t('application_mailer.view')%> <%= admin_report_url(@report) %> <%= raw t('application_mailer.view')%> <%= admin_report_url(@report) %>

1
config/locales/en.yml
View File

@ -376,6 +376,7 @@ en:
admin_mailer: admin_mailer:
new_report: new_report:
body: "%{reporter} has reported %{target}" body: "%{reporter} has reported %{target}"
body_remote: Someone from %{domain} has reported %{target}
subject: New report for %{instance} (#%{id}) subject: New report for %{instance} (#%{id})
application_mailer: application_mailer:
notification_preferences: Change e-mail preferences notification_preferences: Change e-mail preferences