A platform for community discussion. Free, open, simple.
FIX: Sync category description when post content changes outside PostRevisor (#39184)
Régis Hanol73dd5b4da88f
diff --git a/app/jobs/regular/change_display_name.rb b/app/jobs/regular/change_display_name.rbindex ca6b9c3cdd2..8bf75670782 100644--- a/app/jobs/regular/change_display_name.rb+++ b/app/jobs/regular/change_display_name.rb@@ -55,6 +55,7 @@ module Jobspost.cooked = update_cooked(post.cooked)post.update_columns(raw: post.raw, cooked: post.cooked)+ post.sync_first_post_cachesSearchIndexer.index(post, force: true) if post.topicrescue => ediff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rbindex 9fba5282252..ca4dd26c7a0 100644--- a/app/jobs/regular/process_post.rb+++ b/app/jobs/regular/process_post.rb@@ -38,7 +38,7 @@ module Jobs)elsepost.update_column(:cooked, cp.html)- post.topic.update_excerpt(post.excerpt_for_topic) if post.is_first_post?+ post.sync_first_post_cachesextract_links(post)post.publish_change_to_clients! :revisedenddiff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rbindex 9afe7ef90a9..ffd9e70c528 100644--- a/app/jobs/regular/update_username.rb+++ b/app/jobs/regular/update_username.rb@@ -66,16 +66,31 @@ module Jobs.with_deleted.where("raw ILIKE ?", "%@#{@old_username}%").where("posts.user_id = :user_id", user_id: @user_id)+ .where.not(id: updated_post_ids).find_each do |post|update_post(post)updated_post_ids << post.idend+ # Posts quoting this userPost.with_deleted.joins(quoted("posts.id")).where("p.user_id = :user_id", user_id: @user_id)- .find_each { |post| update_post(post) if updated_post_ids.exclude?(post.id) }+ .where.not(id: updated_post_ids)+ .find_each do |post|+ update_post(post)+ updated_post_ids << post.id+ end++ # Category description posts may be authored by the system user and have no user_actions+ Post+ .with_deleted+ .joins("INNER JOIN categories ON categories.topic_id = posts.topic_id")+ .where(post_number: 1)+ .where("raw ILIKE ?", "%@#{@old_username}%")+ .where.not(id: updated_post_ids)+ .find_each { |post| update_post(post) }enddef update_revisions@@ -138,6 +153,7 @@ module Jobspost.cooked = update_cooked(post.cooked)post.update_columns(raw: post.raw, cooked: post.cooked)+ post.sync_first_post_cachesSearchIndexer.index(post, force: true) if post.topicrescue => ediff --git a/app/models/post.rb b/app/models/post.rbindex 66f8a091f62..abacf61b2c1 100644--- a/app/models/post.rb+++ b/app/models/post.rb@@ -566,6 +566,29 @@ class Post < ActiveRecord::Basetopic.present? && topic.is_category_topic? && is_first_post?end+ def sync_first_post_caches+ return if post_number > 1+ topic&.update_excerpt(excerpt_for_topic)+ sync_category_description+ end++ def sync_category_description(category = nil)+ category ||= Category.find_by(topic_id:)+ return unless category++ doc = Nokogiri::HTML5.fragment(cooked)+ doc.css("img").remove++ if (html = doc.css("p").first&.inner_html&.strip)+ new_description = html unless html.starts_with?(Category.post_template[..50])+ return category if category.description == new_description+ category.update_column(:description, new_description)+ category.publish_category+ Site.clear_cache+ category+ end+ end+def is_reply_by_email?via_email && post_number.present? && post_number > 1end@@ -847,7 +870,7 @@ class Post < ActiveRecord::Baseupdate_columns(cooked: new_cooked, baked_at: Time.zone.now, baked_version: BAKED_VERSION)- topic&.update_excerpt(excerpt_for_topic) if is_first_post?+ sync_first_post_cachesif invalidate_broken_imagespost_hotlinked_media.download_failed.destroy_alldiff --git a/app/services/group_mentions_updater.rb b/app/services/group_mentions_updater.rbindex 8099dcde2b8..e54f23697ad 100644--- a/app/services/group_mentions_updater.rb+++ b/app/services/group_mentions_updater.rb@@ -11,6 +11,7 @@ class GroupMentionsUpdaterposts.each do |post|post.raw.gsub!(/(^|\s)(@#{previous_name})(\s|$)/, "\\1@#{current_name}\\3")post.save!(validate: false)+ post.sync_first_post_cachesendendenddiff --git a/lib/post_revisor.rb b/lib/post_revisor.rbindex a6707484a5e..39222e984c9 100644--- a/lib/post_revisor.rb+++ b/lib/post_revisor.rb@@ -800,14 +800,9 @@ class PostRevisorenddef update_category_description- return unless category = Category.find_by(topic_id: @topic.id)+ return unless (category = Category.find_by(topic_id: @topic.id))- doc = Nokogiri::HTML5.fragment(@post.cooked)- doc.css("img").remove-- if html = doc.css("p").first&.inner_html&.strip- new_description = html unless html.starts_with?(Category.post_template[0..50])- category.update_column(:description, new_description)+ if @post.sync_category_description(category)@category_changed = categoryelse@post.errors.add(:base, I18n.t("category.errors.description_incomplete"))diff --git a/spec/jobs/process_post_spec.rb b/spec/jobs/process_post_spec.rbindex bbc6b933b67..0d796473b47 100644--- a/spec/jobs/process_post_spec.rb+++ b/spec/jobs/process_post_spec.rb@@ -85,7 +85,7 @@ RSpec.describe Jobs::ProcessPost doexpect(post.cooked).to eq(cooked)end- it "updates the topic excerpt when first post" do+ it "updates first post caches only for the OP" dopost = Fabricate(:post, raw: "Some OP content", cooked: "")post.topic.update_excerpt("Incorrect")diff --git a/spec/jobs/update_username_spec.rb b/spec/jobs/update_username_spec.rbindex a8a2de17a7e..e52d59d1155 100644--- a/spec/jobs/update_username_spec.rb+++ b/spec/jobs/update_username_spec.rb@@ -41,4 +41,27 @@ RSpec.describe Jobs::UpdateUsername do<p><a class="mention" href="/u/newname">@newname</a> <a class="mention" href="/u/foo-bar">@foo-bar</a></p>HTMLend++ it "updates the category description when a category description topic mentions the user" do+ category = Fabricate(:category_with_definition, user: Discourse.system_user)+ first_post = category.topic.first_post+ first_post.revise(first_post.user, { raw: "This category is managed by @#{user.username}" })+ category.reload++ expect(category.description).to include(user.username)++ old_username = user.username+ new_username = "new_username_123"++ described_class.new.execute(+ user_id: user.id,+ old_username:,+ new_username:,+ avatar_template: user.avatar_template,+ )+ category.reload++ expect(category.description).to include(new_username)+ expect(category.description).not_to include(old_username)+ endenddiff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rbindex 1b131d3d011..fccec1f1f18 100644--- a/spec/models/post_spec.rb+++ b/spec/models/post_spec.rb@@ -1367,6 +1367,18 @@ RSpec.describe Post doexpect(post.topic.excerpt).to eq("test")end+ it "updates the category description when rebaking a category description topic" do+ category = Fabricate(:category_with_definition)+ first_post = category.topic.first_post+ first_post.revise(first_post.user, { raw: "Original description" })+ expect(category.reload.description).to include("Original description")++ first_post.update_column(:raw, "Updated description")+ first_post.rebake!++ expect(category.reload.description).to include("Updated description")+ end+it "works with posts in deleted topics" dopost = create_postpost.topic.trash!diff --git a/spec/services/group_mentions_updater_spec.rb b/spec/services/group_mentions_updater_spec.rbindex 5f37aade09a..deafebdac06 100644--- a/spec/services/group_mentions_updater_spec.rb+++ b/spec/services/group_mentions_updater_spec.rb@@ -41,6 +41,23 @@ RSpec.describe GroupMentionsUpdater doexpect(post.reload.raw_mentions).to eq([])end+ it "should update the category description when a category description topic mentions the group" do+ group = Fabricate(:group, name: "old_team", mentionable_level: Group::ALIAS_LEVELS[:everyone])++ category = Fabricate(:category_with_definition)+ first_post = category.topic.first_post+ first_post.revise(first_post.user, { raw: "This category is managed by @old_team" })+ category.reload++ expect(category.description).to include("old_team")++ GroupMentionsUpdater.update("new_team", "old_team")+ category.reload++ expect(category.description).to include("new_team")+ expect(category.description).not_to include("old_team")+ end+it "should ignore validations" doeveryone_mention_level = Group::ALIAS_LEVELS[:everyone]