X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=cf90406e24a029d5afbc2cd83eceebfce9d95922;hb=2b0610eaf5ea67cc6b6a8e59b4f9c08249f90370;hp=b18159d40cf0cf823bba43b082e6d897af214b9c;hpb=29aa90ec097ee42ff0b2265eb763731b99088cb3;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index b18159d40c..cf90406e24 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -5,27 +5,26 @@ namespace Friendica\Model; use Friendica\BaseObject; -use Friendica\Core\Addon; +use Friendica\Content\Pager; use Friendica\Core\Config; +use Friendica\Core\Hook; use Friendica\Core\L10n; -use Friendica\Core\PConfig; +use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; -use Friendica\Model\Profile; use Friendica\Network\Probe; use Friendica\Object\Image; +use Friendica\Protocol\ActivityPub; +use Friendica\Protocol\DFRN; use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; use Friendica\Protocol\PortableContact; use Friendica\Protocol\Salmon; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; - -require_once 'boot.php'; -require_once 'include/dba.php'; -require_once 'include/text.php'; +use Friendica\Util\Strings; /** * @brief functions for interacting with a contact @@ -33,56 +32,72 @@ require_once 'include/text.php'; class Contact extends BaseObject { /** - * @name page/profile types - * - * PAGE_NORMAL is a typical personal profile account - * PAGE_SOAPBOX automatically approves all friend requests as Contact::SHARING, (readonly) - * PAGE_COMMUNITY automatically approves all friend requests as Contact::SHARING, but with - * write access to wall and comments (no email and not included in page owner's ACL lists) - * PAGE_FREELOVE automatically approves all friend requests as full friends (Contact::FRIEND). - * - * @{ + * @deprecated since version 2019.03 + * @see User::PAGE_FLAGS_NORMAL */ - const PAGE_NORMAL = 0; - const PAGE_SOAPBOX = 1; - const PAGE_COMMUNITY = 2; - const PAGE_FREELOVE = 3; - const PAGE_BLOG = 4; - const PAGE_PRVGROUP = 5; + const PAGE_NORMAL = User::PAGE_FLAGS_NORMAL; + /** + * @deprecated since version 2019.03 + * @see User::PAGE_FLAGS_SOAPBOX + */ + const PAGE_SOAPBOX = User::PAGE_FLAGS_SOAPBOX; + /** + * @deprecated since version 2019.03 + * @see User::PAGE_FLAGS_COMMUNITY + */ + const PAGE_COMMUNITY = User::PAGE_FLAGS_COMMUNITY; + /** + * @deprecated since version 2019.03 + * @see User::PAGE_FLAGS_FREELOVE + */ + const PAGE_FREELOVE = User::PAGE_FLAGS_FREELOVE; + /** + * @deprecated since version 2019.03 + * @see User::PAGE_FLAGS_BLOG + */ + const PAGE_BLOG = User::PAGE_FLAGS_BLOG; + /** + * @deprecated since version 2019.03 + * @see User::PAGE_FLAGS_PRVGROUP + */ + const PAGE_PRVGROUP = User::PAGE_FLAGS_PRVGROUP; /** * @} */ /** - * @name account types + * Account types + * + * TYPE_UNKNOWN - the account has been imported from gcontact where this is the default type value * - * ACCOUNT_TYPE_PERSON - the account belongs to a person + * TYPE_PERSON - the account belongs to a person * Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE * - * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation + * TYPE_ORGANISATION - the account belongs to an organisation * Associated page type: PAGE_SOAPBOX * - * ACCOUNT_TYPE_NEWS - the account is a news reflector + * TYPE_NEWS - the account is a news reflector * Associated page type: PAGE_SOAPBOX * - * ACCOUNT_TYPE_COMMUNITY - the account is community forum + * TYPE_COMMUNITY - the account is community forum * Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP * - * ACCOUNT_TYPE_RELAY - the account is a relay + * TYPE_RELAY - the account is a relay * This will only be assigned to contacts, not to user accounts * @{ */ - const ACCOUNT_TYPE_PERSON = 0; - const ACCOUNT_TYPE_ORGANISATION = 1; - const ACCOUNT_TYPE_NEWS = 2; - const ACCOUNT_TYPE_COMMUNITY = 3; - const ACCOUNT_TYPE_RELAY = 4; + const TYPE_UNKNOWN = -1; + const TYPE_PERSON = User::ACCOUNT_TYPE_PERSON; + const TYPE_ORGANISATION = User::ACCOUNT_TYPE_ORGANISATION; + const TYPE_NEWS = User::ACCOUNT_TYPE_NEWS; + const TYPE_COMMUNITY = User::ACCOUNT_TYPE_COMMUNITY; + const TYPE_RELAY = User::ACCOUNT_TYPE_RELAY; /** * @} */ /** - * @name Contact_is + * Contact_is * * Relationship types * @{ @@ -94,11 +109,271 @@ class Contact extends BaseObject * @} */ + /** + * @brief 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 \ImagickException + */ + public static function isFollower($cid, $uid) + { + if (self::isBlockedByUser($cid, $uid)) { + return false; + } + + $cdata = self::getPublicAndUserContacID($cid, $uid); + if (empty($cdata['user'])) { + return false; + } + + $condition = ['id' => $cdata['user'], 'rel' => [self::FOLLOWER, self::FRIEND]]; + return DBA::exists('contact', $condition); + } + + /** + * @brief Get the basepath for a given contact link + * @todo Add functionality to store this value in the contact table + * + * @param string $url The contact link + * + * @return string basepath + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + public static function getBasepath($url) + { + $data = Probe::uri($url); + if (!empty($data['baseurl'])) { + return $data['baseurl']; + } + + // When we can't probe the server, we use some ugly function that does some pattern matching + return PortableContact::detectServer($url); + } + + /** + * @brief 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 \ImagickException + */ + public static function getPublicAndUserContacID($cid, $uid) + { + if (empty($uid) || empty($cid)) { + return []; + } + + $contact = DBA::selectFirst('contact', ['id', 'uid', 'url'], ['id' => $cid]); + if (!DBA::isResult($contact)) { + return []; + } + + // We quit when the user id don't match the user id of the provided contact + if (($contact['uid'] != $uid) && ($contact['uid'] != 0)) { + return []; + } + + if ($contact['uid'] != 0) { + $pcid = Contact::getIdForURL($contact['url'], 0, true, ['url' => $contact['url']]); + if (empty($pcid)) { + return []; + } + $ucid = $contact['id']; + } else { + $pcid = $contact['id']; + $ucid = Contact::getIdForURL($contact['url'], $uid, true); + } + + return ['public' => $pcid, 'user' => $ucid]; + } + + /** + * @brief Block contact id for user id + * + * @param int $cid Either public contact id or user's contact id + * @param int $uid User ID + * @param boolean $blocked Is the contact blocked or unblocked? + * @throws \Exception + */ + public static function setBlockedForUser($cid, $uid, $blocked) + { + $cdata = self::getPublicAndUserContacID($cid, $uid); + if (empty($cdata)) { + return; + } + + if ($cdata['user'] != 0) { + DBA::update('contact', ['blocked' => $blocked], ['id' => $cdata['user'], 'pending' => false]); + } + + DBA::update('user-contact', ['blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true); + } + + /** + * @brief 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 + * + * @return boolean is the contact id blocked for the given user? + * @throws \Exception + */ + public static function isBlockedByUser($cid, $uid) + { + $cdata = self::getPublicAndUserContacID($cid, $uid); + if (empty($cdata)) { + return; + } + + $public_blocked = false; + + if (!empty($cdata['public'])) { + $public_contact = DBA::selectFirst('user-contact', ['blocked'], ['cid' => $cdata['public'], 'uid' => $uid]); + if (DBA::isResult($public_contact)) { + $public_blocked = $public_contact['blocked']; + } + } + + $user_blocked = $public_blocked; + + if (!empty($cdata['user'])) { + $user_contact = DBA::selectFirst('contact', ['blocked'], ['id' => $cdata['user'], 'pending' => false]); + if (DBA::isResult($user_contact)) { + $user_blocked = $user_contact['blocked']; + } + } + + if ($user_blocked != $public_blocked) { + DBA::update('user-contact', ['blocked' => $user_blocked], ['cid' => $cdata['public'], 'uid' => $uid], true); + } + + return $user_blocked; + } + + /** + * @brief Ignore contact id for user id + * + * @param int $cid Either public contact id or user's contact id + * @param int $uid User ID + * @param boolean $ignored Is the contact ignored or unignored? + * @throws \Exception + */ + public static function setIgnoredForUser($cid, $uid, $ignored) + { + $cdata = self::getPublicAndUserContacID($cid, $uid); + if (empty($cdata)) { + return; + } + + if ($cdata['user'] != 0) { + DBA::update('contact', ['readonly' => $ignored], ['id' => $cdata['user'], 'pending' => false]); + } + + DBA::update('user-contact', ['ignored' => $ignored], ['cid' => $cdata['public'], 'uid' => $uid], true); + } + + /** + * @brief 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 + * + * @return boolean is the contact id ignored for the given user? + * @throws \Exception + */ + public static function isIgnoredByUser($cid, $uid) + { + $cdata = self::getPublicAndUserContacID($cid, $uid); + if (empty($cdata)) { + return; + } + + $public_ignored = false; + + if (!empty($cdata['public'])) { + $public_contact = DBA::selectFirst('user-contact', ['ignored'], ['cid' => $cdata['public'], 'uid' => $uid]); + if (DBA::isResult($public_contact)) { + $public_ignored = $public_contact['ignored']; + } + } + + $user_ignored = $public_ignored; + + if (!empty($cdata['user'])) { + $user_contact = DBA::selectFirst('contact', ['readonly'], ['id' => $cdata['user'], 'pending' => false]); + if (DBA::isResult($user_contact)) { + $user_ignored = $user_contact['readonly']; + } + } + + if ($user_ignored != $public_ignored) { + DBA::update('user-contact', ['ignored' => $user_ignored], ['cid' => $cdata['public'], 'uid' => $uid], true); + } + + return $user_ignored; + } + + /** + * @brief 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 + * @param boolean $collapsed are the contact's posts collapsed or uncollapsed? + * @throws \Exception + */ + public static function setCollapsedForUser($cid, $uid, $collapsed) + { + $cdata = self::getPublicAndUserContacID($cid, $uid); + if (empty($cdata)) { + return; + } + + DBA::update('user-contact', ['collapsed' => $collapsed], ['cid' => $cdata['public'], 'uid' => $uid], true); + } + + /** + * @brief 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 \ImagickException + */ + public static function isCollapsedByUser($cid, $uid) + { + $cdata = self::getPublicAndUserContacID($cid, $uid); + if (empty($cdata)) { + return; + } + + $collapsed = false; + + if (!empty($cdata['public'])) { + $public_contact = DBA::selectFirst('user-contact', ['collapsed'], ['cid' => $cdata['public'], 'uid' => $uid]); + if (DBA::isResult($public_contact)) { + $collapsed = $public_contact['collapsed']; + } + } + + return $collapsed; + } + /** * @brief Returns a list of contacts belonging in a group * * @param int $gid * @return array + * @throws \Exception */ public static function getByGroupId($gid) { @@ -112,6 +387,7 @@ class Contact extends BaseObject WHERE `gid` = ? AND `contact`.`uid` = ? AND NOT `contact`.`self` + AND NOT `contact`.`deleted` AND NOT `contact`.`blocked` AND NOT `contact`.`pending` ORDER BY `contact`.`name` ASC', @@ -132,6 +408,7 @@ class Contact extends BaseObject * * @param int $gid * @return int + * @throws \Exception */ public static function getOStatusCountByGroupId($gid) { @@ -160,6 +437,7 @@ class Contact extends BaseObject * * @param int $uid * @return bool Operation success + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function createSelfFromUserId($uid) { @@ -185,7 +463,7 @@ class Contact extends BaseObject 'blocked' => 0, 'pending' => 0, 'url' => System::baseUrl() . '/profile/' . $user['nickname'], - 'nurl' => normalise_link(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'], @@ -204,13 +482,15 @@ class Contact extends BaseObject /** * Updates the self-contact for the provided user id * - * @param int $uid + * @param int $uid * @param boolean $update_avatar Force the avatar update + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function updateSelfFromUserID($uid, $update_avatar = false) { $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar', - 'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'nurl']; + 'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', + 'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco']; $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]); if (!DBA::isResult($self)) { return; @@ -235,7 +515,7 @@ class Contact extends BaseObject 'gender' => $profile['gender'], 'avatar' => $profile['photo'], 'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']]; - $avatar = DBA::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); + $avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); if (DBA::isResult($avatar)) { if ($update_avatar) { $fields['avatar-date'] = DateTimeFormat::utcNow(); @@ -260,28 +540,28 @@ 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-175.jpg'; + $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['forum'] = $user['page-flags'] == self::PAGE_COMMUNITY; - $fields['prv'] = $user['page-flags'] == self::PAGE_PRVGROUP; + $fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY; + $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP; // 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['nurl'] = normalise_link($fields['url']); + $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['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['poco'] = System::baseUrl() . '/poco/' . $user['nickname']; $update = false; foreach ($fields as $field => $content) { - if (isset($self[$field]) && $self[$field] != $content) { + if ($self[$field] != $content) { $update = true; } } @@ -305,6 +585,7 @@ class Contact extends BaseObject * * @param int $id contact id * @return null + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function remove($id) { @@ -315,7 +596,7 @@ class Contact extends BaseObject } // Archive the contact - DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM], ['id' => $id]); + DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM, 'deleted' => true], ['id' => $id]); // Delete it in the background Worker::add(PRIORITY_LOW, 'RemoveContact', $id); @@ -324,13 +605,21 @@ class Contact extends BaseObject /** * @brief Sends an unfriend message. Does not remove the contact * - * @param array $user User unfriending - * @param array $contact Contact unfriended + * @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 \ImagickException */ - public static function terminateFriendship(array $user, array $contact) + public static function terminateFriendship(array $user, array $contact, $dissolve = false) { - if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) { + if (empty($contact['network'])) { + return; + } + if (($contact['network'] == Protocol::DFRN) && $dissolve) { + DFRN::deliver($user, $contact, 'placeholder', true); + } elseif (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) { // create an unfollow slap $item = []; $item['verb'] = NAMESPACE_OSTATUS . "/unfollow"; @@ -347,6 +636,12 @@ class Contact extends BaseObject } } elseif ($contact['network'] == Protocol::DIASPORA) { Diaspora::sendUnshare($user, $contact); + } elseif ($contact['network'] == Protocol::ACTIVITYPUB) { + ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $user['uid']); + + if ($dissolve) { + ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $user['uid']); + } } } @@ -361,20 +656,30 @@ class Contact extends BaseObject * * @param array $contact contact to mark for archival * @return null + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function markForArchival(array $contact) { + if (!isset($contact['url']) && !empty($contact['id'])) { + $fields = ['id', 'url', 'archive', 'self', 'term-date']; + $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]); + if (!DBA::isResult($contact)) { + return; + } + } elseif (!isset($contact['url'])) { + Logger::log('Empty contact: ' . json_encode($contact) . ' - ' . System::callstack(20), Logger::DEBUG); + } + + Logger::log('Contact '.$contact['id'].' is marked for archival', Logger::DEBUG); + // Contact already archived or "self" contact? => nothing to do if ($contact['archive'] || $contact['self']) { return; } - if ($contact['term-date'] <= NULL_DATE) { + if ($contact['term-date'] <= DBA::NULL_DATETIME) { DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); - - if ($contact['url'] != '') { - DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]); - } + DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', Strings::normaliseLink($contact['url']), DBA::NULL_DATETIME]); } else { /* @todo * We really should send a notification to the owner after 2-3 weeks @@ -392,10 +697,7 @@ class Contact extends BaseObject * the whole process over again. */ DBA::update('contact', ['archive' => 1], ['id' => $contact['id']]); - - if ($contact['url'] != '') { - DBA::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]); - } + DBA::update('contact', ['archive' => 1], ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]); } } } @@ -403,14 +705,15 @@ class Contact extends BaseObject /** * @brief Cancels the archival countdown * - * @see Contact::markForArchival() + * @see Contact::markForArchival() * * @param array $contact contact to be unmarked for archival * @return null + * @throws \Exception */ public static function unmarkForArchival(array $contact) { - $condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], NULL_DATE]; + $condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], DBA::NULL_DATETIME]; $exists = DBA::exists('contact', $condition); // We don't need to update, we never marked this contact for archival @@ -418,16 +721,23 @@ class Contact extends BaseObject return; } - // It's a miracle. Our dead contact has inexplicably come back to life. - $fields = ['term-date' => NULL_DATE, 'archive' => false]; - DBA::update('contact', $fields, ['id' => $contact['id']]); + Logger::log('Contact '.$contact['id'].' is marked as vital again', Logger::DEBUG); - if (!empty($contact['url'])) { - DBA::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]); + if (!isset($contact['url']) && !empty($contact['id'])) { + $fields = ['id', 'url', 'batch']; + $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]); + if (!DBA::isResult($contact)) { + return; + } } + // It's a miracle. Our dead contact has inexplicably come back to life. + $fields = ['term-date' => DBA::NULL_DATETIME, 'archive' => false]; + DBA::update('contact', $fields, ['id' => $contact['id']]); + DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url'])]); + if (!empty($contact['batch'])) { - $condition = ['batch' => $contact['batch'], 'contact-type' => self::ACCOUNT_TYPE_RELAY]; + $condition = ['batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY]; DBA::update('contact', $fields, $condition); } } @@ -443,6 +753,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 */ public static function getDetailsByURL($url, $uid = -1, array $default = []) { @@ -465,14 +776,14 @@ class Contact extends BaseObject // 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` = ?", normalise_link($url), $uid); + FROM `contact` WHERE `nurl` = ? AND `uid` = ?", Strings::normaliseLink($url), $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` = ?", normalise_link($url), $url, $ssl_url, $uid); + FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?", Strings::normaliseLink($url), $url, $ssl_url, $uid); $r = DBA::toArray($s); } @@ -480,7 +791,7 @@ class Contact extends BaseObject 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", normalise_link($url)); + FROM `contact` WHERE `nurl` = ? AND `uid` = 0", Strings::normaliseLink($url)); $r = DBA::toArray($s); } @@ -488,7 +799,7 @@ class Contact extends BaseObject 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", normalise_link($url), $url, $ssl_url); + FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0", Strings::normaliseLink($url), $url, $ssl_url); $r = DBA::toArray($s); } @@ -496,7 +807,7 @@ class Contact extends BaseObject 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` = ?", normalise_link($url)); + FROM `gcontact` WHERE `nurl` = ?", Strings::normaliseLink($url)); $r = DBA::toArray($s); } @@ -514,7 +825,7 @@ class Contact extends BaseObject // "bd" always contains the upcoming birthday of a contact. // "birthday" might contain the birthday including the year of birth. - if ($profile["birthday"] > '0001-01-01') { + if ($profile["birthday"] > DBA::NULL_DATE) { $bd_timestamp = strtotime($profile["birthday"]); $month = date("m", $bd_timestamp); $day = date("d", $bd_timestamp); @@ -531,7 +842,7 @@ class Contact extends BaseObject $profile["bd"] = ( ++$current_year) . "-" . $month . "-" . $day; } } else { - $profile["bd"] = '0001-01-01'; + $profile["bd"] = DBA::NULL_DATE; } } else { $profile = $default; @@ -558,7 +869,7 @@ class Contact extends BaseObject } if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0) - && in_array($profile["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]) + && in_array($profile["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]) ) { Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]); } @@ -568,7 +879,7 @@ class Contact extends BaseObject $profile["location"] = ""; $profile["about"] = ""; $profile["gender"] = ""; - $profile["birthday"] = '0001-01-01'; + $profile["birthday"] = DBA::NULL_DATE; } $cache[$url][$uid] = $profile; @@ -585,11 +896,11 @@ class Contact extends BaseObject * @param int $uid User id * * @return array Contact data + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function getDetailsByAddr($addr, $uid = -1) { - static $cache = []; - if ($addr == '') { return []; } @@ -601,7 +912,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` - FROM `contact` WHERE `addr` = '%s' AND `uid` = %d", + FROM `contact` WHERE `addr` = '%s' AND `uid` = %d AND NOT `deleted`", DBA::escape($addr), intval($uid) ); @@ -609,7 +920,7 @@ class Contact extends BaseObject 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` - FROM `contact` WHERE `addr` = '%s' AND `uid` = 0", + FROM `contact` WHERE `addr` = '%s' AND `uid` = 0 AND NOT `deleted`", DBA::escape($addr) ); } @@ -640,17 +951,14 @@ class Contact extends BaseObject * @param array $contact contact * @param int $uid optional, default 0 * @return array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function photoMenu(array $contact, $uid = 0) { - // @todo Unused, to be removed - $a = get_app(); - - $contact_url = ''; $pm_url = ''; $status_link = ''; $photos_link = ''; - $posts_link = ''; $contact_drop_link = ''; $poke_link = ''; @@ -670,15 +978,6 @@ class Contact extends BaseObject $contact_own = DBA::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]); if (DBA::isResult($contact_own)) { return self::photoMenu($contact_own, $uid); - } else { - $profile_link = self::magicLink($contact['url']); - $connlnk = 'follow/?url=' . $contact['url']; - $menu = [ - 'profile' => [L10n::t('View Profile'), $profile_link, true], - 'follow' => [L10n::t('Connect/Follow'), $connlnk, true] - ]; - - return $menu; } } @@ -708,32 +1007,42 @@ class Contact extends BaseObject $poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id']; } - $contact_url = System::baseUrl() . '/contacts/' . $contact['id']; + $contact_url = System::baseUrl() . '/contact/' . $contact['id']; - $posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/posts'; + $posts_link = System::baseUrl() . '/contact/' . $contact['id'] . '/conversations'; if (!$contact['self']) { - $contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1'; + $contact_drop_link = System::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1'; } /** * Menu array: * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ] */ - $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], - ]; + 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], + ]; + } 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], + ]; + } $args = ['contact' => $contact, 'menu' => &$menu]; - Addon::callHooks('contact_photo_menu', $args); + Hook::callAll('contact_photo_menu', $args); $menucondensed = []; @@ -752,11 +1061,9 @@ class Contact extends BaseObject * Returns either the total number of ungrouped contacts for the given user * id or a paginated list of ungrouped contacts. * - * @param int $uid uid - * @param int $start optional, default 0 - * @param int $count optional, default 0 - * + * @param int $uid uid * @return array + * @throws \Exception */ public static function getUngroupedList($uid) { @@ -764,6 +1071,7 @@ class Contact extends BaseObject FROM `contact` WHERE `uid` = %d AND NOT `self` + AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND `id` NOT IN ( @@ -796,12 +1104,15 @@ class Contact extends BaseObject * @param integer $uid The user id for the contact (0 = public contact) * @param boolean $no_update Don't update the contact * @param array $default Default value for creating the contact when every else fails + * @param boolean $in_loop Internally used variable to prevent an endless loop * * @return integer Contact ID + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - public static function getIdForURL($url, $uid = 0, $no_update = false, $default = []) + public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [], $in_loop = false) { - logger("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), LOGGER_DEBUG); + Logger::log("Get contact data for url " . $url . " and user " . $uid . " - " . System::callstack(), Logger::DEBUG); $contact_id = 0; @@ -811,18 +1122,18 @@ class Contact extends BaseObject /// @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 - $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]); + $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]); // Then the addr (nick@server.tld) if (!DBA::isResult($contact)) { - $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid]); + $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]); } // 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` = ?', $url, normalise_link($url), $ssl_url, $uid]; + $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid]; $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition); } @@ -833,10 +1144,9 @@ class Contact extends BaseObject $update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days')); // We force the update if the avatar is empty - if (!x($contact, 'avatar')) { + if (empty($contact['avatar'])) { $update_contact = true; } - if (!$update_contact || $no_update) { return $contact_id; } @@ -850,7 +1160,7 @@ class Contact extends BaseObject $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', 'photo', 'keywords', 'location', 'about', 'network', 'priority', 'batch', 'request', 'confirm', 'poco']; - $data = DBA::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]); + $data = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]); if (DBA::isResult($data)) { // For security reasons we don't fetch key data from our users @@ -862,19 +1172,24 @@ 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)) { + PortableContact::checkServer($data['baseurl']); + } } // Last try in gcontact for unsupported networks - if (!in_array($data["network"], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) { + if (!in_array($data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) { if ($uid != 0) { return 0; } // Get data from the gcontact table $fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network']; - $contact = DBA::selectFirst('gcontact', $fields, ['nurl' => normalise_link($url)]); + $contact = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]); if (!DBA::isResult($contact)) { - $contact = DBA::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]); + $contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]); } if (!DBA::isResult($contact)) { @@ -884,17 +1199,18 @@ class Contact extends BaseObject $contact = DBA::selectFirst('contact', $fields, ['addr' => $url]); } + // The link could be provided as http although we stored it as https + $ssl_url = str_replace('http://', 'https://', $url); + 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' => [$url, normalise_link($url), $ssl_url]]; + $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]]; $contact = DBA::selectFirst('contact', $fields, $condition); } if (!DBA::isResult($contact)) { $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', 'photo', 'network', 'priority', 'batch', 'request', 'confirm']; - $condition = ['url' => [$url, normalise_link($url), $ssl_url]]; + $condition = ['url' => [$url, Strings::normaliseLink($url), $ssl_url]]; $contact = DBA::selectFirst('fcontact', $fields, $condition); } @@ -909,17 +1225,16 @@ class Contact extends BaseObject } } - if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url)) { - $contact_id = self::getIdForURL($data["alias"], $uid, true); + if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url) && !$in_loop) { + $contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true); } - $url = $data["url"]; if (!$contact_id) { - DBA::insert('contact', [ + $fields = [ 'uid' => $uid, 'created' => DateTimeFormat::utcNow(), 'url' => $data["url"], - 'nurl' => normalise_link($data["url"]), + 'nurl' => Strings::normaliseLink($data["url"]), 'addr' => $data["addr"], 'alias' => $data["alias"], 'notify' => $data["notify"], @@ -944,10 +1259,13 @@ class Contact extends BaseObject 'writable' => 1, 'blocked' => 0, 'readonly' => 0, - 'pending' => 0] - ); + 'pending' => 0]; + + $condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false]; - $s = DBA::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]); + DBA::update('contact', $fields, $condition, true); + + $s = DBA::select('contact', ['id'], $condition, ['order' => ['id'], 'limit' => 2]); $contacts = DBA::toArray($s); if (!DBA::isResult($contacts)) { return 0; @@ -956,7 +1274,7 @@ class Contact extends BaseObject $contact_id = $contacts[0]["id"]; // Update the newly created contact from data in the gcontact table - $gcontact = DBA::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => normalise_link($data["url"])]); + $gcontact = DBA::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => Strings::normaliseLink($data["url"])]); if (DBA::isResult($gcontact)) { // Only use the information when the probing hadn't fetched these values if ($data['keywords'] != '') { @@ -972,8 +1290,10 @@ class Contact extends BaseObject } if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") { - DBA::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`", - normalise_link($data["url"]), $contact_id]); + $condition = ["`nurl` = ? AND `uid` = ? AND `id` != ? AND NOT `self`", + Strings::normaliseLink($data["url"]), 0, $contact_id]; + Logger::log('Deleting duplicate contact ' . json_encode($condition), Logger::DEBUG); + DBA::delete('contact', $condition); } } @@ -990,7 +1310,7 @@ class Contact extends BaseObject $updated = ['addr' => $data['addr'], 'alias' => $data['alias'], 'url' => $data['url'], - 'nurl' => normalise_link($data['url']), + 'nurl' => Strings::normaliseLink($data['url']), 'name' => $data['name'], 'nick' => $data['nick']]; @@ -1046,6 +1366,7 @@ class Contact extends BaseObject * @param int $cid contact id * * @return boolean Is the contact blocked? + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function isBlocked($cid) { @@ -1053,10 +1374,15 @@ class Contact extends BaseObject return false; } - $blocked = DBA::selectFirst('contact', ['blocked'], ['id' => $cid]); + $blocked = DBA::selectFirst('contact', ['blocked', 'url'], ['id' => $cid]); if (!DBA::isResult($blocked)) { return false; } + + if (Network::isUrlBlocked($blocked['url'])) { + return true; + } + return (bool) $blocked['blocked']; } @@ -1066,6 +1392,7 @@ class Contact extends BaseObject * @param int $cid contact id * * @return boolean Is the contact hidden? + * @throws \Exception */ public static function isHidden($cid) { @@ -1085,46 +1412,60 @@ class Contact extends BaseObject * * @param string $contact_url Contact URL * + * @param bool $thread_mode + * @param int $update * @return string posts in HTML + * @throws \Exception */ - public static function getPostsFromUrl($contact_url) + public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0) { $a = self::getApp(); - require_once 'include/conversation.php'; - - // There are no posts with "uid = 0" with connector networks - // This speeds up the query a lot - $r = q("SELECT `network`, `id` AS `author-id`, `contact-type` FROM `contact` - WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0", - DBA::escape(normalise_link($contact_url)) - ); + $cid = self::getIdForURL($contact_url); - if (!DBA::isResult($r)) { + $contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]); + if (!DBA::isResult($contact)) { return ''; } - if (in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) { + if (in_array($contact["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) { $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))"; } else { $sql = "`item`.`uid` = ?"; } - $author_id = intval($r[0]["author-id"]); + $contact_field = ($contact["contact-type"] == self::TYPE_COMMUNITY ? 'owner-id' : 'author-id'); - $contact = ($r[0]["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id'); + if ($thread_mode) { + $condition = ["`$contact_field` = ? AND `gravity` = ? AND " . $sql, + $cid, GRAVITY_PARENT, local_user()]; + } else { + $condition = ["`$contact_field` = ? AND `gravity` IN (?, ?) AND " . $sql, + $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()]; + } + + $pager = new Pager($a->query_string); - $condition = ["`$contact` = ? AND `gravity` IN (?, ?) AND " . $sql, - $author_id, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()]; $params = ['order' => ['created' => true], - 'limit' => [$a->pager['start'], $a->pager['itemspage']]]; - $r = Item::selectForUser(local_user(), [], $condition, $params); + 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; - $items = Item::inArray($r); + if ($thread_mode) { + $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params); - $o = conversation($a, $items, 'contact-posts', false); + $items = Item::inArray($r); - $o .= alt_pager($a, count($items)); + $o = conversation($a, $items, $pager, '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); + } + + if (!$update) { + $o .= $pager->renderMinimal(count($items)); + } return $o; } @@ -1141,17 +1482,17 @@ class Contact extends BaseObject { // There are several fields that indicate that the contact or user is a forum // "page-flags" is a field in the user table, - // "forum" and "prv" are used in the contact table. They stand for self::PAGE_COMMUNITY and self::PAGE_PRVGROUP. - // "community" is used in the gcontact table and is true if the contact is self::PAGE_COMMUNITY or self::PAGE_PRVGROUP. - if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_COMMUNITY)) - || (isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_PRVGROUP)) + // "forum" and "prv" are used in the contact table. They stand for User::PAGE_FLAGS_COMMUNITY and User::PAGE_FLAGS_PRVGROUP. + // "community" is used in the gcontact table and is true if the contact is User::PAGE_FLAGS_COMMUNITY or User::PAGE_FLAGS_PRVGROUP. + if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_COMMUNITY)) + || (isset($contact['page-flags']) && (intval($contact['page-flags']) == User::PAGE_FLAGS_PRVGROUP)) || (isset($contact['forum']) && intval($contact['forum'])) || (isset($contact['prv']) && intval($contact['prv'])) || (isset($contact['community']) && intval($contact['community'])) ) { - $type = self::ACCOUNT_TYPE_COMMUNITY; + $type = self::TYPE_COMMUNITY; } else { - $type = self::ACCOUNT_TYPE_PERSON; + $type = self::TYPE_PERSON; } // The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above. @@ -1164,15 +1505,15 @@ class Contact extends BaseObject } switch ($type) { - case self::ACCOUNT_TYPE_ORGANISATION: + case self::TYPE_ORGANISATION: $account_type = L10n::t("Organisation"); break; - case self::ACCOUNT_TYPE_NEWS: + case self::TYPE_NEWS: $account_type = L10n::t('News'); break; - case self::ACCOUNT_TYPE_COMMUNITY: + case self::TYPE_COMMUNITY: $account_type = L10n::t("Forum"); break; @@ -1189,6 +1530,7 @@ class Contact extends BaseObject * * @param int $uid * @return bool + * @throws \Exception */ public static function block($uid) { @@ -1202,6 +1544,7 @@ class Contact extends BaseObject * * @param int $uid * @return bool + * @throws \Exception */ public static function unblock($uid) { @@ -1219,6 +1562,8 @@ class Contact extends BaseObject * @param bool $force force picture update * * @return array Returns array of the different avatar sizes + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function updateAvatar($avatar, $uid, $cid, $force = false) { @@ -1255,10 +1600,13 @@ class Contact extends BaseObject } /** - * @param integer $id contact id + * @param integer $id contact id + * @param string $network Optional network we are probing for * @return boolean + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - public static function updateFromProbe($id) + public static function updateFromProbe($id, $network = '') { /* Warning: Never ever fetch the public key via Probe::uri and write it into the contacts. @@ -1271,10 +1619,10 @@ class Contact extends BaseObject return false; } - $ret = Probe::uri($contact["url"]); + $ret = Probe::uri($contact["url"], $network); - // If Probe::uri fails the network code will be different - if ($ret["network"] != $contact["network"]) { + // If Probe::uri fails the network code will be different (mostly "feed" or "unkn") + if (($ret["network"] != $contact["network"]) && !in_array($ret["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, $network])) { return false; } @@ -1297,14 +1645,15 @@ class Contact extends BaseObject DBA::update( 'contact', [ - 'url' => $ret['url'], - 'nurl' => normalise_link($ret['url']), - 'addr' => $ret['addr'], - 'alias' => $ret['alias'], - 'batch' => $ret['batch'], - 'notify' => $ret['notify'], - 'poll' => $ret['poll'], - 'poco' => $ret['poco'] + 'url' => $ret['url'], + 'nurl' => Strings::normaliseLink($ret['url']), + 'network' => $ret['network'], + 'addr' => $ret['addr'], + 'alias' => $ret['alias'], + 'batch' => $ret['batch'], + 'notify' => $ret['notify'], + 'poll' => $ret['poll'], + 'poco' => $ret['poco'] ], ['id' => $id] ); @@ -1331,13 +1680,15 @@ class Contact extends BaseObject * @param string $url * @param bool $interactive * @param string $network - * @return boolean|string + * @return array + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function createFromProbe($uid, $url, $interactive = false, $network = '') { $result = ['cid' => -1, 'success' => false, 'message' => '']; - $a = get_app(); + $a = \get_app(); // remove ajax junk, e.g. Twitter $url = str_replace('/#!/', '/', $url); @@ -1359,21 +1710,21 @@ class Contact extends BaseObject $arr = ['url' => $url, 'contact' => []]; - Addon::callHooks('follow', $arr); + 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.'); return $result; } - if (x($arr['contact'], 'name')) { + if (!empty($arr['contact']['name'])) { $ret = $arr['contact']; } else { $ret = Probe::uri($url, $network, $uid, false); } if (($network != '') && ($ret['network'] != $network)) { - logger('Expected network ' . $network . ' does not match actual network ' . $ret['network']); + Logger::log('Expected network ' . $network . ' does not match actual network ' . $ret['network']); return $result; } @@ -1381,36 +1732,28 @@ class Contact extends BaseObject // the poll url is more reliable than the profile url, as we may have // indirect links or webfinger links - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` IN ('%s', '%s') AND `network` = '%s' AND NOT `pending` LIMIT 1", - intval($uid), - DBA::escape($ret['poll']), - DBA::escape(normalise_link($ret['poll'])), - DBA::escape($ret['network']) - ); - - if (!DBA::isResult($r)) { - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' AND NOT `pending` LIMIT 1", - intval($uid), - DBA::escape(normalise_link($url)), - DBA::escape($ret['network']) - ); + $condition = ['uid' => $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]; + $contact = DBA::selectFirst('contact', ['id', 'rel'], $condition); } - if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($r)) { + if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($contact)) { if ($interactive) { - if (strlen($a->urlpath)) { + if (strlen($a->getURLPath())) { $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']); } else { - $myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname()); + $myaddr = bin2hex($a->user['nickname'] . '@' . $a->getHostName()); } - goaway($ret['request'] . "&addr=$myaddr"); + $a->internalRedirect($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; + $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL; return $result; } @@ -1420,16 +1763,15 @@ class Contact extends BaseObject } // do we have enough information? - - if (!((x($ret, 'name')) && (x($ret, 'poll')) && ((x($ret, 'url')) || (x($ret, 'addr'))))) { + 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; - if (!x($ret, 'poll')) { + if (empty($ret['poll'])) { $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL; } - if (!x($ret, 'name')) { + if (empty($ret['name'])) { $result['message'] .= L10n::t('An author or name was not found.') . EOL; } - if (!x($ret, 'url')) { + if (empty($ret['url'])) { $result['message'] .= L10n::t('No browser URL could be matched to this address.') . EOL; } if (strpos($url, '@') !== false) { @@ -1454,25 +1796,27 @@ class Contact extends BaseObject $hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0); - if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA])) { + $pending = in_array($ret['network'], [Protocol::ACTIVITYPUB]); + + if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { $writeable = 1; } - if (DBA::isResult($r)) { + if (DBA::isResult($contact)) { // update contact - $new_relation = (($r[0]['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING); + $new_relation = (($contact['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING); $fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false]; - DBA::update('contact', $fields, ['id' => $r[0]['id']]); + DBA::update('contact', $fields, ['id' => $contact['id']]); } else { - $new_relation = ((in_array($ret['network'], [Protocol::MAIL])) ? self::FRIEND : self::SHARING); + $new_relation = (in_array($ret['network'], [Protocol::MAIL]) ? self::FRIEND : self::SHARING); // create contact record DBA::insert('contact', [ 'uid' => $uid, 'created' => DateTimeFormat::utcNow(), 'url' => $ret['url'], - 'nurl' => normalise_link($ret['url']), + 'nurl' => Strings::normaliseLink($ret['url']), 'addr' => $ret['addr'], 'alias' => $ret['alias'], 'batch' => $ret['batch'], @@ -1489,7 +1833,7 @@ class Contact extends BaseObject 'hidden' => $hidden, 'blocked' => 0, 'readonly'=> 0, - 'pending' => 0, + 'pending' => $pending, 'subhub' => $subhub ]); } @@ -1512,12 +1856,9 @@ class Contact extends BaseObject Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force"); - $r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` - WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1", - intval($uid) - ); + $owner = User::getOwnerDataById($uid); - if (DBA::isResult($r)) { + if (DBA::isResult($owner)) { if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) { // create a follow slap $item = []; @@ -1528,13 +1869,24 @@ class Contact extends BaseObject $item['guid'] = ''; $item['tag'] = ''; $item['attach'] = ''; - $slap = OStatus::salmon($item, $r[0]); + + $slap = OStatus::salmon($item, $owner); + if (!empty($contact['notify'])) { - Salmon::slapper($r[0], $contact['notify'], $slap); + Salmon::slapper($owner, $contact['notify'], $slap); } } elseif ($contact['network'] == Protocol::DIASPORA) { $ret = Diaspora::sendShare($a->user, $contact); - logger('share returns: ' . $ret); + Logger::log('share returns: ' . $ret); + } elseif ($contact['network'] == Protocol::ACTIVITYPUB) { + $activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id); + if (empty($activity_id)) { + // This really should never happen + return false; + } + + $ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid, $activity_id); + Logger::log('Follow returns: ' . $ret); } } @@ -1542,7 +1894,16 @@ class Contact extends BaseObject return $result; } - public static function updateSslPolicy($contact, $new_policy) + /** + * @brief Updated contact's SSL policy + * + * @param array $contact Contact array + * @param string $new_policy New policy, valid: self,full + * + * @return array Contact array with updated values + * @throws \Exception + */ + public static function updateSslPolicy(array $contact, $new_policy) { $ssl_changed = false; if ((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) { @@ -1575,7 +1936,7 @@ class Contact extends BaseObject return $contact; } - public static function addRelationship($importer, $contact, $datarray, $item, $sharing = false) { + public static function addRelationship($importer, $contact, $datarray, $item = '', $sharing = false) { // Should always be set if (empty($datarray['author-id'])) { return; @@ -1588,7 +1949,7 @@ class Contact extends BaseObject return; } - $url = $pub_contact['url']; + $url = defaults($datarray, 'author-link', $pub_contact['url']); $name = $pub_contact['name']; $photo = $pub_contact['photo']; $nick = $pub_contact['nick']; @@ -1600,13 +1961,17 @@ class Contact extends BaseObject DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true], ['id' => $contact['id'], 'uid' => $importer['uid']]); } + + if ($contact['network'] == Protocol::ACTIVITYPUB) { + ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']); + } + // send email notification to owner? } else { - if (DBA::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) { - logger('ignoring duplicated connection request from pending contact ' . $url); + if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($url), 'uid' => $importer['uid'], 'pending' => true])) { + Logger::log('ignoring duplicated connection request from pending contact ' . $url); return; } - // create contact record q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`, `blocked`, `readonly`, `pending`, `writable`) @@ -1614,7 +1979,7 @@ class Contact extends BaseObject intval($importer['uid']), DBA::escape(DateTimeFormat::utcNow()), DBA::escape($url), - DBA::escape(normalise_link($url)), + DBA::escape(Strings::normaliseLink($url)), DBA::escape($name), DBA::escape($nick), DBA::escape($photo), @@ -1635,9 +2000,9 @@ class Contact extends BaseObject /// @TODO Encapsulate this into a function/method $fields = ['uid', 'username', 'email', 'page-flags', 'notify-flags', 'language']; $user = DBA::selectFirst('user', $fields, ['uid' => $importer['uid']]); - if (DBA::isResult($user) && !in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) { + if (DBA::isResult($user) && !in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) { // create notification - $hash = random_string(); + $hash = Strings::getRandomHex(); if (is_array($contact_record)) { DBA::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'], @@ -1648,7 +2013,7 @@ class Contact extends BaseObject Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']); if (($user['notify-flags'] & NOTIFY_INTRO) && - in_array($user['page-flags'], [self::PAGE_NORMAL])) { + in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) { notification([ 'type' => NOTIFY_INTRO, @@ -1666,11 +2031,15 @@ class Contact extends BaseObject ]); } - } elseif (DBA::isResult($user) && in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) { - q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1", - intval($importer['uid']), - DBA::escape($url) - ); + } elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) { + $condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true]; + DBA::update('contact', ['pending' => false], $condition); + + $contact = DBA::selectFirst('contact', ['url', 'network', 'hub-verify'], ['id' => $contact_record['id']]); + + if ($contact['network'] == Protocol::ACTIVITYPUB) { + ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']); + } } } } @@ -1700,46 +2069,33 @@ class Contact extends BaseObject */ public static function updateBirthdays() { - // This only handles foreign or alien networks where a birthday has been provided. - // In-network birthdays are handled within local_delivery - - $r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` "); - if (DBA::isResult($r)) { - foreach ($r as $rr) { - logger('update_contact_birthday: ' . $rr['bd']); - - $nextbd = DateTimeFormat::utcNow('Y') . substr($rr['bd'], 4); - - /* - * Add new birthday event for this person - * - * $bdtext is just a readable placeholder in case the event is shared - * with others. We will replace it during presentation to our $importer - * to contain a sparkle link and perhaps a photo. - */ - - // Check for duplicates - $s = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1", - intval($rr['uid']), intval($rr['id']), DBA::escape(DateTimeFormat::utc($nextbd)), DBA::escape('birthday')); - - if (DBA::isResult($s)) { - continue; - } + $condition = [ + '`bd` != "" + AND `bd` > "0001-01-01" + AND SUBSTRING(`bd`, 1, 4) != `bdyear` + AND (`contact`.`rel` = ? OR `contact`.`rel` = ?) + AND NOT `contact`.`pending` + AND NOT `contact`.`hidden` + AND NOT `contact`.`blocked` + AND NOT `contact`.`archive` + AND NOT `contact`.`deleted`', + Contact::SHARING, + Contact::FRIEND + ]; - $bdtext = L10n::t('%s\'s birthday', $rr['name']); - $bdtext2 = L10n::t('Happy Birthday %s', ' [url=' . $rr['url'] . ']' . $rr['name'] . '[/url]'); + $contacts = DBA::select('contact', ['id', 'uid', 'name', 'url', 'bd'], $condition); - q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`) - VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ", intval($rr['uid']), intval($rr['id']), - DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utc($nextbd)), - DBA::escape(DateTimeFormat::utc($nextbd . ' + 1 day ')), DBA::escape($bdtext), DBA::escape($bdtext2), DBA::escape('birthday'), - intval(0) - ); + while ($contact = DBA::fetch($contacts)) { + Logger::log('update_contact_birthday: ' . $contact['bd']); + $nextbd = DateTimeFormat::utcNow('Y') . substr($contact['bd'], 4); + if (Event::createBirthday($contact, $nextbd)) { // update bdyear - q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", DBA::escape(substr($nextbd, 0, 4)), - DBA::escape($nextbd), intval($rr['uid']), intval($rr['id']) + DBA::update( + 'contact', + ['bdyear' => substr($nextbd, 0, 4), 'bd' => $nextbd], + ['id' => $contact['id']] ); } } @@ -1749,6 +2105,7 @@ class Contact extends BaseObject * Remove the unavailable contact ids from the provided list * * @param array $contact_ids Contact id list + * @throws \Exception */ public static function pruneUnavailable(array &$contact_ids) { @@ -1773,13 +2130,21 @@ class Contact extends BaseObject /** * @brief 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 + * * @param string $contact_url The address of the target contact profile - * @param integer $url An url that we will be redirected to after the authentication + * @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 \ImagickException */ public static function magicLink($contact_url, $url = '') { + if (!local_user() && !remote_user()) { + return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url; + } + $cid = self::getIdForURL($contact_url, 0, true); if (empty($cid)) { return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url; @@ -1792,28 +2157,32 @@ class Contact extends BaseObject * @brief Returns a magic link to authenticate remote visitors * * @param integer $cid The contact id of the target contact profile - * @param integer $url An url that we will be redirected to after the authentication + * @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 \ImagickException */ public static function magicLinkbyId($cid, $url = '') { $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]); return self::magicLinkbyContact($contact, $url); - } + } /** * @brief Returns a magic link to authenticate remote visitors * - * @param array $contact The contact array with "uid", "network" and "url" - * @param integer $url An url that we will be redirected to after the authentication + * @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 \ImagickException */ public static function magicLinkbyContact($contact, $url = '') { - if ($contact['network'] != Protocol::DFRN) { + if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) { return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url']; }