diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index 48b051cd88a..c378d0d7a05 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -374,12 +374,31 @@ module Email
end
end
+ def deduplicate_style(style)
+ styles = {}
+
+ style
+ .split(";")
+ .select(&:present?)
+ .map { _1.split(":", 2).map(&:strip) }
+ .each { |k, v| styles[k] = v if k.present? && v.present? }
+
+ styles.map { |k, v| "#{k}:#{v}" }.join(";")
+ end
+
+ def deduplicate_styles
+ @fragment
+ .css("[style]")
+ .each { |element| element["style"] = deduplicate_style element["style"] }
+ end
+
def to_html
# needs to be before class + id strip because we need to style redacted
# media and also not double-redact already redacted from lower levels
replace_secure_uploads_urls if SiteSetting.secure_uploads?
strip_classes_and_ids
replace_relative_urls
+ deduplicate_styles
@fragment.to_html
end
diff --git a/spec/integration/email_style_spec.rb b/spec/integration/email_style_spec.rb
index 49fff4d3930..b0a2d9cafee 100644
--- a/spec/integration/email_style_spec.rb
+++ b/spec/integration/email_style_spec.rb
@@ -30,13 +30,13 @@ RSpec.describe EmailStyle do
let(:invite_mail) { InviteMailer.send_invite(invite) }
it "applies customizations" do
- expect(mail_html.scan('
#{post.raw}/)
- expect(matches[1]).to include("color: #FAB;") # custom
- expect(matches[1]).to include("padding-top:5px;") # div.body
+ expect(matches[1]).to include("color:#FAB") # custom
+ expect(matches[1]).to include("padding-top:5px") # div.body
end
# TODO: translation override
@@ -86,7 +86,7 @@ RSpec.describe EmailStyle do
let(:signup_mail) { UserNotifications.signup(Fabricate(:user)) }
it "customizations are applied to html part of emails" do
- expect(mail_html.scan('
FOR YOU
').count).to eq(1)
+ expect(mail_html.scan('
FOR YOU
').count).to eq(1)
expect(mail_html).to include("activate-account")
end
@@ -107,7 +107,7 @@ RSpec.describe EmailStyle do
end
it "applies customizations when translation override exists" do
- expect(mail_html.scan('
FOR YOU
').count).to eq(1)
+ expect(mail_html.scan('
FOR YOU
').count).to eq(1)
expect(mail_html.scan("CLICK THAT LINK").count).to eq(1)
end
end
@@ -135,13 +135,13 @@ RSpec.describe EmailStyle do
let(:summary_email) { UserNotifications.digest(Fabricate(:user)) }
it "customizations are applied to html part of emails" do
- expect(mail_html.scan('
FOR YOU
').count).to eq(1)
+ expect(mail_html.scan('
FOR YOU
').count).to eq(1)
expect(mail_html).to include(popular_topic.title)
end
it "doesn't apply customizations if apply_custom_styles_to_digest is disabled" do
SiteSetting.apply_custom_styles_to_digest = false
- expect(mail_html).to_not include('
FOR YOU
')
+ expect(mail_html).to_not include('
FOR YOU
')
expect(mail_html).to_not include("FOR YOU")
expect(mail_html).to include(popular_topic.title)
end
diff --git a/spec/lib/email/sender_spec.rb b/spec/lib/email/sender_spec.rb
index 918ec03c524..aacfb3eeab9 100644
--- a/spec/lib/email/sender_spec.rb
+++ b/spec/lib/email/sender_spec.rb
@@ -591,7 +591,7 @@ RSpec.describe Email::Sender do
reply.rebake!
Email::Sender.new(message, :valid_type).send
expected = <<~HTML
-
#dev
+ #dev
HTML
expect(message.html_part.body.to_s).to include(expected.chomp)
end
diff --git a/spec/lib/email/styles_spec.rb b/spec/lib/email/styles_spec.rb
index e7822da2cf9..eec3491c555 100644
--- a/spec/lib/email/styles_spec.rb
+++ b/spec/lib/email/styles_spec.rb
@@ -168,6 +168,25 @@ RSpec.describe Email::Styles do
end
end
+ describe "deduplicate styles" do
+ it "removes double definitions" do
+ frag = "hello"
+
+ styler = Email::Styles.new(frag)
+ styled = styler.to_html
+ styled = Nokogiri::HTML5.fragment(styled)
+ expect(styled.at("test")["style"]).to eq("color:red")
+ end
+ it "handles whitespace correctly" do
+ frag =
+ "hello"
+ styler = Email::Styles.new(frag)
+ styled = styler.to_html
+ styled = Nokogiri::HTML5.fragment(styled)
+ expect(styled.at("test")["style"]).to eq("color:red;background:yellow")
+ end
+ end
+
describe "dark mode emails" do
it "adds dark_mode_styles when site setting active" do
frag = html_fragment('test
')