fixup!

Signed-off-by: Maksim Sukharev <[email protected]>
nextcloud · Feb 28, 2025 · c6fef38 · c6fef38
1 parent 38830fb
commit c6fef38
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/lib/Service/RoomFormatter.php b/lib/Service/RoomFormatter.php
@@ -274,17 +274,6 @@ public function formatRoomV4(
 			}
 		}
 
-		if ($room->getLobbyState() === Webinary::LOBBY_NON_MODERATORS &&
-			!$currentParticipant->hasModeratorPermissions() &&
-			!($currentParticipant->getPermissions() & Attendee::PERMISSIONS_LOBBY_IGNORE)) {
-			// No participants and chat messages for users in the lobby.
-			$roomData['hasCall'] = false;
-			$roomData['canLeaveConversation'] = true;
-			return $roomData;
-		}
-
-		$roomData['canStartCall'] = $currentParticipant->canStartCall($this->serverConfig);
-
 		$currentUser = null;
 		if ($attendee->getActorType() === Attendee::ACTOR_USERS) {
 			$currentUser = $this->userManager->get($attendee->getActorId());
@@ -356,6 +345,19 @@ public function formatRoomV4(
 			$roomData['remoteToken'] = $room->getRemoteToken();
 		}
 
+		if ($room->getLobbyState() === Webinary::LOBBY_NON_MODERATORS &&
+			!$currentParticipant->hasModeratorPermissions() &&
+			!($currentParticipant->getPermissions() & Attendee::PERMISSIONS_LOBBY_IGNORE)) {
+			// No participants and chat messages for users in the lobby.
+			$roomData['hasCall'] = false;
+			$roomData['unreadMessages'] = 0;
+			$roomData['unreadMention'] = false;
+			$roomData['unreadMentionDirect'] = false;
+			return $roomData;
+		}
+
+		$roomData['canStartCall'] = $currentParticipant->canStartCall($this->serverConfig);
+
 		// FIXME This should not be done, but currently all the clients use it to get the avatar of the user …
 		if ($room->getType() === Room::TYPE_ONE_TO_ONE) {
 			$participants = json_decode($room->getName(), true);

diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
@@ -366,7 +366,7 @@ import SearchBox from '../UIShared/SearchBox.vue'
 import TransitionWrapper from '../UIShared/TransitionWrapper.vue'
 
 import { useArrowNavigation } from '../../composables/useArrowNavigation.js'
-import { ATTENDEE, AVATAR, CONVERSATION, WEBINAR } from '../../constants.ts'
+import { ATTENDEE, AVATAR, CONVERSATION } from '../../constants.ts'
 import BrowserStorage from '../../services/BrowserStorage.js'
 import { getTalkConfig, hasTalkFeature } from '../../services/CapabilitiesManager.ts'
 import {
@@ -893,16 +893,10 @@ export default {
 		 */
 		async handleShouldRefreshConversations(options) {
 			if (options?.token && options?.properties) {
-				if (this.$store.getters.isInLobby && options.properties.lobbyState === WEBINAR.LOBBY.NONE) {
-					// If the lobby enabled, non-moderators do not have access to messages
-					// On disabling, should fetch complete room object to set up chat context
-					await this.$store.dispatch('fetchConversation', { token: options.token })
-				} else {
-					await this.$store.dispatch('setConversationProperties', {
-						token: options.token,
-						properties: options.properties,
-					})
-				}
+				await this.$store.dispatch('setConversationProperties', {
+					token: options.token,
+					properties: options.properties,
+				})
 			}
 
 			if (this.isCurrentTabLeader) {