Skip to content

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

FIX: Single-topic convert API returns success when the new recipient-cap guard blocks conversion (#39933)

discourse-patch-triage[bot]804e63fc0875
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index f9f8ffb3676..74cb861770c 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -1298,7 +1298,7 @@ class TopicsController < ApplicationController
topic.convert_to_private_message(current_user)
end
- topic.valid? ? render_topic_changes(topic) : render_json_error(topic)
+ topic.errors.present? ? render_json_error(topic) : render_topic_changes(topic)
end
def reset_bump_date
diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb
index 7bd66868424..de4065ade83 100644
--- a/spec/requests/topics_controller_spec.rb
+++ b/spec/requests/topics_controller_spec.rb
@@ -5795,6 +5795,27 @@ RSpec.describe TopicsController do
expect(response).to be_forbidden
end
+ context "when the PM recipient cap would be exceeded" do
+ fab!(:reply_1) { Fabricate(:post, topic: topic, user: post_author1, post_number: 2) }
+ fab!(:reply_2) { Fabricate(:post, topic: topic, user: post_author2, post_number: 3) }
+
+ before { SiteSetting.max_allowed_message_recipients = 2 }
+
+ it "returns an error" do
+ sign_in(admin)
+ put "/t/#{topic.id}/convert-topic/private.json"
+
+ expect(response.status).to eq(422)
+ expect(response.parsed_body["errors"]).to contain_exactly(
+ I18n.t(
+ "topic_converter.too_many_recipients",
+ max: SiteSetting.max_allowed_message_recipients,
+ ),
+ )
+ expect(topic.reload.archetype).to eq(Archetype.default)
+ end
+ end
+
context "with success" do
it "returns success" do
sign_in(admin)