X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FImages.php;h=aed72f065b7c8c0810efa22c0aaa938ca6c7c46c;hb=911ed3d6ba98149ed6d400d554e7a0e10bd1c273;hp=533feec844f62ddf75b83a006cae49daf7fe31e1;hpb=a5be5b27e3193c1134855126eab258c810505d93;p=friendica.git diff --git a/src/Util/Images.php b/src/Util/Images.php index 533feec844..aed72f065b 100644 --- a/src/Util/Images.php +++ b/src/Util/Images.php @@ -1,6 +1,6 @@ fetch($url, HttpClientAccept::IMAGE, 4); + try { + $img_str = DI::httpClient()->fetch($url, HttpClientAccept::IMAGE, 4); + } catch (\Exception $exception) { + Logger::notice('Image is invalid', ['url' => $url, 'exception' => $exception]); + return []; + } } if (!$img_str) { @@ -247,8 +252,11 @@ class Images if ($data) { $image = new Image($img_str); - $data['blurhash'] = $image->getBlurHash(); - $data['size'] = $filesize; + if ($image->isValid()) { + $data['blurhash'] = $image->getBlurHash(); + } + + $data['size'] = $filesize; } return is_array($data) ? $data : []; @@ -308,4 +316,40 @@ class Images return ['width' => $dest_width, 'height' => $dest_height]; } + + /** + * Get a BBCode tag for an local photo page URL with a preview thumbnail and an image description + * + * @param string $resource_id + * @param string $nickname The local user owner of the resource + * @param int $preview Preview image size identifier, either 0, 1 or 2 in decreasing order of size + * @param string $ext Image file extension + * @param string $description + * @return string + */ + public static function getBBCodeByResource(string $resource_id, string $nickname, int $preview, string $ext, string $description = ''): string + { + return self::getBBCodeByUrl( + DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id, + DI::baseUrl() . '/photo/' . $resource_id . '-' . $preview. '.' . $ext, + $description + ); + } + + /** + * Get a BBCode tag for an image URL with a preview thumbnail and an image description + * + * @param string $photo Full image URL + * @param string $preview Preview image URL + * @param string $description + * @return string + */ + public static function getBBCodeByUrl(string $photo, string $preview = null, string $description = ''): string + { + if (!empty($preview)) { + return '[url=' . $photo . '][img=' . $preview . ']' . $description . '[/img][/url]'; + } + + return '[img=' . $photo . ']' . $description . '[/img]'; + } }