emailbutler 0.5.6 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83bd2cbfef3169592a190131ff09124cee494f26f81f96f6a93e04138e4d3439
-  data.tar.gz: 75be821dde3a84855c1aa8407a4946c82bbf736e6d92aad7451ac22abce8e385
+  metadata.gz: 7fbec5fbe393584e210acf55f844191eef00fe3e4fff85bfac613553768ca59e
+  data.tar.gz: f7d18a4205c146435eaf1c3bef7fbc9fad9aee7c56777f503714ea6ae7a7401e
 SHA512:
-  metadata.gz: 0bc138bd2a1bdac58cb71cfc6d805bc5c58d8c0f6dda7ca65be307f6849f53d53b8d00ea1576556a54c2a53dea3896f61ac8836e81dc061ecc3fef920cc2f9b7
-  data.tar.gz: 80fe2b4f28eb5952fd67db7ac7a16485a29cd314c654cbbad0e1bc9b0659bc1f687dff5e35bd8e57289468ce7a8619fcc1a58996ac200614ee96337fdefa87da
+  metadata.gz: b7b1a5256a1e258e8223a352026570f6ef29c4fbb268d921e63733264e2705a82237845f86413b8d4fbf157421b6e8633f881f565a13ce491e9a57f170f11e3e
+  data.tar.gz: c083e3b6b964bb7e847c8cd8cfb059cac3c538a7f2fff41ff26896bd42667bc89877507caf2cda58ee9dd6757d76e37e5d389c35c6de098b621822f0bda1cf72

data/app/controllers/emailbutler/webhooks_controller.rb

@@ -16,7 +16,7 @@ module Emailbutler
     private
 
     def receiver_params
-      params.permit('_json' => %w[smtp-id event])
+      params.permit('_json' => %w[smtp-id event timestamp])
     end
   end
 end

data/lib/emailbutler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Emailbutler
-  VERSION = '0.5.6'
+  VERSION = '0.5.8'
 end

data/lib/emailbutler/webhooks/mappers/sendgrid.rb

@@ -7,9 +7,12 @@ module Emailbutler
         DELIVERABILITY_MAPPER = {
           'processed' => 'processed',
           'delivered' => 'delivered',
+          'open' => 'delivered',
+          'click' => 'delivered',
           'deferred' => 'failed',
           'bounce' => 'failed',
-          'dropped' => 'failed'
+          'dropped' => 'failed',
+          'spamreport' => 'failed'
         }.freeze
 
         def self.call(...)
@@ -18,14 +21,15 @@ module Emailbutler
 
         def call(payload:)
           payload['_json'].filter_map { |message|
-            message_uuid = message['smtp-id']
+            message.stringify_keys!
+            message_uuid = message['smtp-id'] || message['sg_message_id']
             status = DELIVERABILITY_MAPPER[message['event']]
-            next unless message_uuid || status
+            next if message_uuid.nil? || status.nil?
 
             {
               message_uuid: message_uuid,
               status: status,
-              timestamp: Time.at(message['timestamp']).utc.to_datetime
+              timestamp: message['timestamp'] ? Time.at(message['timestamp']).utc.to_datetime : nil
             }
           }
         end

data/lib/emailbutler/webhooks/receiver.rb

@@ -16,6 +16,8 @@ module Emailbutler
           .call(payload: payload)
           .each { |event|
             message = Emailbutler.find_message_by(uuid: event.delete(:message_uuid))
+            next unless message
+
             Emailbutler.update_message(message, event)
           }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emailbutler
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.8
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pagy