X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FContact.php;h=201447437945e3aa075d1c60a95e120ee65fcb45;hb=b9873a88a5bb19f2d493739a072c6ac3f745e76e;hp=c7cfddbb84a58e51d0611830fbca259237e7fcdb;hpb=3897c74debb303c45c3678d379edea4d3b480fbc;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index c7cfddbb84..b11919b528 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1,23 +1,39 @@ . + * */ + namespace Friendica\Model; use Friendica\App\BaseURL; -use Friendica\BaseObject; use Friendica\Content\Pager; -use Friendica\Core\Config; use Friendica\Core\Hook; -use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Session; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\DI; +use Friendica\Model\Notify\Type; +use Friendica\Network\HTTPException; use Friendica\Network\Probe; -use Friendica\Object\Image; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; use Friendica\Protocol\DFRN; @@ -25,13 +41,14 @@ use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; use Friendica\Protocol\Salmon; use Friendica\Util\DateTimeFormat; +use Friendica\Util\Images; use Friendica\Util\Network; use Friendica\Util\Strings; /** - * @brief functions for interacting with a contact + * functions for interacting with a contact */ -class Contact extends BaseObject +class Contact { /** * @deprecated since version 2019.03 @@ -174,13 +191,51 @@ class Contact extends BaseObject } /** - * @brief Tests if the given contact is a follower + * Fetches a contact by a given url + * + * @param string $url profile url + * @param integer $uid User ID of the contact + * @param array $fields Field list + * @param boolean $update true = always update, false = never update, null = update when not found or outdated + * @return array contact array + */ + public static function getByURL(string $url, int $uid = 0, array $fields = [], $update = null) + { + if ($update || is_null($update)) { + $cid = self::getIdForURL($url, $uid, !($update ?? false)); + if (empty($cid)) { + return []; + } + return self::getById($cid, $fields); + } + + // 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); + } + return $contact; + } + + /** + * Tests if the given contact is a follower * * @param int $cid Either public contact id or user's contact id * @param int $uid User ID * * @return boolean is the contact id a follower? - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function isFollower($cid, $uid) @@ -199,13 +254,13 @@ class Contact extends BaseObject } /** - * @brief Tests if the given contact url is a follower + * Tests if the given contact url is a follower * * @param string $url Contact URL * @param int $uid User ID * * @return boolean is the contact id a follower? - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function isFollowerByURL($url, $uid) @@ -220,13 +275,13 @@ class Contact extends BaseObject } /** - * @brief Tests if the given user follow the given contact + * Tests if the given user follow the given contact * * @param int $cid Either public contact id or user's contact id * @param int $uid User ID * * @return boolean is the contact url being followed? - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function isSharing($cid, $uid) @@ -245,13 +300,13 @@ class Contact extends BaseObject } /** - * @brief Tests if the given user follow the given contact url + * Tests if the given user follow the given contact url * * @param string $url Contact URL * @param int $uid User ID * * @return boolean is the contact url being followed? - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function isSharingByURL($url, $uid) @@ -266,32 +321,40 @@ class Contact extends BaseObject } /** - * @brief Get the basepath for a given contact link + * Get the basepath for a given contact link * * @param string $url The contact link + * @param boolean $dont_update Don't update the contact * * @return string basepath - * @return boolean $dont_update Don't update the contact - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function getBasepath($url, $dont_update = false) { - $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]); + $contact = DBA::selectFirst('contact', ['id', 'baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]); + if (!DBA::isResult($contact)) { + return ''; + } + if (!empty($contact['baseurl'])) { return $contact['baseurl']; } elseif ($dont_update) { return ''; } - self::updateFromProbeByURL($url, true); + // Update the existing contact + self::updateFromProbe($contact['id'], '', true); - $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]); - if (!empty($contact['baseurl'])) { - return $contact['baseurl']; + // And fetch the result + $contact = DBA::selectFirst('contact', ['baseurl'], ['id' => $contact['id']]); + if (empty($contact['baseurl'])) { + Logger::info('No baseurl for contact', ['url' => $url]); + return ''; } - return ''; + Logger::info('Found baseurl for contact', ['url' => $url, 'baseurl' => $contact['baseurl']]); + return $contact['baseurl']; } /** @@ -303,7 +366,30 @@ class Contact extends BaseObject */ public static function isLocal($url) { - return Strings::compareLink(self::getBasepath($url, true), System::baseUrl()); + return Strings::compareLink(self::getBasepath($url, true), DI::baseUrl()); + } + + /** + * Check if the given contact ID is on the same server + * + * @param string $url The contact link + * + * @return boolean Is it the same server? + */ + public static function isLocalById(int $cid) + { + $contact = DBA::selectFirst('contact', ['url', 'baseurl'], ['id' => $cid]); + if (!DBA::isResult($contact)) { + return false; + } + + if (empty($contact['baseurl'])) { + $baseurl = self::getBasepath($contact['url'], true); + } else { + $baseurl = $contact['baseurl']; + } + + return Strings::compareLink($baseurl, DI::baseUrl()); } /** @@ -312,7 +398,7 @@ class Contact extends BaseObject * @param integer $uid User ID * * @return integer|boolean Public contact id for given user id - * @throws Exception + * @throws \Exception */ public static function getPublicIdByUserId($uid) { @@ -324,13 +410,13 @@ class Contact extends BaseObject } /** - * @brief Returns the contact id for the user and the public contact id for a given contact id + * Returns the contact id for the user and the public contact id for a given contact id * * @param int $cid Either public contact id or user's contact id * @param int $uid User ID * * @return array with public and user's contact id - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function getPublicAndUserContacID($cid, $uid) @@ -386,7 +472,7 @@ class Contact extends BaseObject } /** - * @brief Block contact id for user id + * Block contact id for user id * * @param int $cid Either public contact id or user's contact id * @param int $uid User ID @@ -405,15 +491,10 @@ class Contact extends BaseObject } DBA::update('user-contact', ['blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true); - - if ($blocked) { - // Blocked contact can't be in any group - self::removeFromGroups($cid); - } } /** - * @brief Returns "block" state for contact id and user id + * Returns "block" state for contact id and user id * * @param int $cid Either public contact id or user's contact id * @param int $uid User ID @@ -454,7 +535,7 @@ class Contact extends BaseObject } /** - * @brief Ignore contact id for user id + * Ignore contact id for user id * * @param int $cid Either public contact id or user's contact id * @param int $uid User ID @@ -476,7 +557,7 @@ class Contact extends BaseObject } /** - * @brief Returns "ignore" state for contact id and user id + * Returns "ignore" state for contact id and user id * * @param int $cid Either public contact id or user's contact id * @param int $uid User ID @@ -517,7 +598,7 @@ class Contact extends BaseObject } /** - * @brief Set "collapsed" for contact id and user id + * Set "collapsed" for contact id and user id * * @param int $cid Either public contact id or user's contact id * @param int $uid User ID @@ -535,13 +616,13 @@ class Contact extends BaseObject } /** - * @brief Returns "collapsed" state for contact id and user id + * Returns "collapsed" state for contact id and user id * * @param int $cid Either public contact id or user's contact id * @param int $uid User ID * * @return boolean is the contact id blocked for the given user? - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function isCollapsedByUser($cid, $uid) @@ -564,7 +645,7 @@ class Contact extends BaseObject } /** - * @brief Returns a list of contacts belonging in a group + * Returns a list of contacts belonging in a group * * @param int $gid * @return array @@ -598,41 +679,12 @@ class Contact extends BaseObject return $return; } - /** - * @brief Returns the count of OStatus contacts in a group - * - * @param int $gid - * @return int - * @throws \Exception - */ - public static function getOStatusCountByGroupId($gid) - { - $return = 0; - if (intval($gid)) { - $contacts = DBA::fetchFirst('SELECT COUNT(*) AS `count` - FROM `contact` - INNER JOIN `group_member` - ON `contact`.`id` = `group_member`.`contact-id` - WHERE `gid` = ? - AND `contact`.`uid` = ? - AND `contact`.`network` = ? - AND `contact`.`notify` != ""', - $gid, - local_user(), - Protocol::OSTATUS - ); - $return = $contacts['count']; - } - - return $return; - } - /** * Creates the self-contact for the provided user id * * @param int $uid * @return bool Operation success - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException */ public static function createSelfFromUserId($uid) { @@ -652,19 +704,19 @@ class Contact extends BaseObject 'self' => 1, 'name' => $user['username'], 'nick' => $user['nickname'], - 'photo' => System::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg', - 'thumb' => System::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg', - 'micro' => System::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg', + 'photo' => DI::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg', + 'thumb' => DI::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg', + 'micro' => DI::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg', 'blocked' => 0, 'pending' => 0, - 'url' => System::baseUrl() . '/profile/' . $user['nickname'], - 'nurl' => Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']), - 'addr' => $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3), - 'request' => System::baseUrl() . '/dfrn_request/' . $user['nickname'], - 'notify' => System::baseUrl() . '/dfrn_notify/' . $user['nickname'], - 'poll' => System::baseUrl() . '/dfrn_poll/' . $user['nickname'], - 'confirm' => System::baseUrl() . '/dfrn_confirm/' . $user['nickname'], - 'poco' => System::baseUrl() . '/poco/' . $user['nickname'], + 'url' => DI::baseUrl() . '/profile/' . $user['nickname'], + 'nurl' => Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']), + 'addr' => $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3), + 'request' => DI::baseUrl() . '/dfrn_request/' . $user['nickname'], + 'notify' => DI::baseUrl() . '/dfrn_notify/' . $user['nickname'], + 'poll' => DI::baseUrl() . '/dfrn_poll/' . $user['nickname'], + 'confirm' => DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'], + 'poco' => DI::baseUrl() . '/poco/' . $user['nickname'], 'name-date' => DateTimeFormat::utcNow(), 'uri-date' => DateTimeFormat::utcNow(), 'avatar-date' => DateTimeFormat::utcNow(), @@ -679,11 +731,11 @@ class Contact extends BaseObject * * @param int $uid * @param boolean $update_avatar Force the avatar update - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException */ public static function updateSelfFromUserID($uid, $update_avatar = false) { - $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar', + $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'avatar', 'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable', 'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco']; $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]); @@ -691,15 +743,15 @@ class Contact extends BaseObject return; } - $fields = ['nickname', 'page-flags', 'account-type', 'hidewall']; + $fields = ['nickname', 'page-flags', 'account-type']; $user = DBA::selectFirst('user', $fields, ['uid' => $uid]); if (!DBA::isResult($user)) { return; } $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region', - 'country-name', 'gender', 'pub_keywords', 'xmpp', 'net-publish']; - $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]); + 'country-name', 'pub_keywords', 'xmpp', 'net-publish']; + $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]); if (!DBA::isResult($profile)) { return; } @@ -709,7 +761,7 @@ class Contact extends BaseObject $fields = ['name' => $profile['name'], 'nick' => $user['nickname'], 'avatar-date' => $self['avatar-date'], 'location' => Profile::formatLocation($profile), 'about' => $profile['about'], 'keywords' => $profile['pub_keywords'], - 'gender' => $profile['gender'], 'contact-type' => $user['account-type'], + 'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']]; $avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); @@ -719,7 +771,7 @@ class Contact extends BaseObject } // Creating the path to the avatar, beginning with the file suffix - $types = Image::supportedTypes(); + $types = Images::supportedTypes(); if (isset($types[$avatar['type']])) { $file_suffix = $types[$avatar['type']]; } @@ -727,7 +779,7 @@ class Contact extends BaseObject // We are adding a timestamp value so that other systems won't use cached content $timestamp = strtotime($fields['avatar-date']); - $prefix = System::baseUrl() . '/photo/' .$avatar['resource-id'] . '-'; + $prefix = DI::baseUrl() . '/photo/' .$avatar['resource-id'] . '-'; $suffix = '.' . $file_suffix . '?ts=' . $timestamp; $fields['photo'] = $prefix . '4' . $suffix; @@ -735,25 +787,25 @@ class Contact extends BaseObject $fields['micro'] = $prefix . '6' . $suffix; } else { // We hadn't found a photo entry, so we use the default avatar - $fields['photo'] = System::baseUrl() . '/images/person-300.jpg'; - $fields['thumb'] = System::baseUrl() . '/images/person-80.jpg'; - $fields['micro'] = System::baseUrl() . '/images/person-48.jpg'; + $fields['photo'] = DI::baseUrl() . '/images/person-300.jpg'; + $fields['thumb'] = DI::baseUrl() . '/images/person-80.jpg'; + $fields['micro'] = DI::baseUrl() . '/images/person-48.jpg'; } - $fields['avatar'] = System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix; + $fields['avatar'] = DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix; $fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY; $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP; - $fields['unsearchable'] = $user['hidewall'] || !$profile['net-publish']; + $fields['unsearchable'] = !$profile['net-publish']; // it seems as if ported accounts can have wrong values, so we make sure that now everything is fine. - $fields['url'] = System::baseUrl() . '/profile/' . $user['nickname']; + $fields['url'] = DI::baseUrl() . '/profile/' . $user['nickname']; $fields['nurl'] = Strings::normaliseLink($fields['url']); - $fields['addr'] = $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); - $fields['request'] = System::baseUrl() . '/dfrn_request/' . $user['nickname']; - $fields['notify'] = System::baseUrl() . '/dfrn_notify/' . $user['nickname']; - $fields['poll'] = System::baseUrl() . '/dfrn_poll/'. $user['nickname']; - $fields['confirm'] = System::baseUrl() . '/dfrn_confirm/' . $user['nickname']; - $fields['poco'] = System::baseUrl() . '/poco/' . $user['nickname']; + $fields['addr'] = $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3); + $fields['request'] = DI::baseUrl() . '/dfrn_request/' . $user['nickname']; + $fields['notify'] = DI::baseUrl() . '/dfrn_notify/' . $user['nickname']; + $fields['poll'] = DI::baseUrl() . '/dfrn_poll/'. $user['nickname']; + $fields['confirm'] = DI::baseUrl() . '/dfrn_confirm/' . $user['nickname']; + $fields['poco'] = DI::baseUrl() . '/poco/' . $user['nickname']; $update = false; @@ -774,18 +826,18 @@ class Contact extends BaseObject DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]); // Update the profile - $fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix, - 'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix]; - DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]); + $fields = ['photo' => DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix, + 'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix]; + DBA::update('profile', $fields, ['uid' => $uid]); } } /** - * @brief Marks a contact for removal + * Marks a contact for removal * * @param int $id contact id * @return null - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException */ public static function remove($id) { @@ -803,13 +855,13 @@ class Contact extends BaseObject } /** - * @brief Sends an unfriend message. Does not remove the contact + * Sends an unfriend message. Does not remove the contact * * @param array $user User unfriending * @param array $contact Contact unfriended * @param boolean $dissolve Remove the contact on the remote side * @return void - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function terminateFriendship(array $user, array $contact, $dissolve = false) @@ -829,11 +881,12 @@ class Contact extends BaseObject // create an unfollow slap $item = []; $item['verb'] = Activity::O_UNFOLLOW; + $item['gravity'] = GRAVITY_ACTIVITY; $item['follow'] = $contact["url"]; $item['body'] = ''; $item['title'] = ''; $item['guid'] = ''; - $item['tag'] = ''; + $item['uri-id'] = 0; $item['attach'] = ''; $slap = OStatus::salmon($item, $user); @@ -852,7 +905,7 @@ class Contact extends BaseObject } /** - * @brief Marks a contact for archival after a communication issue delay + * Marks a contact for archival after a communication issue delay * * Contact has refused to recognise us as a friend. We will start a countdown. * If they still don't recognise us in 32 days, the relationship is over, @@ -862,7 +915,7 @@ class Contact extends BaseObject * * @param array $contact contact to mark for archival * @return null - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException */ public static function markForArchival(array $contact) { @@ -873,10 +926,10 @@ class Contact extends BaseObject 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']) { @@ -894,7 +947,7 @@ class Contact extends BaseObject */ /// @todo Check for contact vitality via probing - $archival_days = Config::get('system', 'archival_days', 32); + $archival_days = DI::config()->get('system', 'archival_days', 32); $expiry = $contact['term-date'] . ' + ' . $archival_days . ' days '; if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) { @@ -910,7 +963,7 @@ class Contact extends BaseObject } /** - * @brief Cancels the archival countdown + * Cancels the archival countdown * * @see Contact::markForArchival() * @@ -935,7 +988,7 @@ class Contact extends BaseObject 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']; @@ -953,7 +1006,7 @@ class Contact extends BaseObject } /** - * @brief Get contact data for a given profile link + * 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 @@ -963,7 +1016,7 @@ class Contact extends BaseObject * @param array $default If not data was found take this data as default value * * @return array Contact data - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException */ public static function getDetailsByURL($url, $uid = -1, array $default = []) { @@ -983,45 +1036,48 @@ class Contact extends BaseObject $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`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self` - FROM `contact` WHERE `nurl` = ? AND `uid` = ?", Strings::normaliseLink($url), $uid); + `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`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self` - FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?", Strings::normaliseLink($url), $url, $ssl_url, $uid); + `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`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self` - FROM `contact` WHERE `nurl` = ? AND `uid` = 0", Strings::normaliseLink($url)); + `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`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self` - FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0", Strings::normaliseLink($url), $url, $ssl_url); + `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`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self` - FROM `gcontact` WHERE `nurl` = ?", Strings::normaliseLink($url)); + `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) { @@ -1055,6 +1111,7 @@ class Contact extends BaseObject $profile["bd"] = DBA::NULL_DATE; } } else { + $authoritativeResult = false; $profile = $default; } @@ -1088,17 +1145,20 @@ class Contact extends BaseObject if (empty($profile["cid"]) && ($profile["network"] ?? "") == Protocol::DIASPORA) { $profile["location"] = ""; $profile["about"] = ""; - $profile["gender"] = ""; $profile["birthday"] = DBA::NULL_DATE; } - $cache[$url][$uid] = $profile; + // 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; } /** - * @brief Get contact data for a given address + * Get contact data for a given address * * The function looks at several places (contact table and gcontact table) for the contact * @@ -1106,7 +1166,7 @@ class Contact extends BaseObject * @param int $uid User id * * @return array Contact data - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function getDetailsByAddr($addr, $uid = -1) @@ -1121,7 +1181,7 @@ class Contact extends BaseObject // 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`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self` + `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) @@ -1129,7 +1189,7 @@ class Contact extends BaseObject // 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`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self` + `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) ); @@ -1138,7 +1198,7 @@ class Contact extends BaseObject // 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`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self` + `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) ); @@ -1147,7 +1207,7 @@ class Contact extends BaseObject if (!DBA::isResult($r)) { $data = Probe::uri($addr); - $profile = self::getDetailsByURL($data['url'], $uid); + $profile = self::getDetailsByURL($data['url'], $uid, $data); } else { $profile = $r[0]; } @@ -1156,12 +1216,12 @@ class Contact extends BaseObject } /** - * @brief Returns the data array for the photo menu of a given contact + * Returns the data array for the photo menu of a given contact * * @param array $contact contact * @param int $uid optional, default 0 * @return array - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function photoMenu(array $contact, $uid = 0) @@ -1179,7 +1239,7 @@ class Contact extends BaseObject if (empty($contact['uid']) || ($contact['uid'] != $uid)) { if ($uid == 0) { $profile_link = self::magicLink($contact['url']); - $menu = ['profile' => [L10n::t('View Profile'), $profile_link, true]]; + $menu = ['profile' => [DI::l10n()->t('View Profile'), $profile_link, true]]; return $menu; } @@ -1194,7 +1254,7 @@ class Contact extends BaseObject $sparkle = false; if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) { $sparkle = true; - $profile_link = System::baseUrl() . '/redir/' . $contact['id']; + $profile_link = DI::baseUrl() . '/redir/' . $contact['id']; } else { $profile_link = $contact['url']; } @@ -1204,25 +1264,39 @@ class Contact extends BaseObject } if ($sparkle) { - $status_link = $profile_link . '?tab=status'; + $status_link = $profile_link . '/status'; $photos_link = str_replace('/profile/', '/photos/', $profile_link); - $profile_link = $profile_link . '?tab=profile'; + $profile_link = $profile_link . '/profile'; } if (self::canReceivePrivateMessages($contact) && empty($contact['pending'])) { - $pm_url = System::baseUrl() . '/message/new/' . $contact['id']; + $pm_url = DI::baseUrl() . '/message/new/' . $contact['id']; } if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) { - $poke_link = System::baseUrl() . '/poke/?c=' . $contact['id']; + $poke_link = 'contact/' . $contact['id'] . '/poke'; } - $contact_url = System::baseUrl() . '/contact/' . $contact['id']; + $contact_url = DI::baseUrl() . '/contact/' . $contact['id']; - $posts_link = System::baseUrl() . '/contact/' . $contact['id'] . '/conversations'; + $posts_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/conversations'; if (!$contact['self']) { - $contact_drop_link = System::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1'; + $contact_drop_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1'; + } + + $follow_link = ''; + $unfollow_link = ''; + if (!$contact['self'] && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { + if ($contact['uid'] && in_array($contact['rel'], [self::SHARING, self::FRIEND])) { + $unfollow_link = 'unfollow?url=' . urlencode($contact['url']); + } elseif(!$contact['pending']) { + $follow_link = 'follow?url=' . urlencode($contact['url']); + } + } + + if (!empty($follow_link) || !empty($unfollow_link)) { + $contact_drop_link = ''; } /** @@ -1230,29 +1304,31 @@ class Contact extends BaseObject * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ] */ if (empty($contact['uid'])) { - $connlnk = 'follow/?url=' . $contact['url']; $menu = [ - 'profile' => [L10n::t('View Profile'), $profile_link, true], - 'network' => [L10n::t('Network Posts'), $posts_link, false], - 'edit' => [L10n::t('View Contact'), $contact_url, false], - 'follow' => [L10n::t('Connect/Follow'), $connlnk, true], + 'profile' => [DI::l10n()->t('View Profile') , $profile_link , true], + 'network' => [DI::l10n()->t('Network Posts') , $posts_link , false], + 'edit' => [DI::l10n()->t('View Contact') , $contact_url , false], + 'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true], + 'unfollow'=> [DI::l10n()->t('UnFollow') , $unfollow_link, true], ]; } else { $menu = [ - 'status' => [L10n::t('View Status'), $status_link, true], - 'profile' => [L10n::t('View Profile'), $profile_link, true], - 'photos' => [L10n::t('View Photos'), $photos_link, true], - 'network' => [L10n::t('Network Posts'), $posts_link, false], - 'edit' => [L10n::t('View Contact'), $contact_url, false], - 'drop' => [L10n::t('Drop Contact'), $contact_drop_link, false], - 'pm' => [L10n::t('Send PM'), $pm_url, false], - 'poke' => [L10n::t('Poke'), $poke_link, false], + 'status' => [DI::l10n()->t('View Status') , $status_link , true], + 'profile' => [DI::l10n()->t('View Profile') , $profile_link , true], + 'photos' => [DI::l10n()->t('View Photos') , $photos_link , true], + 'network' => [DI::l10n()->t('Network Posts') , $posts_link , false], + 'edit' => [DI::l10n()->t('View Contact') , $contact_url , false], + 'drop' => [DI::l10n()->t('Drop Contact') , $contact_drop_link, false], + 'pm' => [DI::l10n()->t('Send PM') , $pm_url , false], + 'poke' => [DI::l10n()->t('Poke') , $poke_link , false], + 'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true], + 'unfollow'=> [DI::l10n()->t('UnFollow') , $unfollow_link , true], ]; if (!empty($contact['pending'])) { $intro = DBA::selectFirst('intro', ['id'], ['contact-id' => $contact['id']]); if (DBA::isResult($intro)) { - $menu['follow'] = [L10n::t('Approve'), 'notifications/intros/' . $intro['id'], true]; + $menu['follow'] = [DI::l10n()->t('Approve'), 'notifications/intros/' . $intro['id'], true]; } } } @@ -1273,7 +1349,7 @@ class Contact extends BaseObject } /** - * @brief Returns ungrouped contact count or list for user + * Returns ungrouped contact count or list for user * * Returns either the total number of ungrouped contacts for the given user * id or a paginated list of ungrouped contacts. @@ -1384,7 +1460,7 @@ class Contact extends BaseObject } /** - * @brief Fetch the contact id for a given URL and user + * Fetch the contact id for a given URL and user * * First lookup in the contact table to find a record matching either `url`, `nurl`, * `addr` or `alias`. @@ -1408,12 +1484,12 @@ class Contact extends BaseObject * @param boolean $in_loop Internally used variable to prevent an endless loop * * @return integer Contact ID - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function getIdForURL($url, $uid = 0, $no_update = false, $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; @@ -1421,34 +1497,31 @@ class Contact extends BaseObject 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, $uid, ['id', 'avatar', 'updated', 'network'], false); - if (DBA::isResult($contact)) { + if (!empty($contact)) { $contact_id = $contact["id"]; + $update_contact = false; - // Update the contact every 7 days - $update_contact = ($contact['updated'] < DateTimeFormat::utc('now -7 days')); + // 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; + // 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)) { + // 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]); + if (!DBA::isResult($mailcontact)) { + $mailcontact = DBA::selectFirst('contact', $fields, ["`nurl` = ? AND `network` = ? AND `uid` != 0", $url, Protocol::MAIL]); + } + + if (DBA::isResult($mailcontact)) { + DBA::update('contact', $mailcontact, ['id' => $contact_id]); + } } // Update the contact in the background if needed but it is called by the frontend @@ -1479,10 +1552,6 @@ class Contact extends BaseObject if (empty($data)) { $data = Probe::uri($url, "", $uid); - // Ensure that there is a gserver entry - if (!empty($data['baseurl']) && ($data['network'] != Protocol::PHANTOM)) { - GServer::check($data['baseurl']); - } } // Take the default values when probing failed @@ -1490,11 +1559,20 @@ class Contact extends BaseObject $data = array_merge($data, $default); } - if (empty($data)) { + if (empty($data) || ($data['network'] == Protocol::PHANTOM)) { + Logger::info('No valid network found', ['url' => $url, 'data' => $data, 'callstack' => System::callstack(20)]); return 0; } - if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $url) && !$in_loop) { + if (!empty($data['baseurl'])) { + $data['baseurl'] = GServer::cleanURL($data['baseurl']); + } + + if (!empty($data['baseurl']) && empty($data['gsid'])) { + $data['gsid'] = GServer::getID($data['baseurl']); + } + + if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $data['url']) && !$in_loop) { $contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true); } @@ -1523,6 +1601,7 @@ class Contact extends BaseObject 'confirm' => $data['confirm'] ?? '', 'poco' => $data['poco'] ?? '', 'baseurl' => $data['baseurl'] ?? '', + 'gsid' => $data['gsid'] ?? null, 'name-date' => DateTimeFormat::utcNow(), 'uri-date' => DateTimeFormat::utcNow(), 'avatar-date' => DateTimeFormat::utcNow(), @@ -1569,10 +1648,13 @@ class Contact extends BaseObject // 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']; + $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'baseurl', 'gsid']; $contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]); // This condition should always be true @@ -1586,7 +1668,7 @@ class Contact extends BaseObject 'updated' => DateTimeFormat::utcNow() ]; - $fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl']; + $fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl', 'gsid']; foreach ($fields as $field) { $updated[$field] = ($data[$field] ?? '') ?: $contact[$field]; @@ -1607,12 +1689,12 @@ class Contact extends BaseObject } /** - * @brief Checks if the contact is archived + * Checks if the contact is archived * * @param int $cid contact id * * @return boolean Is the contact archived? - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException */ public static function isArchived(int $cid) { @@ -1651,12 +1733,12 @@ class Contact extends BaseObject } /** - * @brief Checks if the contact is blocked + * Checks if the contact is blocked * * @param int $cid contact id * * @return boolean Is the contact blocked? - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException */ public static function isBlocked($cid) { @@ -1677,7 +1759,7 @@ class Contact extends BaseObject } /** - * @brief Checks if the contact is hidden + * Checks if the contact is hidden * * @param int $cid contact id * @@ -1698,10 +1780,9 @@ class Contact extends BaseObject } /** - * @brief Returns posts from a given contact url + * Returns posts from a given contact url * * @param string $contact_url Contact URL - * * @param bool $thread_mode * @param int $update * @return string posts in HTML @@ -1709,9 +1790,21 @@ class Contact extends BaseObject */ public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0) { - $a = self::getApp(); + return self::getPostsFromId(self::getIdForURL($contact_url), $thread_mode, $update); + } - $cid = self::getIdForURL($contact_url); + /** + * Returns posts from a given contact id + * + * @param integer $cid + * @param bool $thread_mode + * @param integer $update + * @return string posts in HTML + * @throws \Exception + */ + public static function getPostsFromId($cid, $thread_mode = false, $update = 0) + { + $a = DI::app(); $contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]); if (!DBA::isResult($contact)) { @@ -1724,7 +1817,7 @@ class Contact extends BaseObject $sql = "`item`.`uid` = ?"; } - $contact_field = ($contact["contact-type"] == self::TYPE_COMMUNITY ? 'owner-id' : 'author-id'); + $contact_field = ((($contact["contact-type"] == self::TYPE_COMMUNITY) || ($contact['network'] == Protocol::MAIL)) ? 'owner-id' : 'author-id'); if ($thread_mode) { $condition = ["`$contact_field` = ? AND `gravity` = ? AND " . $sql, @@ -1734,7 +1827,15 @@ class Contact extends BaseObject $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()]; } - $pager = new Pager($a->query_string); + if (DI::mode()->isMobile()) { + $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', + DI::config()->get('system', 'itemspage_network_mobile')); + } else { + $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', + DI::config()->get('system', 'itemspage_network')); + } + + $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage); $params = ['order' => ['received' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; @@ -1744,13 +1845,13 @@ class Contact extends BaseObject $items = Item::inArray($r); - $o = conversation($a, $items, $pager, 'contacts', $update, false, 'commented', local_user()); + $o = conversation($a, $items, 'contacts', $update, false, 'commented', local_user()); } else { $r = Item::selectForUser(local_user(), [], $condition, $params); $items = Item::inArray($r); - $o = conversation($a, $items, $pager, 'contact-posts', false); + $o = conversation($a, $items, 'contact-posts', false); } if (!$update) { @@ -1761,7 +1862,7 @@ class Contact extends BaseObject } /** - * @brief Returns the account type name + * Returns the account type name * * The function can be called with either the user or the contact array * @@ -1796,15 +1897,15 @@ class Contact extends BaseObject switch ($type) { case self::TYPE_ORGANISATION: - $account_type = L10n::t("Organisation"); + $account_type = DI::l10n()->t("Organisation"); break; case self::TYPE_NEWS: - $account_type = L10n::t('News'); + $account_type = DI::l10n()->t('News'); break; case self::TYPE_COMMUNITY: - $account_type = L10n::t("Forum"); + $account_type = DI::l10n()->t("Forum"); break; default: @@ -1816,7 +1917,7 @@ class Contact extends BaseObject } /** - * @brief Blocks a contact + * Blocks a contact * * @param int $cid * @return bool @@ -1830,7 +1931,7 @@ class Contact extends BaseObject } /** - * @brief Unblocks a contact + * Unblocks a contact * * @param int $cid * @return bool @@ -1844,24 +1945,37 @@ class Contact extends BaseObject } /** - * @brief Updates the avatar links in a contact only if needed + * 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 bool $force force picture update * - * @return array Returns array of the different avatar sizes - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @return void + * @throws HTTPException\InternalServerErrorException + * @throws HTTPException\NotFoundException * @throws \ImagickException */ public static function updateAvatar($avatar, $uid, $cid, $force = false) { $contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]); if (!DBA::isResult($contact)) { - return false; - } else { - $data = [$contact["photo"], $contact["thumb"], $contact["micro"]]; + 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; + } } if (($contact["avatar"] != $avatar) || $force) { @@ -1878,16 +1992,12 @@ class Contact extends BaseObject DBA::update('contact', $fields, ['id' => $pcontact['id']]); } } - - return $photos; } } - - return $data; } - /** - * @brief Helper function for "updateFromProbe". Updates personal and public contact + /** + * Helper function for "updateFromProbe". Updates personal and public contact * * @param integer $id contact id * @param integer $uid user id @@ -1945,8 +2055,8 @@ class Contact extends BaseObject DBA::update('contact', $fields, $condition); } - /** - * @brief Remove duplicated contacts + /** + * Remove duplicated contacts * * @param string $nurl Normalised contact url * @param integer $uid User id @@ -1985,6 +2095,7 @@ class Contact extends BaseObject Worker::add(PRIORITY_HIGH, 'MergeContact', $first, $duplicate['id'], $uid); } + DBA::close($duplicates); Logger::info('Duplicates handled', ['uid' => $uid, 'nurl' => $nurl]); return true; } @@ -1994,7 +2105,7 @@ class Contact extends BaseObject * @param string $network Optional network we are probing for * @param boolean $force Optional forcing of network probing (otherwise we use the cached data) * @return boolean - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function updateFromProbe($id, $network = '', $force = false) @@ -2007,9 +2118,9 @@ class Contact extends BaseObject // These fields aren't updated by this routine: // 'xmpp', 'sensitive' - $fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'gender', + $fields = ['uid', 'avatar', 'name', 'nick', 'location', 'keywords', 'about', 'subscribe', 'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco', - 'network', 'alias', 'baseurl', 'forum', 'prv', 'contact-type', 'pubkey']; + 'network', 'alias', 'baseurl', 'gsid', 'forum', 'prv', 'contact-type', 'pubkey']; $contact = DBA::selectFirst('contact', $fields, ['id' => $id]); if (!DBA::isResult($contact)) { return false; @@ -2086,6 +2197,12 @@ class Contact extends BaseObject if ($force) { self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]); } + + // Update the public contact + if ($uid != 0) { + self::updateFromProbeByURL($ret['url']); + } + return true; } @@ -2166,6 +2283,7 @@ class Contact extends BaseObject /** * Takes a $uid and a url/handle and adds a new contact + * * Currently if the contact is DFRN, interactive needs to be true, to redirect to the * dfrn_request page. * @@ -2175,36 +2293,36 @@ class Contact extends BaseObject * $return['success'] boolean true if successful * $return['message'] error text if success is false. * - * @brief Takes a $uid and a url/handle and adds a new contact - * @param int $uid - * @param string $url + * Takes a $uid and a url/handle and adds a new contact + * + * @param array $user The user the contact should be created for + * @param string $url The profile URL of the contact * @param bool $interactive * @param string $network * @return array - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException + * @throws HTTPException\NotFoundException * @throws \ImagickException */ - public static function createFromProbe($uid, $url, $interactive = false, $network = '') + public static function createFromProbe(array $user, $url, $interactive = false, $network = '') { $result = ['cid' => -1, 'success' => false, 'message' => '']; - $a = \get_app(); - // remove ajax junk, e.g. Twitter $url = str_replace('/#!/', '/', $url); if (!Network::isUrlAllowed($url)) { - $result['message'] = L10n::t('Disallowed profile URL.'); + $result['message'] = DI::l10n()->t('Disallowed profile URL.'); return $result; } if (Network::isUrlBlocked($url)) { - $result['message'] = L10n::t('Blocked domain'); + $result['message'] = DI::l10n()->t('Blocked domain'); return $result; } if (!$url) { - $result['message'] = L10n::t('Connect URL missing.'); + $result['message'] = DI::l10n()->t('Connect URL missing.'); return $result; } @@ -2213,14 +2331,14 @@ class Contact extends BaseObject Hook::callAll('follow', $arr); if (empty($arr)) { - $result['message'] = L10n::t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.'); + $result['message'] = DI::l10n()->t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.'); return $result; } if (!empty($arr['contact']['name'])) { $ret = $arr['contact']; } else { - $ret = Probe::uri($url, $network, $uid, false); + $ret = Probe::uri($url, $network, $user['uid'], false); } if (($network != '') && ($ret['network'] != $network)) { @@ -2232,30 +2350,30 @@ class Contact extends BaseObject // the poll url is more reliable than the profile url, as we may have // indirect links or webfinger links - $condition = ['uid' => $uid, 'poll' => [$ret['poll'], Strings::normaliseLink($ret['poll'])], 'network' => $ret['network'], 'pending' => false]; + $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' => $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 (strlen($a->getURLPath())) { - $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']); + if (strlen(DI::baseUrl()->getUrlPath())) { + $myaddr = bin2hex(DI::baseUrl() . '/profile/' . $user['nickname']); } else { - $myaddr = bin2hex($a->user['nickname'] . '@' . $a->getHostName()); + $myaddr = bin2hex($user['nickname'] . '@' . DI::baseUrl()->getHostname()); } - $a->internalRedirect($ret['request'] . "&addr=$myaddr"); + DI::baseUrl()->redirect($ret['request'] . "&addr=$myaddr"); // NOTREACHED } - } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) { - $result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL; - $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL; + } elseif (DI::config()->get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) { + $result['message'] = DI::l10n()->t('This site is not configured to allow communications with other networks.') . EOL; + $result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL; return $result; } @@ -2266,30 +2384,30 @@ class Contact extends BaseObject // do we have enough information? if (empty($ret['name']) || empty($ret['poll']) || (empty($ret['url']) && empty($ret['addr']))) { - $result['message'] .= L10n::t('The profile address specified does not provide adequate information.') . EOL; + $result['message'] .= DI::l10n()->t('The profile address specified does not provide adequate information.') . EOL; if (empty($ret['poll'])) { - $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL; + $result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL; } if (empty($ret['name'])) { - $result['message'] .= L10n::t('An author or name was not found.') . EOL; + $result['message'] .= DI::l10n()->t('An author or name was not found.') . EOL; } if (empty($ret['url'])) { - $result['message'] .= L10n::t('No browser URL could be matched to this address.') . EOL; + $result['message'] .= DI::l10n()->t('No browser URL could be matched to this address.') . EOL; } - if (strpos($url, '@') !== false) { - $result['message'] .= L10n::t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL; - $result['message'] .= L10n::t('Use mailto: in front of address to force email check.') . EOL; + 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; } return $result; } - if ($protocol === Protocol::OSTATUS && Config::get('system', 'ostatus_disabled')) { - $result['message'] .= L10n::t('The profile address specified belongs to a network which has been disabled on this site.') . EOL; + if ($protocol === Protocol::OSTATUS && DI::config()->get('system', 'ostatus_disabled')) { + $result['message'] .= DI::l10n()->t('The profile address specified belongs to a network which has been disabled on this site.') . EOL; $ret['notify'] = ''; } if (!$ret['notify']) { - $result['message'] .= L10n::t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL; + $result['message'] .= DI::l10n()->t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL; } $writeable = ((($protocol === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0); @@ -2298,7 +2416,13 @@ class Contact extends BaseObject $hidden = (($protocol === Protocol::MAIL) ? 1 : 0); - $pending = in_array($protocol, [Protocol::ACTIVITYPUB]); + $pending = false; + if ($protocol == Protocol::ACTIVITYPUB) { + $apcontact = APContact::getByURL($ret['url'], false); + if (isset($apcontact['manually-approve'])) { + $pending = (bool)$apcontact['manually-approve']; + } + } if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { $writeable = 1; @@ -2315,7 +2439,7 @@ class Contact extends BaseObject // create contact record self::insert([ - 'uid' => $uid, + 'uid' => $user['uid'], 'created' => DateTimeFormat::utcNow(), 'url' => $ret['url'], 'nurl' => Strings::normaliseLink($ret['url']), @@ -2329,6 +2453,7 @@ class Contact extends BaseObject 'nick' => $ret['nick'], 'network' => $ret['network'], 'baseurl' => $ret['baseurl'], + 'gsid' => $ret['gsid'] ?? null, 'protocol' => $protocol, 'pubkey' => $ret['pubkey'], 'rel' => $new_relation, @@ -2342,36 +2467,37 @@ class Contact extends BaseObject ]); } - $contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]); + $contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $user['uid']]); if (!DBA::isResult($contact)) { - $result['message'] .= L10n::t('Unable to retrieve contact information.') . EOL; + $result['message'] .= DI::l10n()->t('Unable to retrieve contact information.') . EOL; return $result; } $contact_id = $contact['id']; $result['cid'] = $contact_id; - Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id); + Group::addMember(User::getDefaultGroup($user['uid'], $contact["network"]), $contact_id); // Update the avatar - self::updateAvatar($ret['photo'], $uid, $contact_id); + self::updateAvatar($ret['photo'], $user['uid'], $contact_id); // pull feed and consume it, which should subscribe to the hub. Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force"); - $owner = User::getOwnerDataById($uid); + $owner = User::getOwnerDataById($user['uid']); if (DBA::isResult($owner)) { if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) { // create a follow slap $item = []; $item['verb'] = Activity::FOLLOW; + $item['gravity'] = GRAVITY_ACTIVITY; $item['follow'] = $contact["url"]; $item['body'] = ''; $item['title'] = ''; $item['guid'] = ''; - $item['tag'] = ''; + $item['uri-id'] = 0; $item['attach'] = ''; $slap = OStatus::salmon($item, $owner); @@ -2380,7 +2506,7 @@ class Contact extends BaseObject Salmon::slapper($owner, $contact['notify'], $slap); } } elseif ($protocol == Protocol::DIASPORA) { - $ret = Diaspora::sendShare($a->user, $contact); + $ret = Diaspora::sendShare($owner, $contact); Logger::log('share returns: ' . $ret); } elseif ($protocol == Protocol::ACTIVITYPUB) { $activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id); @@ -2389,7 +2515,7 @@ class Contact extends BaseObject return false; } - $ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid, $activity_id); + $ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $user['uid'], $activity_id); Logger::log('Follow returns: ' . $ret); } } @@ -2399,7 +2525,7 @@ class Contact extends BaseObject } /** - * @brief Updated contact's SSL policy + * Updated contact's SSL policy * * @param array $contact Contact array * @param string $new_policy New policy, valid: self,full @@ -2447,7 +2573,7 @@ class Contact extends BaseObject * @param bool $sharing True: Contact is now sharing with Owner; False: Contact is now following Owner (default) * @param string $note Introduction additional message * @return bool|null True: follow request is accepted; False: relationship is rejected; Null: relationship is pending - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function addRelationship(array $importer, array $contact, array $datarray, $sharing = false, $note = '') @@ -2554,18 +2680,18 @@ class Contact extends BaseObject Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']); - if (($user['notify-flags'] & NOTIFY_INTRO) && + if (($user['notify-flags'] & Type::INTRO) && in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) { notification([ - 'type' => NOTIFY_INTRO, + 'type' => Type::INTRO, 'notify_flags' => $user['notify-flags'], 'language' => $user['language'], 'to_name' => $user['username'], 'to_email' => $user['email'], 'uid' => $user['uid'], - 'link' => System::baseUrl() . '/notifications/intro', - 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')), + 'link' => DI::baseUrl() . '/notifications/intros', + 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : DI::l10n()->t('[Name Withheld]')), 'source_link' => $contact_record['url'], 'source_photo' => $contact_record['photo'], 'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW), @@ -2573,8 +2699,17 @@ class Contact extends BaseObject ]); } } elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) { + if (($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) && ($network != Protocol::DIASPORA)) { + self::createFromProbe($importer, $url, false, $network); + } + $condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true]; - DBA::update('contact', ['pending' => false], $condition); + $fields = ['pending' => false]; + if ($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) { + $fields['rel'] = Contact::FRIEND; + } + + DBA::update('contact', $fields, $condition); return true; } @@ -2602,7 +2737,7 @@ class Contact extends BaseObject } /** - * @brief Create a birthday event. + * Create a birthday event. * * Update the year and the birthday. */ @@ -2638,36 +2773,34 @@ class Contact extends BaseObject ); } } + DBA::close($contacts); } /** * Remove the unavailable contact ids from the provided list * * @param array $contact_ids Contact id list + * @return array * @throws \Exception */ - public static function pruneUnavailable(array &$contact_ids) + public static function pruneUnavailable(array $contact_ids) { if (empty($contact_ids)) { - return; - } - - $str = DBA::escape(implode(',', $contact_ids)); - - $stmt = DBA::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0"); - - $return = []; - while($contact = DBA::fetch($stmt)) { - $return[] = $contact['id']; + return []; } - DBA::close($stmt); + $contacts = Contact::selectToArray(['id'], [ + 'id' => $contact_ids, + 'blocked' => false, + 'pending' => false, + 'archive' => false, + ]); - $contact_ids = $return; + return array_column($contacts, 'id'); } /** - * @brief Returns a magic link to authenticate remote visitors + * Returns a magic link to authenticate remote visitors * * @todo check if the return is either a fully qualified URL or a relative path to Friendica basedir * @@ -2675,7 +2808,7 @@ class Contact extends BaseObject * @param string $url An url that we will be redirected to after the authentication * * @return string with "redir" link - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function magicLink($contact_url, $url = '') @@ -2696,13 +2829,13 @@ class Contact extends BaseObject } /** - * @brief Returns a magic link to authenticate remote visitors + * Returns a magic link to authenticate remote visitors * * @param integer $cid The contact id of the target contact profile * @param string $url An url that we will be redirected to after the authentication * * @return string with "redir" link - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function magicLinkbyId($cid, $url = '') @@ -2713,13 +2846,13 @@ class Contact extends BaseObject } /** - * @brief Returns a magic link to authenticate remote visitors + * Returns a magic link to authenticate remote visitors * * @param array $contact The contact array with "uid", "network" and "url" * @param string $url An url that we will be redirected to after the authentication * * @return string with "redir" link - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws HTTPException\InternalServerErrorException * @throws \ImagickException */ public static function magicLinkByContact($contact, $url = '')