Add confirmation step to account suspensions (#8353)
* Add confirmation page for suspensions * Suspension confirmation closes reports, linked from report UI * Fix tests
This commit is contained in:
parent
251308eb69
commit
801b0f583f
12 changed files with 92 additions and 29 deletions
|
@ -44,14 +44,8 @@ module Admin
|
|||
when 'resolve'
|
||||
@report.resolve!(current_account)
|
||||
log_action :resolve, @report
|
||||
when 'suspend'
|
||||
Admin::SuspensionWorker.perform_async(@report.target_account.id)
|
||||
|
||||
log_action :resolve, @report
|
||||
log_action :suspend, @report.target_account
|
||||
|
||||
resolve_all_target_account_reports
|
||||
when 'silence'
|
||||
@report.resolve!(current_account)
|
||||
@report.target_account.update!(silenced: true)
|
||||
|
||||
log_action :resolve, @report
|
||||
|
|
|
@ -4,11 +4,24 @@ module Admin
|
|||
class SuspensionsController < BaseController
|
||||
before_action :set_account
|
||||
|
||||
def new
|
||||
@suspension = Form::AdminSuspensionConfirmation.new(report_id: params[:report_id])
|
||||
end
|
||||
|
||||
def create
|
||||
authorize @account, :suspend?
|
||||
Admin::SuspensionWorker.perform_async(@account.id)
|
||||
log_action :suspend, @account
|
||||
redirect_to admin_accounts_path
|
||||
|
||||
@suspension = Form::AdminSuspensionConfirmation.new(suspension_params)
|
||||
|
||||
if suspension_params[:acct] == @account.acct
|
||||
resolve_report! if suspension_params[:report_id]
|
||||
perform_suspend!
|
||||
mark_reports_resolved!
|
||||
redirect_to admin_accounts_path
|
||||
else
|
||||
flash.now[:alert] = I18n.t('admin.suspensions.bad_acct_msg')
|
||||
render :new
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
|
@ -23,5 +36,25 @@ module Admin
|
|||
def set_account
|
||||
@account = Account.find(params[:account_id])
|
||||
end
|
||||
|
||||
def suspension_params
|
||||
params.require(:form_admin_suspension_confirmation).permit(:acct, :report_id)
|
||||
end
|
||||
|
||||
def resolve_report!
|
||||
report = Report.find(suspension_params[:report_id])
|
||||
report.resolve!(current_account)
|
||||
log_action :resolve, report
|
||||
end
|
||||
|
||||
def perform_suspend!
|
||||
@account.suspend!
|
||||
Admin::SuspensionWorker.perform_async(@account.id)
|
||||
log_action :suspend, @account
|
||||
end
|
||||
|
||||
def mark_reports_resolved!
|
||||
Report.where(target_account: @account).unresolved.update_all(action_taken: true, action_taken_by_account_id: current_account.id)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -50,6 +50,12 @@ code {
|
|||
color: $highlight-text-color;
|
||||
}
|
||||
}
|
||||
|
||||
code {
|
||||
border-radius: 3px;
|
||||
padding: 0.2em 0.4em;
|
||||
background: darken($ui-base-color, 12%);
|
||||
}
|
||||
}
|
||||
|
||||
.card {
|
||||
|
|
|
@ -193,6 +193,13 @@ class Account < ApplicationRecord
|
|||
ResolveAccountService.new.call(acct)
|
||||
end
|
||||
|
||||
def suspend!
|
||||
transaction do
|
||||
user&.disable! if local?
|
||||
update!(suspended: true)
|
||||
end
|
||||
end
|
||||
|
||||
def unsuspend!
|
||||
transaction do
|
||||
user&.enable! if local?
|
||||
|
|
7
app/models/form/admin_suspension_confirmation.rb
Normal file
7
app/models/form/admin_suspension_confirmation.rb
Normal file
|
@ -0,0 +1,7 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Form::AdminSuspensionConfirmation
|
||||
include ActiveModel::Model
|
||||
|
||||
attr_accessor :acct, :report_id
|
||||
end
|
|
@ -123,7 +123,7 @@
|
|||
- if @account.suspended?
|
||||
= link_to t('admin.accounts.undo_suspension'), admin_account_suspension_path(@account.id), method: :delete, class: 'button' if can?(:unsuspend, @account)
|
||||
- else
|
||||
= link_to t('admin.accounts.perform_full_suspension'), admin_account_suspension_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button' if can?(:suspend, @account)
|
||||
= link_to t('admin.accounts.perform_full_suspension'), new_admin_account_suspension_path(@account.id), class: 'button' if can?(:suspend, @account)
|
||||
|
||||
- if !@account.local? && @account.hub_url.present?
|
||||
%hr.spacer/
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
- if @report.unresolved?
|
||||
%div{ style: 'float: right' }
|
||||
= link_to t('admin.reports.silence_account'), admin_report_path(@report, outcome: 'silence'), method: :put, class: 'button'
|
||||
= link_to t('admin.reports.suspend_account'), admin_report_path(@report, outcome: 'suspend'), method: :put, class: 'button'
|
||||
= link_to t('admin.reports.suspend_account'), new_admin_account_suspension_path(@report.target_account_id, report_id: @report.id), class: 'button'
|
||||
%div{ style: 'float: left' }
|
||||
= link_to t('admin.reports.mark_as_resolved'), admin_report_path(@report, outcome: 'resolve'), method: :put, class: 'button'
|
||||
- else
|
||||
|
|
25
app/views/admin/suspensions/new.html.haml
Normal file
25
app/views/admin/suspensions/new.html.haml
Normal file
|
@ -0,0 +1,25 @@
|
|||
- content_for :page_title do
|
||||
= t('admin.suspensions.title', acct: @account.acct)
|
||||
|
||||
= simple_form_for @suspension, url: admin_account_suspension_path(@account.id), method: :post do |f|
|
||||
%p.hint= t('admin.suspensions.warning_html')
|
||||
|
||||
.fields-group
|
||||
%ul
|
||||
%li.negative-hint
|
||||
= number_to_human @account.statuses_count, strip_insignificant_zeros: true
|
||||
= t('accounts.posts')
|
||||
%li.negative-hint
|
||||
= number_to_human @account.following_count, strip_insignificant_zeros: true
|
||||
= t('accounts.following')
|
||||
%li.negative-hint
|
||||
= number_to_human @account.followers_count, strip_insignificant_zeros: true
|
||||
= t('accounts.followers')
|
||||
|
||||
%p.hint= t('admin.suspensions.hint_html', value: content_tag(:code, @account.acct))
|
||||
|
||||
= f.input :acct
|
||||
= f.input_field :report_id, as: :hidden
|
||||
|
||||
.actions
|
||||
= f.button :button, t('admin.suspensions.proceed'), type: :submit, class: 'negative'
|
|
@ -414,6 +414,12 @@ en:
|
|||
last_delivery: Last delivery
|
||||
title: WebSub
|
||||
topic: Topic
|
||||
suspensions:
|
||||
bad_acct_msg: The confirmation value didn't match up. Are you suspending the right account?
|
||||
hint_html: 'To confirm the suspension of the account, please enter %{value} into the field below:'
|
||||
proceed: Proceed
|
||||
title: Suspend %{acct}
|
||||
warning_html: 'Suspending this account will <strong>irreversibly</strong> delete data from this account, which includes:'
|
||||
title: Administration
|
||||
admin_mailer:
|
||||
new_report:
|
||||
|
|
|
@ -174,7 +174,7 @@ Rails.application.routes.draw do
|
|||
resource :change_email, only: [:show, :update]
|
||||
resource :reset, only: [:create]
|
||||
resource :silence, only: [:create, :destroy]
|
||||
resource :suspension, only: [:create, :destroy]
|
||||
resource :suspension, only: [:new, :create, :destroy]
|
||||
resources :statuses, only: [:index, :create, :update, :destroy]
|
||||
|
||||
resource :confirmation, only: [:create] do
|
||||
|
|
|
@ -68,21 +68,6 @@ describe Admin::ReportsController do
|
|||
end
|
||||
end
|
||||
|
||||
describe 'with an outcome of `suspend`' do
|
||||
it 'suspends the reported account' do
|
||||
report = Fabricate(:report)
|
||||
allow(Admin::SuspensionWorker).to receive(:perform_async)
|
||||
|
||||
put :update, params: { id: report, outcome: 'suspend' }
|
||||
expect(response).to redirect_to(admin_reports_path)
|
||||
report.reload
|
||||
expect(report.action_taken_by_account).to eq user.account
|
||||
expect(report.action_taken).to eq true
|
||||
expect(Admin::SuspensionWorker).
|
||||
to have_received(:perform_async).with(report.target_account_id)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'with an outsome of `silence`' do
|
||||
it 'silences the reported account' do
|
||||
report = Fabricate(:report)
|
||||
|
|
|
@ -12,7 +12,7 @@ describe Admin::SuspensionsController do
|
|||
account = Fabricate(:account, suspended: false)
|
||||
expect(Admin::SuspensionWorker).to receive(:perform_async).with(account.id)
|
||||
|
||||
post :create, params: { account_id: account.id }
|
||||
post :create, params: { account_id: account.id, form_admin_suspension_confirmation: { acct: account.acct } }
|
||||
|
||||
expect(response).to redirect_to(admin_accounts_path)
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue