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

FIX: don't overwrite custom email headers when using mandrill/sparkpost

Browse Source
This commit is contained in:
Régis Hanol
2016-10-30 11:38:55 +01:00
parent 6aacc655d1
commit f8caae0be7
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/email/sender.rb
View File

@ -138,9 +138,9 @@ module Email
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
merge_json_x_header('X-MC-Metadata', { message_id: @message.message_id })
when "smtp.sparkpostmail.com"
@message.header['X-MSYS-API'] = { metadata: { message_id: @message.message_id } }.to_json
merge_json_x_header('X-MSYS-API', { metadata: { message_id: @message.message_id } })
end
# Suppress images from short emails
@ -202,5 +202,13 @@ module Email
)
end
def merge_json_x_header(name, value)
mc_metadata = JSON.parse(@message.header[name].to_s) rescue nil
mc_metadata ||= {}
mc_metadata.merge!(value)
@message.header[name] = nil
@message.header[name] = mc_metadata.to_json
end
end
end