Merge pull request #6 from nextcloud/fix/noid/thumbnails

Fix project thumbnails
nextcloud · Apr 28, 2023 · 6338889 · 6338889
2 parents dedd648 + f1d45ea
commit 6338889
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/Service/CollaboardAPIService.php b/lib/Service/CollaboardAPIService.php
@@ -66,6 +66,11 @@ public function getImage(string $url): array {
 		];
 	}
 
+	/**
+	 * @param string $userId
+	 * @return array|string[]
+	 * @throws Exception
+	 */
 	public function getProjects(string $userId): array {
 		$params = [
 			'AppVer' => '5.16.520',
@@ -76,9 +81,15 @@ public function getProjects(string $userId): array {
 		if (isset($projectsResult['error'])) {
 			return $projectsResult;
 		}
+		$thumbnailRequestOptions = [
+			'headers' => [
+				'User-Agent'  => Application::INTEGRATION_USER_AGENT,
+			],
+		];
+		$client = $this->client;
 		if (isset($projectsResult['Results']) && is_array($projectsResult['Results'])) {
 			$remoteProjects = $projectsResult['Results'];
-			return array_map(static function(array $remoteProject) {
+			return array_map(static function(array $remoteProject) use ($thumbnailRequestOptions, $client) {
 				$remoteProject['trash'] = false;
 				$remoteProject['name'] = $remoteProject['Project']['Description'];
 				$remoteProject['id'] = $remoteProject['Project']['ProjectId'];
@@ -88,6 +99,14 @@ public function getProjects(string $userId): array {
 					'photoUrl' => $remoteProject['Owner']['PhotoUrl'] ?? null,
 				];
 				$remoteProject['updated_at'] = $remoteProject['Project']['LastUpdate'];
+				if (isset($remoteProject['ThumbnailUrl']) && $remoteProject['ThumbnailUrl']) {
+					try {
+						$response = $client->get($remoteProject['ThumbnailUrl'], $thumbnailRequestOptions);
+						$remoteProject['Project']['Thumbnail'] = base64_encode($response->getBody());
+					} catch (Exception | Throwable $e) {
+
+					}
+				}
 				return $remoteProject;
 			}, $remoteProjects);
 		}

diff --git a/src/components/ProjectItem.vue b/src/components/ProjectItem.vue
@@ -59,7 +59,7 @@ export default {
 
 	computed: {
 		hasImage() {
-			return this.project.Project.Thumbnail !== null
+			return !!this.project.Project.Thumbnail
 		},
 		imgSrc() {
 			return 'data:image/png;base64,' + this.project.Project.Thumbnail