Changeset 111419 in spip-zone

Timestamp:

Aug 24, 2018, 3:04:55 PM (2 years ago)

Author:

cedric@…

Message:

Les erreurs SParkPost reviennent dans des message_event et plus des track_event, on adapte le code pour les catcher a nouveau, avec plus de precision qui plus est

Location:

_plugins_/mailshot/trunk

Files:

• bulkmailer/sparkpost.php (modified) (2 diffs)
• paquet.xml (modified) (1 diff)

_plugins_/mailshot/trunk/bulkmailer/sparkpost.php

@@ -133 +133 @@
         foreach($events as $e){
                 if (isset($e['msys']['track_event'])) {
-                        $event = &$e['msys']['track_event'];
-                        // array("open", "click", "bounce", "spam", "blocked");
-                        $quoi = $event['type'];
-                        if ($quoi == "open") {
-                                $quoi = "read"; // open chez sparkpost, read ici
-                        }
-                        if ($quoi == "click") {
-                                $quoi = "clic"; // click chez sparkpost, clic ici
-                        }
-                        if ($quoi == "bounce") {
-                                $quoi = "soft_bounce"; // bounce chez sparkpost, soft_bounce ici
-                        }
-                        //if ($quoi=="blocked") $quoi="reject"; // blocked chez sparkpost, reject ici
-
-                        $email = $event['rcpt_to'];
-                        $tracking_id = $event['campaign_id'];
-                        if ($tracking_id) {
-                                $tracking_id = explode('/#', $tracking_id);
-                                if (reset($tracking_id) == protocole_implicite($GLOBALS['meta']['adresse_site'])) {
-                                        $tracking_id = end($tracking_id);
-                                        spip_log("tracking $quoi $email $tracking_id", 'mailshot_feedback');
-                                        // appeler l'api webhook mailshot
-                                        $feedback = charger_fonction("feedback", "newsletter");
-                                        $feedback($quoi, $email, $tracking_id);
-                                }
-                        }
+                        bulkmailer_sparkpost_webhook_track_event($e['msys']['track_event']);
+                }
+                if (isset($e['msys']['message_event'])) {
+                        bulkmailer_sparkpost_webhook_message_event($e['msys']['message_event']);
                 }
         }
@@ -167 +145 @@
 }
 
+function bulkmailer_sparkpost_webhook_track_event($event) {
+        // array("open", "click", "bounce", "spam", "blocked");
+        $quoi = $event['type'];
+        if ($quoi == "open") {
+                $quoi = "read"; // open chez sparkpost, read ici
+        }
+        if ($quoi == "click") {
+                $quoi = "clic"; // click chez sparkpost, clic ici
+        }
+        if ($quoi == "bounce") {
+                $quoi = "soft_bounce"; // bounce chez sparkpost, soft_bounce ici
+                if (isset($event['bounce_class'])) {
+                        switch ($event['bounce_class']) {
+                                case "20":
+                                case "21":
+                                case "22":
+                                case "23":
+                                case "24":
+                                case "25":
+                                case "40":
+                                case "60":
+                                case "70":
+                                case "100":
+                                        $quoi = "soft_bounce";
+                                        break;
+                                default:
+                                        $quoi = "hard_bounce";
+                                        break;
+                        }
+                }
+        }
+        if ($quoi == "out_of_band") {
+                $quoi = "soft_bounce";
+        }
+        if ($quoi == "spam_complaint") {
+                $quoi = "spam";
+        }
+        if ($quoi == "policy_rejection") {
+                $quoi = "reject";
+        }
+
+        $email = $event['rcpt_to'];
+        $tracking_id = $event['campaign_id'];
+        if ($tracking_id) {
+                $tracking_id = explode('/#', $tracking_id);
+                if (reset($tracking_id) == protocole_implicite($GLOBALS['meta']['adresse_site'])) {
+                        $tracking_id = end($tracking_id);
+                        spip_log("tracking $quoi $email $tracking_id", 'mailshot_feedback');
+                        // appeler l'api webhook mailshot
+                        $feedback = charger_fonction("feedback", "newsletter");
+                        $feedback($quoi, $email, $tracking_id);
+                }
+        }
+}
+
+function bulkmailer_sparkpost_webhook_message_event($event) {
+        return bulkmailer_sparkpost_webhook_track_event($event);
+}
 
 /**

_plugins_/mailshot/trunk/paquet.xml

@@ -2 +2 @@
         prefix="mailshot"
         categorie="communication"
-        version="1.25.0"
+        version="1.26.0"
         etat="stable"
         compatibilite="[3.0.5;3.2.*]"