Merge pull request #10813 from tobiasd/20211003-lengthcounter

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index e669de8a3dcc04dd5059db288a2460e5d9a4b306..ea6af2636739ee66533025796f1269a779b89875 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -31,10 +31,12 @@ use Friendica\Model\Post;
 use Friendica\Model\Profile;
 use Friendica\Model\Storage\ExternalResource;
 use Friendica\Model\Storage\SystemResource;
-use Friendica\Util\Proxy;
+use Friendica\Model\User;
+use Friendica\Network\HTTPException;
 use Friendica\Object\Image;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
+use Friendica\Util\Proxy;
 
 /**
  * Photo Module
@@ -71,19 +73,38 @@ class Photo extends BaseModule
 
                $customsize = 0;
                $square_resize = true;
-               $photo = false;
                $scale = null;
                $stamp = microtime(true);
-               if (!empty($parameters['customsize'])) {
-                       $customsize = intval($parameters['customsize']);
-                       $uid = MPhoto::stripExtension($parameters['name']);
-                       $photo = self::getAvatar($uid, $parameters['type'], $customsize);
-                       $square_resize = !in_array($parameters['type'], ['media', 'preview']);
-               } elseif (!empty($parameters['type'])) {
-                       $uid = MPhoto::stripExtension($parameters['name']);
-                       $photo = self::getAvatar($uid, $parameters['type'], Proxy::PIXEL_SMALL);
-               } elseif (!empty($parameters['name'])) {
-                       $photoid = MPhoto::stripExtension($parameters['name']);
+               // User avatar
+               if (!empty($parameters['type'])) {
+                       if (!empty($parameters['customsize'])) {
+                               $customsize = intval($parameters['customsize']);
+                               $square_resize = !in_array($parameters['type'], ['media', 'preview']);
+                       }
+
+                       if (!empty($parameters['nickname_ext'])) {
+                               $nickname = pathinfo($parameters['nickname_ext'], PATHINFO_FILENAME);
+                               $user = User::getByNickname($nickname, ['uid']);
+                               if (empty($user)) {
+                                       throw new HTTPException\NotFoundException();
+                               }
+
+                               $uid = $user['uid'];
+                       }
+
+                       // User Id Fallback, to remove after version 2021.12
+                       if (!empty($parameters['uid_ext'])) {
+                               $uid = intval(pathinfo($parameters['uid_ext'], PATHINFO_FILENAME));
+                       }
+
+                       // Please refactor this for the love of everything that's good
+                       if (!empty($parameters['id'])) {
+                               $uid = $parameters['id'];
+                       }
+
+                       $photo = self::getAvatar($uid, $parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
+               } else {
+                       $photoid = pathinfo($parameters['name'], PATHINFO_FILENAME);
                        $scale = 0;
                        if (substr($photoid, -2, 1) == "-") {
                                $scale = intval(substr($photoid, -1, 1));
@@ -91,21 +112,24 @@ class Photo extends BaseModule
                        }
                        $photo = MPhoto::getPhoto($photoid, $scale);
                        if ($photo === false) {
-                               throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('The Photo with id %s is not available.', $photoid));
+                               throw new HTTPException\NotFoundException(DI::l10n()->t('The Photo with id %s is not available.', $photoid));
                        }
-               } else {
-                       throw new \Friendica\Network\HTTPException\BadRequestException();
                }
+
                $fetch = microtime(true) - $stamp;
 
                if ($photo === false) {
-                       throw new \Friendica\Network\HTTPException\NotFoundException();
+                       throw new HTTPException\NotFoundException();
                }
 
                $cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);
 
                $stamp = microtime(true);
+
                $imgdata = MPhoto::getImageDataForPhoto($photo);
+               if (empty($imgdata)) {
+                       throw new HTTPException\NotFoundException();
+               }
 
                // The mimetype for an external or system resource can only be known reliably after it had been fetched
                if (in_array($photo['backend-class'], [ExternalResource::NAME, SystemResource::NAME])) {
@@ -118,8 +142,14 @@ class Photo extends BaseModule
                $data = microtime(true) - $stamp;
 
                if (empty($imgdata)) {
-                       Logger::warning("Invalid photo with id {$photo["id"]}.");
-                       throw new \Friendica\Network\HTTPException\InternalServerErrorException(DI::l10n()->t('Invalid photo with id %s.', $photo["id"]));
+                       Logger::warning('Invalid photo', ['id' => $photo['id']]);
+                       if (in_array($photo['backend-class'], [ExternalResource::NAME])) {
+                               $reference = json_decode($photo['backend-ref'], true);
+                               $error = DI::l10n()->t('Invalid external resource with url %s.', $reference['url']);
+                       } else {
+                               $error = DI::l10n()->t('Invalid photo with id %s.', $photo['id']);
+                       }
+                       throw new HTTPException\InternalServerErrorException($error);
                }
 
                // if customsize is set and image is not a gif, resize it
@@ -172,7 +202,7 @@ class Photo extends BaseModule
                exit();
        }
 
-       private static function getAvatar($uid, $type="avatar", $customsize)
+       private static function getAvatar(int $uid, $type, $customsize)
        {
                switch($type) {
                        case "preview":