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;
$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])) {
$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
{
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)) {