Skip to content

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

FIX: add missing solved schema microdata (#39131)

David Battersby6e8876152c45
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 9849ffdacac..31975d63df8 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -56,6 +56,7 @@
<% if main_entity_schema %>
<div <%= main_entity_schema %>>
+ <%= build_plugin_html 'server:topic-main-entity-meta-crawler' %>
<% end %>
<% if @topic_view.crawler_posts&.first && !@topic_view.crawler_posts.first.is_first_post? %>
diff --git a/plugins/discourse-solved/lib/discourse_solved/schema_utils.rb b/plugins/discourse-solved/lib/discourse_solved/schema_utils.rb
index 2fe2bea6dfd..906be1cd90f 100644
--- a/plugins/discourse-solved/lib/discourse_solved/schema_utils.rb
+++ b/plugins/discourse-solved/lib/discourse_solved/schema_utils.rb
@@ -31,7 +31,7 @@ module DiscourseSolved
end
topic.instance_variable_set(
:@qa_page_schema,
- schema_markup_enabled?(topic) && has_eligible_answers?(topic),
+ schema_markup_enabled?(topic) && eligible_answers(topic).exists?,
)
end
@@ -56,17 +56,19 @@ module DiscourseSolved
end
end
+ def self.main_entity_meta(topic)
+ return unless qa_page_schema?(topic)
+ "<meta itemprop='name' content='#{ERB::Util.html_escape(topic.title)}'>" \
+ "<meta itemprop='answerCount' content='#{eligible_answers(topic).count}'>"
+ end
+
private_class_method def self.accepted_answer_visible?(topic)
post = topic.solved&.answer_post
post.present? && Guardian.new.can_see_post?(post)
end
- private_class_method def self.has_eligible_answers?(topic)
- topic
- .posts
- .where.not(post_number: 1)
- .where(post_type: Post.types[:regular], hidden: false)
- .exists?
+ private_class_method def self.eligible_answers(topic)
+ topic.posts.where.not(post_number: 1).where(post_type: Post.types[:regular], hidden: false)
end
end
end
diff --git a/plugins/discourse-solved/plugin.rb b/plugins/discourse-solved/plugin.rb
index b0d0e43292d..a42dcf21f45 100644
--- a/plugins/discourse-solved/plugin.rb
+++ b/plugins/discourse-solved/plugin.rb
@@ -92,6 +92,11 @@ after_initialize do
DiscourseSolved::SchemaUtils.post_schema(post, topic) || schema
end
+ register_html_builder("server:topic-main-entity-meta-crawler") do |controller|
+ topic_view = controller.instance_variable_get(:@topic_view)
+ DiscourseSolved::SchemaUtils.main_entity_meta(topic_view&.topic)
+ end
+
register_html_builder("server:before-head-close-crawler") do |controller|
topic_view = controller.instance_variable_get(:@topic_view)
result =
diff --git a/plugins/discourse-solved/spec/requests/topics_controller_spec.rb b/plugins/discourse-solved/spec/requests/topics_controller_spec.rb
index bc502c4d9e7..6f3d1e29a51 100644
--- a/plugins/discourse-solved/spec/requests/topics_controller_spec.rb
+++ b/plugins/discourse-solved/spec/requests/topics_controller_spec.rb
@@ -143,15 +143,38 @@ RSpec.describe TopicsController do
expect(doc.css('[itemtype*="QAPage"]').size).to eq(0)
end
- it "marks the solution post as acceptedAnswer and other replies as suggestedAnswer" do
+ it "emits valid QAPage microdata with all required schema.org properties" do
p3 = Fabricate(:post, topic:, user: Fabricate(:user))
Fabricate(:solved_topic, topic:, answer_post: p2)
get "/t/#{topic.slug}/#{topic.id}", env: crawler_env
doc = parsed_crawler_body
- expect(doc.at_css("#post_#{p2.post_number}")["itemprop"]).to eq("acceptedAnswer")
- expect(doc.at_css("#post_#{p3.post_number}")["itemprop"]).to eq("suggestedAnswer")
+ qa_page = doc.at_css('[itemtype*="QAPage"]')
+ expect(qa_page).to be_present
+ expect(qa_page.at_css('> [itemprop="name"]')["content"]).to eq(topic.title)
+ expect(qa_page.at_css('> [itemprop="datePublished"]')["content"]).to be_present
+
+ question = doc.at_css('[itemtype*="Question"]')
+ expect(question).to be_present
+ expect(question.at_css('[itemprop="name"]')["content"]).to eq(topic.title)
+ expect(question.at_css('[itemprop="answerCount"]')["content"]).to eq("2")
+ expect(question.at_css('[itemprop="text"]')).to be_present
+ expect(question.at_css('[itemprop="author"] [itemprop="name"]')).to be_present
+
+ accepted = doc.at_css("#post_#{p2.post_number}")
+ expect(accepted["itemprop"]).to eq("acceptedAnswer")
+ expect(accepted["itemtype"]).to include("Answer")
+ expect(accepted.at_css('[itemprop="text"]')).to be_present
+ expect(accepted.at_css('[itemprop="datePublished"]')).to be_present
+ expect(accepted.at_css('[itemprop="author"] [itemprop="name"]')).to be_present
+
+ suggested = doc.at_css("#post_#{p3.post_number}")
+ expect(suggested["itemprop"]).to eq("suggestedAnswer")
+ expect(suggested["itemtype"]).to include("Answer")
+ expect(suggested.at_css('[itemprop="text"]')).to be_present
+ expect(suggested.at_css('[itemprop="datePublished"]')).to be_present
+ expect(suggested.at_css('[itemprop="author"] [itemprop="name"]')).to be_present
end
it "does not modify schema for topics without solved enabled" do