matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix mentions in front-end + email spam

Browse Source
This commit is contained in:
Julien Nahum
2024-10-22 11:04:49 +02:00
parent dad5c825b1
commit 97c4b9db5b
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/app/Notifications/Forms/FormEmailNotification.php
View File

@@ -127,14 +127,23 @@ class FormEmailNotification extends Notification implements ShouldQueue
$formId = $this->event->form->id;
$submissionId = $this->event->data['submission_id'] ?? 'unknown';
$domain = Str::after(config('app.url'), '://');
$timestamp = time();
$uniquePart = substr(md5($formId . $submissionId), 0, 8);
$messageId = "form-{$formId}-{$uniquePart}@{$domain}";
$references = "form-{$formId}@{$domain}";
// Create a unique Message-ID for each submission
$messageId = "<form-{$formId}-submission-{$submissionId}-{$timestamp}@{$domain}>";
$message->getHeaders()->remove('Message-ID');
$message->getHeaders()->addIdHeader('Message-ID', $messageId);
// Create a References header that links to the form, but not to specific submissions
$references = "<form-{$formId}@{$domain}>";
// Add our custom Message-ID as X-Custom-Message-ID
$message->getHeaders()->addTextHeader('X-Custom-Message-ID', $messageId);
// Add References header
$message->getHeaders()->addTextHeader('References', $references);
// Add a unique Thread-Index to further prevent grouping
$threadIndex = base64_encode(pack('H*', md5($formId . $submissionId . $timestamp)));
$message->getHeaders()->addTextHeader('Thread-Index', $threadIndex);
}
private function getMailData(): array