X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=789062403b3c8bbdd2cb25c1bf9cbb6fde705304;hb=0b0309ce8f10e1f7f3a519d6d91408f8e9d35140;hp=5da36685b6744462d774be8356f435fb69648e21;hpb=4786298da470ced5c52f6e6ecf0d6cc113047387;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 5da36685b6..789062403b 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1,23 +1,38 @@ . + * */ + 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\Probe; -use Friendica\Object\Image; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; use Friendica\Protocol\DFRN; @@ -30,9 +45,9 @@ 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 @@ -175,7 +190,7 @@ class Contact extends BaseObject } /** - * @brief Tests if the given contact is a follower + * 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 @@ -200,7 +215,7 @@ 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 @@ -221,7 +236,7 @@ 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 @@ -246,7 +261,7 @@ 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 @@ -267,32 +282,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 \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']; } /** @@ -304,7 +327,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()); } /** @@ -313,7 +359,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) { @@ -325,7 +371,7 @@ 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 @@ -387,7 +433,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 @@ -409,7 +455,7 @@ class Contact extends BaseObject } /** - * @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 @@ -450,7 +496,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 @@ -472,7 +518,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 @@ -513,7 +559,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 @@ -531,7 +577,7 @@ 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 @@ -560,7 +606,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 @@ -595,7 +641,7 @@ class Contact extends BaseObject } /** - * @brief Returns the count of OStatus contacts in a group + * Returns the count of OStatus contacts in a group * * @param int $gid * @return int @@ -648,19 +694,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(), @@ -694,8 +740,8 @@ class Contact extends BaseObject } $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; } @@ -705,7 +751,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'], + 'gender' => '', 'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']]; $avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); @@ -723,7 +769,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; @@ -731,25 +777,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']; // 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; @@ -770,14 +816,14 @@ 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 @@ -799,7 +845,7 @@ 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 @@ -848,7 +894,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, @@ -890,7 +936,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)) { @@ -906,7 +952,7 @@ class Contact extends BaseObject } /** - * @brief Cancels the archival countdown + * Cancels the archival countdown * * @see Contact::markForArchival() * @@ -949,7 +995,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 @@ -1096,7 +1142,7 @@ class Contact extends BaseObject } /** - * @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 * @@ -1154,7 +1200,7 @@ 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 @@ -1177,7 +1223,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; } @@ -1192,7 +1238,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']; } @@ -1202,25 +1248,25 @@ 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 = DI::baseUrl() . '/poke/?c=' . $contact['id']; } - $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 = ''; @@ -1239,30 +1285,30 @@ class Contact extends BaseObject */ if (empty($contact['uid'])) { $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'), $follow_link , true], - 'unfollow'=> [L10n::t('UnFollow') , $unfollow_link, 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], - 'follow' => [L10n::t('Connect/Follow'), $follow_link , true], - 'unfollow'=> [L10n::t('UnFollow') , $unfollow_link , true], + '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]; } } } @@ -1283,7 +1329,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. @@ -1394,7 +1440,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`. @@ -1632,7 +1678,7 @@ class Contact extends BaseObject } /** - * @brief Checks if the contact is archived + * Checks if the contact is archived * * @param int $cid contact id * @@ -1676,7 +1722,7 @@ class Contact extends BaseObject } /** - * @brief Checks if the contact is blocked + * Checks if the contact is blocked * * @param int $cid contact id * @@ -1702,7 +1748,7 @@ class Contact extends BaseObject } /** - * @brief Checks if the contact is hidden + * Checks if the contact is hidden * * @param int $cid contact id * @@ -1723,7 +1769,7 @@ 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 * @@ -1734,7 +1780,7 @@ class Contact extends BaseObject */ public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0) { - $a = self::getApp(); + $a = DI::app(); $cid = self::getIdForURL($contact_url); @@ -1759,7 +1805,7 @@ class Contact extends BaseObject $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()]; } - $pager = new Pager($a->query_string); + $pager = new Pager(DI::args()->getQueryString()); $params = ['order' => ['received' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; @@ -1769,13 +1815,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) { @@ -1786,7 +1832,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 * @@ -1821,15 +1867,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: @@ -1841,7 +1887,7 @@ class Contact extends BaseObject } /** - * @brief Blocks a contact + * Blocks a contact * * @param int $cid * @return bool @@ -1855,7 +1901,7 @@ class Contact extends BaseObject } /** - * @brief Unblocks a contact + * Unblocks a contact * * @param int $cid * @return bool @@ -1869,7 +1915,7 @@ 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 @@ -1889,6 +1935,14 @@ class Contact extends BaseObject $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) { $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true); @@ -1911,8 +1965,8 @@ class Contact extends BaseObject 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 @@ -1970,8 +2024,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 @@ -2111,6 +2165,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; } @@ -2191,6 +2251,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. * @@ -2200,7 +2261,7 @@ 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 + * Takes a $uid and a url/handle and adds a new contact * @param int $uid * @param string $url * @param bool $interactive @@ -2213,23 +2274,23 @@ class Contact extends BaseObject { $result = ['cid' => -1, 'success' => false, 'message' => '']; - $a = \get_app(); + $a = DI::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; } @@ -2238,7 +2299,7 @@ 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; } @@ -2268,19 +2329,19 @@ class Contact extends BaseObject 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/' . $a->user['nickname']); } else { - $myaddr = bin2hex($a->user['nickname'] . '@' . $a->getHostName()); + $myaddr = bin2hex($a->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; } @@ -2291,30 +2352,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; + $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); @@ -2375,7 +2436,7 @@ class Contact extends BaseObject $contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $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; } @@ -2430,7 +2491,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 @@ -2585,18 +2646,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), @@ -2633,7 +2694,7 @@ class Contact extends BaseObject } /** - * @brief Create a birthday event. + * Create a birthday event. * * Update the year and the birthday. */ @@ -2675,30 +2736,27 @@ class Contact extends BaseObject * 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 * @@ -2727,7 +2785,7 @@ 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 @@ -2744,7 +2802,7 @@ 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