<?php
/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\Contact\Header;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
use Friendica\Util\Proxy;
+use Friendica\Worker\UpdateContact;
/**
* Photo Module
*/
-class Photo extends BaseModule
+class Photo extends BaseApi
{
/**
* Module initializer
$scale = intval(substr($photoid, -1, 1));
$photoid = substr($photoid, 0, -2);
}
- $photo = MPhoto::getPhoto($photoid, $scale);
+
+ if (!empty($this->parameters['size'])) {
+ switch ($this->parameters['size']) {
+ case 'thumb_small':
+ $scale = 2;
+ break;
+ case 'scaled_full':
+ $scale = 1;
+ break;
+ }
+ }
+
+ $photo = MPhoto::getPhoto($photoid, $scale, self::getCurrentUserID());
if ($photo === false) {
throw new HTTPException\NotFoundException(DI::l10n()->t('The Photo with id %s is not available.', $photoid));
}
$stamp = microtime(true);
$imgdata = MPhoto::getImageDataForPhoto($photo);
- if (empty($imgdata)) {
+ if (empty($imgdata) && empty($photo['blurhash'])) {
throw new HTTPException\NotFoundException();
+ } elseif (empty($imgdata) && !empty($photo['blurhash'])) {
+ $image = New Image('', 'image/png');
+ $image->getFromBlurHash($photo['blurhash'], $photo['width'], $photo['height']);
+ $imgdata = $image->asString();
}
// The mimetype for an external or system resource can only be known reliably after it had been fetched
throw new HTTPException\InternalServerErrorException($error);
}
+ if (!empty($request['static'])) {
+ $img = new Image($imgdata, $photo['type']);
+ $img->toStatic();
+ $imgdata = $img->asString();
+ }
+
// if customsize is set and image is not a gif, resize it
if ($photo['type'] !== 'image/gif' && $customsize > 0 && $customsize <= Proxy::PIXEL_THUMB && $square_resize) {
$img = new Image($imgdata, $photo['type']);
{
switch($type) {
case 'preview':
- $media = DBA::selectFirst('post-media', ['preview', 'url', 'mimetype', 'type', 'uri-id'], ['id' => $id]);
+ $media = DBA::selectFirst('post-media', ['preview', 'url', 'preview-height', 'preview-width', 'height', 'width', 'mimetype', 'type', 'uri-id', 'blurhash'], ['id' => $id]);
if (empty($media)) {
return false;
}
- $url = $media['preview'];
+ $url = $media['preview'];
+ $width = $media['preview-width'];
+ $height = $media['preview-height'];
if (empty($url) && ($media['type'] == Post\Media::IMAGE)) {
- $url = $media['url'];
+ $url = $media['url'];
+ $width = $media['width'];
+ $height = $media['height'];
}
if (empty($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::getPhoto($matches[1], $matches[2], self::getCurrentUserID());
}
- return MPhoto::createPhotoForExternalResource($url, (int)local_user(), $media['mimetype'] ?? '');
+ return MPhoto::createPhotoForExternalResource($url, (int)DI::userSession()->getLocalUserId(), $media['mimetype'] ?? '', $media['blurhash'], $width, $height);
case 'media':
- $media = DBA::selectFirst('post-media', ['url', 'mimetype', 'uri-id'], ['id' => $id, 'type' => Post\Media::IMAGE]);
+ $media = DBA::selectFirst('post-media', ['url', 'height', 'width', 'mimetype', 'uri-id', 'blurhash'], ['id' => $id, 'type' => Post\Media::IMAGE]);
if (empty($media)) {
return false;
}
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::getPhoto($matches[1], $matches[2], self::getCurrentUserID());
}
- return MPhoto::createPhotoForExternalResource($media['url'], (int)local_user(), $media['mimetype']);
+ return MPhoto::createPhotoForExternalResource($media['url'], (int)DI::userSession()->getLocalUserId(), $media['mimetype'], $media['blurhash'], $media['width'], $media['height']);
case 'link':
- $link = DBA::selectFirst('post-link', ['url', 'mimetype'], ['id' => $id]);
+ $link = DBA::selectFirst('post-link', ['url', 'mimetype', 'blurhash', 'width', 'height'], ['id' => $id]);
if (empty($link)) {
return false;
}
- return MPhoto::createPhotoForExternalResource($link['url'], (int)local_user(), $link['mimetype'] ?? '');
+ return MPhoto::createPhotoForExternalResource($link['url'], (int)DI::userSession()->getLocalUserId(), $link['mimetype'] ?? '', $link['blurhash'] ?? '', $link['width'] ?? 0, $link['height'] ?? 0);
case 'contact':
- $fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'xmpp', 'addr', 'network', 'failed', 'updated'];
+ $fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'blurhash', 'xmpp', 'addr', 'network', 'failed', 'updated'];
$contact = Contact::getById($id, $fields);
if (empty($contact)) {
return false;
} elseif (!empty($contact['avatar'])) {
$url = $contact['avatar'];
}
+
+ // If it is a local link, we save resources by just redirecting to it.
+ if (!empty($url) && Network::isLocalLink($url)) {
+ System::externalRedirect($url);
+ }
+
$mimetext = '';
if (!empty($url)) {
$mime = ParseUrl::getContentType($url, HttpClientAccept::IMAGE);
Logger::debug('Got return code for avatar', ['return code' => $curlResult->getReturnCode(), 'cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
}
if ($update) {
- Logger::info('Invalid file, contact update initiated', ['cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
- Worker::add(PRIORITY_LOW, 'UpdateContact', $id);
+ try {
+ UpdateContact::add(Worker::PRIORITY_LOW, $id);
+ Logger::info('Invalid file, contact update initiated', ['cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
+ } catch (\InvalidArgumentException $e) {
+ Logger::notice($e->getMessage(), ['id' => $id, 'contact' => $contact]);
+ }
} else {
Logger::info('Invalid file', ['cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
}
Logger::debug('Expected Content-Type', ['mime' => $mimetext, 'url' => $url]);
}
}
- if (empty($mimetext)) {
+ if (empty($mimetext) && !empty($contact['blurhash'])) {
+ $image = New Image('', 'image/png');
+ $image->getFromBlurHash($contact['blurhash'], $customsize, $customsize);
+ return MPhoto::createPhotoForImageData($image->asString());
+ } elseif (empty($mimetext)) {
if ($customsize <= Proxy::PIXEL_MICRO) {
$url = Contact::getDefaultAvatar($contact ?: [], Proxy::SIZE_MICRO);
} elseif ($customsize <= Proxy::PIXEL_THUMB) {
} else {
$url = Contact::getDefaultAvatar($contact ?: [], Proxy::SIZE_SMALL);
}
+ if (Network::isLocalLink($url)) {
+ System::externalRedirect($url);
+ }
}
- return MPhoto::createPhotoForExternalResource($url, 0, $mimetext);
+ return MPhoto::createPhotoForExternalResource($url, 0, $mimetext, $contact['blurhash'] ?? null, $customsize, $customsize);
case 'header':
$fields = ['uid', 'url', 'header', 'network', 'gsid'];
$contact = Contact::getById($id, $fields);
if (empty($contact)) {
return false;
}
+
+ if (Network::isLocalLink($contact['url'])) {
+ $header_uid = User::getIdForURL($contact['url']);
+ if (empty($header_uid)) {
+ throw new HTTPException\NotFoundException();
+ }
+ return self::getBannerForUser($header_uid);
+ }
+
If (($contact['uid'] != 0) && empty($contact['header'])) {
$contact = Contact::getByURL($contact['url'], false, $fields);
}
$url = $contact['header'];
} else {
$url = Contact::getDefaultHeader($contact);
+ if (Network::isLocalLink($url)) {
+ System::externalRedirect($url);
+ }
}
return MPhoto::createPhotoForExternalResource($url);
case 'banner':
- $photo = MPhoto::selectFirst([], ['scale' => 3, 'uid' => $id, 'photo-type' => MPhoto::USER_BANNER]);
- if (!empty($photo)) {
- return $photo;
- }
- return MPhoto::createPhotoForExternalResource(DI::baseUrl() . '/images/friendica-banner.jpg');
+ return self::getBannerForUser($id);
case 'profile':
case 'custom':
$scale = 4;
$default = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
}
+ if (Network::isLocalLink($default)) {
+ System::externalRedirect($default);
+ }
+
$parts = parse_url($default);
if (!empty($parts['scheme']) || !empty($parts['host'])) {
$photo = MPhoto::createPhotoForExternalResource($default);
}
return $photo;
}
+
+ private static function getBannerForUser(int $uid): array
+ {
+ $photo = MPhoto::selectFirst([], ['scale' => 3, 'uid' => $uid, 'photo-type' => MPhoto::USER_BANNER]);
+ if (!empty($photo)) {
+ return $photo;
+ }
+ return MPhoto::createPhotoForImageData(file_get_contents(DI::basePath() . (new Header(DI::config()))->getMastodonBannerPath()));
+ }
}
projects / friendica.git / blobdiff