root/THANASOFT-HFC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfixes/hotfix-talk-sender-message' into staging

Browse Source
This commit is contained in:
Tiavina 2025-04-02 12:26:41 +03:00
commit 748d7e7fbf
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gestion/lib/Db/TalkDb.php
View File

@ -195,9 +195,9 @@ class TalkDb {
[$messageId,$roomId,$idNextCloud]); [$messageId,$roomId,$idNextCloud]);
} }
public function createDevisTalkRoomMessageAndReturnMessage($roomId,$message){ public function createDevisTalkRoomMessageAndReturnMessage($roomId,$message,$senderUser){
$this->createDevisTalkRoomMessage( $this->createDevisTalkRoomMessage(
BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD, $senderUser,
$message, $message,
self::DEVIS_TALK_ROOM_VERB_COMMENT, self::DEVIS_TALK_ROOM_VERB_COMMENT,
$roomId, $roomId,

2
gestion/lib/Service/TalkService.php
View File

@ -94,7 +94,7 @@ class TalkService {
else{ else{
$roomToken = $room['token']; $roomToken = $room['token'];
} }
$devisMessage = $this->talkDb->createDevisTalkRoomMessageAndReturnMessage($room['id'],$message); $devisMessage = $this->talkDb->createDevisTalkRoomMessageAndReturnMessage($room['id'],$message,$senderUser);
$this->talkDb->updateRoomLastMessage($room['id'],$devisMessage['id']); $this->talkDb->updateRoomLastMessage($room['id'],$devisMessage['id']);
$this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],$senderUser); $this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],$senderUser);
//send notifications //send notifications