about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-05-04 12:04:55 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-05-04 12:04:55 -0500
commit2058922cc9dc4f622ecd64ebd102f29b0a43a177 (patch)
tree89c86321fd30a76e7369b31337fce761642364ee /app
parent1aa25ee0f52a0f9dd045897949be688de0e45bfb (diff)
parent54e80bec735bd0329fc4db08d36103d5e80f358e (diff)
Merge branch 'merge-upstream' into gs-master
Diffstat (limited to 'app')
-rw-r--r--app/views/admin/reports/_report.html.haml5
-rw-r--r--app/views/admin/reports/show.html.haml9
-rw-r--r--app/views/admin_mailer/new_report.text.erb2
3 files changed, 11 insertions, 5 deletions
diff --git a/app/views/admin/reports/_report.html.haml b/app/views/admin/reports/_report.html.haml
index d6c881955..7b25c924b 100644
--- a/app/views/admin/reports/_report.html.haml
+++ b/app/views/admin/reports/_report.html.haml
@@ -4,7 +4,10 @@
   %td.target
     = admin_account_link_to report.target_account
   %td.reporter
-    = admin_account_link_to report.account
+    - if report.account.local?
+      = admin_account_link_to report.account
+    - else
+      = report.account.domain
   %td
     %div{ title: report.comment }
       = truncate(report.comment, length: 30, separator: ' ')
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index cbfbdcfa9..38e47e6ca 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -23,9 +23,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)
       %tr
         %th= t('admin.reports.reported_by')
-        %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 'file', pluralize(@report.account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_reports_path(target_account_id: @report.account.id)
+        - if @report.account.local?
+          %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 '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
         %th= t('admin.reports.created_at')
         %td{ colspan: 3 }
diff --git a/app/views/admin_mailer/new_report.text.erb b/app/views/admin_mailer/new_report.text.erb
index 671ae5ca7..d6c7d6bab 100644
--- a/app/views/admin_mailer/new_report.text.erb
+++ b/app/views/admin_mailer/new_report.text.erb
@@ -1,5 +1,5 @@
 <%= 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) %>