VladPolskiy/nextcloud-spreed
1
0
Fork 0
mirror of https://github.com/nextcloud/spreed.git synced 2025-07-21 05:46:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15545 from nextcloud/bugfix/noid/empty-chat-for-guests

Browse Source 
fix(chat): Fix guests in a fully empty chat
This commit is contained in:
Joas Schilling
2025-07-18 16:58:29 +02:00
committed by GitHub
parent 524be3036e 948ef62d59
commit 169009c53c
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Controller/ChatController.php
View File

@ -811,9 +811,14 @@ class ChatController extends AEnvironmentAwareOCSController {
}
$currentUser = $this->userManager->get($this->userId);
$commentsHistory = $this->chatManager->getHistory($this->room, $messageId, $limit, true, $threadId);
$commentsHistory = array_reverse($commentsHistory);
$commentsFuture = $this->chatManager->waitForNewMessages($this->room, $messageId, $limit, 0, $currentUser, false);
if ($messageId === 0) {
// Guest in a fully expired chat, no history, just loading the chat from beginning for now
$commentsHistory = $commentsFuture = [];
} else {
$commentsHistory = $this->chatManager->getHistory($this->room, $messageId, $limit, true, $threadId);
$commentsHistory = array_reverse($commentsHistory);
$commentsFuture = $this->chatManager->waitForNewMessages($this->room, $messageId, $limit, 0, $currentUser, false);
}
return $this->prepareCommentsAsDataResponse(array_merge($commentsHistory, $commentsFuture));
}

5
lib/Service/RoomFormatter.php
View File

@ -418,6 +418,11 @@ class RoomFormatter {
}
}
if ($roomData['lastReadMessage'] === 0) {
// Guest in a fully expired chat, no history, just loading the chat from beginning for now
$roomData['lastReadMessage'] = ChatManager::UNREAD_FIRST_MESSAGE;
}
if ($currentUser instanceof IUser
&& $attendee->getActorType() === Attendee::ACTOR_USERS
&& $roomData['lastReadMessage'] === ChatManager::UNREAD_FIRST_MESSAGE