Do not load the session in getParticipantByActor() as no caller needs it

Also fixes a problem with MariaDB ONLY_FULL_GROUP_BY and Oracle

Signed-off-by: Joas Schilling <[email protected]>

Author: nickvergessen

lib/Chat/MessageParser.php

@@ -92,7 +92,7 @@ protected function setActor(Message $message): void {
 				$displayName = $this->guestNames[$comment->getActorId()];
 			} else {
 				try {
-					$participant = $message->getRoom()->getParticipantByActor(Attendee::ACTOR_GUESTS, $comment->getActorId(), false);
+					$participant = $message->getRoom()->getParticipantByActor(Attendee::ACTOR_GUESTS, $comment->getActorId());
 					$displayName = $participant->getAttendee()->getDisplayName();
 				} catch (ParticipantNotFoundException $e) {
 				}

lib/Chat/Parser/SystemMessage.php

@@ -700,7 +700,7 @@ protected function getGuest(Room $room, string $actorId): array {
 
 	protected function getGuestName(Room $room, string $actorId): string {
 		try {
-			$participant = $room->getParticipantByActor(Attendee::ACTOR_GUESTS, $actorId, false);
+			$participant = $room->getParticipantByActor(Attendee::ACTOR_GUESTS, $actorId);
 			$name = $participant->getAttendee()->getDisplayName();
 			if ($name === '') {
 				return $this->l->t('Guest');

lib/Chat/Parser/UserMention.php

@@ -132,7 +132,7 @@ public function parseMessage(Message $chatMessage): void {
 				];
 			} elseif ($mention['type'] === 'guest') {
 				try {
-					$participant = $chatMessage->getRoom()->getParticipantByActor(Attendee::ACTOR_GUESTS, substr($mention['id'], strlen('guest/')), false);
+					$participant = $chatMessage->getRoom()->getParticipantByActor(Attendee::ACTOR_GUESTS, substr($mention['id'], strlen('guest/')));
 					$displayName = $participant->getAttendee()->getDisplayName() ?: $this->l->t('Guest');
 				} catch (ParticipantNotFoundException $e) {
 					$displayName = $this->l->t('Guest');

lib/Controller/SignalingController.php

@@ -601,14 +601,14 @@ private function backendRoom(array $roomRequest): DataResponse {
 						// If the user joins the session might not be known to the server yet.
 						// In this case we load by actor information and use the session id as new session.
 						try {
-							$participant = $room->getParticipantByActor($actorType, $actorId, false);
+							$participant = $room->getParticipantByActor($actorType, $actorId);
 						} catch (ParticipantNotFoundException $e) {
 						}
 					}
 				}
 			} else {
 				try {
-					$participant = $room->getParticipantByActor($actorType, $actorId, false);
+					$participant = $room->getParticipantByActor($actorType, $actorId);
 				} catch (ParticipantNotFoundException $e) {
 				}
 			}

lib/Notification/Notifier.php

@@ -516,7 +516,7 @@ protected function parseChatMessage(INotification $notification, Room $room, Par
 	 * @throws ParticipantNotFoundException
 	 */
 	protected function getGuestParameter(Room $room, string $actorId): array {
-		$participant = $room->getParticipantByActor(Attendee::ACTOR_GUESTS, $actorId, false);
+		$participant = $room->getParticipantByActor(Attendee::ACTOR_GUESTS, $actorId);
 		$name = $participant->getAttendee()->getDisplayName();
 		if (trim($name) === '') {
 			throw new ParticipantNotFoundException('Empty name');

lib/Room.php

@@ -593,15 +593,12 @@ public function getParticipantByAttendeeId(int $attendeeId): Participant {
 	/**
 	 * @param string $actorType
 	 * @param string $actorId
-	 * @param string|null|false $sessionId Set to false if you don't want to load a session (and save resources),
-	 *                                     string to try loading a specific session
-	 *                                     null to try loading "any"
 	 * @return Participant
 	 * @throws ParticipantNotFoundException When the pin is not valid (has no participant assigned)
 	 */
-	public function getParticipantByActor(string $actorType, string $actorId, $sessionId = null): Participant {
+	public function getParticipantByActor(string $actorType, string $actorId): Participant {
 		if ($actorType === Attendee::ACTOR_USERS) {
-			return $this->getParticipant($actorId, $sessionId);
+			return $this->getParticipant($actorId, false);
 		}
 
 		$query = $this->db->getQueryBuilder();
@@ -613,20 +610,6 @@ public function getParticipantByActor(string $actorType, string $actorId, $sessi
 			->andWhere($query->expr()->eq('a.room_id', $query->createNamedParameter($this->getId())))
 			->setMaxResults(1);
 
-		if ($sessionId !== false) {
-			if ($sessionId !== null) {
-				$helper->selectSessionsTable($query);
-				$query->leftJoin('a', 'talk_sessions', 's', $query->expr()->andX(
-					$query->expr()->eq('s.session_id', $query->createNamedParameter($sessionId)),
-					$query->expr()->eq('a.id', 's.attendee_id')
-				));
-			} else {
-				$helper->selectSessionsTableMax($query);
-				$query->groupBy('a.id');
-				$query->leftJoin('a', 'talk_sessions', 's', $query->expr()->eq('a.id', 's.attendee_id'));
-			}
-		}
-
 		$result = $query->executeQuery();
 		$row = $result->fetch();
 		$result->closeCursor();