Simplify getRoomIconUrl method

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

lib/Collaboration/Reference/TalkReferenceProvider.php

@@ -255,19 +255,13 @@ public function getCacheKey(string $referenceId): ?string {
 
 	protected function getRoomIconUrl(Room $room, string $userId): string {
 		if ($room->getType() === Room::TYPE_ONE_TO_ONE) {
-			$participants = json_decode($room->getName(), true);
-
-			foreach ($participants as $p) {
-				if ($p !== $userId) {
-					return $this->urlGenerator->linkToRouteAbsolute(
-						'core.avatar.getAvatar',
-						[
-							'userId' => $p,
-							'size' => 64,
-						]
-					);
-				}
-			}
+			return $this->urlGenerator->linkToRouteAbsolute(
+				'core.avatar.getAvatar',
+				[
+					'userId' => $room->getSecondParticipant($userId),
+					'size' => 64,
+				]
+			);
 		}
 
 		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('spreed', 'changelog.svg'));

lib/Room.php

@@ -369,6 +369,21 @@ public function getName(): string {
 		return $this->name;
 	}
 
+	public function getSecondParticipant(string $userId): string {
+		if ($this->getType() !== self::TYPE_ONE_TO_ONE) {
+			throw new \InvalidArgumentException('Not a one-to-one room');
+		}
+		$participants = json_decode($this->getName(), true);
+
+		foreach ($participants as $uid) {
+			if ($uid !== $userId) {
+				return $uid;
+			}
+		}
+
+		return $this->getName();
+	}
+
 	public function getDisplayName(string $userId): string {
 		return $this->manager->resolveRoomDisplayName($this, $userId);
 	}