github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-21 12:27:23 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: sparkpost webhooks support

Browse Source
This commit is contained in:
Régis Hanol 2016-10-17 11:26:49 +02:00
parent d8722e7a87
commit 3949c24f80
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/webhooks_controller.rb
View File

@ -91,7 +91,7 @@ class WebhooksController < ActionController::Base
def sparkpost def sparkpost
events = params["_json"] || [params] events = params["_json"] || [params]
events.each do |event| events.each do |event|
message_id = event["msys"]["message_event"]["campaign_id"] rescue nil message_id = event["msys"]["message_event"]["message_id"] rescue nil
bounce_class = event["msys"]["message_event"]["bounce_class"] rescue nil bounce_class = event["msys"]["message_event"]["bounce_class"] rescue nil
next unless message_id && bounce_class next unless message_id && bounce_class

2
lib/email/sender.rb
View File

@ -139,8 +139,6 @@ module Email
@message.header['X-MJ-CustomID'] = @message.message_id @message.header['X-MJ-CustomID'] = @message.message_id
when "smtp.mandrillapp.com" when "smtp.mandrillapp.com"
@message.header['X-MC-Metadata'] = { message_id: @message.message_id }.to_json @message.header['X-MC-Metadata'] = { message_id: @message.message_id }.to_json
when "smtp.sparkpostmail.com"
@message.header['X-MSYS-API'] = { campaign_id: @message.message_id }.to_json
end end
# Suppress images from short emails # Suppress images from short emails

2
spec/controllers/webhooks_controller_spec.rb
View File

@ -109,7 +109,7 @@ describe WebhooksController do
"msys" => { "msys" => {
"message_event" => { "message_event" => {
"bounce_class" => 10, "bounce_class" => 10,
"campaign_id" => message_id "message_id" => message_id
} }
} }
}] }]