[stable25] improve related resources' title

lib/Db/CoreQueryBuilder.php

@@ -80,6 +80,7 @@ class CoreQueryBuilder {
 		],
 		self::TABLE_TALK_ROOM => [
 			'name',
+			'type',
 			'token'
 		],
 		self::TABLE_DAV_SHARE => [

lib/IRelatedResourceProvider.php

@@ -60,4 +60,13 @@ public function getRelatedFromItem(string $itemId): ?IRelatedResource;
 	 * @return string[]
 	 */
 	public function getItemsAvailableToEntity(FederatedUser $entity): array;
+
+	/**
+	 * improve a related resource before sending result to front-end.
+	 *
+	 * @param IRelatedResource $entry
+	 *
+	 * @return void
+	 */
+	public function improveRelatedResource(IRelatedResource $entry): void;
 }

lib/Model/TalkRoom.php

@@ -40,6 +40,7 @@ class TalkRoom implements IQueryRow, JsonSerializable {
 
 	private int $roomId = 0;
 	private string $roomName = '';
+	private int $roomType = 0;
 	private string $token = '';
 
 	public function __construct() {
@@ -83,6 +84,24 @@ public function getRoomName(): string {
 		return $this->roomName;
 	}
 
+	/**
+	 * @param int $roomType
+	 *
+	 * @return TalkRoom
+	 */
+	public function setRoomType(int $roomType): self {
+		$this->roomType = $roomType;
+
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getRoomType(): int {
+		return $this->roomType;
+	}
+
 
 	/**
 	 * @param string $token
@@ -109,6 +128,7 @@ public function getToken(): string {
 	public function importFromDatabase(array $data): IQueryRow {
 		$this->setRoomId($this->getInt('id', $data))
 			 ->setRoomName($this->get('name', $data))
+			 ->setRoomType($this->getInt('type', $data))
 			 ->setToken($this->get('token', $data));
 
 		return $this;
@@ -121,6 +141,7 @@ public function jsonSerialize(): array {
 		return [
 			'roomId' => $this->getRoomId(),
 			'roomName' => $this->getRoomName(),
+			'roomType' => $this->getRoomType(),
 			'token' => $this->getToken()
 		];
 	}

lib/RelatedResourceProviders/CalendarRelatedResourceProvider.php

@@ -144,6 +144,11 @@ public function getItemsAvailableToEntity(FederatedUser $entity): array {
 	}
 
 
+	public function improveRelatedResource(IRelatedResource $entry): void {
+	}
+
+
+
 	private function convertToRelatedResource(Calendar $calendar): IRelatedResource {
 		$related = new RelatedResource(self::PROVIDER_ID, $calendar->getId());
 

lib/RelatedResourceProviders/DeckRelatedResourceProvider.php

@@ -139,6 +139,9 @@ public function getItemsAvailableToEntity(FederatedUser $entity): array {
 	}
 
 
+	public function improveRelatedResource(IRelatedResource $entry): void {
+	}
+
 	private function convertToRelatedResource(DeckBoard $board): IRelatedResource {
 		$url = '';
 		try {

lib/RelatedResourceProviders/FilesRelatedResourceProvider.php

@@ -143,6 +143,21 @@ public function getItemsAvailableToEntity(FederatedUser $entity): array {
 	}
 
 
+	public function improveRelatedResource(IRelatedResource $entry): void {
+		$current = $this->circlesManager->getCurrentFederatedUser();
+		if (!$current->isLocal() || $current->getUserType() !== Member::TYPE_USER) {
+			return;
+		}
+
+		$paths = $this->rootFolder->getUserFolder($current->getUserId())
+								  ->getById((int) $entry->getItemId());
+
+		if (sizeof($paths) > 0) {
+			$entry->setTitle($paths[0]->getName());
+		}
+	}
+
+
 	private function convertToRelatedResource(FilesShare $share): IRelatedResource {
 		$related = new RelatedResource(self::PROVIDER_ID, (string)$share->getFileId());
 		$related->setTitle(trim($share->getFileTarget(), '/'));

lib/RelatedResourceProviders/TalkRelatedResourceProvider.php

@@ -113,15 +113,35 @@ public function getRelatedFromItem(string $itemId): ?IRelatedResource {
 				return null;
 			}
 
-			if ($countActor === 2) { // 1:1 convo
-				$related->setTitle($this->l10n->t('1:1 Conversation'));
+			if ($countActor === 2 && $room->getRoomType() === \OCA\Talk\Room::TYPE_ONE_TO_ONE) {
+				$related->setTitle($this->l10n->t('Talk conversation'))
+						->setMetaArray('1on1', json_decode($room->getRoomName()));
 			}
 		}
 
 		return $related;
 	}
 
 
+	public function improveRelatedResource(IRelatedResource $entry): void {
+		if (!$entry->hasMeta('1on1')) {
+			return;
+		}
+
+		$current = $this->circlesManager->getCurrentFederatedUser();
+		if (!$current->isLocal() || $current->getUserType() !== Member::TYPE_USER) {
+			return;
+		}
+
+		foreach ($entry->getMetaArray('1on1') as $actor) {
+			if ($actor !== $current->getUserId()) {
+				$entry->setTitle($this->l10n->t('Conversation with %s', $actor));
+
+				return;
+			}
+		}
+	}
+
 	public function getItemsAvailableToEntity(FederatedUser $entity): array {
 		switch ($entity->getBasedOn()->getSource()) {
 			case Member::TYPE_USER:

lib/Service/RelatedService.php

@@ -198,6 +198,7 @@ private function retrieveRelatedToItem(string $providerId, string $itemId): arra
 
 		$result = $this->strictMatching($current, $result);
 		$result = $this->filterUnavailableResults($result);
+		$result = $this->improveResult($result);
 
 		$this->weightResult($current, $result);
 
@@ -450,6 +451,22 @@ private function filterUnavailableResults(array $result): array {
 		});
 	}
 
+
+	/**
+	 * @param IRelatedResource[] $result
+	 *
+	 * @return array
+	 * @throws RelatedResourceProviderNotFound
+	 */
+	private function improveResult(array $result): array {
+		foreach ($result as $entry) {
+			$this->getRelatedResourceProvider($entry->getProviderId())
+				 ->improveRelatedResource($entry);
+		}
+
+		return $result;
+	}
+
 	/**
 	 * @param IRelatedResource $current
 	 * @param IRelatedResource[] $result

psalm.xml

@@ -31,6 +31,7 @@
                 <referencedClass name="OCA\Circles\Model\Member" />
                 <referencedClass name="OCA\Circles\Model\FederatedUser" />
                 <referencedClass name="OCA\Circles\Exceptions\MembershipNotFoundException" />
+                <referencedClass name="OCA\Talk\Room" />
             </errorLevel>
         </UndefinedClass>
         <UndefinedDocblockClass>