Merge remote-tracking branch 'origin/master' into merge-upstream

  Conflicts:
 	Gemfile.lock

6 files changed, 14 insertions, 6 deletions

diff --git a/Gemfile b/Gemfile
index c3f4a62f2..c7d1b9354 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,6 +62,7 @@ gem 'nsa', '~> 0.2'
 gem 'oj', '~> 3.5'
 gem 'ostatus2', '~> 2.0'
 gem 'ox', '~> 2.9'
+gem 'posix-spawn', '~> 0.3'
 gem 'pundit', '~> 1.1'
 gem 'premailer-rails'
 gem 'rack-attack', '~> 5.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e2cf1f3d..36554c1ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -709,7 +709,7 @@ DEPENDENCIES
   pg (~> 1.0)
   pghero (~> 2.1)
   pkg-config (~> 1.3)
-  posix-spawn
+  posix-spawn (~> 0.3)
   premailer-rails
   private_address_check (~> 0.4.1)
   pry-byebug (~> 3.6)
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) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4c7c5078c..8e1b916c1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -376,6 +376,7 @@ en:
   admin_mailer:
     new_report:
       body: "%{reporter} has reported %{target}"
+      body_remote: Someone from %{domain} has reported %{target}
       subject: New report for %{instance} (#%{id})
   application_mailer:
     notification_preferences: Change e-mail preferences