A platform for community discussion. Free, open, simple.
FIX: Ensure 'accepted answers' can never include whispers (#40797)
David Taylor9f830f5201dd
diff --git a/plugins/discourse-solved/lib/discourse_solved/accepted_answers_helper.rb b/plugins/discourse-solved/lib/discourse_solved/accepted_answers_helper.rbindex 5c5d41b70a6..069ff9c8141 100644--- a/plugins/discourse-solved/lib/discourse_solved/accepted_answers_helper.rb+++ b/plugins/discourse-solved/lib/discourse_solved/accepted_answers_helper.rb@@ -15,7 +15,9 @@ module DiscourseSolvedanswers =topic.topic_answers- .select { |ta| ta.post.present? }+ .select do |topic_answer|+ topic_answer.post.present? && guardian.can_see_post?(topic_answer.post)+ end.sort_by { |ta| ta.post.created_at }.map do |ta|AcceptedAnswerSerializer.new(diff --git a/plugins/discourse-solved/spec/lib/accepted_answers_helper_spec.rb b/plugins/discourse-solved/spec/lib/accepted_answers_helper_spec.rbindex 4e5aee02aa6..4a47026eb3d 100644--- a/plugins/discourse-solved/spec/lib/accepted_answers_helper_spec.rb+++ b/plugins/discourse-solved/spec/lib/accepted_answers_helper_spec.rb@@ -137,7 +137,9 @@ RSpec.describe DiscourseSolved::AcceptedAnswersHelper do}.not_to raise_errorexpect(accepted_answers.length).to eq(2)- PostDestroyer.new(Discourse.system_user, answer_post, context: "test").destroy++ # Destroying answer_post would delete the whole topic, since it's the OP+ PostDestroyer.new(Discourse.system_user, answer_post2, context: "test").destroyexpect {accepted_answers =diff --git a/plugins/discourse-solved/spec/requests/topics_controller_spec.rb b/plugins/discourse-solved/spec/requests/topics_controller_spec.rbindex d660d5a7f4e..386ec0ead8c 100644--- a/plugins/discourse-solved/spec/requests/topics_controller_spec.rb+++ b/plugins/discourse-solved/spec/requests/topics_controller_spec.rb@@ -105,6 +105,20 @@ RSpec.describe TopicsController doexpect(response.parsed_body["accepted_answers"][0]["username"]).to eq(p2.user.username)end+ it "does not serialize accepted answers hidden from the current user" do+ answer_post =+ Fabricate(:post, topic:, raw: "secret accepted whisper solution", user: Fabricate(:user))+ Fabricate(:solved_topic, topic:, answer_post:)+ answer_post.update!(post_type: Post.types[:whisper])+ sign_in(Fabricate(:user))++ get "/t/#{topic.slug}/#{topic.id}.json"++ expect(response.status).to eq(200)+ expect(response.parsed_body["accepted_answers"]).to be_nil+ expect(response.parsed_body.to_s).not_to include(answer_post.raw)+ end+describe "with multiple solutions enabled" dobefore { SiteSetting.solved_allow_multiple_solutions = true }