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

Deploy: 2026-05-22 00:22:23

Browse Source
This commit is contained in:
Hamza-Ayed
2026-05-22 00:22:23 +03:00
parent 9450af6c8e
commit 11b0bdf107
4 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
backend/app/Controllers/CampaignController.php
View File

@@ -145,8 +145,12 @@ class CampaignController extends BaseController
return;
}
$gatewayUrl = getenv('WHATSAPP_GATEWAY_URL') ?: 'http://localhost:3722';
$sendUrl = $gatewayUrl . '/api/messages/send';
$gatewayUrl = rtrim(getenv('WHATSAPP_GATEWAY_URL') ?: 'http://localhost:3722', '/');
if (substr($gatewayUrl, -4) === '/api') {
$sendUrl = $gatewayUrl . '/messages/send';
} else {
$sendUrl = $gatewayUrl . '/api/messages/send';
}
foreach ($contacts as $rawContact) {
// Decrypt contact data

5
backend/app/Controllers/GroupController.php
View File

@@ -14,11 +14,10 @@ class GroupController extends BaseController
public function index(Request $request, Response $response)
{
$groupModel = new ContactGroup();
// Since ContactGroup extends BaseModel we can access the DB connection
$groups = $groupModel->db->query(
$groups = \App\Core\Database::select(
"SELECT * FROM contact_groups WHERE company_id = ? ORDER BY id DESC",
[$request->company_id]
)->fetchAll();
);
$response->json([
'status' => 'success',

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

@@ -244,8 +244,12 @@ class WhatsAppController extends BaseController
if (!empty($replyText)) {
// Send reply back to the contact via Node.js Gateway
$gatewayUrl = getenv('WHATSAPP_GATEWAY_URL') ?: 'http://localhost:3722';
$sendUrl = $gatewayUrl . '/api/messages/send';
$gatewayUrl = rtrim(getenv('WHATSAPP_GATEWAY_URL') ?: 'http://localhost:3722', '/');
if (substr($gatewayUrl, -4) === '/api') {
$sendUrl = $gatewayUrl . '/messages/send';
} else {
$sendUrl = $gatewayUrl . '/api/messages/send';
}
$payload = json_encode([
'session_key' => $session['session_key'],