Merge pull request #10722 from MrPetovan/task/refactor-notifications

[friendica.git] / src / Model / Photo.php

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 8df9b92f2d8e0a0cb891d5a50bb091f84e8f363e..7d97d6398c69b5bfa6b336292493d88c3f9796f4 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -196,13 +196,8 @@ class Photo
 
                try {
                        $backendClass = DI::storageManager()->getByName($photo['backend-class'] ?? '');
-                       $image        = $backendClass->get($photo['backend-ref'] ?? '');
-
-                       if ($image instanceof Image) {
-                               return $image;
-                       } else {
-                               DI::logger()->info('Stored data is not an image', ['photo' => $photo]);
-                       }
+                       /// @todo refactoring this returning, because the storage returns a "string" which is casted in different ways - a check "instanceof Image" will fail!
+                       return $backendClass->get($photo['backend-ref'] ?? '');
                } catch (InvalidClassStorageException $storageException) {
                        try {
                                // legacy data storage in "data" column
@@ -418,7 +413,7 @@ class Photo
                while ($photo = DBA::fetch($photos)) {
                        try {
                                $backend_class = DI::storageManager()->getWritableStorageByName($photo['backend-class'] ?? '');
-                               $backend_class->delete($item['backend-ref'] ?? '');
+                               $backend_class->delete($photo['backend-ref'] ?? '');
                                // Delete the photos after they had been deleted successfully
                                DBA::delete("photo", ['id' => $photo['id']]);
                        } catch (InvalidClassStorageException $storageException) {
@@ -495,11 +490,12 @@ class Photo
 
                $filename = basename($image_url);
                if (!empty($image_url)) {
-                       $ret = DI::httpRequest()->get($image_url);
+                       $ret = DI::httpClient()->get($image_url);
                        $img_str = $ret->getBody();
                        $type = $ret->getContentType();
                } else {
                        $img_str = '';
+                       $type = '';
                }
 
                if ($quit_on_error && ($img_str == "")) {
@@ -803,22 +799,6 @@ class Photo
                Photo::update($fields, $condition);
        }
 
-       /**
-        * Strips known picture extensions from picture links
-        *
-        * @param string $name Picture link
-        * @return string stripped picture link
-        * @throws \Exception
-        */
-       public static function stripExtension($name)
-       {
-               $name = str_replace([".jpg", ".png", ".gif"], ["", "", ""], $name);
-               foreach (Images::supportedTypes() as $m => $e) {
-                       $name = str_replace("." . $e, "", $name);
-               }
-               return $name;
-       }
-
        /**
         * Fetch the guid and scale from picture links
         *
@@ -835,7 +815,7 @@ class Photo
                        return [];
                }
 
-               $guid = self::stripExtension($guid);
+               $guid = pathinfo($guid, PATHINFO_FILENAME);
                if (substr($guid, -2, 1) != "-") {
                        return [];
                }