Skip to content

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

FIX: release reviewable claim when resolved (#43704)

Kris9cce40b85f11
diff --git a/app/controllers/reviewable_claimed_topics_controller.rb b/app/controllers/reviewable_claimed_topics_controller.rb
index 45ef145e67b..c61cb7f679b 100644
--- a/app/controllers/reviewable_claimed_topics_controller.rb
+++ b/app/controllers/reviewable_claimed_topics_controller.rb
@@ -16,8 +16,8 @@ class ReviewableClaimedTopicsController < ApplicationController
end
claim.log_topic_history(:claimed, current_user)
+ claim.publish_change(current_user, claimed: true)
- notify_users(topic, current_user, automatic)
render json: success_json
end
@@ -28,33 +28,8 @@ class ReviewableClaimedTopicsController < ApplicationController
raise Discourse::NotFound
end
- if claim = ReviewableClaimedTopic.find_by(topic_id: topic.id)
- claim.delete
- claim.log_topic_history(:unclaimed, current_user)
- notify_users(topic, current_user, claim.automatic, claimed: false)
- end
+ ReviewableClaimedTopic.find_by(topic_id: topic.id)&.release(current_user)
render json: success_json
end
-
- private
-
- def notify_users(topic, user, automatic, claimed: true)
- group_ids = Set.new([Group::AUTO_GROUPS[:staff]])
-
- if SiteSetting.enable_category_group_moderation? && topic.category
- group_ids.merge(topic.category.moderating_group_ids)
- end
-
- data = {
- topic_id: topic.id,
- user: BasicUserSerializer.new(user, root: false).as_json,
- automatic:,
- claimed:,
- }
-
- MessageBus.publish("/reviewable_claimed", data, group_ids: group_ids.to_a)
-
- Jobs.enqueue(:refresh_users_reviewable_counts, group_ids: group_ids.to_a)
- end
end
diff --git a/app/models/reviewable.rb b/app/models/reviewable.rb
index 0680bebeed0..7fd25d7793b 100644
--- a/app/models/reviewable.rb
+++ b/app/models/reviewable.rb
@@ -457,6 +457,12 @@ class Reviewable < ActiveRecord::Base
end
def transition_to(status_symbol, performed_by)
+ # Claims are held per topic, so one left behind would claim the topic's next reviewable.
+ # Released while still pending so the unclaim is recorded on this reviewable's timeline.
+ if topic_id && pending? && status_symbol.to_sym != :pending
+ ReviewableClaimedTopic.release_manual_claim(topic_id, performed_by)
+ end
+
self.status = status_symbol
save!
diff --git a/app/models/reviewable_claimed_topic.rb b/app/models/reviewable_claimed_topic.rb
index d05cd365fcf..1e453d173ad 100644
--- a/app/models/reviewable_claimed_topic.rb
+++ b/app/models/reviewable_claimed_topic.rb
@@ -5,6 +5,16 @@ class ReviewableClaimedTopic < ActiveRecord::Base
belongs_to :user
validates :topic, uniqueness: true
+ def self.release_manual_claim(topic_id, performed_by)
+ find_by(topic_id:, automatic: false)&.release(performed_by)
+ end
+
+ def release(performed_by)
+ delete
+ log_topic_history(:unclaimed, performed_by) if SiteSetting.reviewable_claiming != "disabled"
+ publish_change(performed_by, claimed: false)
+ end
+
def log_topic_history(type, performed_by)
return if automatic?
@@ -14,6 +24,26 @@ class ReviewableClaimedTopic < ActiveRecord::Base
.find_each { |reviewable| reviewable.log_history(type, performed_by) }
end
+ def publish_change(performed_by, claimed:)
+ group_ids = [Group::AUTO_GROUPS[:staff]]
+
+ if SiteSetting.enable_category_group_moderation?
+ category = Topic.with_deleted.find_by(id: topic_id)&.category
+ group_ids |= category.moderating_group_ids if category
+ end
+
+ data = {
+ topic_id:,
+ user: BasicUserSerializer.new(performed_by, root: false).as_json,
+ automatic:,
+ claimed:,
+ }
+
+ MessageBus.publish("/reviewable_claimed", data, group_ids:)
+
+ Jobs.enqueue(:refresh_users_reviewable_counts, group_ids:)
+ end
+
def self.claimed_hash(topic_ids)
result = {}
if SiteSetting.reviewable_claiming == "disabled"
diff --git a/app/models/reviewable_flagged_post.rb b/app/models/reviewable_flagged_post.rb
index d08fe2ea996..8f4309e6750 100644
--- a/app/models/reviewable_flagged_post.rb
+++ b/app/models/reviewable_flagged_post.rb
@@ -247,7 +247,6 @@ class ReviewableFlaggedPost < Reviewable
end
if actions.first.present?
- unassign_topic performed_by, post
DiscourseEvent.trigger(:flag_reviewed, post)
DiscourseEvent.trigger(:flag_deferred, actions.first)
end
@@ -307,7 +306,6 @@ class ReviewableFlaggedPost < Reviewable
Post.with_deleted.where(id: target_id).update_all(cached)
if actions.first.present?
- unassign_topic performed_by, post
DiscourseEvent.trigger(:flag_reviewed, post)
DiscourseEvent.trigger(:flag_disagreed, actions.first)
end
@@ -376,7 +374,6 @@ class ReviewableFlaggedPost < Reviewable
DiscourseEvent.trigger(:confirmed_spam_post, post) if trigger_spam
if actions.first.present?
- unassign_topic performed_by, post
DiscourseEvent.trigger(:flag_reviewed, post)
DiscourseEvent.trigger(:flag_agreed, actions.first)
yield(actions.first) if block_given?
@@ -385,40 +382,6 @@ class ReviewableFlaggedPost < Reviewable
create_result(:success, :approved, actions.map(&:user_id), false)
end
- def unassign_topic(performed_by, post)
- topic = post.topic
- return unless topic && performed_by && SiteSetting.reviewable_claiming != "disabled"
- claim = ReviewableClaimedTopic.find_by(topic_id: topic.id, automatic: false)
- return if claim.nil?
-
- claim.delete
- claim.log_topic_history(:unclaimed, performed_by)
-
- user_ids = User.staff.pluck(:id)
-
- if SiteSetting.enable_category_group_moderation? && topic.category
- user_ids.concat(
- GroupUser
- .joins(
- "INNER JOIN category_moderation_groups ON category_moderation_groups.group_id = group_users.group_id",
- )
- .where("category_moderation_groups.category_id": topic.category.id)
- .distinct
- .pluck(:user_id),
- )
- user_ids.uniq!
- end
-
- data = {
- topic_id: topic.id,
- user: BasicUserSerializer.new(performed_by, root: false).as_json,
- automatic: false,
- claimed: false,
- }
-
- MessageBus.publish("/reviewable_claimed", data, user_ids: user_ids)
- end
-
private
def destroyer(performed_by, post)
diff --git a/db/post_migrate/20260915191328_remove_stale_reviewable_claimed_topics.rb b/db/post_migrate/20260915191328_remove_stale_reviewable_claimed_topics.rb
new file mode 100644
index 00000000000..f71831836e8
--- /dev/null
+++ b/db/post_migrate/20260915191328_remove_stale_reviewable_claimed_topics.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class RemoveStaleReviewableClaimedTopics < ActiveRecord::Migration[8.0]
+ def up
+ # A manual claim is only live while a reviewable on its topic has been pending since before
+ # the claim was made. Anything else was left behind by a reviewable that has since been
+ # resolved (and possibly reopened), so later reviewables on the topic inherited it.
+ # reviewable_history_type 0 = created, 1 = transitioned; status 0 = pending.
+ execute <<~SQL
+ DELETE FROM reviewable_claimed_topics rct
+ WHERE NOT rct.automatic
+ AND NOT EXISTS (
+ SELECT 1
+ FROM reviewables r
+ WHERE r.topic_id = rct.topic_id
+ AND r.status = 0
+ AND COALESCE(
+ (
+ SELECT MAX(rh.created_at)
+ FROM reviewable_histories rh
+ WHERE rh.reviewable_id = r.id
+ AND rh.reviewable_history_type IN (0, 1)
+ ),
+ r.created_at
+ ) <= rct.created_at
+ )
+ SQL
+ end
+
+ def down
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 6b5e65d11a9..8349149b7ea 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -25183,6 +25183,7 @@ ALTER TABLE ONLY public.ad_plugin_house_ads_groups
SET search_path TO "$user", public;
INSERT INTO "schema_migrations" (version) VALUES
+('20260915191328'),
('20260914213908'),
('20260914172801'),
('20260914172757'),
diff --git a/spec/db/post_migrate/20260915191328_remove_stale_reviewable_claimed_topics_spec.rb b/spec/db/post_migrate/20260915191328_remove_stale_reviewable_claimed_topics_spec.rb
new file mode 100644
index 00000000000..e10de042650
--- /dev/null
+++ b/spec/db/post_migrate/20260915191328_remove_stale_reviewable_claimed_topics_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require Rails.root.join("db/post_migrate/20260915191328_remove_stale_reviewable_claimed_topics.rb")
+
+RSpec.describe RemoveStaleReviewableClaimedTopics do
+ before do
+ @original_verbose = ActiveRecord::Migration.verbose
+ ActiveRecord::Migration.verbose = false
+ end
+
+ after { ActiveRecord::Migration.verbose = @original_verbose }
+
+ fab!(:moderator)
+ fab!(:inherited_topic, :topic)
+ fab!(:reopened_topic, :topic)
+ fab!(:resolved_topic, :topic)
+ fab!(:live_topic, :topic)
+ fab!(:automatic_topic, :topic)
+
+ it "removes manual claims whose topic has no reviewable pending since before the claim" do
+ reopened_reviewable =
+ freeze_time(3.days.ago) do
+ Fabricate(:reviewable_queued_post, topic: inherited_topic, status: :approved)
+ Fabricate(:reviewable_queued_post, topic: resolved_topic, status: :approved)
+ Fabricate(:reviewable_flagged_post, topic: reopened_topic)
+ end
+
+ freeze_time(2.days.ago) do
+ [inherited_topic, reopened_topic, resolved_topic].each do |topic|
+ Fabricate(:reviewable_claimed_topic, topic:, user: moderator)
+ end
+ end
+
+ freeze_time(1.day.ago) do
+ Fabricate(:reviewable_flagged_post, topic: inherited_topic)
+ reopened_reviewable.log_history(:transitioned, moderator)
+ end
+
+ described_class.new.up
+
+ expect(ReviewableClaimedTopic.all).to be_empty
+ end
+
+ it "keeps manual claims on reviewables pending since before the claim, and automatic claims" do
+ freeze_time(2.days.ago) { Fabricate(:reviewable_flagged_post, topic: live_topic) }
+
+ live_claim =
+ freeze_time(1.day.ago) do
+ Fabricate(:reviewable_claimed_topic, topic: live_topic, user: moderator)
+ end
+ automatic_claim =
+ Fabricate(:reviewable_claimed_topic, topic: automatic_topic, user: moderator, automatic: true)
+
+ described_class.new.up
+
+ expect(ReviewableClaimedTopic.all).to contain_exactly(live_claim, automatic_claim)
+ end
+end
diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb
index 3af5f57c39b..c606d01e5ba 100644
--- a/spec/models/reviewable_spec.rb
+++ b/spec/models/reviewable_spec.rb
@@ -662,6 +662,40 @@ RSpec.describe Reviewable, type: :model do
end
end
+ describe "#transition_to" do
+ fab!(:moderator)
+ fab!(:topic)
+ let(:reviewable) { Fabricate(:reviewable_queued_post, topic:) }
+
+ it "releases a manual claim on the topic when the reviewable is resolved" do
+ SiteSetting.reviewable_claiming = "optional"
+ Fabricate(:reviewable_claimed_topic, topic:, user: moderator)
+
+ reviewable.transition_to(:approved, moderator)
+
+ expect(ReviewableClaimedTopic.exists?(topic_id: topic.id)).to eq(false)
+ expect(reviewable.history.unclaimed.size).to eq(1)
+ end
+
+ it "silently releases a manual claim when claiming is disabled so it cannot resurface when re-enabled" do
+ SiteSetting.reviewable_claiming = "disabled"
+ Fabricate(:reviewable_claimed_topic, topic:, user: moderator)
+
+ reviewable.transition_to(:ignored, moderator)
+
+ expect(ReviewableClaimedTopic.exists?(topic_id: topic.id)).to eq(false)
+ expect(reviewable.history.unclaimed).to be_empty
+ end
+
+ it "leaves an automatic claim for the acting moderator to release" do
+ claim = Fabricate(:reviewable_claimed_topic, topic:, user: moderator, automatic: true)
+
+ reviewable.transition_to(:approved, moderator)
+
+ expect(ReviewableClaimedTopic.exists?(claim.id)).to eq(true)
+ end
+ end
+
describe "flag_stats" do
fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }
fab!(:post)
diff --git a/spec/requests/reviewable_claimed_topics_controller_spec.rb b/spec/requests/reviewable_claimed_topics_controller_spec.rb
index 6213f773d74..b9a446e8c85 100644
--- a/spec/requests/reviewable_claimed_topics_controller_spec.rb
+++ b/spec/requests/reviewable_claimed_topics_controller_spec.rb
@@ -311,15 +311,12 @@ RSpec.describe ReviewableClaimedTopicsController do
end
it "works with deleted topics" do
- first_post = topic.first_post || Fabricate(:post, topic: topic)
- PostDestroyer.new(Discourse.system_user, first_post, context: "Automated testing").destroy
+ topic.trash!(Discourse.system_user)
delete "/reviewable_claimed_topics/#{claimed.topic_id}.json"
expect(response.status).to eq(200)
- expect(
- ReviewableClaimedTopic.where(user_id: moderator.id, topic_id: topic.id).exists?,
- ).to eq(false)
+ expect(ReviewableClaimedTopic.where(topic_id: topic.id).exists?).to eq(false)
end
it "raises an error if topic is missing" do