From 6c28f9c9fea94aa2d251d0d45f3e1f07b5473f55 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 23 Nov 2024 16:31:13 +1100 Subject: [PATCH] Fixes for mailgun bounces --- app/Jobs/Mailgun/ProcessMailgunWebhook.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Jobs/Mailgun/ProcessMailgunWebhook.php b/app/Jobs/Mailgun/ProcessMailgunWebhook.php index de9cf830dc..410c92a274 100644 --- a/app/Jobs/Mailgun/ProcessMailgunWebhook.php +++ b/app/Jobs/Mailgun/ProcessMailgunWebhook.php @@ -364,7 +364,7 @@ class ProcessMailgunWebhook implements ShouldQueue $bounce = new EmailBounce( $this->request['event-data']['tags'][0], - $this->request['event-data']['envelope']['sender'] ?? $this->request['event-data']['envelope']['from'], + $this->request['event-data']['message']['headers']['from'] ?? $this->request['event-data']['message']['headers']['to'], $this->message_id ); @@ -374,11 +374,11 @@ class ProcessMailgunWebhook implements ShouldQueue $event = [ 'bounce_id' => $this->request['event-data']['id'], - 'recipient' => $this->request['event-data']['recipient'] ?? '', + 'recipient' => $this->request['event-data']['message']['headers']['to'] ?? '', 'status' => $this->request['event-data']['event'] ?? '', - 'delivery_message' => $this->request['event-data']['delivery-status']['description'] ?? $this->request['event-data']['delivery-status']['message'] ?? '', - 'server' => $this->request['event-data']['delivery-status']['mx-host'] ?? '', - 'server_ip' => $this->request['event-data']['envelope']['sending-ip'] ?? '', + 'delivery_message' => $this->request['event-data']['delivery-status']['message'] ?? $this->request['event-data']['delivery-status']['bounce-code'] ?? '', + 'server' => $this->request['event-data']['delivery-status']['message'] ?? '', + 'server_ip' => '', 'date' => \Carbon\Carbon::parse($this->request['event-data']['timestamp'])->format('Y-m-d H:i:s') ?? '', ];