diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb index 86c227a0804..094c234efbe 100644 --- a/app/controllers/webhooks_controller.rb +++ b/app/controllers/webhooks_controller.rb @@ -91,7 +91,7 @@ class WebhooksController < ActionController::Base def sparkpost events = params["_json"] || [params] 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 next unless message_id && bounce_class diff --git a/lib/email/sender.rb b/lib/email/sender.rb index 60cb98eccbe..d3774641820 100644 --- a/lib/email/sender.rb +++ b/lib/email/sender.rb @@ -139,8 +139,6 @@ module Email @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'] = { campaign_id: @message.message_id }.to_json end # Suppress images from short emails diff --git a/spec/controllers/webhooks_controller_spec.rb b/spec/controllers/webhooks_controller_spec.rb index 2cf6ef71064..b77e363d831 100644 --- a/spec/controllers/webhooks_controller_spec.rb +++ b/spec/controllers/webhooks_controller_spec.rb @@ -109,7 +109,7 @@ describe WebhooksController do "msys" => { "message_event" => { "bounce_class" => 10, - "campaign_id" => message_id + "message_id" => message_id } } }]