IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: support for mandrill webhooks

Browse Source
This commit is contained in:
Régis Hanol
2016-06-13 12:31:01 +02:00
parent 95a013784f
commit 49f8a2baa7
4 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/email/sender.rb
View File

@@ -133,9 +133,12 @@ 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"]
# pass the original message_id when using mailjet/mandrill
case ActionMailer::Base.smtp_settings[:address]
when /\.mailjet\.com/
@message.header['X-MJ-CustomID'] = @message.message_id
when "smtp.mandrillapp.com"
@message.header['X-MC-Metadata'] = { message_id: @message.message_id }.to_json
end
# Suppress images from short emails