mirror of
https://github.com/discourse/discourse.git
synced 2024-11-25 20:23:44 +08:00
a674c6c4c2
When we introduced the new quote format with full-name display name: ``` [quote="Ted Johansson, post:1, topic:2, username:ted"] we overlooked the code responsible for rewriting quotes when a user's name is changed. ``` The functional part of this change adds support for the new quote format in the code that updates quotes when a user's username changes. See the test case in `spec/services/username_changer_spec.rb` for the details. In addition, this change adds a regression test for PrettyText to cover the new quote format, and extracts the code responsible for rewriting raw and cooked quotes into its own `QuoteRewriter` class. The functionality of the latter is tested through the tests in `spec/services/username_changer_spec.rb`.
55 lines
1.5 KiB
Ruby
55 lines
1.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class QuoteRewriter
|
|
def initialize(user_id, old_username, new_username, avatar_img)
|
|
@user_id = user_id
|
|
@old_username = old_username
|
|
@new_username = new_username
|
|
@avatar_img = avatar_img
|
|
end
|
|
|
|
def rewrite_raw(raw)
|
|
pattern =
|
|
Regexp.union(
|
|
/(?<pre>\[quote\s*=\s*["'']?.*username:)#{old_username}(?<post>\,?[^\]]*\])/i,
|
|
/(?<pre>\[quote\s*=\s*["'']?)#{old_username}(?<post>\,?[^\]]*\])/i,
|
|
)
|
|
|
|
raw.gsub(pattern, "\\k<pre>#{new_username}\\k<post>")
|
|
end
|
|
|
|
def rewrite_cooked(cooked)
|
|
pattern = /(?<=\s)#{PrettyText::Helpers.format_username(old_username)}(?=:)/i
|
|
|
|
cooked
|
|
.css("aside.quote")
|
|
.each do |aside|
|
|
next unless div = aside.at_css("div.title")
|
|
|
|
username_replaced = false
|
|
|
|
aside["data-username"] = new_username if aside["data-username"] == old_username
|
|
|
|
div.children.each do |child|
|
|
if child.text?
|
|
content = child.content
|
|
username_replaced = content.gsub!(pattern, new_username).present?
|
|
child.content = content if username_replaced
|
|
end
|
|
end
|
|
|
|
if username_replaced || quotes_correct_user?(aside)
|
|
div.at_css("img.avatar")&.replace(avatar_img)
|
|
end
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
attr_reader :user_id, :old_username, :new_username, :avatar_img
|
|
|
|
def quotes_correct_user?(aside)
|
|
Post.exists?(topic_id: aside["data-topic"], post_number: aside["data-post"], user_id: user_id)
|
|
end
|
|
end
|