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
$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));
}
$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])) {
$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
exit();
}
- private static function getAvatar($uid, $type="avatar", $customsize)
+ private static function getAvatar(int $uid, $type, $customsize)
{
switch($type) {
case "preview":
- $media = DBA::selectFirst('post-media', ['preview', 'url', 'type', 'uri-id'], ['id' => $uid]);
+ $media = DBA::selectFirst('post-media', ['preview', 'url', 'mimetype', 'type', 'uri-id'], ['id' => $uid]);
if (empty($media)) {
return false;
}
return MPhoto::getPhoto($matches[1], $matches[2]);
}
- return MPhoto::createPhotoForExternalResource($url, (int)local_user());
+ return MPhoto::createPhotoForExternalResource($url, (int)local_user(), $media['mimetype']);
case "media":
- $media = DBA::selectFirst('post-media', ['url', 'uri-id'], ['id' => $uid, 'type' => Post\Media::IMAGE]);
+ $media = DBA::selectFirst('post-media', ['url', 'mimetype', 'uri-id'], ['id' => $uid, 'type' => Post\Media::IMAGE]);
if (empty($media)) {
return false;
}
return MPhoto::getPhoto($matches[1], $matches[2]);
}
- return MPhoto::createPhotoForExternalResource($media['url'], (int)local_user());
+ return MPhoto::createPhotoForExternalResource($media['url'], (int)local_user(), $media['mimetype']);
+ case "link":
+ $link = DBA::selectFirst('post-link', ['url', 'mimetype'], ['id' => $uid]);
+ if (empty($link)) {
+ return false;
+ }
+
+ return MPhoto::createPhotoForExternalResource($link['url'], (int)local_user(), $link['mimetype']);
case "contact":
$contact = Contact::getById($uid, ['uid', 'url', 'avatar', 'photo', 'xmpp', 'addr']);
if (empty($contact)) {
If (($contact['uid'] != 0) && empty($contact['photo']) && empty($contact['avatar'])) {
$contact = Contact::getByURL($contact['url'], false, ['avatar', 'photo', 'xmpp', 'addr']);
}
- if (!empty($contact['photo'])) {
+ if (!empty($contact['photo']) && !empty($contact['avatar'])) {
// Fetch photo directly
$resourceid = MPhoto::ridFromURI($contact['photo']);
if (!empty($resourceid)) {
return $photo;
}
}
- $url = $contact['photo'];
+ // We continue with the avatar link when the photo link is invalid
+ $url = $contact['avatar'];
} elseif (!empty($contact['avatar'])) {
$url = $contact['avatar'];
} elseif ($customsize <= Proxy::PIXEL_MICRO) {
projects / friendica.git / blobdiff