use Friendica\Model\Contact;
use Friendica\Model\Photo as MPhoto;
use Friendica\Model\Post;
+use Friendica\Model\Profile;
+use Friendica\Model\Storage\ExternalResource;
+use Friendica\Model\Storage\ReferenceStorageException;
+use Friendica\Model\Storage\StorageException;
+use Friendica\Model\Storage\SystemResource;
+use Friendica\Network\HTTPException\InternalServerErrorException;
+use Friendica\Network\HTTPException\NotFoundException;
use Friendica\Util\Proxy;
use Friendica\Object\Image;
+use Friendica\Util\Images;
+use Friendica\Util\Network;
/**
* Photo Module
exit;
}
+ Profile::addVisitorCookieForHTTPSigner();
+
$customsize = 0;
+ $square_resize = true;
$photo = false;
$scale = null;
$stamp = microtime(true);
$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);
$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 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])) {
+ $mimetype = Images::getMimeTypeByData($imgdata);
+ if (!empty($mimetype)) {
+ $photo['type'] = $mimetype;
+ }
+ }
+
$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 \Friendica\Network\HTTPException\InternalServerErrorException($error);
}
// if customsize is set and image is not a gif, resize it
- if ($photo['type'] !== "image/gif" && $customsize > 0 && $customsize < 501) {
+ if ($photo['type'] !== "image/gif" && $customsize > 0 && $customsize <= Proxy::PIXEL_THUMB && $square_resize) {
$img = new Image($imgdata, $photo['type']);
$img->scaleToSquare($customsize);
$imgdata = $img->asString();
+ } elseif ($photo['type'] !== "image/gif" && $customsize > 0) {
+ $img = new Image($imgdata, $photo['type']);
+ $img->scaleDown($customsize);
+ $imgdata = $img->asString();
}
if (function_exists("header_remove")) {
{
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 false;
}
- $author = Contact::selectFirst([], ["`id` IN (SELECT `author-id` FROM `post` WHERE `uri-id` = ?)", $media['uri-id']]);
- $url = Contact::magicLinkByContact($author, $url);
-
- return MPhoto::createPhotoForExternalResource($url);
+ if (Network::isLocalLink($url) && preg_match('|.*?/photo/(.*[a-fA-F0-9])\-(.*[0-9])\..*[\w]|', $url, $matches)) {
+ return MPhoto::getPhoto($matches[1], $matches[2]);
+ }
+
+ return MPhoto::createPhotoForExternalResource($url, (int)local_user(), $media['mimetype']);
case "media":
- $media = DBA::selectFirst('post-media', ['url'], ['id' => $uid, 'type' => Post\Media::IMAGE]);
- if (empty($media['url'])) {
+ $media = DBA::selectFirst('post-media', ['url', 'mimetype', 'uri-id'], ['id' => $uid, 'type' => Post\Media::IMAGE]);
+ if (empty($media)) {
return false;
}
- $author = Contact::selectFirst([], ["`id` IN (SELECT `author-id` FROM `post` WHERE `uri-id` = ?)", $media['uri-id']]);
- $url = Contact::magicLinkByContact($author, $media['url']);
+ if (Network::isLocalLink($media['url']) && preg_match('|.*?/photo/(.*[a-fA-F0-9])\-(.*[0-9])\..*[\w]|', $media['url'], $matches)) {
+ return MPhoto::getPhoto($matches[1], $matches[2]);
+ }
- return MPhoto::createPhotoForExternalResource($url);
- case "contact":
+ 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)) {
return false;
If (($contact['uid'] != 0) && empty($contact['photo']) && empty($contact['avatar'])) {
$contact = Contact::getByURL($contact['url'], false, ['avatar', 'photo', 'xmpp', 'addr']);
}
- if (!empty($contact['photo'])) {
- $url = $contact['photo'];
+ if (!empty($contact['photo']) && !empty($contact['avatar'])) {
+ // Fetch photo directly
+ $resourceid = MPhoto::ridFromURI($contact['photo']);
+ if (!empty($resourceid)) {
+ $photo = MPhoto::selectFirst([], ['resource-id' => $resourceid], ['order' => ['scale']]);
+ if (!empty($photo)) {
+ return $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