use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images;
use Friendica\Util\Network;
+use Friendica\Util\Proxy;
use Friendica\Util\Strings;
/**
if (empty($cid)) {
return [];
}
- return self::getById($cid, $fields);
+
+ $contact = self::getById($cid, $fields);
+ if (empty($contact)) {
+ return [];
+ }
+ return $contact;
}
// Add internal fields
$contact = DBA::selectFirst('contact', $fields, $condition, $options);
}
+ if (!DBA::isResult($contact)) {
+ return [];
+ }
+
// Update the contact in the background if needed
if ((($contact['updated'] < DateTimeFormat::utc('now -7 days')) || empty($contact['avatar'])) &&
in_array($contact['network'], Protocol::FEDERATED)) {
'poll' => $data['poll'] ?? '',
'name' => $data['name'] ?? '',
'nick' => $data['nick'] ?? '',
- 'photo' => $data['photo'] ?? '',
'keywords' => $data['keywords'] ?? '',
'location' => $data['location'] ?? '',
'about' => $data['about'] ?? '',
}
if (!empty($data['photo']) && ($data['network'] != Protocol::FEED)) {
- self::updateAvatar($data['photo'], $uid, $contact_id);
+ self::updateAvatar($contact_id, $data['photo']);
}
if (in_array($data["network"], array_merge(Protocol::NATIVE_SUPPORT, [Protocol::PUMPIO]))) {
} else {
// Else do a direct update
self::updateFromProbe($contact_id, '', false);
-
- // Update the gcontact entry
- if ($uid == 0) {
- GContact::updateFromPublicContactID($contact_id);
- if (($data['network'] == Protocol::ACTIVITYPUB) && in_array(DI::config()->get('system', 'gcontact_discovery'), [GContact::DISCOVERY_DIRECT, GContact::DISCOVERY_RECURSIVE])) {
- GContact::discoverFollowers($data['url']);
- }
- }
}
} else {
$fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl', 'gsid'];
return $return;
}
+ /**
+ * Ensure that cached avatar exist
+ *
+ * @param integer $cid
+ */
+ public static function checkAvatarCache(int $cid)
+ {
+ $contact = DBA::selectFirst('contact', ['url', 'avatar', 'photo', 'thumb', 'micro'], ['id' => $cid, 'uid' => 0, 'self' => false]);
+ if (!DBA::isResult($contact)) {
+ return;
+ }
+
+ if (empty($contact['avatar']) || (!empty($contact['photo']) && !empty($contact['thumb']) && !empty($contact['micro']))) {
+ return;
+ }
+
+ Logger::info('Adding avatar cache', ['id' => $cid, 'contact' => $contact]);
+
+ self::updateAvatar($cid, $contact['avatar'], true);
+ }
+
+ /**
+ * Return the photo path for a given contact array in the given size
+ *
+ * @param array $contact contact array
+ * @param string $field Fieldname of the photo in the contact array
+ * @param string $default Default path when no picture had been found
+ * @param string $size Size of the avatar picture
+ * @param string $avatar Avatar path that is displayed when no photo had been found
+ * @return string photo path
+ */
+ private static function getAvatarPath(array $contact, string $field, string $default, string $size, string $avatar)
+ {
+ if (!empty($contact)) {
+ $contact = self::checkAvatarCacheByArray($contact);
+ if (!empty($contact[$field])) {
+ $avatar = $contact[$field];
+ }
+ }
+
+ if (empty($avatar)) {
+ return $default;
+ }
+
+ if (Proxy::isLocalImage($avatar)) {
+ return $avatar;
+ } else {
+ return Proxy::proxifyUrl($avatar, false, $size);
+ }
+ }
+
+ /**
+ * Return the photo path for a given contact array
+ *
+ * @param array $contact Contact array
+ * @param string $avatar Avatar path that is displayed when no photo had been found
+ * @return string photo path
+ */
+ public static function getPhoto(array $contact, string $avatar = '')
+ {
+ return self::getAvatarPath($contact, 'photo', DI::baseUrl() . '/images/person-300.jpg', Proxy::SIZE_SMALL, $avatar);
+ }
+
+ /**
+ * Return the photo path (thumb size) for a given contact array
+ *
+ * @param array $contact Contact array
+ * @param string $avatar Avatar path that is displayed when no photo had been found
+ * @return string photo path
+ */
+ public static function getThumb(array $contact, string $avatar = '')
+ {
+ return self::getAvatarPath($contact, 'thumb', DI::baseUrl() . '/images/person-80.jpg', Proxy::SIZE_THUMB, $avatar);
+ }
+
+ /**
+ * Return the photo path (micro size) for a given contact array
+ *
+ * @param array $contact Contact array
+ * @param string $avatar Avatar path that is displayed when no photo had been found
+ * @return string photo path
+ */
+ public static function getMicro(array $contact, string $avatar = '')
+ {
+ return self::getAvatarPath($contact, 'micro', DI::baseUrl() . '/images/person-48.jpg', Proxy::SIZE_MICRO, $avatar);
+ }
+
+ /**
+ * Check the given contact array for avatar cache fields
+ *
+ * @param array $contact
+ * @return array contact array with avatar cache fields
+ */
+ private static function checkAvatarCacheByArray(array $contact)
+ {
+ $update = false;
+ $contact_fields = [];
+ $fields = ['photo', 'thumb', 'micro'];
+ foreach ($fields as $field) {
+ if (isset($contact[$field])) {
+ $contact_fields[] = $field;
+ }
+ if (isset($contact[$field]) && empty($contact[$field])) {
+ $update = true;
+ }
+ }
+
+ if (!$update) {
+ return $contact;
+ }
+
+ if (!empty($contact['id']) && !empty($contact['avatar'])) {
+ self::updateAvatar($contact['id'], $contact['avatar'], true);
+
+ $new_contact = self::getById($contact['id'], $contact_fields);
+ if (DBA::isResult($new_contact)) {
+ // We only update the cache fields
+ $contact = array_merge($contact, $new_contact);
+ }
+ }
+
+ /// add the default avatars if the fields aren't filled
+ if (isset($contact['photo']) && empty($contact['photo'])) {
+ $contact['photo'] = DI::baseUrl() . '/images/person-300.jpg';
+ }
+ if (isset($contact['thumb']) && empty($contact['thumb'])) {
+ $contact['thumb'] = DI::baseUrl() . '/images/person-80.jpg';
+ }
+ if (isset($contact['micro']) && empty($contact['micro'])) {
+ $contact['micro'] = DI::baseUrl() . '/images/person-48.jpg';
+ }
+
+ return $contact;
+ }
+
/**
* Updates the avatar links in a contact only if needed
*
- * @param string $avatar Link to avatar picture
- * @param int $uid User id of contact owner
* @param int $cid Contact id
+ * @param string $avatar Link to avatar picture
* @param bool $force force picture update
*
* @return void
* @throws HTTPException\NotFoundException
* @throws \ImagickException
*/
- public static function updateAvatar($avatar, $uid, $cid, $force = false)
+ public static function updateAvatar(int $cid, string $avatar, bool $force = false)
{
- $contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]);
+ $contact = DBA::selectFirst('contact', ['uid', 'avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]);
if (!DBA::isResult($contact)) {
return;
}
+ $uid = $contact['uid'];
+
+ // Only update the cached photo links of public contacts when they already are cached
+ if (($uid == 0) && !$force && empty($contact['thumb']) && empty($contact['micro'])) {
+ if ($contact['avatar'] != $avatar) {
+ DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]);
+ Logger::info('Only update the avatar', ['id' => $cid, 'avatar' => $avatar, 'contact' => $contact]);
+ }
+ return;
+ }
+
$data = [
$contact['photo'] ?? '',
$contact['thumb'] ?? '',
$contact['micro'] ?? '',
];
- foreach ($data as $image_uri) {
- $image_rid = Photo::ridFromURI($image_uri);
- if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
- Logger::info('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
- $force = true;
+ $update = ($contact['avatar'] != $avatar) || $force;
+
+ if (!$update) {
+ foreach ($data as $image_uri) {
+ $image_rid = Photo::ridFromURI($image_uri);
+ if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
+ Logger::info('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
+ $update = true;
+ }
}
}
- if (($contact["avatar"] != $avatar) || $force) {
+ if ($update) {
$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
-
if ($photos) {
$fields = ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()];
DBA::update('contact', $fields, ['id' => $cid]);
-
- // Update the public contact (contact id = 0)
- if ($uid != 0) {
- $pcontact = DBA::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
- if (DBA::isResult($pcontact)) {
- DBA::update('contact', $fields, ['id' => $pcontact['id']]);
- }
- }
+ } elseif (empty($contact['avatar'])) {
+ // Ensure that the avatar field is set
+ DBA::update('contact', ['avatar' => $avatar], ['id' => $cid]);
+ Logger::info('Failed profile import', ['id' => $cid, 'force' => $force, 'avatar' => $avatar, 'contact' => $contact]);
}
}
}
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function updateFromProbe($id, $network = '', $force = false)
+ public static function updateFromProbe(int $id, string $network = '', bool $force = false)
{
/*
Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
return false;
}
+ if (ContactRelation::isDiscoverable($ret['url'])) {
+ Worker::add(PRIORITY_LOW, 'ContactDiscovery', $ret['url']);
+ }
+
if (isset($ret['hide']) && is_bool($ret['hide'])) {
$ret['unsearchable'] = $ret['hide'];
}
$new_pubkey = $ret['pubkey'];
+ // Update the gcontact entry
+ if ($uid == 0) {
+ GContact::updateFromPublicContactID($id);
+ }
+
$update = false;
// make sure to not overwrite existing values with blank entries except some technical fields
}
if (!empty($ret['photo']) && ($ret['network'] != Protocol::FEED)) {
- self::updateAvatar($ret['photo'], $uid, $id, $update || $force);
+ self::updateAvatar($id, $ret['photo'], $update || $force);
}
if (!$update) {
Group::addMember(User::getDefaultGroup($user['uid'], $contact["network"]), $contact_id);
// Update the avatar
- self::updateAvatar($ret['photo'], $user['uid'], $contact_id);
+ self::updateAvatar($contact_id, $ret['photo']);
// pull feed and consume it, which should subscribe to the hub.
'nurl' => Strings::normaliseLink($url),
'name' => $name,
'nick' => $nick,
- 'photo' => $photo,
'network' => $network,
'rel' => self::FOLLOWER,
'blocked' => 0,
// Ensure to always have the correct network type, independent from the connection request method
self::updateFromProbe($contact_id, '', true);
- Contact::updateAvatar($photo, $importer["uid"], $contact_id, true);
+ self::updateAvatar($contact_id, $photo, true);
$contact_record = DBA::selectFirst('contact', ['id', 'network', 'name', 'url', 'photo'], ['id' => $contact_id]);
projects / friendica.git / blobdiff