namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\Contact\Header;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
/**
* Photo Module
*/
-class Photo extends BaseModule
+class Photo extends BaseApi
{
/**
* Module initializer
}
}
- $photo = MPhoto::getPhoto($photoid, $scale);
+ $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));
}
}
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)DI::userSession()->getLocalUserId(), $media['mimetype'] ?? '', $media['blurhash'], $width, $height);
}
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)DI::userSession()->getLocalUserId(), $media['mimetype'], $media['blurhash'], $media['width'], $media['height']);
}
// If it is a local link, we save resources by just redirecting to it.
- if (Network::isLocalLink($url)) {
+ if (!empty($url) && Network::isLocalLink($url)) {
System::externalRedirect($url);
- System::exit();
}
$mimetext = '';
}
if (Network::isLocalLink($url)) {
System::externalRedirect($url);
- System::exit();
}
}
return MPhoto::createPhotoForExternalResource($url, 0, $mimetext, $contact['blurhash'] ?? null, $customsize, $customsize);
$url = Contact::getDefaultHeader($contact);
if (Network::isLocalLink($url)) {
System::externalRedirect($url);
- System::exit();
}
}
return MPhoto::createPhotoForExternalResource($url);
if (Network::isLocalLink($default)) {
System::externalRedirect($default);
- System::exit();
}
$parts = parse_url($default);
if (!empty($photo)) {
return $photo;
}
- return MPhoto::createPhotoForImageData(file_get_contents(DI::basePath() . '/images/friendica-banner.jpg'));
+ return MPhoto::createPhotoForImageData(file_get_contents(DI::basePath() . (new Header(DI::config()))->getMastodonBannerPath()));
}
}