X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FImages.php;h=6874d36e9bc3e7d93fd8e719fbd37b7b9744c929;hb=4faf08c0643d3e6bbe2a0a77be2ff8c1dbea4d5c;hp=077509d3cb5e6e1c64105e2a7886bd131cf31be5;hpb=3d8e82d95d9cc76b45a8db301b22c4111f335e1c;p=friendica.git

diff --git a/src/Util/Images.php b/src/Util/Images.php
index 077509d3cb..6874d36e9b 100644
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,6 +24,8 @@ namespace Friendica\Util;
 use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Model\Photo;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Object\Image;
 
 /**
  * Image utilities
@@ -33,23 +35,23 @@ class Images
 	/**
 	 * Maps Mime types to Imagick formats
 	 *
-	 * @return array
+	 * @return array Format map
 	 */
 	public static function getFormatsMap()
 	{
-		$m = [
+		return [
 			'image/jpeg' => 'JPG',
+			'image/jpg' => 'JPG',
 			'image/png' => 'PNG',
-			'image/gif' => 'GIF'
+			'image/gif' => 'GIF',
 		];
-
-		return $m;
 	}
 
 	/**
-	 * Return file extension for mime type
-	 * @param string $mimetype
-	 * @return string
+	 * Return file extension for MIME type
+	 *
+	 * @param string $mimetype MIME type
+	 * @return string File extension for MIME type
 	 */
 	public static function getExtensionByMimeType(string $mimetype): string
 	{
@@ -62,9 +64,14 @@ class Images
 				$imagetype = IMAGETYPE_GIF;
 				break;
 
-			default:
+			case 'image/jpeg':
+			case 'image/jpg':
 				$imagetype = IMAGETYPE_JPEG;
 				break;
+
+			default: // Unknown type must be a blob then
+				return 'blob';
+				break;
 		}
 
 		return image_type_to_extension($imagetype);
@@ -75,11 +82,13 @@ class Images
 	 *
 	 * @return array
 	 */
-	public static function supportedTypes()
+	public static function supportedTypes(): array
 	{
 		$types = [
-			'image/jpeg' => 'jpg'
+			'image/jpeg' => 'jpg',
+			'image/jpg' => 'jpg',
 		];
+
 		if (class_exists('Imagick')) {
 			// Imagick::queryFormats won't help us a lot there...
 			// At least, not yet, other parts of friendica uses this array
@@ -101,21 +110,20 @@ class Images
 	 *
 	 * @param string $image_data Image data
 	 * @param string $filename   File name (for guessing the type via the extension)
-	 * @param string $mime       default mime type
-	 *
-	 * @return string
+	 * @param string $default    Default MIME type
+	 * @return string MIME type
 	 * @throws \Exception
 	 */
-	public static function getMimeTypeByData(string $image_data, string $filename = '', string $mime = '')
+	public static function getMimeTypeByData(string $image_data, string $filename = '', string $default = ''): string
 	{
-		if (substr($mime, 0, 6) == 'image/') {
-			Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mime]);
-			return $mime;
+		if (substr($default, 0, 6) == 'image/') {
+			Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $default]);
+			return $default;
 		}
 
 		$image = @getimagesizefromstring($image_data);
 		if (!empty($image['mime'])) {
-			Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $mime, 'mime' => $image['mime']]);
+			Logger::info('Mime type detected via data', ['filename' => $filename, 'default' => $default, 'mime' => $image['mime']]);
 			return $image['mime'];
 		}
 
@@ -127,21 +135,20 @@ class Images
 	 *
 	 * @param string $sourcefile Source file of the image
 	 * @param string $filename   File name (for guessing the type via the extension)
-	 * @param string $mime       default mime type
-	 *
-	 * @return string
+	 * @param string $default    default MIME type
+	 * @return string MIME type
 	 * @throws \Exception
 	 */
-	public static function getMimeTypeBySource(string $sourcefile, string $filename = '', string $mime = '')
+	public static function getMimeTypeBySource(string $sourcefile, string $filename = '', string $default = ''): string
 	{
-		if (substr($mime, 0, 6) == 'image/') {
-			Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $mime]);
-			return $mime;
+		if (substr($default, 0, 6) == 'image/') {
+			Logger::info('Using default mime type', ['filename' => $filename, 'mime' => $default]);
+			return $default;
 		}
 
 		$image = @getimagesize($sourcefile);
 		if (!empty($image['mime'])) {
-			Logger::info('Mime type detected via file', ['filename' => $filename, 'default' => $mime, 'image' => $image]);
+			Logger::info('Mime type detected via file', ['filename' => $filename, 'default' => $default, 'image' => $image]);
 			return $image['mime'];
 		}
 
@@ -149,14 +156,13 @@ class Images
 	}
 
 	/**
-	 * Guess image mimetype from the filename
+	 * Guess image MIME type from the filename's extension
 	 *
-	 * @param string $filename   Image filename
-	 *
-	 * @return string
+	 * @param string $filename Image filename
+	 * @return string Guessed MIME type by extension
 	 * @throws \Exception
 	 */
-	public static function guessTypeByExtension(string $filename)
+	public static function guessTypeByExtension(string $filename): string
 	{
 		$ext = pathinfo(parse_url($filename, PHP_URL_PATH), PATHINFO_EXTENSION);
 		$types = self::supportedTypes();
@@ -172,11 +178,13 @@ class Images
 	}
 
 	/**
+	 * Gets info array from given URL, cached data has priority
+	 *
 	 * @param string $url
-	 * @return array
+	 * @return array Info
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function getInfoFromURLCached($url)
+	public static function getInfoFromURLCached(string $url): array
 	{
 		$data = [];
 
@@ -184,23 +192,27 @@ class Images
 			return $data;
 		}
 
-		$data = DI::cache()->get($url);
+		$cacheKey = 'getInfoFromURL:' . sha1($url);
+
+		$data = DI::cache()->get($cacheKey);
 
 		if (empty($data) || !is_array($data)) {
 			$data = self::getInfoFromURL($url);
 
-			DI::cache()->set($url, $data);
+			DI::cache()->set($cacheKey, $data);
 		}
 
-		return $data;
+		return $data ?? [];
 	}
 
 	/**
+	 * Gets info from URL uncached
+	 *
 	 * @param string $url
-	 * @return array
+	 * @return array Info array
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function getInfoFromURL($url)
+	public static function getInfoFromURL(string $url): array
 	{
 		$data = [];
 
@@ -217,7 +229,7 @@ class Images
 		}
 
 		if (empty($img_str)) {
-			$img_str = DI::httpClient()->fetch($url, 4);
+			$img_str = DI::httpClient()->fetch($url, HttpClientAccept::IMAGE, 4);
 		}
 
 		if (!$img_str) {
@@ -233,19 +245,27 @@ class Images
 		}
 
 		if ($data) {
+			$image = new Image($img_str);
+
+			if ($image->isValid()) {
+				$data['blurhash'] = $image->getBlurHash();
+			}
+
 			$data['size'] = $filesize;
 		}
 
-		return $data;
+		return is_array($data) ? $data : [];
 	}
 
 	/**
-	 * @param integer $width
-	 * @param integer $height
-	 * @param integer $max
-	 * @return array
+	 * Returns scaling information
+	 *
+	 * @param integer $width Width
+	 * @param integer $height Height
+	 * @param integer $max Max width/height
+	 * @return array Scaling dimensions
 	 */
-	public static function getScalingDimensions($width, $height, $max)
+	public static function getScalingDimensions(int $width, int $height, int $max): array
 	{
 		if ((!$width) || (!$height)) {
 			return ['width' => 0, 'height' => 0];