Merge pull request #9412 from nextcloud/bugfix/8787/keep-guest-attendees-with-values

Bugfix/8787/keep guest attendees with values

2 files changed, 24 insertions, 3 deletions

diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index 787a2d63d..920624aa6 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -829,9 +829,18 @@ class RoomController extends AEnvironmentAwareController {
 					$result['statusClearAt'] = null;
 				}
 			} elseif ($participant->getAttendee()->getActorType() === Attendee::ACTOR_GUESTS) {
-				if ($result['lastPing'] <= $maxPingAge) {
-					$cleanGuests = true;
-					continue;
+				if ($participant->getAttendee()->getParticipantType() === Participant::GUEST
+					&& ($participant->getAttendee()->getPermissions() === Attendee::PERMISSIONS_DEFAULT
+						|| $participant->getAttendee()->getPermissions() === Attendee::PERMISSIONS_CUSTOM)) {
+					// Guests without an up-to-date session are filtered out. We
+					// only keep there attendees in the database, so that the
+					// comments show the display name. Only when they have
+					// non-default permissions we show them, so permissions can
+					// be reset or removed
+					if ($result['lastPing'] <= $maxPingAge) {
+						$cleanGuests = true;
+						continue;
+					}
 				}
 
 				$result['displayName'] = $participant->getAttendee()->getDisplayName();
diff --git a/lib/Service/ParticipantService.php b/lib/Service/ParticipantService.php
index afb33ac07..225f32986 100644
--- a/lib/Service/ParticipantService.php
+++ b/lib/Service/ParticipantService.php
@@ -1001,6 +1001,18 @@ class ParticipantService {
 		$attendees = [];
 		$result = $query->executeQuery();
 		while ($row = $result->fetch()) {
+			if ($row['display_name'] !== '' && $row['display_name'] !== null) {
+				// Keep guests with a non-empty display name, so we can still
+				// render the guest display name on chat messages.
+				continue;
+			}
+
+			if ($row['permissions'] !== Attendee::PERMISSIONS_DEFAULT
+				|| $row['participant_type'] === Participant::GUEST_MODERATOR) {
+				// Keep guests with non-default permissions in case they just reconnect
+				continue;
+			}
+
 			$attendeeIds[] = (int) $row['a_id'];
 			$attendees[] = $this->attendeeMapper->createAttendeeFromRow($row);
 		}