KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Improve mail content parsing (#2638)

Browse source
This commit is contained in:
Pranav Raj S 2021-07-15 22:50:32 +05:30 committed by GitHub
parent 85ea56b765
commit 5aac2acf56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/mailboxes/support_mailbox.rb
View file

@ -9,10 +9,12 @@ class SupportMailbox < ApplicationMailbox
:decorate_mail
def process
find_or_create_contact
create_conversation
create_message
add_attachments_to_message
ActiveRecord::Base.transaction do
find_or_create_contact
create_conversation
create_message
add_attachments_to_message
end
end
private

10
app/presenters/mail_presenter.rb
View file

@ -12,7 +12,7 @@ class MailPresenter < SimpleDelegator
end
def text_content
@decoded_text_content ||= encode_to_unicode(text_part&.decoded || mail.decoded || '')
@decoded_text_content ||= encode_to_unicode(text_part&.decoded || decoded_message || '')
return {} if @decoded_text_content.blank?
@ -47,6 +47,14 @@ class MailPresenter < SimpleDelegator
end
end
def decoded_message
if mail.multipart?
return mail.text_part ? mail.text_part.decoded : nil
end
mail.decoded
end
def number_of_attachments
mail.attachments.count
end