X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FPhoto.php;h=5f1d65845b1213950935f24031a08a86b38c192e;hb=f114ad188353910f1714a2df04affb7e5ee58253;hp=1847b4f707e0ebe6432c62a5b134456409ca552b;hpb=f609386ca11d805838f5526261068a69b489eab0;p=friendica.git

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 1847b4f707..5f1d65845b 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -153,8 +153,12 @@ class Photo extends BaseModule
 		$stamp = microtime(true);
 
 		$imgdata = MPhoto::getImageDataForPhoto($photo);
-		if (empty($imgdata)) {
+		if (empty($imgdata) && empty($photo['blurhash'])) {
 			throw new HTTPException\NotFoundException();
+		} elseif (empty($imgdata) && !empty($photo['blurhash'])) {
+			$image = New Image('', 'image/png');
+			$image->getFromBlurHash($photo['blurhash'], $photo['width'], $photo['height']);
+			$imgdata = $image->asString();
 		}
 
 		// The mimetype for an external or system resource can only be known reliably after it had been fetched
@@ -178,6 +182,12 @@ class Photo extends BaseModule
 			throw new HTTPException\InternalServerErrorException($error);
 		}
 
+		if (!empty($request['static'])) {
+			$img = new Image($imgdata, $photo['type']);
+			$img->toStatic();
+			$imgdata = $img->asString();
+		}
+
 		// if customsize is set and image is not a gif, resize it
 		if ($photo['type'] !== 'image/gif' && $customsize > 0 && $customsize <= Proxy::PIXEL_THUMB && $square_resize) {
 			$img = new Image($imgdata, $photo['type']);
@@ -240,14 +250,18 @@ class Photo extends BaseModule
 	{
 		switch($type) {
 			case 'preview':
-				$media = DBA::selectFirst('post-media', ['preview', 'url', 'mimetype', 'type', 'uri-id'], ['id' => $id]);
+				$media = DBA::selectFirst('post-media', ['preview', 'url', 'preview-height', 'preview-width', 'height', 'width', 'mimetype', 'type', 'uri-id', 'blurhash'], ['id' => $id]);
 				if (empty($media)) {
 					return false;
 				}
-				$url = $media['preview'];
+				$url    = $media['preview'];
+				$width  = $media['preview-width'];
+				$height = $media['preview-height'];
 
 				if (empty($url) && ($media['type'] == Post\Media::IMAGE)) {
-					$url = $media['url'];
+					$url    = $media['url'];
+					$width  = $media['width'];
+					$height = $media['height'];
 				}
 
 				if (empty($url)) {
@@ -258,9 +272,9 @@ class Photo extends BaseModule
 					return MPhoto::getPhoto($matches[1], $matches[2]);
 				}
 
-				return MPhoto::createPhotoForExternalResource($url, (int)DI::userSession()->getLocalUserId(), $media['mimetype'] ?? '');
+				return MPhoto::createPhotoForExternalResource($url, (int)DI::userSession()->getLocalUserId(), $media['mimetype'] ?? '', $media['blurhash'], $width, $height);
 			case 'media':
-				$media = DBA::selectFirst('post-media', ['url', 'mimetype', 'uri-id'], ['id' => $id, 'type' => Post\Media::IMAGE]);
+				$media = DBA::selectFirst('post-media', ['url', 'height', 'width', 'mimetype', 'uri-id', 'blurhash'], ['id' => $id, 'type' => Post\Media::IMAGE]);
 				if (empty($media)) {
 					return false;
 				}
@@ -269,16 +283,16 @@ class Photo extends BaseModule
 					return MPhoto::getPhoto($matches[1], $matches[2]);
 				}
 
-				return MPhoto::createPhotoForExternalResource($media['url'], (int)DI::userSession()->getLocalUserId(), $media['mimetype']);
+				return MPhoto::createPhotoForExternalResource($media['url'], (int)DI::userSession()->getLocalUserId(), $media['mimetype'], $media['blurhash'], $media['width'], $media['height']);
 			case 'link':
-				$link = DBA::selectFirst('post-link', ['url', 'mimetype'], ['id' => $id]);
+				$link = DBA::selectFirst('post-link', ['url', 'mimetype', 'blurhash', 'width', 'height'], ['id' => $id]);
 				if (empty($link)) {
 					return false;
 				}
 
-				return MPhoto::createPhotoForExternalResource($link['url'], (int)DI::userSession()->getLocalUserId(), $link['mimetype'] ?? '');
+				return MPhoto::createPhotoForExternalResource($link['url'], (int)DI::userSession()->getLocalUserId(), $link['mimetype'] ?? '', $link['blurhash'] ?? '', $link['width'] ?? 0, $link['height'] ?? 0);
 			case 'contact':
-				$fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'xmpp', 'addr', 'network', 'failed', 'updated'];
+				$fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'blurhash', 'xmpp', 'addr', 'network', 'failed', 'updated'];
 				$contact = Contact::getById($id, $fields);
 				if (empty($contact)) {
 					return false;
@@ -350,7 +364,11 @@ class Photo extends BaseModule
 						Logger::debug('Expected Content-Type', ['mime' => $mimetext, 'url' => $url]);
 					}
 				}
-				if (empty($mimetext)) {
+				if (empty($mimetext) && !empty($contact['blurhash'])) {
+					$image = New Image('', 'image/png');
+					$image->getFromBlurHash($contact['blurhash'], $customsize, $customsize);
+					return MPhoto::createPhotoForImageData($image->asString());
+				} elseif (empty($mimetext)) {
 					if ($customsize <= Proxy::PIXEL_MICRO) {
 						$url = Contact::getDefaultAvatar($contact ?: [], Proxy::SIZE_MICRO);
 					} elseif ($customsize <= Proxy::PIXEL_THUMB) {
@@ -359,7 +377,7 @@ class Photo extends BaseModule
 						$url = Contact::getDefaultAvatar($contact ?: [], Proxy::SIZE_SMALL);
 					}
 				}
-				return MPhoto::createPhotoForExternalResource($url, 0, $mimetext);
+				return MPhoto::createPhotoForExternalResource($url, 0, $mimetext, $contact['blurhash'], $customsize, $customsize);
 			case 'header':
 				$fields = ['uid', 'url', 'header', 'network', 'gsid'];
 				$contact = Contact::getById($id, $fields);