mirror of
https://github.com/chatwoot/chatwoot.git
synced 2026-06-04 21:02:35 +08:00
# Pull Request Template ## Description This PR fixes an issue where outgoing Email messages (via API) do not preserve single line breaks in rendered HTML. #### Cause Messages are stored with `\n`, but rendering differs: * **Other channel** (`markdown-it`, `breaks: true`) → `\n` → `<br>` * **Email** (CommonMark) without `HARDBREAKS` → `\n` collapsed into spaces Result: multi-line messages appear as a single paragraph in Email. #### Solution * Added `hardbreaks:` option to `render_message` (default: false) * Enabled `hardbreaks: true` in `EmailHelper#render_email_html` This ensures `\n` renders as `<br />` in Email, matching web widget behavior. Fixes https://linear.app/chatwoot/issue/CW-6941/outgoing-email-messages-strip-single-newlines-from-plain-text-content ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? #### Screenshots **Before** <img width="604" height="104" alt="image" src="https://github.com/user-attachments/assets/f9086ffb-a5c7-4688-99aa-97ea5edcccde" /> **After** <img width="604" height="210" alt="image" src="https://github.com/user-attachments/assets/a8f21c76-bcb8-4058-937a-dd185fb6745c" /> ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [x] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
56 lines
1.7 KiB
Ruby
56 lines
1.7 KiB
Ruby
module EmailHelper
|
|
def extract_domain_without_tld(email)
|
|
domain = email.split('@').last
|
|
domain.split('.').first
|
|
end
|
|
|
|
def render_email_html(content)
|
|
return '' if content.blank?
|
|
|
|
ChatwootMarkdownRenderer.new(content).render_message(hardbreaks: true).to_s
|
|
end
|
|
|
|
# Raise a standard error if any email address is invalid
|
|
def validate_email_addresses(emails_to_test)
|
|
emails_to_test&.each do |email|
|
|
raise StandardError, 'Invalid email address' unless email.match?(URI::MailTo::EMAIL_REGEXP)
|
|
end
|
|
end
|
|
|
|
# ref: https://www.rfc-editor.org/rfc/rfc5233.html
|
|
# This is not a mandatory requirement for email addresses, but it is a common practice.
|
|
# john+test@xyc.com is the same as john@xyc.com
|
|
def normalize_email_with_plus_addressing(email)
|
|
"#{email.split('@').first.split('+').first}@#{email.split('@').last}".downcase
|
|
end
|
|
|
|
def parse_email_variables(conversation, email)
|
|
case email
|
|
when modified_liquid_content(email)
|
|
template = Liquid::Template.parse(modified_liquid_content(email))
|
|
template.render(message_drops(conversation))
|
|
when URI::MailTo::EMAIL_REGEXP
|
|
email
|
|
end
|
|
end
|
|
|
|
def normalize_email_body(content)
|
|
content.to_s.gsub("\r\n", "\n")
|
|
end
|
|
|
|
def modified_liquid_content(email)
|
|
# This regex is used to match the code blocks in the content
|
|
# We don't want to process liquid in code blocks
|
|
email.gsub(/`(.*?)`/m, '{% raw %}`\\1`{% endraw %}')
|
|
end
|
|
|
|
def message_drops(conversation)
|
|
{
|
|
'contact' => ContactDrop.new(conversation.contact),
|
|
'conversation' => ConversationDrop.new(conversation),
|
|
'inbox' => InboxDrop.new(conversation.inbox),
|
|
'account' => AccountDrop.new(conversation.account)
|
|
}
|
|
end
|
|
end
|