Fix: Pagination in search result works again

[friendica.git] / src / Util / Images.php

diff --git a/src/Util/Images.php b/src/Util/Images.php
index 6874d36e9bc3e7d93fd8e719fbd37b7b9744c929..aed72f065b7c8c0810efa22c0aaa938ca6c7c46c 100644 (file)
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -229,7 +229,12 @@ class Images
                }
 
                if (empty($img_str)) {
-                       $img_str = DI::httpClient()->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) {
@@ -311,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]';
+       }
 }