LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

chore: Enable email channel (#1851)

Browse Source
This commit is contained in:
Sojan Jose
2021-03-04 13:59:59 +05:30
committed by GitHub
parent 6aed01de0c
commit ca4a766b82
15 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/presenters/mail_presenter.rb
View File

@@ -91,13 +91,13 @@ class MailPresenter < SimpleDelegator
end
def quoted_text_regexes
return sender_agnostic_regexes if @account.nil? || account_support_email.blank?
return sender_agnostic_regexes if @account.nil? || @account.support_email.blank?
[
Regexp.new("From:\s* #{Regexp.escape(account_support_email)}", Regexp::IGNORECASE),
Regexp.new("<#{Regexp.escape(account_support_email)}>", Regexp::IGNORECASE),
Regexp.new("#{Regexp.escape(account_support_email)}\s+wrote:", Regexp::IGNORECASE),
Regexp.new("On(.*)#{Regexp.escape(account_support_email)}(.*)wrote:", Regexp::IGNORECASE)
Regexp.new("From:\s* #{Regexp.escape(@account.support_email)}", Regexp::IGNORECASE),
Regexp.new("<#{Regexp.escape(@account.support_email)}>", Regexp::IGNORECASE),
Regexp.new("#{Regexp.escape(@account.support_email)}\s+wrote:", Regexp::IGNORECASE),
Regexp.new("On(.*)#{Regexp.escape(@account.support_email)}(.*)wrote:", Regexp::IGNORECASE)
] + sender_agnostic_regexes
end
@@ -109,12 +109,4 @@ class MailPresenter < SimpleDelegator
Regexp.new("from:\s*$", Regexp::IGNORECASE)
]
end
def account_support_email
@account_support_email ||= begin
@account.support_email ||
GlobalConfig.get('MAILER_SUPPORT_EMAIL')['MAILER_SUPPORT_EMAIL'] ||
ENV.fetch('MAILER_SENDER_EMAIL', nil)
end
end
end