X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=b18159d40cf0cf823bba43b082e6d897af214b9c;hb=bca7419987bb3f3c5782b9f8f80d5fa3b614c963;hp=093ee0d91e831b599aa03b39f9dfca722c078c6a;hpb=2fa6cc000013089d59d9cc221b544ed1a7a4cd37;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 093ee0d91e..51264d4697 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -5,16 +5,18 @@ 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\DBM; -use Friendica\Model\Photo; -use Friendica\Model\Profile; +use Friendica\Database\DBA; use Friendica\Network\Probe; +use Friendica\Object\Image; +use Friendica\Protocol\ActivityPub; use Friendica\Protocol\DFRN; use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; @@ -22,43 +24,411 @@ use Friendica\Protocol\PortableContact; use Friendica\Protocol\Salmon; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; -use Friendica\Object\Image; -use dba; - -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 */ class Contact extends BaseObject { + /** + * @deprecated since version 2019.03 + * @see User::PAGE_FLAGS_NORMAL + */ + 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; + /** + * @} + */ + + /** + * Account types + * + * TYPE_UNKNOWN - the account has been imported from gcontact where this is the default type value + * + * TYPE_PERSON - the account belongs to a person + * Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE + * + * TYPE_ORGANISATION - the account belongs to an organisation + * Associated page type: PAGE_SOAPBOX + * + * TYPE_NEWS - the account is a news reflector + * Associated page type: PAGE_SOAPBOX + * + * TYPE_COMMUNITY - the account is community forum + * Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP + * + * TYPE_RELAY - the account is a relay + * This will only be assigned to contacts, not to user accounts + * @{ + */ + 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; + /** + * @} + */ + + /** + * Contact_is + * + * Relationship types + * @{ + */ + const FOLLOWER = 1; + const SHARING = 2; + const FRIEND = 3; + /** + * @} + */ + + /** + * @param integer $id + * @return array|boolean Contact record if it exists, false otherwise + * @throws \Exception + */ + public static function getById($id) + { + return DBA::selectFirst('contact', [], ['id' => $id]); + } + + /** + * @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); + } + + /** + * 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 + */ + public static function getPublicIdByUserId($uid) + { + $self = DBA::selectFirst('contact', ['url'], ['self' => true, 'uid' => $uid]); + if (!DBA::isResult($self)) { + return false; + } + return self::getIdForURL($self['url'], 0, true); + } + + /** + * @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); + + if ($blocked) { + // Blocked contact can't be in any group + self::removeFromGroups($cid); + } + } + + /** + * @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) { $return = []; + if (intval($gid)) { - $stmt = dba::p('SELECT `group_member`.`contact-id`, `contact`.* + $stmt = DBA::p('SELECT `group_member`.`contact-id`, `contact`.* FROM `contact` INNER JOIN `group_member` ON `contact`.`id` = `group_member`.`contact-id` 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', $gid, local_user() ); - if (DBM::is_result($stmt)) { - $return = dba::inArray($stmt); + + if (DBA::isResult($stmt)) { + $return = DBA::toArray($stmt); } } @@ -70,12 +440,13 @@ class Contact extends BaseObject * * @param int $gid * @return int + * @throws \Exception */ public static function getOStatusCountByGroupId($gid) { $return = 0; if (intval($gid)) { - $contacts = dba::fetch_first('SELECT COUNT(*) AS `count` + $contacts = DBA::fetchFirst('SELECT COUNT(*) AS `count` FROM `contact` INNER JOIN `group_member` ON `contact`.`id` = `group_member`.`contact-id` @@ -85,7 +456,7 @@ class Contact extends BaseObject AND `contact`.`notify` != ""', $gid, local_user(), - NETWORK_OSTATUS + Protocol::OSTATUS ); $return = $contacts['count']; } @@ -98,20 +469,21 @@ class Contact extends BaseObject * * @param int $uid * @return bool Operation success + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function createSelfFromUserId($uid) { // Only create the entry if it doesn't exist yet - if (dba::exists('contact', ['uid' => $uid, 'self' => true])) { + if (DBA::exists('contact', ['uid' => $uid, 'self' => true])) { return true; } - $user = dba::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]); - if (!DBM::is_result($user)) { + $user = DBA::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]); + if (!DBA::isResult($user)) { return false; } - $return = dba::insert('contact', [ + $return = DBA::insert('contact', [ 'uid' => $user['uid'], 'created' => DateTimeFormat::utcNow(), 'self' => 1, @@ -123,7 +495,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'], @@ -142,28 +514,30 @@ 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']; - $self = dba::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]); - if (!DBM::is_result($self)) { + '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; } $fields = ['nickname', 'page-flags', 'account-type']; - $user = dba::selectFirst('user', $fields, ['uid' => $uid]); - if (!DBM::is_result($user)) { + $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']; - $profile = dba::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]); - if (!DBM::is_result($profile)) { + $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]); + if (!DBA::isResult($profile)) { return; } @@ -173,8 +547,8 @@ 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]); - if (DBM::is_result($avatar)) { + $avatar = Photo::selectFirst(['resource-id', 'type'], ['uid' => $uid, 'profile' => true]); + if (DBA::isResult($avatar)) { if ($update_avatar) { $fields['avatar-date'] = DateTimeFormat::utcNow(); } @@ -198,23 +572,23 @@ 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'] == PAGE_COMMUNITY; - $fields['prv'] = $user['page-flags'] == 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; @@ -225,16 +599,19 @@ class Contact extends BaseObject } if ($update) { - $fields['name-date'] = DateTimeFormat::utcNow(); - dba::update('contact', $fields, ['id' => $self['id']]); + if ($fields['name'] != $self['name']) { + $fields['name-date'] = DateTimeFormat::utcNow(); + } + $fields['updated'] = DateTimeFormat::utcNow(); + DBA::update('contact', $fields, ['id' => $self['id']]); // Update the public contact as well - dba::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]); + DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]); // Update the profile $fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.jpg', 'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.jpg']; - dba::update('profile', $fields, ['uid' => $uid, 'is-default' => true]); + DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]); } } @@ -243,48 +620,63 @@ class Contact extends BaseObject * * @param int $id contact id * @return null + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function remove($id) { // We want just to make sure that we don't delete our "self" contact - $contact = dba::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]); - if (!DBM::is_result($contact) || !intval($contact['uid'])) { - return; - } - - $archive = PConfig::get($contact['uid'], 'system', 'archive_removed_contacts'); - if ($archive) { - dba::update('contact', ['archive' => true, 'network' => 'none', 'writable' => false], ['id' => $id]); + $contact = DBA::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]); + if (!DBA::isResult($contact) || !intval($contact['uid'])) { return; } - dba::delete('contact', ['id' => $id]); + // Archive the contact + DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM, 'deleted' => true], ['id' => $id]); - // Delete the rest in the background - Worker::add(PRIORITY_LOW, 'RemoveContact', $id); + // Delete it in the background + Worker::add(PRIORITY_MEDIUM, 'RemoveContact', $id); } /** * @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'], [NETWORK_OSTATUS, NETWORK_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"; $item['follow'] = $contact["url"]; + $item['body'] = ''; + $item['title'] = ''; + $item['guid'] = ''; + $item['tag'] = ''; + $item['attach'] = ''; $slap = OStatus::salmon($item, $user); if (!empty($contact['notify'])) { Salmon::slapper($user, $contact['notify'], $slap); } - } elseif ($contact['network'] == NETWORK_DIASPORA) { + } 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']); + } } } @@ -299,20 +691,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) { - 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]); - } + if ($contact['term-date'] <= DBA::NULL_DATETIME) { + DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]); + 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 @@ -329,11 +731,8 @@ class Contact extends BaseObject * delete, though if the owner tries to unarchive them we'll start * 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], ['id' => $contact['id']]); + DBA::update('contact', ['archive' => 1], ['nurl' => Strings::normaliseLink($contact['url']), 'self' => false]); } } } @@ -341,32 +740,40 @@ 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]; - $exists = dba::exists('contact', $condition); + $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 if (!$exists) { 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' => ACCOUNT_TYPE_RELAY]; - dba::update('contact', $fields, $condition); + $condition = ['batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY]; + DBA::update('contact', $fields, $condition); } } @@ -381,6 +788,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 = []) { @@ -401,48 +809,48 @@ class Contact extends BaseObject $ssl_url = str_replace('http://', 'https://', $url); // Fetch contact data from the contact table for the given user - $s = dba::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`, + $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); - $r = dba::inArray($s); + 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 (!DBM::is_result($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`, + 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); - $r = dba::inArray($s); + FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?", Strings::normaliseLink($url), $url, $ssl_url, $uid); + $r = DBA::toArray($s); } // Fetch the data from the contact table with "uid=0" (which is filled automatically) - if (!DBM::is_result($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`, + 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)); - $r = dba::inArray($s); + FROM `contact` WHERE `nurl` = ? AND `uid` = 0", Strings::normaliseLink($url)); + $r = DBA::toArray($s); } // Fetch the data from the contact table with "uid=0" (which is filled automatically) - checked with the alias - if (!DBM::is_result($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`, + 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); - $r = dba::inArray($s); + FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0", Strings::normaliseLink($url), $url, $ssl_url); + $r = DBA::toArray($s); } // Fetch the data from the gcontact table - if (!DBM::is_result($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`, + 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)); - $r = dba::inArray($s); + FROM `gcontact` WHERE `nurl` = ?", Strings::normaliseLink($url)); + $r = DBA::toArray($s); } - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { // If there is more than one entry we filter out the connector networks if (count($r) > 1) { foreach ($r as $id => $result) { - if ($result["network"] == NETWORK_STATUSNET) { + if ($result["network"] == Protocol::STATUSNET) { unset($r[$id]); } } @@ -452,7 +860,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); @@ -469,7 +877,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; @@ -496,17 +904,17 @@ class Contact extends BaseObject } if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0) - && in_array($profile["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]) + && in_array($profile["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]) ) { Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]); } // Show contact details of Diaspora contacts only if connected - if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == NETWORK_DIASPORA)) { + if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == Protocol::DIASPORA)) { $profile["location"] = ""; $profile["about"] = ""; $profile["gender"] = ""; - $profile["birthday"] = '0001-01-01'; + $profile["birthday"] = DBA::NULL_DATE; } $cache[$url][$uid] = $profile; @@ -523,11 +931,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 []; } @@ -539,29 +947,29 @@ 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", - dbesc($addr), + FROM `contact` WHERE `addr` = '%s' AND `uid` = %d AND NOT `deleted`", + DBA::escape($addr), intval($uid) ); // Fetch the data from the contact table with "uid=0" (which is filled automatically) - if (!DBM::is_result($r)) { + 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", - dbesc($addr) + FROM `contact` WHERE `addr` = '%s' AND `uid` = 0 AND NOT `deleted`", + DBA::escape($addr) ); } // Fetch the data from the gcontact table - if (!DBM::is_result($r)) { + 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` FROM `gcontact` WHERE `addr` = '%s'", - dbesc($addr) + DBA::escape($addr) ); } - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { $data = Probe::uri($addr); $profile = self::getDetailsByURL($data['url'], $uid); @@ -578,17 +986,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 = ''; @@ -605,25 +1010,16 @@ class Contact extends BaseObject } // Look for our own contact if the uid doesn't match and isn't public - $contact_own = dba::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]); - if (DBM::is_result($contact_own)) { + $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; } } $sparkle = false; - if (($contact['network'] === NETWORK_DFRN) && !$contact['self']) { + if (($contact['network'] === Protocol::DFRN) && !$contact['self']) { $sparkle = true; - $profile_link = System::baseUrl() . '/redir/' . $contact['id']; + $profile_link = System::baseUrl() . '/redir/' . $contact['id'] . '?url=' . $contact['url']; } else { $profile_link = $contact['url']; } @@ -633,45 +1029,55 @@ class Contact extends BaseObject } if ($sparkle) { - $status_link = $profile_link . '?url=status'; - $photos_link = $profile_link . '?url=photos'; - $profile_link = $profile_link . '?url=profile'; + $status_link = $profile_link . '?tab=status'; + $photos_link = str_replace('/profile/', '/photos/', $profile_link); + $profile_link = $profile_link . '?tab=profile'; } - if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA]) && !$contact['self']) { + if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) { $pm_url = System::baseUrl() . '/message/new/' . $contact['id']; } - if (($contact['network'] == NETWORK_DFRN) && !$contact['self']) { + if (($contact['network'] == Protocol::DFRN) && !$contact['self']) { $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 = []; @@ -690,11 +1096,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) { @@ -702,6 +1106,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 ( @@ -712,6 +1117,81 @@ class Contact extends BaseObject )", intval($uid), intval($uid)); } + /** + * Have a look at all contact tables for a given profile url. + * This function works as a replacement for probing the contact. + * + * @param string $url Contact URL + * + * @return array Contact array in the "probe" structure + */ + private static function getProbeDataFromDatabase($url) + { + // The link could be provided as http although we stored it as https + $ssl_url = str_replace('http://', 'https://', $url); + + $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', + 'photo', 'keywords', 'location', 'about', 'network', + 'priority', 'batch', 'request', 'confirm', 'poco']; + $data = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]); + + if (!DBA::isResult($data)) { + $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]]; + $data = DBA::selectFirst('contact', $fields, $condition); + } + + if (DBA::isResult($data)) { + // For security reasons we don't fetch key data from our users + $data["pubkey"] = ''; + return $data; + } + + $fields = ['url', 'addr', 'alias', 'notify', 'name', 'nick', + 'photo', 'keywords', 'location', 'about', 'network']; + $data = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]); + + if (!DBA::isResult($data)) { + $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]]; + $data = DBA::selectFirst('contact', $fields, $condition); + } + + if (DBA::isResult($data)) { + $data["pubkey"] = ''; + $data["poll"] = ''; + $data["priority"] = 0; + $data["batch"] = ''; + $data["request"] = ''; + $data["confirm"] = ''; + $data["poco"] = ''; + return $data; + } + + $data = ActivityPub::probeProfile($url, false); + if (!empty($data)) { + return $data; + } + + $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', + 'photo', 'network', 'priority', 'batch', 'request', 'confirm']; + $data = DBA::selectFirst('fcontact', $fields, ['url' => $url]); + + if (!DBA::isResult($data)) { + $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]]; + $data = DBA::selectFirst('contact', $fields, $condition); + } + + if (DBA::isResult($data)) { + $data["pubkey"] = ''; + $data["keywords"] = ''; + $data["location"] = ''; + $data["about"] = ''; + $data["poco"] = ''; + return $data; + } + + return []; + } + /** * @brief Fetch the contact id for a given URL and user * @@ -734,12 +1214,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; @@ -749,32 +1232,37 @@ 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', 'updated'], ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]); // Then the addr (nick@server.tld) - if (!DBM::is_result($contact)) { - $contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid]); + if (!DBA::isResult($contact)) { + $contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]); } // Then the alias (which could be anything) - if (!DBM::is_result($contact)) { + 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]; - $contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition); + $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid]; + $contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated'], $condition); } - if (DBM::is_result($contact)) { + if (DBA::isResult($contact)) { $contact_id = $contact["id"]; // Update the contact every 7 days - $update_contact = ($contact['avatar-date'] < DateTimeFormat::utc('now -7 days')); + $update_contact = ($contact['updated'] < 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; } + // Update the contact in the background if needed but it is called by the frontend + if ($update_contact && $no_update) { + Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id); + } + if (!$update_contact || $no_update) { return $contact_id; } @@ -783,64 +1271,52 @@ class Contact extends BaseObject return 0; } - $data = Probe::uri($url, "", $uid); - - // Last try in gcontact for unsupported networks - if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL, NETWORK_FEED])) { - if ($uid != 0) { - return 0; - } + // When we don't want to update, we look if we know this contact in any way + if ($no_update && empty($default)) { + $data = self::getProbeDataFromDatabase($url); + $background_update = true; + } else { + $data = []; + $background_update = false; + } - // Get data from the gcontact table - $fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network']; - $contact = dba::selectFirst('gcontact', $fields, ['nurl' => normalise_link($url)]); - if (!DBM::is_result($contact)) { - $contact = dba::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]); - } + if (empty($data)) { + $data = Probe::uri($url, "", $uid); - if (!DBM::is_result($contact)) { - $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', - 'photo', 'keywords', 'location', 'about', 'network', - 'priority', 'batch', 'request', 'confirm', 'poco']; - $contact = dba::selectFirst('contact', $fields, ['addr' => $url]); + // Ensure that there is a gserver entry + if (!empty($data['baseurl']) && ($data['network'] != Protocol::PHANTOM)) { + PortableContact::checkServer($data['baseurl']); } + } - if (!DBM::is_result($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]]; - $contact = dba::selectFirst('contact', $fields, $condition); + // Last try in gcontact for unsupported networks + if (!in_array($data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) { + if ($uid != 0) { + return 0; } - if (!DBM::is_result($contact)) { - $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick', - 'photo', 'network', 'priority', 'batch', 'request', 'confirm']; - $condition = ['url' => [$url, normalise_link($url), $ssl_url]]; - $contact = dba::selectFirst('fcontact', $fields, $condition); + $contact = array_merge(self::getProbeDataFromDatabase($url), $default); + if (empty($contact)) { + return 0; } - if (!empty($default)) { - $contact = $default; - } + $data = array_merge($data, $contact); + } - if (!DBM::is_result($contact)) { - return 0; - } else { - $data = array_merge($data, $contact); - } + if (empty($data)) { + return 0; } - 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"], @@ -853,7 +1329,7 @@ class Contact extends BaseObject 'about' => $data["about"], 'network' => $data["network"], 'pubkey' => $data["pubkey"], - 'rel' => CONTACT_IS_SHARING, + 'rel' => self::SHARING, 'priority' => $data["priority"], 'batch' => $data["batch"], 'request' => $data["request"], @@ -865,20 +1341,28 @@ class Contact extends BaseObject 'writable' => 1, 'blocked' => 0, 'readonly' => 0, - 'pending' => 0] - ); + 'pending' => 0]; - $s = dba::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]); - $contacts = dba::inArray($s); - if (!DBM::is_result($contacts)) { + $condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false]; + + 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; } $contact_id = $contacts[0]["id"]; + // Update in the background when we fetched the data solely from the database + if ($background_update) { + Worker::add(PRIORITY_LOW, "UpdateContact", $contact_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"])]); - if (DBM::is_result($gcontact)) { + $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'] != '') { unset($gcontact['keywords']); @@ -889,29 +1373,31 @@ class Contact extends BaseObject if ($data['about'] != '') { unset($gcontact['about']); } - dba::update('contact', $gcontact, ['id' => $contact_id]); + DBA::update('contact', $gcontact, ['id' => $contact_id]); } 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); } } self::updateAvatar($data["photo"], $uid, $contact_id); $fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey']; - $contact = dba::selectFirst('contact', $fields, ['id' => $contact_id]); + $contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]); // This condition should always be true - if (!DBM::is_result($contact)) { + if (!DBA::isResult($contact)) { return $contact_id; } $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']]; @@ -954,9 +1440,9 @@ class Contact extends BaseObject $updated['name-date'] = DateTimeFormat::utcNow(); } - $updated['avatar-date'] = DateTimeFormat::utcNow(); + $updated['updated'] = DateTimeFormat::utcNow(); - dba::update('contact', $updated, ['id' => $contact_id], $contact); + DBA::update('contact', $updated, ['id' => $contact_id], $contact); return $contact_id; } @@ -967,6 +1453,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) { @@ -974,10 +1461,15 @@ class Contact extends BaseObject return false; } - $blocked = dba::selectFirst('contact', ['blocked'], ['id' => $cid]); - if (!DBM::is_result($blocked)) { + $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']; } @@ -987,6 +1479,7 @@ class Contact extends BaseObject * @param int $cid contact id * * @return boolean Is the contact hidden? + * @throws \Exception */ public static function isHidden($cid) { @@ -994,8 +1487,8 @@ class Contact extends BaseObject return false; } - $hidden = dba::selectFirst('contact', ['hidden'], ['id' => $cid]); - if (!DBM::is_result($hidden)) { + $hidden = DBA::selectFirst('contact', ['hidden'], ['id' => $cid]); + if (!DBA::isResult($hidden)) { return false; } return (bool) $hidden['hidden']; @@ -1006,46 +1499,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'; + $cid = self::getIdForURL($contact_url); - // 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", - dbesc(normalise_link($contact_url)) - ); - - if (!DBM::is_result($r)) { + $contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]); + if (!DBA::isResult($contact)) { return ''; } - if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_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'); + + 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()]; + } - $contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id'); + $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()]]; + + if ($thread_mode) { + $r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params); - $items = Item::inArray($r); + $items = Item::inArray($r); - $o = conversation($a, $items, 'contact-posts', false); + $o = conversation($a, $items, $pager, 'contacts', $update, false, 'commented', local_user()); + } else { + $r = Item::selectForUser(local_user(), [], $condition, $params); + + $items = Item::inArray($r); - $o .= alt_pager($a, count($items)); + $o = conversation($a, $items, $pager, 'contact-posts', false); + } + + if (!$update) { + $o .= $pager->renderMinimal(count($items)); + } return $o; } @@ -1062,17 +1569,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 PAGE_COMMUNITY and PAGE_PRVGROUP. - // "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP. - if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY)) - || (isset($contact['page-flags']) && (intval($contact['page-flags']) == 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 = ACCOUNT_TYPE_COMMUNITY; + $type = self::TYPE_COMMUNITY; } else { - $type = 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. @@ -1085,15 +1592,18 @@ class Contact extends BaseObject } switch ($type) { - case ACCOUNT_TYPE_ORGANISATION: + case self::TYPE_ORGANISATION: $account_type = L10n::t("Organisation"); break; - case ACCOUNT_TYPE_NEWS: + + case self::TYPE_NEWS: $account_type = L10n::t('News'); break; - case ACCOUNT_TYPE_COMMUNITY: + + case self::TYPE_COMMUNITY: $account_type = L10n::t("Forum"); break; + default: $account_type = ""; break; @@ -1107,10 +1617,11 @@ class Contact extends BaseObject * * @param int $uid * @return bool + * @throws \Exception */ public static function block($uid) { - $return = dba::update('contact', ['blocked' => true], ['id' => $uid]); + $return = DBA::update('contact', ['blocked' => true], ['id' => $uid]); return $return; } @@ -1120,10 +1631,11 @@ class Contact extends BaseObject * * @param int $uid * @return bool + * @throws \Exception */ public static function unblock($uid) { - $return = dba::update('contact', ['blocked' => false], ['id' => $uid]); + $return = DBA::update('contact', ['blocked' => false], ['id' => $uid]); return $return; } @@ -1137,11 +1649,13 @@ 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) { - $contact = dba::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]); - if (!DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]); + if (!DBA::isResult($contact)) { return false; } else { $data = [$contact["photo"], $contact["thumb"], $contact["micro"]]; @@ -1151,7 +1665,7 @@ class Contact extends BaseObject $photos = Photo::importProfilePhoto($avatar, $uid, $cid, true); if ($photos) { - dba::update( + DBA::update( 'contact', ['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()], ['id' => $cid] @@ -1159,8 +1673,8 @@ class Contact extends BaseObject // Update the public contact (contact id = 0) if ($uid != 0) { - $pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]); - if (DBM::is_result($pcontact)) { + $pcontact = DBA::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]); + if (DBA::isResult($pcontact)) { self::updateAvatar($avatar, 0, $pcontact['id'], $force); } } @@ -1173,26 +1687,37 @@ class Contact extends BaseObject } /** - * @param integer $id contact id + * @param integer $id contact id + * @param string $network Optional network we are probing for + * @param boolean $force Optional forcing of network probing (otherwise we use the cached data) * @return boolean + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - public static function updateFromProbe($id) + public static function updateFromProbe($id, $network = '', $force = false) { /* Warning: Never ever fetch the public key via Probe::uri and write it into the contacts. This will reliably kill your communication with Friendica contacts. */ - $fields = ['url', 'nurl', 'addr', 'alias', 'batch', 'notify', 'poll', 'poco', 'network']; - $contact = dba::selectFirst('contact', $fields, ['id' => $id]); - if (!DBM::is_result($contact)) { + $fields = ['avatar', 'uid', 'name', 'nick', 'url', 'addr', 'batch', 'notify', + 'poll', 'request', 'confirm', 'poco', 'network', 'alias']; + $contact = DBA::selectFirst('contact', $fields, ['id' => $id]); + if (!DBA::isResult($contact)) { return false; } - $ret = Probe::uri($contact["url"]); + $uid = $contact['uid']; + unset($contact['uid']); - // If Probe::uri fails the network code will be different - if ($ret["network"] != $contact["network"]) { + $contact['photo'] = $contact['avatar']; + unset($contact['avatar']); + + $ret = Probe::uri($contact['url'], $network, $uid, !$force); + + // If Probe::uri fails the network code will be different (mostly "feed" or "unkn") + if ((in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM])) && ($ret['network'] != $contact['network'])) { return false; } @@ -1200,11 +1725,11 @@ class Contact extends BaseObject // make sure to not overwrite existing values with blank entries foreach ($ret as $key => $val) { - if (isset($contact[$key]) && ($contact[$key] != "") && ($val == "")) { + if (!isset($contact[$key])) { + unset($ret[$key]); + } elseif (($contact[$key] != '') && ($val == '')) { $ret[$key] = $contact[$key]; - } - - if (isset($contact[$key]) && ($ret[$key] != $contact[$key])) { + } elseif ($ret[$key] != $contact[$key]) { $update = true; } } @@ -1213,19 +1738,13 @@ class Contact extends BaseObject return true; } - 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'] - ], - ['id' => $id] - ); + $ret['nurl'] = Strings::normaliseLink($ret['url']); + $ret['updated'] = DateTimeFormat::utcNow(); + + self::updateAvatar($ret['photo'], $uid, $id, true); + + unset($ret['photo']); + DBA::update('contact', $ret, ['id' => $id]); // Update the corresponding gcontact entry PortableContact::lastUpdated($ret["url"]); @@ -1249,13 +1768,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); @@ -1277,21 +1798,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; } @@ -1299,55 +1820,46 @@ 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), - dbesc($ret['poll']), - dbesc(normalise_link($ret['poll'])), - dbesc($ret['network']) - ); - - if (!DBM::is_result($r)) { - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' AND NOT `pending` LIMIT 1", - intval($uid), - dbesc(normalise_link($url)), - dbesc($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'] === NETWORK_DFRN) && !DBM::is_result($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'] != NETWORK_DFRN)) { + } 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; } // This extra param just confuses things, remove it - if ($ret['network'] === NETWORK_DIASPORA) { + if ($ret['network'] === Protocol::DIASPORA) { $ret['url'] = str_replace('?absolute=true', '', $ret['url']); } // 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) { @@ -1357,7 +1869,7 @@ class Contact extends BaseObject return $result; } - if ($ret['network'] === NETWORK_OSTATUS && Config::get('system', 'ostatus_disabled')) { + if ($ret['network'] === 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; $ret['notify'] = ''; } @@ -1366,31 +1878,33 @@ class Contact extends BaseObject $result['message'] .= L10n::t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL; } - $writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0); + $writeable = ((($ret['network'] === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0); + + $subhub = (($ret['network'] === Protocol::OSTATUS) ? true : false); - $subhub = (($ret['network'] === NETWORK_OSTATUS) ? true : false); + $hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0); - $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0); + $pending = in_array($ret['network'], [Protocol::ACTIVITYPUB]); - if (in_array($ret['network'], [NETWORK_MAIL, NETWORK_DIASPORA])) { + if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) { $writeable = 1; } - if (DBM::is_result($r)) { + if (DBA::isResult($contact)) { // update contact - $new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_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'], [NETWORK_MAIL])) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING); + $new_relation = (in_array($ret['network'], [Protocol::MAIL]) ? self::FRIEND : self::SHARING); // create contact record - dba::insert('contact', [ + 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'], @@ -1407,13 +1921,13 @@ class Contact extends BaseObject 'hidden' => $hidden, 'blocked' => 0, 'readonly'=> 0, - 'pending' => 0, + 'pending' => $pending, 'subhub' => $subhub ]); } - $contact = dba::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]); - if (!DBM::is_result($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; return $result; } @@ -1430,24 +1944,37 @@ 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 (DBM::is_result($r)) { - if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) { + if (DBA::isResult($owner)) { + if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) { // create a follow slap $item = []; $item['verb'] = ACTIVITY_FOLLOW; $item['follow'] = $contact["url"]; - $slap = OStatus::salmon($item, $r[0]); + $item['body'] = ''; + $item['title'] = ''; + $item['guid'] = ''; + $item['tag'] = ''; + $item['attach'] = ''; + + $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'] == NETWORK_DIASPORA) { + } 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); } } @@ -1455,7 +1982,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:')) { @@ -1482,58 +2018,66 @@ class Contact extends BaseObject $fields = ['url' => $contact['url'], 'request' => $contact['request'], 'notify' => $contact['notify'], 'poll' => $contact['poll'], 'confirm' => $contact['confirm'], 'poco' => $contact['poco']]; - dba::update('contact', $fields, ['id' => $contact['id']]); + DBA::update('contact', $fields, ['id' => $contact['id']]); } return $contact; } - public static function addRelationship($importer, $contact, $datarray, $item, $sharing = false) { - $url = notags(trim($datarray['author-link'])); - $name = notags(trim($datarray['author-name'])); - $photo = notags(trim($datarray['author-avatar'])); - $nick = ''; + public static function addRelationship($importer, $contact, $datarray, $item = '', $sharing = false) { + // Should always be set + if (empty($datarray['author-id'])) { + return; + } - if (is_object($item)) { - $rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor'); - if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) { - $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']; - } - } else { - $nick = $item; + $fields = ['url', 'name', 'nick', 'photo', 'network']; + $pub_contact = DBA::selectFirst('contact', $fields, ['id' => $datarray['author-id']]); + if (!DBA::isResult($pub_contact)) { + // Should never happen + return; } + $url = defaults($datarray, 'author-link', $pub_contact['url']); + $name = $pub_contact['name']; + $photo = $pub_contact['photo']; + $nick = $pub_contact['nick']; + $network = $pub_contact['network']; + if (is_array($contact)) { - if (($contact['rel'] == CONTACT_IS_SHARING) - || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) { - dba::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true], + if (($contact['rel'] == self::SHARING) + || ($sharing && $contact['rel'] == self::FOLLOWER)) { + 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`) VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)", intval($importer['uid']), - dbesc(DateTimeFormat::utcNow()), - dbesc($url), - dbesc(normalise_link($url)), - dbesc($name), - dbesc($nick), - dbesc($photo), - dbesc(NETWORK_OSTATUS), - intval(CONTACT_IS_FOLLOWER) + DBA::escape(DateTimeFormat::utcNow()), + DBA::escape($url), + DBA::escape(Strings::normaliseLink($url)), + DBA::escape($name), + DBA::escape($nick), + DBA::escape($photo), + DBA::escape($network), + intval(self::FOLLOWER) ); $contact_record = [ - 'id' => dba::lastInsertId(), - 'network' => NETWORK_OSTATUS, + 'id' => DBA::lastInsertId(), + 'network' => $network, 'name' => $name, 'url' => $url, 'photo' => $photo @@ -1543,13 +2087,13 @@ 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 (DBM::is_result($user) && !in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) { + $user = DBA::selectFirst('user', $fields, ['uid' => $importer['uid']]); + 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'], + DBA::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'], 'blocked' => false, 'knowyou' => false, 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow()]); } @@ -1557,7 +2101,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'], [PAGE_NORMAL])) { + in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) { notification([ 'type' => NOTIFY_INTRO, @@ -1566,7 +2110,7 @@ class Contact extends BaseObject 'to_name' => $user['username'], 'to_email' => $user['email'], 'uid' => $user['uid'], - 'link' => System::baseUrl() . '/notifications/intro', + 'link' => System::baseUrl() . '/notifications/intro', 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')), 'source_link' => $contact_record['url'], 'source_photo' => $contact_record['photo'], @@ -1575,28 +2119,32 @@ class Contact extends BaseObject ]); } - } elseif (DBM::is_result($user) && in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) { - q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1", - intval($importer['uid']), - dbesc($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']); + } } } } - public static function removeFollower($importer, $contact, array $datarray = [], $item = "") { - - if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) { - dba::update('contact', ['rel' => CONTACT_IS_SHARING], ['id' => $contact['id']]); + public static function removeFollower($importer, $contact, array $datarray = [], $item = "") + { + if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::SHARING)) { + DBA::update('contact', ['rel' => self::SHARING], ['id' => $contact['id']]); } else { Contact::remove($contact['id']); } } - public static function removeSharer($importer, $contact, array $datarray = [], $item = "") { - - if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) { - dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]); + public static function removeSharer($importer, $contact, array $datarray = [], $item = "") + { + if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::FOLLOWER)) { + DBA::update('contact', ['rel' => self::FOLLOWER], ['id' => $contact['id']]); } else { Contact::remove($contact['id']); } @@ -1609,46 +2157,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 (DBM::is_result($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']), dbesc(DateTimeFormat::utc($nextbd)), dbesc('birthday')); - - if (DBM::is_result($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']), - dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utc($nextbd)), - dbesc(DateTimeFormat::utc($nextbd . ' + 1 day ')), dbesc($bdtext), dbesc($bdtext2), dbesc('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", dbesc(substr($nextbd, 0, 4)), - dbesc($nextbd), intval($rr['uid']), intval($rr['id']) + DBA::update( + 'contact', + ['bdyear' => substr($nextbd, 0, 4), 'bd' => $nextbd], + ['id' => $contact['id']] ); } } @@ -1658,6 +2193,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) { @@ -1665,16 +2201,16 @@ class Contact extends BaseObject return; } - $str = dbesc(implode(',', $contact_ids)); + $str = DBA::escape(implode(',', $contact_ids)); - $stmt = dba::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0"); + $stmt = DBA::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0"); $return = []; - while($contact = dba::fetch($stmt)) { + while($contact = DBA::fetch($stmt)) { $return[] = $contact['id']; } - dba::close($stmt); + DBA::close($stmt); $contact_ids = $return; } @@ -1682,13 +2218,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; @@ -1701,28 +2245,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]); + $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]); - return self::magicLinkbyContact($contact, $url); - } + 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 = '') + public static function magicLinkByContact($contact, $url = '') { - if ($contact['network'] != NETWORK_DFRN) { + if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) { return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url']; } @@ -1742,5 +2290,37 @@ class Contact extends BaseObject } return $redirect; - } + } + + /** + * Remove a contact from all groups + * + * @param integer $contact_id + * + * @return boolean Success + */ + public static function removeFromGroups($contact_id) + { + return DBA::delete('group_member', ['contact-id' => $contact_id]); + } + + /** + * Is the contact a forum? + * + * @param integer $contactid ID of the contact + * + * @return boolean "true" if it is a forum + */ + public static function isForum($contactid) + { + $fields = ['forum', 'prv']; + $condition = ['id' => $contactid]; + $contact = DBA::selectFirst('contact', $fields, $condition); + if (!DBA::isResult($contact)) { + return false; + } + + // Is it a forum? + return ($contact['forum'] || $contact['prv']); + } }