Skip to content

A platform for community discussion. Free, open, simple.

FEATURE: Allow suspending and silencing users from the review queue (#42205)

Régis Hanolca469579dc59
diff --git a/app/models/concerns/reviewable_action_builder.rb b/app/models/concerns/reviewable_action_builder.rb
index d563f02445a..0e324805955 100644
--- a/app/models/concerns/reviewable_action_builder.rb
+++ b/app/models/concerns/reviewable_action_builder.rb
@@ -60,6 +60,18 @@ module ReviewableActionBuilder
end
end
+ def build_penalty_actions(actions, bundle:, silence:, suspend:, user: target_user)
+ return if user.blank? || !guardian.can_suspend?(user)
+
+ if !user.silenced?
+ build_action(actions, silence, icon: "microphone-slash", bundle:, client_action: "silence")
+ end
+
+ if !user.suspended?
+ build_action(actions, suspend, icon: "ban", bundle:, client_action: "suspend")
+ end
+ end
+
def perform_silence_user(performed_by, args)
create_result(:success, :rejected)
end
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 674063d2540..bb579199561 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -446,13 +446,20 @@ class Reviewable < ActiveRecord::Base
]
target_associations << :localizations if SiteSetting.content_localization_enabled
+ target_created_by_associations = [:user_custom_fields]
+
+ if SiteSetting.allow_anonymous_mode
+ target_associations << { anonymous_user_master: :master_user }
+ target_created_by_associations << { anonymous_user_master: :master_user }
+ end
+
result =
result
.includes(
{ created_by: :user_stat },
:topic,
{ target: target_associations },
- { target_created_by: [:user_custom_fields] },
+ { target_created_by: target_created_by_associations },
:reviewable_histories,
)
.includes(reviewable_scores: { user: :user_stat, meta_topic: :posts })
diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index 27bf31d1a59..9873002ca94 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -94,25 +94,12 @@ class ReviewableFlaggedPost < Reviewable
end
end
- if guardian.can_suspend?(target_created_by)
- if !target_created_by.silenced?
- build_action(
- actions,
- :agree_and_silence,
- icon: "microphone-slash",
- bundle: agree_bundle,
- client_action: "silence",
- )
- end
-
- build_action(
- actions,
- :agree_and_suspend,
- icon: "ban",
- bundle: agree_bundle,
- client_action: "suspend",
- )
- end
+ build_penalty_actions(
+ actions,
+ bundle: agree_bundle,
+ silence: :agree_and_silence,
+ suspend: :agree_and_suspend,
+ )
if (potential_spam? || potentially_illegal?) && guardian.can_delete_user?(target_created_by)
delete_user_actions(actions, agree_bundle)
diff --git a/app/models/reviewable_post.rb b/app/models/reviewable_post.rb
index db41bdae2da..8ed63c92086 100644
--- a/app/models/reviewable_post.rb
+++ b/app/models/reviewable_post.rb
@@ -3,10 +3,6 @@
class ReviewablePost < Reviewable
include ReviewableActionBuilder
- def self.action_aliases
- { reject_and_silence: :reject_and_suspend }
- end
-
def self.queue_for_review_if_possible(post, created_or_edited_by)
return unless SiteSetting.review_every_post
return if post.post_type != Post.types[:regular] || post.topic.private_message?
@@ -75,22 +71,12 @@ class ReviewablePost < Reviewable
end
end
- if can_penalize
- build_action(
- actions,
- :reject_and_suspend,
- icon: "ban",
- bundle: reject,
- client_action: "suspend",
- )
- build_action(
- actions,
- :reject_and_silence,
- icon: "microphone-slash",
- bundle: reject,
- client_action: "silence",
- )
- end
+ build_penalty_actions(
+ actions,
+ bundle: reject,
+ silence: :reject_and_silence,
+ suspend: :reject_and_suspend,
+ )
end
def perform_approve(performed_by, _args)
@@ -124,6 +110,10 @@ class ReviewablePost < Reviewable
create_result(:success, :rejected, [created_by_id], false)
end
+ def perform_reject_and_silence(performed_by, _args)
+ create_result(:success, :rejected, [created_by_id], false)
+ end
+
private
def post
diff --git a/app/models/reviewable_queued_post.rb b/app/models/reviewable_queued_post.rb
index f838eacfb9f..90b61b2f0a3 100644
--- a/app/models/reviewable_queued_post.rb
+++ b/app/models/reviewable_queued_post.rb
@@ -4,7 +4,12 @@ class ReviewableQueuedPost < Reviewable
include ReviewableActionBuilder
def self.action_aliases
- { discard_post: :reject_post, delete_user_block: :delete_and_block_user }
+ {
+ discard_post: :reject_post,
+ reject_and_silence: :reject_post,
+ reject_and_suspend: :reject_post,
+ delete_user_block: :delete_and_block_user,
+ }
end
after_create do
@@ -50,6 +55,13 @@ class ReviewableQueuedPost < Reviewable
build_action(actions, :reject_post, bundle: reject_bundle, icon: "xmark")
build_action(actions, :revise_and_reject_post, bundle: reject_bundle, icon: "envelope")
+ build_penalty_actions(
+ actions,
+ bundle: reject_bundle,
+ silence: :reject_and_silence,
+ suspend: :reject_and_suspend,
+ )
+
delete_user_actions(actions, reject_bundle) if guardian.can_delete_user?(target_created_by)
end
diff --git a/app/models/reviewable_user.rb b/app/models/reviewable_user.rb
index fbe1db97b3e..50a0e9dafd7 100644
--- a/app/models/reviewable_user.rb
+++ b/app/models/reviewable_user.rb
@@ -12,9 +12,7 @@ class ReviewableUser < Reviewable
end
def build_combined_actions(actions, guardian, args)
- if status == "rejected" && !payload&.dig("scrubbed_by")
- build_action(actions, :scrub, client_action: "scrub")
- end
+ build_action(actions, :scrub, client_action: "scrub") if guardian.is_admin? && scrubbable?
suspect_pending = status == "pending" && is_a_suspect_user?
@@ -27,6 +25,9 @@ class ReviewableUser < Reviewable
icon: "user-xmark",
label: "reviewables.actions.confirm_spam.title",
)
+
+ build_penalty_actions(actions, bundle:, silence: :silence_user, suspend: :suspend_user)
+
delete_user_actions(actions, bundle, require_reject_reason: false)
end
@@ -87,9 +88,9 @@ class ReviewableUser < Reviewable
)
self.payload = {
- scrubbed_by: guardian.current_user.username,
- scrubbed_reason: reason,
- scrubbed_at:,
+ "scrubbed_by" => guardian.current_user.username,
+ "scrubbed_reason" => reason,
+ "scrubbed_at" => scrubbed_at,
}
save!
@@ -160,6 +161,15 @@ class ReviewableUser < Reviewable
def is_a_suspect_user?
reviewable_scores.any? { |rs| rs.reason == "suspect_user" }
end
+
+ private
+
+ def scrubbable?
+ username = payload&.dig("username")
+ return false if !rejected? || username.blank?
+
+ target.blank? || username != target.username
+ end
end
# == Schema Information
diff --git a/app/serializers/flagged_user_serializer.rb b/app/serializers/flagged_user_serializer.rb
index 74d9f02fd6a..ca4a26621ac 100644
--- a/app/serializers/flagged_user_serializer.rb
+++ b/app/serializers/flagged_user_serializer.rb
@@ -17,7 +17,11 @@ class FlaggedUserSerializer < BasicUserSerializer
:trust_level,
:silenced_count,
:suspended_count,
- :rejected_posts_count
+ :rejected_posts_count,
+ :silenced_till,
+ :silence_reason,
+ :suspended_till,
+ :suspend_reason
def can_delete_all_posts
scope.can_delete_all_posts?(object)
@@ -71,4 +75,20 @@ class FlaggedUserSerializer < BasicUserSerializer
def include_email?
scope.can_check_emails?(scope.user)
end
+
+ def include_silenced_till?
+ object.silenced?
+ end
+
+ def include_silence_reason?
+ object.silenced? && object.silence_reason.present?
+ end
+
+ def include_suspended_till?
+ object.suspended?
+ end
+
+ def include_suspend_reason?
+ object.suspended? && object.suspend_reason.present?
+ end
end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e8ff54b7de9..0a7c035354a 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -974,6 +974,11 @@ en:
email: "Email"
name: "Name"
fields: "Fields"
+ silenced_until: "Silenced until"
+ silence_reason: "Silence reason"
+ suspended_until: "Suspended until"
+ suspend_reason: "Suspension reason"
+ penalty_forever: "Forever"
reject_reason: "Reason"
scrubbed_by: "Record scrubbed by"
scrubbed_reason: "Reason"
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index f433b93c6fb..15db20584c3 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -6240,12 +6240,12 @@ en:
reject_user:
title: "No"
delete:
- title: "Delete User"
- description: "Delete user without blocking"
+ title: "Delete user"
+ description: "Delete the user without blocking their email or IP address"
complete: "User deleted."
block:
- title: "Delete and Block User"
- description: "The user will be deleted, and we'll block their IP and email address."
+ title: "Delete and block user"
+ description: "Delete the user and block their email and IP address"
complete: "User deleted and blocked."
confirm_spam:
title: "Yes"
@@ -6256,10 +6256,12 @@ en:
title: "Reject"
bundle_title: "Reject…"
reject_and_suspend:
- title: "Reject and Suspend user"
+ title: "Reject and suspend user"
+ description: "Reject the post and prevent the user from logging in until the suspension ends"
complete: "Post rejected and user suspended."
reject_and_silence:
- title: "Reject and Silence user"
+ title: "Reject and silence user"
+ description: "Reject the post and prevent the user from posting or sending messages"
complete: "Post rejected and user silenced."
reject_and_delete:
title: "Reject and Delete the post"
@@ -6306,12 +6308,12 @@ en:
bundle_title: "What do you want to do with the user?"
silence_user:
title: "Silence user"
- description: "Prevent the user from posting"
+ description: "Prevent the user from posting or sending messages"
complete: "User silenced"
reason: "User silenced via review queue"
suspend_user:
title: "Suspend user"
- description: "Suspend the user account"
+ description: "Prevent the user from logging in until the suspension ends"
complete: "User suspended"
reason: "User suspended via review queue"
delete_user:
diff --git a/frontend/discourse/admin/components/modal/penalize-user.gjs b/frontend/discourse/admin/components/modal/penalize-user.gjs
index 577a65577b8..4857d95e19e 100644
--- a/frontend/discourse/admin/components/modal/penalize-user.gjs
+++ b/frontend/discourse/admin/components/modal/penalize-user.gjs
@@ -21,13 +21,16 @@ export default class PenalizeUser extends Component {
@service siteSettings;
@tracked penalizeUntil = this.args.model.user.next_penalty;
+ @tracked penalizing = false;
@tracked confirmClose = false;
+
@tracked otherUserIds = [];
@tracked postAction = "delete";
@tracked flash;
@tracked reason;
@tracked message;
@tracked readyToDeleteAll = false;
+ #beforeCompleted = false;
constructor() {
super(...arguments);
@@ -90,12 +93,13 @@ export default class PenalizeUser extends Component {
this.penalizing = true;
this.confirmClose = true;
- if (this.args.model.before) {
- this.args.model.before();
- }
-
let result;
try {
+ if (this.args.model.before && !this.#beforeCompleted) {
+ await this.args.model.before();
+ this.#beforeCompleted = true;
+ }
+
const opts = {
reason: this.reason,
message: this.message,
diff --git a/frontend/discourse/app/components/reviewable/item.gjs b/frontend/discourse/app/components/reviewable/item.gjs
index c654a0d6f30..b9738ff1c95 100644
--- a/frontend/discourse/app/components/reviewable/item.gjs
+++ b/frontend/discourse/app/components/reviewable/item.gjs
@@ -441,28 +441,31 @@ export default class ReviewableItem extends Component {
reviewable
)
)
- .catch(popupAjaxError)
.finally(() => {
this.set("updating", false);
this.disabled = false;
});
};
- if (performableAction.client_action) {
- let actionMethod =
- this[`client${classify(performableAction.client_action)}`];
- if (actionMethod) {
- if (await this.#claimReviewable()) {
- await actionMethod.call(this, reviewable, performAction);
+ try {
+ if (performableAction.client_action) {
+ let actionMethod =
+ this[`client${classify(performableAction.client_action)}`];
+ if (actionMethod) {
+ if (await this.#claimReviewable()) {
+ await actionMethod.call(this, reviewable, performAction);
+ }
+ } else {
+ // eslint-disable-next-line no-console
+ console.error(
+ `No handler for ${performableAction.client_action} found`
+ );
}
} else {
- // eslint-disable-next-line no-console
- console.error(
- `No handler for ${performableAction.client_action} found`
- );
+ await performAction();
}
- } else {
- await performAction();
+ } catch (error) {
+ popupAjaxError(error);
}
return this.#unclaimAutomaticReviewable();
@@ -561,7 +564,7 @@ export default class ReviewableItem extends Component {
if (adminTools) {
let createdBy = reviewable.get("target_created_by");
let postId = reviewable.get("post_id");
- let postEdit = reviewable.get("raw");
+ let postEdit = reviewable.get("raw") ?? reviewable.get("payload.raw");
return adminTools[adminToolMethod](createdBy, {
postId,
diff --git a/frontend/discourse/app/components/reviewable/user.gjs b/frontend/discourse/app/components/reviewable/user.gjs
index f4cc3252e95..e2eee6e3be0 100644
--- a/frontend/discourse/app/components/reviewable/user.gjs
+++ b/frontend/discourse/app/components/reviewable/user.gjs
@@ -10,6 +10,7 @@ import rawDate from "discourse/helpers/raw-date";
import { ajax } from "discourse/lib/ajax";
import { popupAjaxError } from "discourse/lib/ajax-error";
import { bind } from "discourse/lib/decorators";
+import { longDate } from "discourse/lib/formatter";
import getUrl from "discourse/lib/get-url";
import { i18n } from "discourse-i18n";
@@ -28,6 +29,26 @@ export default class ReviewableUser extends Component {
return !!this.reviewable?.payload?.scrubbed_by;
}
+ @computed("reviewable.target_user.silenced_till")
+ get silencedTill() {
+ return this.penaltyDate(this.reviewable?.target_user?.silenced_till);
+ }
+
+ @computed("reviewable.target_user.suspended_till")
+ get suspendedTill() {
+ return this.penaltyDate(this.reviewable?.target_user?.suspended_till);
+ }
+
+ penaltyDate(date) {
+ if (!date) {
+ return;
+ }
+
+ return moment().diff(date, "years") < -100
+ ? i18n("review.user.penalty_forever")
+ : longDate(date);
+ }
+
@action
showScrubRejectedUserModal() {
this.modal.show(ScrubRejectedUserModal, {
@@ -101,6 +122,32 @@ export default class ReviewableUser extends Component {
{{/if}}
</div>
</div>
+ {{#if this.reviewable.target_user.silenced_till}}
+ <ReviewableField
+ @classes="reviewable-user-details silenced-till"
+ @name={{i18n "review.user.silenced_until"}}
+ @value={{this.silencedTill}}
+ />
+ <ReviewableField
+ @classes="reviewable-user-details silence-reason"
+ @name={{i18n "review.user.silence_reason"}}
+ @value={{this.reviewable.target_user.silence_reason}}
+ />
+ {{/if}}
+
+ {{#if this.reviewable.target_user.suspended_till}}
+ <ReviewableField
+ @classes="reviewable-user-details suspended-till"
+ @name={{i18n "review.user.suspended_until"}}
+ @value={{this.suspendedTill}}
+ />
+ <ReviewableField
+ @classes="reviewable-user-details suspend-reason"
+ @name={{i18n "review.user.suspend_reason"}}
+ @value={{this.reviewable.target_user.suspend_reason}}
+ />
+ {{/if}}
+
<ReviewableField
@classes="reviewable-user-details name"
@name={{i18n "review.user.name"}}
diff --git a/spec/fabricators/reviewable_fabricator.rb b/spec/fabricators/reviewable_fabricator.rb
index f7b1caf72b1..9c67c2ae488 100644
--- a/spec/fabricators/reviewable_fabricator.rb
+++ b/spec/fabricators/reviewable_fabricator.rb
@@ -32,6 +32,29 @@ Fabricator(:reviewable_queued_post_topic, class_name: :reviewable_queued_post) d
end
end
+Fabricator(:suspect_user_reviewable, class_name: :reviewable_user) do
+ reviewable_by_moderator true
+ created_by { Discourse.system_user }
+ target { Fabricate(:user, approved: false) }
+ payload do |attrs|
+ {
+ "username" => attrs[:target].username,
+ "name" => attrs[:target].name,
+ "email" => attrs[:target].email,
+ }
+ end
+ status { :pending }
+
+ after_create do |reviewable|
+ reviewable.add_score(
+ Discourse.system_user,
+ ReviewableScore.types[:needs_approval],
+ reason: :suspect_user,
+ force_review: true,
+ )
+ end
+end
+
Fabricator(:reviewable_queued_post) do
reviewable_by_moderator true
type "ReviewableQueuedPost"
diff --git a/spec/models/reviewable_flagged_post_spec.rb b/spec/models/reviewable_flagged_post_spec.rb
index 3f01365f1cd..1e76b2b5c88 100644
--- a/spec/models/reviewable_flagged_post_spec.rb
+++ b/spec/models/reviewable_flagged_post_spec.rb
@@ -140,6 +140,15 @@ RSpec.describe ReviewableFlaggedPost, type: :model do
expect(actions.has?(:agree_and_suspend)).to eq(true)
end
+ it "doesn't return the suspend action if the user is already suspended" do
+ post.user.update!(suspended_till: 1.year.from_now, suspended_at: Time.zone.now)
+
+ actions = reviewable.actions_for(guardian)
+
+ expect(actions.has?(:agree_and_suspend)).to eq(false)
+ expect(actions.has?(:agree_and_silence)).to eq(true)
+ end
+
it "doesn't end up with an empty ignore bundle when the post is already hidden and deleted" do
post.update!(hidden: true)
post.topic.trash!
diff --git a/spec/models/reviewable_post_spec.rb b/spec/models/reviewable_post_spec.rb
index 72ba801b9d1..781db8367f3 100644
--- a/spec/models/reviewable_post_spec.rb
+++ b/spec/models/reviewable_post_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe ReviewablePost do
describe "#build_actions" do
let(:post) { Fabricate.build(:post) }
- let(:reviewable) { ReviewablePost.new(target: post) }
+ let(:reviewable) { ReviewablePost.new(target: post, target_created_by: post.user) }
let(:guardian) { Guardian.new }
it "Does not return available actions when the reviewable is no longer pending" do
@@ -53,6 +53,25 @@ RSpec.describe ReviewablePost do
expect(actions.has?(:approve_and_restore)).to eq(false)
end
+ it "doesn't include the suspend action when the author is already suspended" do
+ post.user.suspended_till = 1.year.from_now
+ post.user.suspended_at = Time.zone.now
+
+ actions = reviewable_actions(Guardian.new(admin))
+
+ expect(actions.has?(:reject_and_suspend)).to eq(false)
+ expect(actions.has?(:reject_and_silence)).to eq(true)
+ end
+
+ it "doesn't include the silence action when the author is already silenced" do
+ post.user.silenced_till = 1.year.from_now
+
+ actions = reviewable_actions(Guardian.new(admin))
+
+ expect(actions.has?(:reject_and_suspend)).to eq(true)
+ expect(actions.has?(:reject_and_silence)).to eq(false)
+ end
+
def reviewable_actions(guardian)
actions = Reviewable::Actions.new(reviewable, guardian, {})
reviewable.build_actions(actions, guardian, {})
diff --git a/spec/models/reviewable_queued_post_spec.rb b/spec/models/reviewable_queued_post_spec.rb
index 2b5df68b4ce..0d2c5debe1b 100644
--- a/spec/models/reviewable_queued_post_spec.rb
+++ b/spec/models/reviewable_queued_post_spec.rb
@@ -454,4 +454,75 @@ RSpec.describe ReviewableQueuedPost, type: :model do
end
end
end
+
+ describe "penalty actions" do
+ fab!(:reviewable, :reviewable_queued_post)
+
+ it "offers silence and suspend between the reject and delete actions" do
+ actions = reviewable.actions_for(Guardian.new(moderator))
+ bundle = actions.bundles.find { |b| b.id == "#{reviewable.id}-reject-post" }
+
+ expect(bundle.actions.map(&:server_action)).to eq(
+ %w[
+ reject_post
+ revise_and_reject_post
+ reject_and_silence
+ reject_and_suspend
+ delete_user
+ delete_user_block
+ ],
+ )
+ end
+
+ it "doesn't offer the penalties when the author can't be suspended" do
+ reviewable.target_created_by.update!(moderator: true)
+
+ actions = reviewable.actions_for(Guardian.new(moderator))
+ expect(actions.has?(:reject_and_silence)).to eq(false)
+ expect(actions.has?(:reject_and_suspend)).to eq(false)
+ end
+
+ it "doesn't offer the silence action when the author is already silenced" do
+ reviewable.target_created_by.update!(silenced_till: 1.year.from_now)
+
+ actions = reviewable.actions_for(Guardian.new(moderator))
+ expect(actions.has?(:reject_and_silence)).to eq(false)
+ expect(actions.has?(:reject_and_suspend)).to eq(true)
+ end
+
+ it "doesn't offer the suspend action when the author is already suspended" do
+ reviewable.target_created_by.update!(
+ suspended_till: 1.year.from_now,
+ suspended_at: Time.zone.now,
+ )
+
+ actions = reviewable.actions_for(Guardian.new(moderator))
+ expect(actions.has?(:reject_and_silence)).to eq(true)
+ expect(actions.has?(:reject_and_suspend)).to eq(false)
+ end
+
+ it "rejects the post and keeps the author, letting the client apply the suspension" do
+ result = nil
+ expect { result = reviewable.perform(moderator, :reject_and_suspend) }.not_to change(
+ Post,
+ :count,
+ )
+
+ expect(result.success?).to eq(true)
+ expect(reviewable.rejected?).to eq(true)
+ expect(reviewable.target_created_by.suspended?).to eq(false)
+ end
+
+ it "rejects the post and keeps the author, letting the client apply the silencing" do
+ result = nil
+ expect { result = reviewable.perform(moderator, :reject_and_silence) }.not_to change(
+ Post,
+ :count,
+ )
+
+ expect(result.success?).to eq(true)
+ expect(reviewable.rejected?).to eq(true)
+ expect(reviewable.target_created_by.silenced?).to eq(false)
+ end
+ end
end
diff --git a/spec/models/reviewable_user_spec.rb b/spec/models/reviewable_user_spec.rb
index d41a32f54e0..e1b9a6ac155 100644
--- a/spec/models/reviewable_user_spec.rb
+++ b/spec/models/reviewable_user_spec.rb
@@ -17,6 +17,90 @@ RSpec.describe ReviewableUser, type: :model do
expect(actions.has?(:approve_user)).to eq(true)
expect(actions.has?(:delete_user)).to eq(true)
expect(actions.has?(:delete_user_block)).to eq(true)
+ expect(actions.has?(:silence_user)).to eq(false)
+ expect(actions.has?(:suspend_user)).to eq(false)
+ end
+
+ context "when the user was flagged as a possible spammer" do
+ fab!(:reviewable, :suspect_user_reviewable)
+
+ it "returns silence and suspend actions before the delete actions in the confirm-spam bundle" do
+ actions = reviewable.actions_for(Guardian.new(moderator))
+ bundle = actions.bundles.find { |b| b.id == "#{reviewable.id}-confirm-spam" }
+
+ expect(bundle.actions.map(&:server_action)).to eq(
+ %w[silence_user suspend_user delete_user delete_user_block],
+ )
+ end
+
+ it "doesn't return the silence action when the user is already silenced" do
+ reviewable.target.update!(silenced_till: 1.year.from_now)
+
+ actions = reviewable.actions_for(Guardian.new(moderator))
+ expect(actions.has?(:silence_user)).to eq(false)
+ expect(actions.has?(:suspend_user)).to eq(true)
+ end
+
+ it "doesn't return the suspend action when the user is already suspended" do
+ reviewable.target.update!(suspended_till: 1.year.from_now, suspended_at: Time.zone.now)
+
+ actions = reviewable.actions_for(Guardian.new(moderator))
+ expect(actions.has?(:silence_user)).to eq(true)
+ expect(actions.has?(:suspend_user)).to eq(false)
+ end
+
+ it "doesn't return silence or suspend actions when the user can't be suspended" do
+ reviewable.target.update!(moderator: true)
+
+ actions = reviewable.actions_for(Guardian.new(moderator))
+ expect(actions.has?(:silence_user)).to eq(false)
+ expect(actions.has?(:suspend_user)).to eq(false)
+ end
+ end
+
+ context "when the reviewable is rejected" do
+ before do
+ reviewable.update!(
+ status: Reviewable.statuses[:rejected],
+ payload: {
+ "username" => reviewable.target.username,
+ },
+ )
+ end
+
+ it "doesn't return the scrub action when the payload still matches the user" do
+ actions = reviewable.actions_for(Guardian.new(admin))
+ expect(actions.has?(:scrub)).to eq(false)
+ end
+
+ it "returns the scrub action when the user has been deleted" do
+ reviewable.target.destroy!
+
+ actions = reviewable.reload.actions_for(Guardian.new(admin))
+ expect(actions.has?(:scrub)).to eq(true)
+ end
+
+ it "returns the scrub action when the payload no longer matches the user, like after an anonymization" do
+ UserAnonymizer.new(reviewable.target, admin).make_anonymous
+
+ actions = reviewable.reload.actions_for(Guardian.new(admin))
+ expect(actions.has?(:scrub)).to eq(true)
+ end
+
+ it "doesn't return the scrub action for moderators since the endpoint is admin-only" do
+ reviewable.target.destroy!
+
+ actions = reviewable.reload.actions_for(Guardian.new(moderator))
+ expect(actions.has?(:scrub)).to eq(false)
+ end
+
+ it "doesn't return the scrub action when there is no payload to scrub" do
+ reviewable.update!(payload: nil)
+ reviewable.target.destroy!
+
+ actions = reviewable.reload.actions_for(Guardian.new(admin))
+ expect(actions.has?(:scrub)).to eq(false)
+ end
end
it "doesn't return anything in the approved state" do
@@ -233,6 +317,29 @@ RSpec.describe ReviewableUser, type: :model do
}.by(1)
end
end
+
+ context "when suspending or silencing" do
+ fab!(:reviewable, :suspect_user_reviewable)
+
+ it "rejects the reviewable and keeps the user, letting the client apply the suspension" do
+ result = reviewable.perform(moderator, :suspend_user)
+ expect(result.success?).to eq(true)
+
+ expect(reviewable.rejected?).to eq(true)
+ expect(reviewable.reload.target).to be_present
+ expect(reviewable.target.approved).to eq(false)
+ expect(reviewable.target.suspended?).to eq(false)
+ end
+
+ it "rejects the reviewable and keeps the user, letting the client apply the silencing" do
+ result = reviewable.perform(moderator, :silence_user)
+ expect(result.success?).to eq(true)
+
+ expect(reviewable.rejected?).to eq(true)
+ expect(reviewable.reload.target).to be_present
+ expect(reviewable.target.silenced?).to eq(false)
+ end
+ end
end
describe "changing must_approve_users" do
diff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rb
index 2f48dc4310e..9e7165a9d74 100644
--- a/spec/requests/reviewables_controller_spec.rb
+++ b/spec/requests/reviewables_controller_spec.rb
@@ -1282,18 +1282,22 @@ RSpec.describe ReviewablesController do
end
describe "#scrub" do
- it "only allows admins to scrub reviewables" do
- moderator = Fabricate(:moderator)
+ let(:user) { Fabricate(:user).tap(&:activate) }
+ let(:reviewable) { ReviewableUser.find_by(target: user) }
+ before do
Jobs.run_immediately!
SiteSetting.must_approve_users = true
- user = Fabricate(:user)
- user.activate
- reviewable = ReviewableUser.find_by(target: user)
+ end
- sign_in(moderator)
+ def reject_user
put "/review/#{reviewable.id}/perform/delete_user.json?version=0"
expect(response.status).to eq(200)
+ end
+
+ it "only allows admins to scrub reviewables" do
+ sign_in(Fabricate(:moderator))
+ reject_user
put "/review/#{reviewable.id}/scrub.json?reason=spam"
expect(response.status).to eq(403)
@@ -1304,12 +1308,6 @@ RSpec.describe ReviewablesController do
end
it "doesn't allow scrubbing of reviewables that haven't been rejected" do
- Jobs.run_immediately!
- SiteSetting.must_approve_users = true
- user = Fabricate(:user)
- user.activate
- reviewable = ReviewableUser.find_by(target: user)
-
sign_in(admin)
put "/review/#{reviewable.id}/scrub.json?reason=spam"
expect(response.status).to eq(404)
@@ -1331,15 +1329,8 @@ RSpec.describe ReviewablesController do
end
it "doesn't allow scrubbing of reviewables that have already been scrubbed" do
- Jobs.run_immediately!
- SiteSetting.must_approve_users = true
- user = Fabricate(:user)
- user.activate
- reviewable = ReviewableUser.find_by(target: user)
-
sign_in(admin)
- put "/review/#{reviewable.id}/perform/delete_user.json?version=0"
- expect(response.status).to eq(200)
+ reject_user
put "/review/#{reviewable.id}/scrub.json?reason=spam"
expect(response.status).to eq(200)
@@ -1347,6 +1338,17 @@ RSpec.describe ReviewablesController do
put "/review/#{reviewable.id}/scrub.json?reason=spam"
expect(response.status).to eq(403)
end
+
+ it "allows scrubbing of rejected reviewables whose user couldn't be deleted" do
+ Fabricate(:post, user: user)
+
+ sign_in(admin)
+ reject_user
+ expect(User.exists?(user.id)).to eq(true)
+
+ put "/review/#{reviewable.id}/scrub.json?reason=spam"
+ expect(response.status).to eq(200)
+ end
end
describe "#count" do
diff --git a/spec/serializers/reviewable_user_serializer_spec.rb b/spec/serializers/reviewable_user_serializer_spec.rb
index 5b0fc77f2a9..811103764dc 100644
--- a/spec/serializers/reviewable_user_serializer_spec.rb
+++ b/spec/serializers/reviewable_user_serializer_spec.rb
@@ -69,5 +69,29 @@ RSpec.describe ReviewableUserSerializer do
expect(json[:target_user][:id]).to eq(user.id)
expect(json[:target_user][:username]).to eq(user.username)
end
+
+ it "exposes an active penalty with its reason" do
+ user.update!(silenced_till: 1.month.from_now)
+ UserHistory.create!(
+ action: UserHistory.actions[:silence_user],
+ acting_user_id: admin.id,
+ target_user_id: user.id,
+ details: "Promotional links in bio",
+ )
+
+ json = ReviewableUserSerializer.new(reviewable, scope: Guardian.new(admin), root: nil).as_json
+ expect(json[:target_user][:silenced_till]).to be_present
+ expect(json[:target_user][:silence_reason]).to eq("Promotional links in bio")
+ expect(json[:target_user]).not_to have_key(:suspended_till)
+ expect(json[:target_user]).not_to have_key(:suspend_reason)
+ end
+
+ it "doesn't expose expired penalties" do
+ user.update!(suspended_till: 1.day.ago, suspended_at: 1.month.ago)
+
+ json = ReviewableUserSerializer.new(reviewable, scope: Guardian.new(admin), root: nil).as_json
+ expect(json[:target_user]).not_to have_key(:suspended_till)
+ expect(json[:target_user]).not_to have_key(:suspend_reason)
+ end
end
end
diff --git a/spec/system/page_objects/modals/penalize_user.rb b/spec/system/page_objects/modals/penalize_user.rb
index 791a70a6a95..0b24be5d90b 100644
--- a/spec/system/page_objects/modals/penalize_user.rb
+++ b/spec/system/page_objects/modals/penalize_user.rb
@@ -19,6 +19,12 @@ module PageObjects
find(".d-modal.#{@penalty_type}-user-modal")
end
+ def suspend(reason, date: "tomorrow")
+ fill_in_suspend_reason(reason)
+ set_future_date(date)
+ perform
+ end
+
def fill_in_suspend_reason(reason)
find("input.suspend-reason").fill_in with: reason
end
diff --git a/spec/system/page_objects/pages/review.rb b/spec/system/page_objects/pages/review.rb
index c4c8f4dfb50..49e9d6fcc06 100644
--- a/spec/system/page_objects/pages/review.rb
+++ b/spec/system/page_objects/pages/review.rb
@@ -76,11 +76,11 @@ module PageObjects
end
def has_scrub_button?(reviewable)
- within(reviewable_by_id(reviewable.id)) { page.has_css?(".scrub-rejected-user button") }
+ within(reviewable_by_id(reviewable.id)) { page.has_css?(".user-scrub") }
end
def has_no_scrub_button?(reviewable)
- within(reviewable_by_id(reviewable.id)) { page.has_no_css?(".scrub-rejected-user button") }
+ within(reviewable_by_id(reviewable.id)) { page.has_no_css?(".user-scrub") }
end
def click_scrub_user_button
diff --git a/spec/system/reviewables_spec.rb b/spec/system/reviewables_spec.rb
index 55c328b7289..600f4eed928 100644
--- a/spec/system/reviewables_spec.rb
+++ b/spec/system/reviewables_spec.rb
@@ -9,6 +9,7 @@ describe "Reviewables" do
let(:composer) { PageObjects::Components::Composer.new }
let(:moderator) { Fabricate(:moderator) }
let(:toasts) { PageObjects::Components::Toasts.new }
+ let(:suspend_user_modal) { PageObjects::Modals::PenalizeUser.new("suspend") }
before { sign_in(admin) }
@@ -141,6 +142,29 @@ describe "Reviewables" do
end
end
+ describe "when there is a suspect user reviewable" do
+ fab!(:suspect_user) { Fabricate(:user, approved: false) }
+ fab!(:suspect_reviewable) { Fabricate(:suspect_user_reviewable, target: suspect_user) }
+
+ it "allows suspending the user without deleting them" do
+ review_page.visit_reviewable(suspect_reviewable)
+ review_page.select_bundled_action(suspect_reviewable, "user-suspend_user")
+
+ suspend_user_modal.suspend("spam profile")
+
+ expect(suspend_user_modal).to be_closed
+ expect(review_page).to have_reviewable_with_rejected_status(suspect_reviewable)
+ expect(review_page).to have_no_scrub_button(suspect_reviewable)
+ expect(suspect_user.reload).to be_suspended
+ expect(
+ UserHistory.find_by(
+ action: UserHistory.actions[:suspend_user],
+ target_user_id: suspect_user.id,
+ ).reviewable_id,
+ ).to eq(suspect_reviewable.id)
+ end
+ end
+
context "when performing a review action from the show route" do
fab!(:contact_group, :group)
fab!(:contact_user, :user)
@@ -169,6 +193,18 @@ describe "Reviewables" do
expect(queued_post_reviewable.target_created_by).to be_nil
end
+ it "reject_and_suspend rejects the post and suspends its author" do
+ review_page.visit_reviewable(queued_post_reviewable)
+ review_page.select_bundled_action(queued_post_reviewable, "reject_and_suspend")
+
+ suspend_user_modal.suspend("spam")
+
+ expect(suspend_user_modal).to be_closed
+ expect(review_page).to have_reviewable_with_rejected_status(queued_post_reviewable)
+ expect(queued_post_reviewable.reload).to be_rejected
+ expect(queued_post_reviewable.target_created_by.reload).to be_suspended
+ end
+
it "allows revising and rejecting to send a PM to the user" do
revise_modal = PageObjects::Modals::Base.new