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

Merge branch 'fixes/fix-talk-notifications' into staging

Browse Source
This commit is contained in:
Tiavina 2025-01-21 17:14:10 +03:00
commit 5e5621fe5e
2 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,12 +16,14 @@ class TalkDb {
private const DEVIS_TALK_ROOM_INITIAL_MESSAGE = '{"message":"conversation_created","parameters":[]}'; private const DEVIS_TALK_ROOM_INITIAL_MESSAGE = '{"message":"conversation_created","parameters":[]}';
private const DEVIS_TALK_ROOM_DEFAULT_MESSAGE_TYPE = "chat"; private const DEVIS_TALK_ROOM_DEFAULT_MESSAGE_TYPE = "chat";
private const DEVIS_TALK_ROOM_DEFAULT_PARTICIPANT_TYPE = 1; private const DEVIS_TALK_ROOM_DEFAULT_PARTICIPANT_TYPE = 1;
private $commentsTablePrefix; private const DEVIS_TALK_NOTIFICATIONS_APP_NAME ="spreed";
private $defaultTablePrefix;
private IDbConnection $pdo; private IDbConnection $pdo;
public function __construct(IDbConnection $db) { public function __construct(IDbConnection $db) {
$this->talkTablePrefix = BddConstant::DEFAULT_TABLE_PREFIX ."talk_"; $this->talkTablePrefix = BddConstant::DEFAULT_TABLE_PREFIX ."talk_";
$this->commentsTablePrefix = BddConstant::DEFAULT_TABLE_PREFIX; $this->defaultTablePrefix = BddConstant::DEFAULT_TABLE_PREFIX;
$this->pdo = $db; $this->pdo = $db;
} }
@ -104,7 +106,7 @@ class TalkDb {
private function createDevisTalkRoomMessage($actorId,$message,$verb,$roomId,$reference = null){ private function createDevisTalkRoomMessage($actorId,$message,$verb,$roomId,$reference = null){
$datetime = new DateTime(); $datetime = new DateTime();
$datetime = $datetime->format(('Y-m-d H:i:s')); $datetime = $datetime->format(('Y-m-d H:i:s'));
$sql = "INSERT INTO `".$this->commentsTablePrefix."comments` ( $sql = "INSERT INTO `".$this->defaultTablePrefix."comments` (
`actor_type`, `actor_type`,
`actor_id`, `actor_id`,
`message`, `message`,
@ -128,7 +130,7 @@ class TalkDb {
private function getDevisTalkRoomMessageByRoomAndMessage($roomId,$message){ private function getDevisTalkRoomMessageByRoomAndMessage($roomId,$message){
$sql = "SELECT * $sql = "SELECT *
FROM ".$this->commentsTablePrefix."comments as comment FROM ".$this->defaultTablePrefix."comments as comment
WHERE comment.object_id = ? AND WHERE comment.object_id = ? AND
comment.message = ? comment.message = ?
ORDER BY comment.id DESC ORDER BY comment.id DESC
@ -226,5 +228,39 @@ class TalkDb {
[$lastMessageId,$roomId]); [$lastMessageId,$roomId]);
} }
public function sendAttendeeNotifications($idNextCloud,$roomToken,$notificationsSubjectsParameters,$notificationsMessageParameters){
$datetimeNow = new DateTime();
$timestamp = $datetimeNow->getTimestamp();
$sql = "INSERT INTO `".$this->defaultTablePrefix."notifications` (
`app`,
`user`,
`timestamp`,
`object_type`,
`object_id`,
`subject`,
`subject_parameters`,
`message`,
`message_parameters`,
`link`,
`icon`,
`actions`
) VALUES (?,?,?,?,?,?,?,?,?,?,?,?);";
$this->execSQLNoData($sql, array(
self::DEVIS_TALK_NOTIFICATIONS_APP_NAME,
$idNextCloud,
$timestamp,
'chat',
$roomToken,
'chat',
$notificationsSubjectsParameters,
'comment',
$notificationsMessageParameters,
'',
'',
'[]'
));
}
} }

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

@ -68,6 +68,14 @@ class TalkService {
return $randomToken; return $randomToken;
} }
private function getNotificationsSubjectsParameters(){
return '{"userType":"users","userId":"'.BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD.'"}';
}
private function getNotificationsMessageParameters($commentId){
return '{"commentId":"'.$commentId.'"}';
}
public function sendDevisTalkNotifications(string $message,string $idNextcloud){ public function sendDevisTalkNotifications(string $message,string $idNextcloud){
if($idNextcloud === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD || $idNextcloud === BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD){ if($idNextcloud === BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD || $idNextcloud === BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD){
return true; return true;
@ -75,12 +83,20 @@ class TalkService {
$roomNames = $this->getUserDevisTalkRoomNames($idNextcloud); $roomNames = $this->getUserDevisTalkRoomNames($idNextcloud);
$room = $this->talkDb->getDevisTalkRoomByNames($roomNames); $room = $this->talkDb->getDevisTalkRoomByNames($roomNames);
if($room == null){ if($room == null){
$room = $this->talkDb->createDevisTalkRoomAndReturnDevisTalkRoom($idNextcloud,$this->generateTalkRandomToken()); $roomToken = $this->generateTalkRandomToken();
$room = $this->talkDb->createDevisTalkRoomAndReturnDevisTalkRoom($idNextcloud,$roomToken);
$initialMessage = $this->talkDb->setDevisTalkRoomInitialMessageAndReturnMessage($room['id'],$idNextcloud); $initialMessage = $this->talkDb->setDevisTalkRoomInitialMessageAndReturnMessage($room['id'],$idNextcloud);
} }
else{
$roomToken = $room['token'];
}
$devisMessage = $this->talkDb->createDevisTalkRoomMessageAndReturnMessage($room['id'],$message); $devisMessage = $this->talkDb->createDevisTalkRoomMessageAndReturnMessage($room['id'],$message);
$this->talkDb->updateRoomLastMessage($room['id'],$devisMessage['id']); $this->talkDb->updateRoomLastMessage($room['id'],$devisMessage['id']);
$this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD); $this->talkDb->setAttendeeLastReadMessage($room['id'],$devisMessage['id'],BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
//send notifications
$notificationsSubjectsParameters = $this->getNotificationsSubjectsParameters();
$notificationsMessageParameters = $this->getNotificationsMessageParameters($devisMessage['id']);
$this->talkDb->sendAttendeeNotifications($idNextcloud,$roomToken,$notificationsSubjectsParameters,$notificationsMessageParameters);
return true; return true;
} }