FIX: sparkpost webhooks support

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
 

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

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
           }
         }
       }]