X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=e4f142e3a2d93d06bfb74ef3d6fad368de333489;hb=e14ed2ce350306fb9989d23e66da64add1927711;hp=e6c00b1e3c6e1fa518d6cb86a154d55153f8edef;hpb=33664ebb48f415dd74a32da13edb25f54e494134;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index e6c00b1e3c..e4f142e3a2 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1,14 +1,29 @@ . + * */ + namespace Friendica\Model; use Friendica\App\BaseURL; 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; @@ -16,6 +31,7 @@ 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\Protocol\Activity; use Friendica\Protocol\ActivityPub; @@ -29,7 +45,7 @@ use Friendica\Util\Network; use Friendica\Util\Strings; /** - * @brief functions for interacting with a contact + * functions for interacting with a contact */ class Contact { @@ -174,7 +190,7 @@ class Contact } /** - * @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 @@ -199,7 +215,7 @@ class Contact } /** - * @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 @@ -220,7 +236,7 @@ class Contact } /** - * @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 @@ -245,7 +261,7 @@ class Contact } /** - * @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 @@ -266,7 +282,7 @@ class Contact } /** - * @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 @@ -314,13 +330,36 @@ class Contact 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()); + } + /** * Returns the public contact id of the given user id * * @param integer $uid User ID * * @return integer|boolean Public contact id for given user id - * @throws Exception + * @throws \Exception */ public static function getPublicIdByUserId($uid) { @@ -332,7 +371,7 @@ class Contact } /** - * @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 @@ -394,7 +433,7 @@ class Contact } /** - * @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 @@ -416,7 +455,7 @@ class Contact } /** - * @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 @@ -457,7 +496,7 @@ class Contact } /** - * @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 @@ -479,7 +518,7 @@ class Contact } /** - * @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 @@ -520,7 +559,7 @@ class Contact } /** - * @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 @@ -538,7 +577,7 @@ class Contact } /** - * @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 @@ -567,7 +606,7 @@ class Contact } /** - * @brief Returns a list of contacts belonging in a group + * Returns a list of contacts belonging in a group * * @param int $gid * @return array @@ -601,35 +640,6 @@ class Contact 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 * @@ -686,7 +696,7 @@ class Contact */ 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]); @@ -694,15 +704,15 @@ class Contact 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; } @@ -712,7 +722,7 @@ class Contact $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]); @@ -746,7 +756,7 @@ class Contact $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'] = DI::baseUrl() . '/profile/' . $user['nickname']; @@ -779,12 +789,12 @@ class Contact // Update the profile $fields = ['photo' => DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix, 'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix]; - DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]); + DBA::update('profile', $fields, ['uid' => $uid]); } } /** - * @brief Marks a contact for removal + * Marks a contact for removal * * @param int $id contact id * @return null @@ -806,7 +816,7 @@ class Contact } /** - * @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 @@ -855,7 +865,7 @@ class Contact } /** - * @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, @@ -897,7 +907,7 @@ class Contact */ /// @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)) { @@ -913,7 +923,7 @@ class Contact } /** - * @brief Cancels the archival countdown + * Cancels the archival countdown * * @see Contact::markForArchival() * @@ -956,7 +966,7 @@ class Contact } /** - * @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 @@ -990,14 +1000,14 @@ class Contact // 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`, `rel`, `pending` + `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`, `rel`, `pending` + `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); } @@ -1005,7 +1015,7 @@ class Contact // 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`, `rel`, `pending` + `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); } @@ -1013,7 +1023,7 @@ class Contact // 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`, `rel`, `pending` + `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); } @@ -1021,12 +1031,13 @@ class Contact // 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`, 2 AS `rel`, 0 AS `pending` + `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) { @@ -1060,6 +1071,7 @@ class Contact $profile["bd"] = DBA::NULL_DATE; } } else { + $authoritativeResult = false; $profile = $default; } @@ -1093,17 +1105,20 @@ class Contact 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 * @@ -1126,7 +1141,7 @@ class Contact // 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`, `rel`, `pending` + `keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending` FROM `contact` WHERE `addr` = '%s' AND `uid` = %d AND NOT `deleted`", DBA::escape($addr), intval($uid) @@ -1134,7 +1149,7 @@ class Contact // 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`, `rel`, `pending` + `keywords`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending` FROM `contact` WHERE `addr` = '%s' AND `uid` = 0 AND NOT `deleted`", DBA::escape($addr) ); @@ -1143,7 +1158,7 @@ class Contact // 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`, 2 AS `rel`, 0 AS `pending` + `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` FROM `gcontact` WHERE `addr` = '%s'", DBA::escape($addr) ); @@ -1161,7 +1176,7 @@ class Contact } /** - * @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 @@ -1184,7 +1199,7 @@ class Contact 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; } @@ -1209,9 +1224,9 @@ class Contact } 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'])) { @@ -1240,36 +1255,40 @@ class Contact } } + if (!empty($follow_link) || !empty($unfollow_link)) { + $contact_drop_link = ''; + } + /** * Menu array: * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ] */ 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]; } } } @@ -1290,7 +1309,7 @@ class Contact } /** - * @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. @@ -1401,7 +1420,7 @@ class Contact } /** - * @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`. @@ -1639,7 +1658,7 @@ class Contact } /** - * @brief Checks if the contact is archived + * Checks if the contact is archived * * @param int $cid contact id * @@ -1683,7 +1702,7 @@ class Contact } /** - * @brief Checks if the contact is blocked + * Checks if the contact is blocked * * @param int $cid contact id * @@ -1709,7 +1728,7 @@ class Contact } /** - * @brief Checks if the contact is hidden + * Checks if the contact is hidden * * @param int $cid contact id * @@ -1730,7 +1749,7 @@ class Contact } /** - * @brief Returns posts from a given contact url + * Returns posts from a given contact url * * @param string $contact_url Contact URL * @@ -1766,7 +1785,15 @@ class Contact $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()]; } - $pager = new Pager(DI::args()->getQueryString()); + 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()]]; @@ -1776,13 +1803,13 @@ class Contact $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) { @@ -1793,7 +1820,7 @@ class Contact } /** - * @brief Returns the account type name + * Returns the account type name * * The function can be called with either the user or the contact array * @@ -1828,15 +1855,15 @@ class Contact 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: @@ -1848,7 +1875,7 @@ class Contact } /** - * @brief Blocks a contact + * Blocks a contact * * @param int $cid * @return bool @@ -1862,7 +1889,7 @@ class Contact } /** - * @brief Unblocks a contact + * Unblocks a contact * * @param int $cid * @return bool @@ -1876,7 +1903,7 @@ class Contact } /** - * @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 @@ -1926,8 +1953,8 @@ class Contact 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 @@ -1985,8 +2012,8 @@ class Contact DBA::update('contact', $fields, $condition); } - /** - * @brief Remove duplicated contacts + /** + * Remove duplicated contacts * * @param string $nurl Normalised contact url * @param integer $uid User id @@ -2047,7 +2074,7 @@ class Contact // 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', 'unsearchable', 'url', 'addr', 'batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'network', 'alias', 'baseurl', 'forum', 'prv', 'contact-type', 'pubkey']; $contact = DBA::selectFirst('contact', $fields, ['id' => $id]); @@ -2126,6 +2153,12 @@ class Contact 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; } @@ -2206,6 +2239,7 @@ class Contact /** * 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. * @@ -2215,7 +2249,7 @@ class Contact * $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 @@ -2234,17 +2268,17 @@ class Contact $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; } @@ -2253,7 +2287,7 @@ class Contact 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; } @@ -2293,9 +2327,9 @@ class Contact // 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; } @@ -2306,30 +2340,30 @@ class Contact // 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); @@ -2390,7 +2424,7 @@ class Contact $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; } @@ -2445,7 +2479,7 @@ class Contact } /** - * @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 @@ -2600,18 +2634,18 @@ class Contact 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' => DI::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), @@ -2619,8 +2653,17 @@ class Contact ]); } } 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['uid'], $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; } @@ -2648,7 +2691,7 @@ class Contact } /** - * @brief Create a birthday event. + * Create a birthday event. * * Update the year and the birthday. */ @@ -2710,7 +2753,7 @@ class Contact } /** - * @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 * @@ -2739,7 +2782,7 @@ class Contact } /** - * @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 @@ -2756,7 +2799,7 @@ class Contact } /** - * @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