A platform for community discussion. Free, open, simple.
FIX: Restrict opening post type transitions to regular and moderator_action (#42221)
Isaac Janzende770c5719b8
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rbindex 17c3a01899a..c0321b178a8 100644--- a/app/controllers/posts_controller.rb+++ b/app/controllers/posts_controller.rb@@ -729,9 +729,16 @@ class PostsController < ApplicationControllerguardian.ensure_can_change_post_type!post = find_post_from_paramsparams.require(:post_type)- raise Discourse::InvalidParameters.new(:post_type) if Post.types[params[:post_type].to_i].blank?+ post_type = params[:post_type].to_i+ unless PostRevisor.valid_post_type?(post_type)+ raise Discourse::InvalidParameters.new(:post_type)+ end++ if post.is_first_post? && post_type == Post.types[:whisper]+ raise Discourse::InvalidParameters.new(:post_type)+ end- post.revise(current_user, post_type: params[:post_type].to_i)+ post.revise(current_user, post_type: post_type)render body: nilenddiff --git a/lib/post_revisor.rb b/lib/post_revisor.rbindex ab0ff816637..6914eec94a8 100644--- a/lib/post_revisor.rb+++ b/lib/post_revisor.rb@@ -109,6 +109,10 @@ class PostRevisor@@tracked_topic_fieldsend+ def self.valid_post_type?(post_type)+ [Post.types[:regular], Post.types[:moderator_action], Post.types[:whisper]].include?(post_type)+ end+def self.track_topic_field(field, &block)tracked_topic_fields[field] = block@@ -288,6 +292,10 @@ class PostRevisor@fields[:raw] = cleanup_whitespaces(@fields[:raw]) if @fields.has_key?(:raw)@fields[:user_id] = @fields[:user_id].to_i if @fields.has_key?(:user_id)@fields[:category_id] = @fields[:category_id].to_i if @fields.has_key?(:category_id)+ if @fields.has_key?(:post_type)+ @fields[:post_type] = @fields[:post_type].to_i+ return false unless validate_post_type+ endif @fields.has_key?(:tags) && PostRevisor.tag_change_noop?(@topic, @fields[:tags])@fields.delete(:tags)end@@ -909,6 +917,13 @@ class PostRevisorprivate+ def validate_post_type+ return true if self.class.valid_post_type?(@fields[:post_type])++ @post.errors.add(:post_type, :invalid)+ false+ end+def resolve_reply_to_changenew_post_number = @fields[:reply_to_post_number]diff --git a/spec/lib/post_revisor_spec.rb b/spec/lib/post_revisor_spec.rbindex b8bd7284dc4..2b34e9a707c 100644--- a/spec/lib/post_revisor_spec.rb+++ b/spec/lib/post_revisor_spec.rb@@ -443,6 +443,23 @@ describe PostRevisor dolet(:post) { Fabricate(:post, post_args) }let(:first_version_at) { post.last_version_at }+ describe "post type changes" do+ let!(:opening_post) { Fabricate(:post, topic: topic) }+ let!(:reply) { Fabricate(:post, topic: topic) }++ it "rejects changing a post to a small action" do+ expect(reply.revise(admin, post_type: Post.types[:small_action])).to eq(false)++ expect(reply.reload.post_type).to eq(Post.types[:regular])+ end++ it "allows changing a post to a whisper" do+ expect(opening_post.revise(admin, post_type: Post.types[:whisper])).to eq(true)++ expect(opening_post.reload).to be_whisper+ end+ end+it "destroys last revision if edit is undone" doold_raw = post.rawdiff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rbindex 7d0adff6bb5..e0158255b29 100644--- a/spec/requests/posts_controller_spec.rb+++ b/spec/requests/posts_controller_spec.rb@@ -1195,6 +1195,46 @@ RSpec.describe PostsController doexpect(response.status).to eq(400)end+ it "rejects changing a reply to a small action" do+ put "/posts/#{post.id}/post_type.json", params: { post_type: Post.types[:small_action] }++ expect(response).to be_bad_request+ expect(post.reload.post_type).to eq(Post.types[:regular])+ end++ it "rejects changing an opening post to a whisper" do+ opening_post = Fabricate(:post)++ put "/posts/#{opening_post.id}/post_type.json", params: { post_type: Post.types[:whisper] }++ expect(response).to be_bad_request+ expect(opening_post.reload.post_type).to eq(Post.types[:regular])+ end++ it "rejects changing a nested topic's opening post to a small action" do+ nested_view_topic = Fabricate(:topic, user: user)+ opening_post = Fabricate(:post, topic: nested_view_topic, user: user, post_number: 1)+ Fabricate(:nested_topic, topic: nested_view_topic)+ SiteSetting.nested_replies_enabled = true++ put "/posts/#{opening_post.id}/post_type.json",+ params: {+ post_type: Post.types[:small_action],+ }++ aggregate_failures do+ expect(response).to be_bad_request+ expect(response.body).to include("post_type")+ expect(opening_post.reload.post_type).to eq(Post.types[:regular])++ sign_out+ get "/n/#{nested_view_topic.slug}/#{nested_view_topic.id}.json"++ expect(response).to be_ok+ expect(response.parsed_body.dig("op_post", "id")).to eq(opening_post.id)+ end+ end+it "can change the post type" doput "/posts/#{post.id}/post_type.json", params: { post_type: 2 }