github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:11:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: mailjet webhook

Browse Source
This commit is contained in:
Régis Hanol
2016-06-06 19:47:45 +02:00
parent 1e2bad135f
commit fe595f1653
4 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/email/sender.rb
View File

@ -133,6 +133,11 @@ module Email
@message.header['X-Discourse-Post-Id'] = nil if post_id.present?
@message.header['X-Discourse-Reply-Key'] = nil if reply_key.present?
# it's the only way to pass the original message_id when using mailjet
if ActionMailer::Base.smtp_settings[:address][".mailjet.com"]
@message.header['X-MJ-CustomID'] = @message.message_id
end
# Suppress images from short emails
if SiteSetting.strip_images_from_short_emails &&
@message.html_part.body.to_s.bytesize <= SiteSetting.short_email_length &&