Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-05 08:59:27 +08:00
Code Packages Activity Actions 11

FIX: use metadata to hold the message_id with sparkpost

Browse source
This commit is contained in:
Régis Hanol 2016-10-27 19:35:50 +02:00
parent 407cda1dfe
commit 71f940d478
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/email/sender.rb
View file

@ -133,12 +133,14 @@ module Email
@message.header['X-Discourse-Post-Id'] = nil if post_id.present?
@message.header['X-Discourse-Reply-Key'] = nil if reply_key.present?
# pass the original message_id when using mailjet/mandrill
# pass the original message_id when using mailjet/mandrill/sparkpost
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
when "smtp.sparkpostmail.com"
@message.header['X-MSYS-API'] = { metadata: { message_id: @message.message_id } }.to_json
end
# Suppress images from short emails