From 5591a27d82e906d065722f016a5252f47b52dd6e Mon Sep 17 00:00:00 2001
From: Narindra ezway <narindra@ezway-technology.com>
Date: Wed, 12 Mar 2025 16:30:50 +0300
Subject: [PATCH] Fix notification logic in TalkService to prevent
 self-notifications for admin users

---
 gestion/lib/Service/TalkService.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gestion/lib/Service/TalkService.php b/gestion/lib/Service/TalkService.php
index 58cd441..ad63bb7 100644
--- a/gestion/lib/Service/TalkService.php
+++ b/gestion/lib/Service/TalkService.php
@@ -76,9 +76,14 @@ class TalkService {
         return '{"commentId":"'.$commentId.'"}';
     }
 
+    
+
     public function sendDevisTalkNotifications(string $message,string $targetUser ,string $senderUser){
         $senderAndTargetIsTheSameUser = $targetUser == $senderUser;
         $senderUser = $senderAndTargetIsTheSameUser ? BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD : $senderUser;
+        if( $targetUser === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD && $senderUser === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD){
+            return;
+        }
         $roomNames = $this->getUserDevisTalkRoomNames($targetUser , $senderUser);
         $room = $this->talkDb->getDevisTalkRoomByNames($roomNames);
         if($room == null){
@@ -96,7 +101,6 @@ class TalkService {
         $notificationsSubjectsParameters = $this->getNotificationsSubjectsParameters($senderUser);
         $notificationsMessageParameters = $this->getNotificationsMessageParameters($devisMessage['id']);
         $this->talkDb->sendAttendeeNotifications($targetUser,$roomToken,$notificationsSubjectsParameters,$notificationsMessageParameters);
-        return true;
     }
 
 }