return DBA::selectFirst('contact', $fields, ['id' => $id]);
}
+ /**
+ * Fetches a contact by a given url
+ *
+ * @param string $url profile url
+ * @param boolean $update true = always update, false = never update, null = update when not found or outdated
+ * @param array $fields Field list
+ * @param integer $uid User ID of the contact
+ * @return array contact array
+ */
+ public static function getByURL(string $url, $update = null, array $fields = [], int $uid = 0)
+ {
+ if ($update || is_null($update)) {
+ $cid = self::getIdForURL($url, $uid, $update);
+ if (empty($cid)) {
+ return [];
+ }
+ return self::getById($cid, $fields);
+ }
+
+ // Add internal fields
+ $removal = [];
+ if (!empty($fields)) {
+ foreach (['id', 'updated', 'network'] as $internal) {
+ if (!in_array($internal, $fields)) {
+ $fields[] = $internal;
+ $removal[] = $internal;
+ }
+ }
+ }
+
+ // We first try the nurl (http://server.tld/nick), most common case
+ $options = ['order' => ['id']];
+ $contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false], $options);
+
+ // Then the addr (nick@server.tld)
+ if (!DBA::isResult($contact)) {
+ $contact = DBA::selectFirst('contact', $fields, ['addr' => str_replace('acct:', '', $url), 'uid' => $uid, 'deleted' => false], $options);
+ }
+
+ // Then the alias (which could be anything)
+ if (!DBA::isResult($contact)) {
+ // The link could be provided as http although we stored it as https
+ $ssl_url = str_replace('http://', 'https://', $url);
+ $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid];
+ $contact = DBA::selectFirst('contact', $fields, $condition, $options);
+ }
+
+ // 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)) {
+ Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id'], ($uid == 0 ? 'force' : ''));
+ }
+
+ // Remove the internal fields
+ foreach ($removal as $internal) {
+ unset($contact[$internal]);
+ }
+
+ return $contact;
+ }
+
+ /**
+ * Fetches a contact for a given user by a given url.
+ * In difference to "getByURL" the function will fetch a public contact when no user contact had been found.
+ *
+ * @param string $url profile url
+ * @param integer $uid User ID of the contact
+ * @param boolean $update true = always update, false = never update, null = update when not found or outdated
+ * @param array $fields Field list
+ * @return array contact array
+ */
+ public static function getByURLForUser(string $url, int $uid = 0, $update = false, array $fields = [])
+ {
+ if ($uid != 0) {
+ $contact = self::getByURL($url, $update, $fields, $uid);
+ if (!empty($contact)) {
+ if (!empty($contact['id'])) {
+ $contact['cid'] = $contact['id'];
+ $contact['zid'] = 0;
+ }
+ return $contact;
+ }
+ }
+
+ $contact = self::getByURL($url, $update, $fields);
+ if (!empty($contact['id'])) {
+ $contact['cid'] = 0;
+ $contact['zid'] = $contact['id'];
+ }
+ return $contact;
+ }
+
/**
* Tests if the given contact is a follower
*
*/
public static function isFollowerByURL($url, $uid)
{
- $cid = self::getIdForURL($url, $uid, true);
+ $cid = self::getIdForURL($url, $uid, false);
if (empty($cid)) {
return false;
*/
public static function isSharingByURL($url, $uid)
{
- $cid = self::getIdForURL($url, $uid, true);
+ $cid = self::getIdForURL($url, $uid, false);
if (empty($cid)) {
return false;
if (!DBA::isResult($self)) {
return false;
}
- return self::getIdForURL($self['url'], 0, true);
+ return self::getIdForURL($self['url'], 0, false);
}
/**
}
if ($contact['uid'] != 0) {
- $pcid = Contact::getIdForURL($contact['url'], 0, true, ['url' => $contact['url']]);
+ $pcid = Contact::getIdForURL($contact['url'], 0, false, ['url' => $contact['url']]);
if (empty($pcid)) {
return [];
}
$ucid = $contact['id'];
} else {
$pcid = $contact['id'];
- $ucid = Contact::getIdForURL($contact['url'], $uid, true);
+ $ucid = Contact::getIdForURL($contact['url'], $uid, false);
}
return ['public' => $pcid, 'user' => $ucid];
// create an unfollow slap
$item = [];
$item['verb'] = Activity::O_UNFOLLOW;
+ $item['gravity'] = GRAVITY_ACTIVITY;
$item['follow'] = $contact["url"];
$item['body'] = '';
$item['title'] = '';
return;
}
} elseif (!isset($contact['url'])) {
- Logger::log('Empty contact: ' . json_encode($contact) . ' - ' . System::callstack(20), Logger::DEBUG);
+ Logger::info('Empty contact', ['contact' => $contact, 'callstack' => System::callstack(20)]);
}
- Logger::log('Contact '.$contact['id'].' is marked for archival', Logger::DEBUG);
+ Logger::info('Contact is marked for archival', ['id' => $contact['id']]);
// Contact already archived or "self" contact? => nothing to do
if ($contact['archive'] || $contact['self']) {
{
// Always unarchive the relay contact entry
if (!empty($contact['batch']) && !empty($contact['term-date']) && ($contact['term-date'] > DBA::NULL_DATETIME)) {
- $fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
+ $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false];
$condition = ['uid' => 0, 'network' => Protocol::FEDERATED, 'batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
DBA::update('contact', $fields, $condition);
}
return;
}
- Logger::log('Contact '.$contact['id'].' is marked as vital again', Logger::DEBUG);
+ Logger::info('Contact is marked as vital again', ['id' => $contact['id']]);
if (!isset($contact['url']) && !empty($contact['id'])) {
$fields = ['id', 'url', 'batch'];
}
// It's a miracle. Our dead contact has inexplicably come back to life.
- $fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false];
+ $fields = ['failed' => false, 'term-date' => DBA::NULL_DATETIME, 'archive' => false];
DBA::update('contact', $fields, ['id' => $contact['id']]);
DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]);
GContact::updateFromPublicContactURL($contact['url']);
}
- /**
- * Get contact data for a given profile link
- *
- * The function looks at several places (contact table and gcontact table) for the contact
- * It caches its result for the same script execution to prevent duplicate calls
- *
- * @param string $url The profile link
- * @param int $uid User id
- * @param array $default If not data was found take this data as default value
- *
- * @return array Contact data
- * @throws HTTPException\InternalServerErrorException
- */
- public static function getDetailsByURL($url, $uid = -1, array $default = [])
- {
- static $cache = [];
-
- if ($url == '') {
- return $default;
- }
-
- if ($uid == -1) {
- $uid = local_user();
- }
-
- if (isset($cache[$url][$uid])) {
- return $cache[$url][$uid];
- }
-
- $ssl_url = str_replace('http://', 'https://', $url);
-
- $nurl = Strings::normaliseLink($url);
-
- // Fetch contact data from the contact table for the given user
- $s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`
- FROM `contact` WHERE `nurl` = ? AND `uid` = ?", $nurl, $uid);
- $r = DBA::toArray($s);
-
- // Fetch contact data from the contact table for the given user, checking with the alias
- if (!DBA::isResult($r)) {
- $s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`
- FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?", $nurl, $url, $ssl_url, $uid);
- $r = DBA::toArray($s);
- }
-
- // Fetch the data from the contact table with "uid=0" (which is filled automatically)
- if (!DBA::isResult($r)) {
- $s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`
- FROM `contact` WHERE `nurl` = ? AND `uid` = 0", $nurl);
- $r = DBA::toArray($s);
- }
-
- // Fetch the data from the contact table with "uid=0" (which is filled automatically) - checked with the alias
- if (!DBA::isResult($r)) {
- $s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`
- FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0", $nurl, $url, $ssl_url);
- $r = DBA::toArray($s);
- }
-
- // Fetch the data from the gcontact table
- if (!DBA::isResult($r)) {
- $s = DBA::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
- `keywords`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`, 2 AS `rel`, 0 AS `pending`
- FROM `gcontact` WHERE `nurl` = ?", $nurl);
- $r = DBA::toArray($s);
- }
-
- if (DBA::isResult($r)) {
- $authoritativeResult = true;
- // If there is more than one entry we filter out the connector networks
- if (count($r) > 1) {
- foreach ($r as $id => $result) {
- if (!in_array($result["network"], Protocol::NATIVE_SUPPORT)) {
- unset($r[$id]);
- }
- }
- }
-
- $profile = array_shift($r);
-
- // "bd" always contains the upcoming birthday of a contact.
- // "birthday" might contain the birthday including the year of birth.
- if ($profile["birthday"] > DBA::NULL_DATE) {
- $bd_timestamp = strtotime($profile["birthday"]);
- $month = date("m", $bd_timestamp);
- $day = date("d", $bd_timestamp);
-
- $current_timestamp = time();
- $current_year = date("Y", $current_timestamp);
- $current_month = date("m", $current_timestamp);
- $current_day = date("d", $current_timestamp);
-
- $profile["bd"] = $current_year . "-" . $month . "-" . $day;
- $current = $current_year . "-" . $current_month . "-" . $current_day;
-
- if ($profile["bd"] < $current) {
- $profile["bd"] = ( ++$current_year) . "-" . $month . "-" . $day;
- }
- } else {
- $profile["bd"] = DBA::NULL_DATE;
- }
- } else {
- $authoritativeResult = false;
- $profile = $default;
- }
-
- if (empty($profile["photo"]) && isset($default["photo"])) {
- $profile["photo"] = $default["photo"];
- }
-
- if (empty($profile["name"]) && isset($default["name"])) {
- $profile["name"] = $default["name"];
- }
-
- if (empty($profile["network"]) && isset($default["network"])) {
- $profile["network"] = $default["network"];
- }
-
- if (empty($profile["thumb"]) && isset($profile["photo"])) {
- $profile["thumb"] = $profile["photo"];
- }
-
- if (empty($profile["micro"]) && isset($profile["thumb"])) {
- $profile["micro"] = $profile["thumb"];
- }
-
- if ((empty($profile["addr"]) || empty($profile["name"])) && !empty($profile["gid"])
- && in_array($profile["network"], Protocol::FEDERATED)
- ) {
- Worker::add(PRIORITY_LOW, "UpdateGContact", $url);
- }
-
- // Show contact details of Diaspora contacts only if connected
- if (empty($profile["cid"]) && ($profile["network"] ?? "") == Protocol::DIASPORA) {
- $profile["location"] = "";
- $profile["about"] = "";
- $profile["birthday"] = DBA::NULL_DATE;
- }
-
- // Only cache the result if it came from the DB since this method is used in widely different contexts
- // @see display_fetch_author for an example of $default parameter diverging from the DB result
- if ($authoritativeResult) {
- $cache[$url][$uid] = $profile;
- }
-
- return $profile;
- }
-
- /**
- * Get contact data for a given address
- *
- * The function looks at several places (contact table and gcontact table) for the contact
- *
- * @param string $addr The profile link
- * @param int $uid User id
- *
- * @return array Contact data
- * @throws HTTPException\InternalServerErrorException
- * @throws \ImagickException
- */
- public static function getDetailsByAddr($addr, $uid = -1)
- {
- if ($addr == '') {
- return [];
- }
-
- if ($uid == -1) {
- $uid = local_user();
- }
-
- // Fetch contact data from the contact table for the given user
- $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`,`baseurl`
- FROM `contact` WHERE `addr` = '%s' AND `uid` = %d AND NOT `deleted`",
- DBA::escape($addr),
- intval($uid)
- );
- // Fetch the data from the contact table with "uid=0" (which is filled automatically)
- if (!DBA::isResult($r)) {
- $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`, `baseurl`
- FROM `contact` WHERE `addr` = '%s' AND `uid` = 0 AND NOT `deleted`",
- DBA::escape($addr)
- );
- }
-
- // Fetch the data from the gcontact table
- if (!DBA::isResult($r)) {
- $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
- `keywords`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`, 2 AS `rel`, 0 AS `pending`, `server_url` AS `baseurl`
- FROM `gcontact` WHERE `addr` = '%s'",
- DBA::escape($addr)
- );
- }
-
- if (!DBA::isResult($r)) {
- $data = Probe::uri($addr);
-
- $profile = self::getDetailsByURL($data['url'], $uid);
- } else {
- $profile = $r[0];
- }
-
- return $profile;
- }
-
/**
* Returns the data array for the photo menu of a given contact
*
*
* @param string $url Contact URL
* @param integer $uid The user id for the contact (0 = public contact)
- * @param boolean $no_update Don't update the contact
+ * @param boolean $update true = always update, false = never update, null = update when not found or outdated
* @param array $default Default value for creating the contact when every else fails
* @param boolean $in_loop Internally used variable to prevent an endless loop
*
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [], $in_loop = false)
+ public static function getIdForURL($url, $uid = 0, $update = null, $default = [], $in_loop = false)
{
- Logger::log("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), Logger::DEBUG);
+ Logger::info('Get contact data', ['url' => $url, 'user' => $uid]);
$contact_id = 0;
return 0;
}
- /// @todo Verify if we can't use Contact::getDetailsByUrl instead of the following
- // We first try the nurl (http://server.tld/nick), most common case
- $fields = ['id', 'avatar', 'updated', 'network'];
- $options = ['order' => ['id']];
- $contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false], $options);
-
- // Then the addr (nick@server.tld)
- if (!DBA::isResult($contact)) {
- $contact = DBA::selectFirst('contact', $fields, ['addr' => str_replace('acct:', '', $url), 'uid' => $uid, 'deleted' => false], $options);
- }
-
- // Then the alias (which could be anything)
- if (!DBA::isResult($contact)) {
- // The link could be provided as http although we stored it as https
- $ssl_url = str_replace('http://', 'https://', $url);
- $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid];
- $contact = DBA::selectFirst('contact', $fields, $condition, $options);
- }
+ $contact = self::getByURL($url, false, ['id', 'avatar', 'updated', 'network'], $uid);
- if (DBA::isResult($contact)) {
+ if (!empty($contact)) {
$contact_id = $contact["id"];
- $update_contact = false;
-
- // Update the contact every 7 days (Don't update mail or feed contacts)
- if (in_array($contact['network'], Protocol::FEDERATED)) {
- $update_contact = ($contact['updated'] < DateTimeFormat::utc('now -7 days'));
- // We force the update if the avatar is empty
- if (empty($contact['avatar'])) {
- $update_contact = true;
- }
- } elseif (empty($default) && in_array($contact['network'], [Protocol::MAIL, Protocol::PHANTOM]) && ($uid == 0)) {
+ if (empty($default) && in_array($contact['network'], [Protocol::MAIL, Protocol::PHANTOM]) && ($uid == 0)) {
// Update public mail accounts via their user's accounts
$fields = ['network', 'addr', 'name', 'nick', 'avatar', 'photo', 'thumb', 'micro'];
$mailcontact = DBA::selectFirst('contact', $fields, ["`addr` = ? AND `network` = ? AND `uid` != 0", $url, Protocol::MAIL]);
}
}
- // Update the contact in the background if needed but it is called by the frontend
- if ($update_contact && $no_update && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
- Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id, ($uid == 0 ? 'force' : ''));
- }
-
- if (!$update_contact || $no_update) {
+ if (empty($update)) {
return $contact_id;
}
} elseif ($uid != 0) {
return 0;
}
- if ($no_update && empty($default)) {
+ if (!$update && empty($default)) {
// When we don't want to update, we look if we know this contact in any way
$data = self::getProbeDataFromDatabase($url, $contact_id);
$background_update = true;
- } elseif ($no_update && !empty($default['network'])) {
+ } elseif (!$update && !empty($default['network'])) {
// If there are default values, take these
$data = $default;
$background_update = false;
$background_update = false;
}
- if (empty($data)) {
+ if ((empty($data) && is_null($update)) || $update) {
$data = Probe::uri($url, "", $uid);
}
$data['gsid'] = GServer::getID($data['baseurl']);
}
- if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $url) && !$in_loop) {
- $contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
+ if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $data['url']) && !$in_loop) {
+ $contact_id = self::getIdForURL($data["alias"], $uid, false, $default, true);
}
if (!$contact_id) {
'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'];
$updated = [
'url' => $data['url'],
'nurl' => Strings::normaliseLink($data['url']),
- 'updated' => DateTimeFormat::utcNow()
+ 'updated' => DateTimeFormat::utcNow(),
+ 'failed' => false
];
$fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', '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);
+ }
+
+ /**
+ * Check the given contact array for avatar cache fields
+ *
+ * @param array $contact
+ * @return array contact array with avatar cache fields
+ */
+ public static function checkAvatarCacheArray(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]);
}
}
}
// We check after the probing to be able to correct falsely detected contact types.
if (($contact['contact-type'] == self::TYPE_RELAY) &&
(!Strings::compareLink($ret['url'], $contact['url']) || in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]))) {
- self::updateContact($id, $uid, $contact['url'], ['last-update' => $updated, 'success_update' => $updated]);
+ self::updateContact($id, $uid, $contact['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
Logger::info('Not updating relais', ['id' => $id, 'url' => $contact['url']]);
return true;
}
// If Probe::uri fails the network code will be different ("feed" or "unkn")
if (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network'])) {
if ($force && ($uid == 0)) {
- self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'failure_update' => $updated]);
+ self::updateContact($id, $uid, $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
}
return false;
}
$new_pubkey = $ret['pubkey'];
+ // Update the gcontact entry
+ if ($uid == 0) {
+ GContact::updateFromPublicContactID($id);
+ }
+
+ ContactRelation::discoverByUrl($ret['url']);
+
$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) {
if ($force) {
- self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]);
+ self::updateContact($id, $uid, $ret['url'], ['failed' => false, 'last-update' => $updated, 'success_update' => $updated]);
}
// Update the public contact
if ($force && ($uid == 0)) {
$ret['last-update'] = $updated;
$ret['success_update'] = $updated;
+ $ret['failed'] = false;
}
unset($ret['photo']);
$condition = ['uid' => $user['uid'], 'poll' => [$ret['poll'], Strings::normaliseLink($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
if (!DBA::isResult($contact)) {
- $condition = ['uid' => $user['uid'], 'nurl' => Strings::normaliseLink($url), 'network' => $ret['network'], 'pending' => false];
+ $condition = ['uid' => $user['uid'], 'nurl' => Strings::normaliseLink($ret['url']), 'network' => $ret['network'], 'pending' => false];
$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
}
- $protocol = self::getProtocol($url, $ret['network']);
+ $protocol = self::getProtocol($ret['url'], $ret['network']);
if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) {
if ($interactive) {
if (empty($ret['url'])) {
$result['message'] .= DI::l10n()->t('No browser URL could be matched to this address.') . EOL;
}
- if (strpos($url, '@') !== false) {
+ if (strpos($ret['url'], '@') !== false) {
$result['message'] .= DI::l10n()->t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
$result['message'] .= DI::l10n()->t('Use mailto: in front of address to force email check.') . EOL;
}
$pending = false;
if ($protocol == Protocol::ACTIVITYPUB) {
- $apcontact = APContact::getByURL($url, false);
+ $apcontact = APContact::getByURL($ret['url'], false);
if (isset($apcontact['manually-approve'])) {
$pending = (bool)$apcontact['manually-approve'];
}
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.
// create a follow slap
$item = [];
$item['verb'] = Activity::FOLLOW;
+ $item['gravity'] = GRAVITY_ACTIVITY;
$item['follow'] = $contact["url"];
$item['body'] = '';
$item['title'] = '';
'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]);