<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\BaseModule;
use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Core\Storage\Type\ExternalResource;
use Friendica\Core\Storage\Type\SystemResource;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Network\HTTPException;
use Friendica\Network\HTTPException\NotModifiedException;
use Friendica\Object\Image;
* Fetch a photo or an avatar, in optional size, check for permissions and
* return the image
*/
- public function rawContent()
+ protected function rawContent(array $request = [])
{
$totalstamp = microtime(true);
$scale = null;
$stamp = microtime(true);
// User avatar
- if (!empty(static::$parameters['type'])) {
- if (!empty(static::$parameters['customsize'])) {
- $customsize = intval(static::$parameters['customsize']);
- $square_resize = !in_array(static::$parameters['type'], ['media', 'preview']);
+ if (!empty($this->parameters['type'])) {
+ if (!empty($this->parameters['customsize'])) {
+ $customsize = intval($this->parameters['customsize']);
+ $square_resize = !in_array($this->parameters['type'], ['media', 'preview']);
}
- if (!empty(static::$parameters['guid'])) {
- $guid = static::$parameters['guid'];
+ if (!empty($this->parameters['guid'])) {
+ $guid = $this->parameters['guid'];
$account = DBA::selectFirst('account-user-view', ['id'], ['guid' => $guid], ['order' => ['uid' => true]]);
if (empty($account)) {
throw new HTTPException\NotFoundException();
}
// Contact Id Fallback, to remove after version 2021.12
- if (isset(static::$parameters['contact_id'])) {
- $id = intval(static::$parameters['contact_id']);
+ if (isset($this->parameters['contact_id'])) {
+ $id = intval($this->parameters['contact_id']);
}
- if (!empty(static::$parameters['nickname_ext'])) {
- $nickname = pathinfo(static::$parameters['nickname_ext'], PATHINFO_FILENAME);
+ if (!empty($this->parameters['nickname_ext'])) {
+ $nickname = pathinfo($this->parameters['nickname_ext'], PATHINFO_FILENAME);
$user = User::getByNickname($nickname, ['uid']);
if (empty($user)) {
throw new HTTPException\NotFoundException();
}
// User Id Fallback, to remove after version 2021.12
- if (!empty(static::$parameters['uid_ext'])) {
- $id = intval(pathinfo(static::$parameters['uid_ext'], PATHINFO_FILENAME));
+ if (!empty($this->parameters['uid_ext'])) {
+ $id = intval(pathinfo($this->parameters['uid_ext'], PATHINFO_FILENAME));
}
// Please refactor this for the love of everything that's good
- if (isset(static::$parameters['id'])) {
- $id = static::$parameters['id'];
+ if (isset($this->parameters['id'])) {
+ $id = $this->parameters['id'];
}
if (empty($id)) {
- Logger::notice('No picture id was detected', ['parameters' => static::$parameters, 'query' => DI::args()->getQueryString()]);
+ Logger::notice('No picture id was detected', ['parameters' => $this->parameters, 'query' => DI::args()->getQueryString()]);
throw new HTTPException\NotFoundException(DI::l10n()->t('The Photo is not available.'));
}
- $photo = self::getPhotoByid($id, static::$parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
+ $photo = self::getPhotoByid($id, $this->parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
} else {
- $photoid = pathinfo(static::$parameters['name'], PATHINFO_FILENAME);
+ $photoid = pathinfo($this->parameters['name'], PATHINFO_FILENAME);
$scale = 0;
if (substr($photoid, -2, 1) == "-") {
$scale = intval(substr($photoid, -1, 1));
'output' => number_format($output, 3), 'rest' => number_format($rest, 3)]);
}
- exit();
+ System::exit();
}
private static function getPhotoByid(int $id, $type, $customsize)
return MPhoto::createPhotoForExternalResource($link['url'], (int)local_user(), $link['mimetype']);
case "contact":
- $contact = Contact::getById($id, ['uid', 'url', 'avatar', 'photo', 'xmpp', 'addr']);
+ $fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'xmpp', 'addr', 'network', 'failed', 'updated'];
+ $contact = Contact::getById($id, $fields);
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']);
+
+ // For local users directly use the photo record that is marked as the profile
+ if (Network::isLocalLink($contact['url'])) {
+ $contact = Contact::selectFirst($fields, ['nurl' => $contact['nurl'], 'self' => true]);
+ if (!empty($contact)) {
+ if ($customsize <= Proxy::PIXEL_MICRO) {
+ $scale = 6;
+ } elseif ($customsize <= Proxy::PIXEL_THUMB) {
+ $scale = 5;
+ } else {
+ $scale = 4;
+ }
+ $photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $contact['uid'], "profile" => 1]);
+ if (!empty($photo)) {
+ return $photo;
+ }
+ }
+ }
+
+ if (!empty($contact['uid']) && empty($contact['photo']) && empty($contact['avatar'])) {
+ $contact = Contact::getByURL($contact['url'], false, $fields);
}
+
if (!empty($contact['photo']) && !empty($contact['avatar'])) {
// Fetch photo directly
$resourceid = MPhoto::ridFromURI($contact['photo']);
$photo = MPhoto::selectFirst([], ['resource-id' => $resourceid], ['order' => ['scale']]);
if (!empty($photo)) {
return $photo;
+ } else {
+ $url = $contact['avatar'];
}
+ } else {
+ $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'];
}
$mimetext = '';
if (!empty($url)) {
- $mime = ParseUrl::getContentType($url);
+ $mime = ParseUrl::getContentType($url, HttpClientAccept::IMAGE);
if (!empty($mime)) {
$mimetext = $mime[0] . '/' . $mime[1];
} else {
- Logger::info('Invalid file', ['url' => $url]);
+ // Only update federated accounts that hadn't failed before and hadn't been updated recently
+ $update = in_array($contact['network'], Protocol::FEDERATED) && !$contact['failed']
+ && ((time() - strtotime($contact['updated']) > 86400));
+ if ($update) {
+ $curlResult = DI::httpClient()->head($url, [HttpClientOptions::ACCEPT_CONTENT => HttpClientAccept::IMAGE]);
+ $update = !$curlResult->isSuccess() && ($curlResult->getReturnCode() == 404);
+ 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);
+ } else {
+ Logger::info('Invalid file', ['cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
+ }
}
if (!empty($mimetext) && ($mime[0] != 'image') && ($mimetext != 'application/octet-stream')) {
Logger::info('Unexpected Content-Type', ['mime' => $mimetext, 'url' => $url]);
$mimetext = '';
+ } if (!empty($mimetext)) {
+ Logger::debug('Expected Content-Type', ['mime' => $mimetext, 'url' => $url]);
}
}
if (empty($mimetext)) {
}
return MPhoto::createPhotoForExternalResource($url, 0, $mimetext);
case "header":
- $contact = Contact::getById($id, ['uid', 'url', 'header']);
+ $fields = ['uid', 'url', 'header', 'network', 'gsid'];
+ $contact = Contact::getById($id, $fields);
if (empty($contact)) {
return false;
}
If (($contact['uid'] != 0) && empty($contact['header'])) {
- $contact = Contact::getByURL($contact['url'], false, ['header']);
+ $contact = Contact::getByURL($contact['url'], false, $fields);
}
if (!empty($contact['header'])) {
$url = $contact['header'];
} else {
- $url = DI::baseUrl() . '/images/blank.png';
+ $url = Contact::getDefaultHeader($contact);
}
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');
case "profile":
case "custom":
$scale = 4;