slambert/Thanasoft-H2F
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fixes/fix-error-sharing-file-in-talk' into releases/release-h2f

Browse Source
This commit is contained in:
Tiavina 2025-03-25 17:39:10 +03:00
commit df826724b1
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gestion/lib/Service/GestionService.php
View File

@ -249,6 +249,7 @@ class GestionService {
} }
}else { }else {
$roomToken = $this->talkService->getRoomTokenBeetwenTwoUser($this->userConnectedUuid, $userName); $roomToken = $this->talkService->getRoomTokenBeetwenTwoUser($this->userConnectedUuid, $userName);
if($roomToken != null){
foreach ( $attachments as $attachment) { foreach ( $attachments as $attachment) {
$this->userConnectedStorage->getFullPath("/"); $this->userConnectedStorage->getFullPath("/");
$path = Filesystem::getPath($attachment['file_id']); $path = Filesystem::getPath($attachment['file_id']);
@ -257,6 +258,7 @@ class GestionService {
$this->sendFileAttachmentToTalk($roomToken,$cookie , $attachment['name']); $this->sendFileAttachmentToTalk($roomToken,$cookie , $attachment['name']);
} }
} }
}
} }
} }
@ -408,6 +410,7 @@ class GestionService {
}else{ }else{
$roomToken = $this->talkService->getRoomTokenBeetwenTwoUser($this->userConnectedUuid, $userName); $roomToken = $this->talkService->getRoomTokenBeetwenTwoUser($this->userConnectedUuid, $userName);
if($roomToken != null){
foreach ( $attachments as $attachment) { foreach ( $attachments as $attachment) {
$this->userConnectedStorage->getFullPath("/"); $this->userConnectedStorage->getFullPath("/");
$path = Filesystem::getPath($attachment['file_id']); $path = Filesystem::getPath($attachment['file_id']);
@ -416,6 +419,7 @@ class GestionService {
//sendFileAttachmentToTalk //sendFileAttachmentToTalk
$this->sendFileAttachmentToTalk($roomToken,$cookie , $attachment['name']); $this->sendFileAttachmentToTalk($roomToken,$cookie , $attachment['name']);
} }
}
} }
} }

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

@ -107,7 +107,7 @@ class TalkService {
$senderAndTargetIsTheSameUser = $targetUser == $senderUser; $senderAndTargetIsTheSameUser = $targetUser == $senderUser;
$senderUser = $senderAndTargetIsTheSameUser ? BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD : $senderUser; $senderUser = $senderAndTargetIsTheSameUser ? BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD : $senderUser;
if( $targetUser === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD && $senderUser === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD){ if( $targetUser === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD && $senderUser === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD){
return; return null;
} }
$roomNames = $this->getUserDevisTalkRoomNames($targetUser , $senderUser); $roomNames = $this->getUserDevisTalkRoomNames($targetUser , $senderUser);
$room = $this->talkDb->getDevisTalkRoomByNames($roomNames); $room = $this->talkDb->getDevisTalkRoomByNames($roomNames);