Hamza/nabeh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix E2EE decryption issue and duplicate webhook insertion

Browse Source
This commit is contained in:
Hamza-Ayed
2026-05-22 17:35:26 +03:00
parent 814b1b5caa
commit 5478fbbae6
3 changed files with 88 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
backend/app/Controllers/WhatsAppController.php
View File

@@ -202,19 +202,40 @@ class WhatsAppController extends BaseController
$msgData = $body['message'];
// 0. Check if this message has already been processed (deduplication)
if (!empty($msgData['id'])) {
$alreadyLogged = \App\Core\Database::selectOne(
"SELECT id FROM messages_log WHERE whatsapp_message_id = ? LIMIT 1",
[$msgData['id']]
);
if ($alreadyLogged) {
// Message already processed, return 200 immediately to prevent duplicate replies & DB errors
$response->status(200)->json([
'status' => 'success',
'message' => 'Message already processed (duplicate detected)'
]);
return;
}
}
// 1. Find or create the contact in the CRM
$contact = \App\Models\Contact::findByPhone($session['company_id'], $msgData['phone']);
if (!$contact) {
// Determine a fallback name
$contactName = !empty($msgData['name']) ? $msgData['name'] : 'WA-' . substr($msgData['phone'], -4);
\App\Models\Contact::createSecure([
'company_id' => $session['company_id'],
'name' => $contactName,
'phone' => $msgData['phone'],
'notes' => 'Auto-created via incoming WhatsApp message'
]);
try {
\App\Models\Contact::createSecure([
'company_id' => $session['company_id'],
'name' => $contactName,
'phone' => $msgData['phone'],
'notes' => 'Auto-created via incoming WhatsApp message'
]);
} catch (\PDOException $e) {
// Ignore duplicate contact error if another thread created it concurrently
if ($e->getCode() !== '23000' && strpos($e->getMessage(), '1062') === false) {
throw $e;
}
}
}
// 2. Log the incoming message in history log