Skip to content

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

UX: keep unresolved review queue items in queue after taking action (#43539)

Kriscb96175e93ce
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 45922f20bdb..0680bebeed0 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -433,19 +433,20 @@ class Reviewable < ActiveRecord::Base
result.affected_reviewable_ids |= resolved_reviewable_ids(affected_candidate_ids)
end
- unless status == :pending
- if update_count || result.remove_reviewable_ids.present?
- Jobs.enqueue(
- :notify_reviewable,
- reviewable_id: id,
- performing_username: performed_by.username,
- updated_reviewable_ids: result.remove_reviewable_ids,
- )
- end
-
- notify_users(result, guardian)
+ # An action that leaves the reviewable pending didn't resolve it, so it stays in the queue.
+ result.remove_reviewable_ids -= [id] if pending?
+
+ if update_count || result.remove_reviewable_ids.present?
+ Jobs.enqueue(
+ :notify_reviewable,
+ reviewable_id: id,
+ performing_username: performed_by.username,
+ updated_reviewable_ids: result.remove_reviewable_ids,
+ )
end
+ notify_users(result, guardian)
+
result
end
diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index 932d1b67151..d08fe2ea996 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -178,7 +178,7 @@ class ReviewableFlaggedPost < Reviewable
def perform_unsilence_user(performed_by, _args)
UserSilencer.unsilence(target_user, performed_by, reviewable_id: id)
- create_result(:success) { |result| result.remove_reviewable_ids = [] }
+ create_result(:success)
end
def perform_unsilence_user_and_ignore(performed_by, args)
diff --git a/plugins/chat/app/models/chat/reviewable_message.rb b/plugins/chat/app/models/chat/reviewable_message.rb
index 2b78d763468..b139f27e2ae 100644
--- a/plugins/chat/app/models/chat/reviewable_message.rb
+++ b/plugins/chat/app/models/chat/reviewable_message.rb
@@ -155,7 +155,7 @@ module Chat
def perform_unsilence_user(performed_by, _args)
UserSilencer.unsilence(chat_message_creator, performed_by, reviewable_id: id)
- create_result(:success) { |result| result.remove_reviewable_ids = [] }
+ create_result(:success)
end
def perform_delete_and_ignore(performed_by, args)
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 003846e2bef..3af5f57c39b 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -620,6 +620,20 @@ RSpec.describe Reviewable, type: :model do
)
end
+ it "keeps the reviewable in the queue when the action leaves it pending" do
+ reviewable =
+ PostActionCreator.spam(Fabricate(:user, refresh_auto_groups: true), post).reviewable
+ UserSilencer.silence(post.user, moderator, post_id: post.id)
+
+ perform_result = nil
+ expect { perform_result = reviewable.perform(moderator, :unsilence_user) }.not_to change {
+ Jobs::NotifyReviewable.jobs.size
+ }
+
+ expect(reviewable.reload).to be_pending
+ expect(perform_result.remove_reviewable_ids).to be_empty
+ end
+
it "triggers a notification on approve -> reject to update status" do
reviewable = Fabricate(:reviewable_queued_post, status: Reviewable.statuses[:approved])