X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact.php;h=73118be0d04e92807f99e06bb2e1fc09551afbd8;hb=3aebb92cf3e9248dc4c6871b1f43cc02bdf28bfe;hp=a0e746f511514248e7a2de6c15dacfd80ddc2595;hpb=14d8c12130672bae9ff2e86dd9d7cf669b743939;p=friendica.git diff --git a/src/Model/Contact.php b/src/Model/Contact.php index a0e746f511..73118be0d0 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -125,13 +125,28 @@ class Contact extends BaseObject } /** - * @param integer $id + * @param array $fields Array of selected fields, empty for all + * @param array $condition Array of fields for condition + * @param array $params Array of several parameters + * @return array + * @throws \Exception + */ + public static function selectFirst(array $fields = [], array $condition = [], array $params = []) + { + $contact = DBA::selectFirst('contact', $fields, $condition, $params); + + return $contact; + } + + /** + * @param integer $id Contact ID + * @param array $fields Array of selected fields, empty for all * @return array|boolean Contact record if it exists, false otherwise * @throws \Exception */ - public static function getById($id) + public static function getById($id, $fields = []) { - return DBA::selectFirst('contact', [], ['id' => $id]); + return DBA::selectFirst('contact', $fields, ['id' => $id]); } /** @@ -893,7 +908,7 @@ class Contact extends BaseObject // 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"] == Protocol::STATUSNET) { + if (!in_array($result["network"], Protocol::NATIVE_SUPPORT)) { unset($r[$id]); } } @@ -1077,7 +1092,7 @@ class Contact extends BaseObject $profile_link = $profile_link . '?tab=profile'; } - if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) { + if (self::canReceivePrivateMessages($contact)) { $pm_url = System::baseUrl() . '/message/new/' . $contact['id']; } @@ -1669,13 +1684,13 @@ class Contact extends BaseObject /** * @brief Blocks a contact * - * @param int $uid + * @param int $cid * @return bool * @throws \Exception */ - public static function block($uid) + public static function block($cid, $reason = null) { - $return = DBA::update('contact', ['blocked' => true], ['id' => $uid]); + $return = DBA::update('contact', ['blocked' => true, 'block_reason' => $reason], ['id' => $cid]); return $return; } @@ -1683,13 +1698,13 @@ class Contact extends BaseObject /** * @brief Unblocks a contact * - * @param int $uid + * @param int $cid * @return bool * @throws \Exception */ - public static function unblock($uid) + public static function unblock($cid) { - $return = DBA::update('contact', ['blocked' => false], ['id' => $uid]); + $return = DBA::update('contact', ['blocked' => false, 'block_reason' => null], ['id' => $cid]); return $return; } @@ -2119,17 +2134,33 @@ class Contact extends BaseObject return $contact; } - public static function addRelationship($importer, $contact, $datarray, $item = '', $sharing = false, $note = '') { + /** + * @param array $importer Owner (local user) data + * @param array $contact Existing owner-specific contact data we want to expand the relationship with. Optional. + * @param array $datarray An item-like array with at least the 'author-id' and 'author-url' keys for the contact. Mandatory. + * @param bool $sharing True: Contact is now sharing with Owner; False: Contact is now following Owner (default) + * @param string $note Introduction additional message + * @return bool|null True: follow request is accepted; False: relationship is rejected; Null: relationship is pending + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + public static function addRelationship(array $importer, array $contact, array $datarray, $sharing = false, $note = '') + { // Should always be set if (empty($datarray['author-id'])) { - return; + return false; } - $fields = ['url', 'name', 'nick', 'photo', 'network']; + $fields = ['url', 'name', 'nick', 'photo', 'network', 'blocked']; $pub_contact = DBA::selectFirst('contact', $fields, ['id' => $datarray['author-id']]); if (!DBA::isResult($pub_contact)) { // Should never happen - return; + return false; + } + + // Contact is blocked at node-level + if (self::isBlocked($datarray['author-id'])) { + return false; } $url = defaults($datarray, 'author-link', $pub_contact['url']); @@ -2138,44 +2169,45 @@ class Contact extends BaseObject $nick = $pub_contact['nick']; $network = $pub_contact['network']; - if (is_array($contact)) { + if (!empty($contact)) { + // Contact is blocked at user-level + if (self::isBlockedByUser($contact['id'], $importer['id'])) { + return false; + } + // Make sure that the existing contact isn't archived self::unmarkForArchival($contact); - $protocol = self::getProtocol($url, $contact['network']); - if (($contact['rel'] == self::SHARING) || ($sharing && $contact['rel'] == self::FOLLOWER)) { DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true, 'pending' => false], ['id' => $contact['id'], 'uid' => $importer['uid']]); } - if ($protocol == Protocol::ACTIVITYPUB) { - ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']); - } - - // send email notification to owner? + return true; } else { - $protocol = self::getProtocol($url, $network); - + // send email notification to owner? if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($url), 'uid' => $importer['uid'], 'pending' => true])) { Logger::log('ignoring duplicated connection request from pending contact ' . $url); - return; + return null; } + // 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']), - 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) - ); + DBA::insert('contact', [ + 'uid' => $importer['uid'], + 'created' => DateTimeFormat::utcNow(), + 'url' => $url, + 'nurl' => Strings::normaliseLink($url), + 'name' => $name, + 'nick' => $nick, + 'photo' => $photo, + 'network' => $network, + 'rel' => self::FOLLOWER, + 'blocked' => 0, + 'readonly' => 0, + 'pending' => 1, + 'writable' => 1, + ]); $contact_record = [ 'id' => DBA::lastInsertId(), @@ -2219,20 +2251,16 @@ class Contact extends BaseObject 'verb' => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW), 'otype' => 'intro' ]); - } } 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']]); - $protocol = self::getProtocol($contact['url'], $contact['network']); - - if ($protocol == Protocol::ACTIVITYPUB) { - ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']); - } + return true; } } + + return null; } public static function removeFollower($importer, $contact, array $datarray = [], $item = "") @@ -2341,6 +2369,9 @@ class Contact extends BaseObject return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url; } + // Prevents endless loop in case only a non-public contact exists for the contact URL + unset($data['uid']); + return self::magicLinkByContact($data, $contact_url); } @@ -2373,10 +2404,6 @@ class Contact extends BaseObject */ public static function magicLinkByContact($contact, $url = '') { - if (empty($contact['id']) || empty($contact['uid'])) { - return $url ?: $contact['url']; - } - if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) { return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url']; } @@ -2386,10 +2413,14 @@ class Contact extends BaseObject return $url; } - if ($contact['uid'] != 0) { + if (!empty($contact['uid'])) { return self::magicLink($contact['url'], $url); } + if (empty($contact['id'])) { + return $url ?: $contact['url']; + } + $redirect = 'redir/' . $contact['id']; if ($url != '') { @@ -2430,4 +2461,18 @@ class Contact extends BaseObject // Is it a forum? return ($contact['forum'] || $contact['prv']); } + + /** + * Can the remote contact receive private messages? + * + * @param array $contact + * @return bool + */ + public static function canReceivePrivateMessages(array $contact) + { + $protocol = $contact['network'] ?? $contact['protocol'] ?? Protocol::PHANTOM; + $self = $contact['self'] ?? false; + + return in_array($protocol, [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB]) && !$self; + } }