From a78b27c7cce9529e49e1572ac77b6081b60003b2 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 4 May 2018 13:22:23 +0200 Subject: [PATCH 1/4] Marginally improve convert/ffmpeg calls performance with posix-spawn (#7346) --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index c5f1ab681ed..98718f87d06 100644 --- a/Gemfile +++ b/Gemfile @@ -60,6 +60,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 cbb7dbb7fc0..f4be9bf9ca9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -381,6 +381,7 @@ GEM pghero (2.1.0) activerecord pkg-config (1.3.0) + posix-spawn (0.3.13) powerpack (0.1.1) premailer (1.11.1) addressable @@ -705,6 +706,7 @@ DEPENDENCIES pg (~> 1.0) pghero (~> 2.1) pkg-config (~> 1.3) + posix-spawn (~> 0.3) premailer-rails private_address_check (~> 0.4.1) pry-byebug (~> 3.6) From 251bbf9728a310353c3957a0ad51a7f641aa0a9e Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 4 May 2018 13:26:25 +0200 Subject: [PATCH 2/4] Show remote reports in admin UI as coming from domain rather than user (#7347) Fix #6994 --- app/views/admin/reports/_report.html.haml | 5 ++++- app/views/admin/reports/show.html.haml | 9 ++++++--- app/views/admin_mailer/new_report.text.erb | 2 +- config/locales/en.yml | 1 + 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/views/admin/reports/_report.html.haml b/app/views/admin/reports/_report.html.haml index d6c881955c9..7b25c924bc9 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 2bba3079ed9..c9ebc041583 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -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) %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 671ae5ca706..d6c7d6bab37 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 1468d85598e..f7127f7948f 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 From e41332c37be6ff7147e76edba8337636430433e3 Mon Sep 17 00:00:00 2001 From: David Yip Date: Fri, 4 May 2018 09:51:18 -0500 Subject: [PATCH 3/4] Make posix-spawn spec in Gemfile match what's in Gemfile.lock. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index c7d1b935430..990c4353923 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'fog-local', '~> 0.5', require: false gem 'fog-openstack', '~> 0.1', require: false gem 'paperclip', '~> 6.0' gem 'paperclip-av-transcoder', '~> 0.6' -gem 'posix-spawn' +gem 'posix-spawn', '~> 0.3' gem 'streamio-ffmpeg', '~> 3.0' gem 'active_model_serializers', '~> 0.10' From 54e80bec735bd0329fc4db08d36103d5e80f358e Mon Sep 17 00:00:00 2001 From: David Yip Date: Fri, 4 May 2018 10:11:45 -0500 Subject: [PATCH 4/4] Remove duplicate posix-spawn entry from Gemfile. --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index 990c4353923..500628ad1d1 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,6 @@ 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'