}
/**
- * @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]);
}
/**
if (empty($contact['network'])) {
return;
}
- if (($contact['network'] == Protocol::DFRN) && $dissolve) {
+
+ $protocol = $contact['network'];
+ if (($protocol == Protocol::DFRN) && !self::isLegacyDFRNContact($contact)) {
+ $protocol = Protocol::ACTIVITYPUB;
+ }
+
+ if (($protocol == Protocol::DFRN) && $dissolve) {
DFRN::deliver($user, $contact, 'placeholder', true);
- } elseif (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
+ } elseif (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
// create an unfollow slap
$item = [];
$item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
if (!empty($contact['notify'])) {
Salmon::slapper($user, $contact['notify'], $slap);
}
- } elseif ($contact['network'] == Protocol::DIASPORA) {
+ } elseif ($protocol == Protocol::DIASPORA) {
Diaspora::sendUnshare($user, $contact);
- } elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
+ } elseif ($protocol == Protocol::ACTIVITYPUB) {
ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $user['uid']);
if ($dissolve) {
// 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]);
}
}
$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'];
}
// 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',
+ $fields = ['id', 'uid', 'url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
'photo', 'keywords', 'location', 'about', 'network',
'priority', 'batch', 'request', 'confirm', 'poco'];
/**
* @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;
}
/**
* @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;
}
return true;
}
+ /**
+ * Detects if a given contact array belongs to a legacy DFRN connection
+ *
+ * @param array $contact
+ * @return boolean
+ */
+ public static function isLegacyDFRNContact($contact)
+ {
+ // Newer Friendica contacts are connected via AP, then these fields aren't set
+ return !empty($contact['dfrn-id']) || !empty($contact['issued-id']);
+ }
+
+ /**
+ * Detects the communication protocol for a given contact url.
+ * This is used to detect Friendica contacts that we can communicate via AP.
+ *
+ * @param string $url contact url
+ * @param string $network Network of that contact
+ * @return string with protocol
+ */
+ public static function getProtocol($url, $network)
+ {
+ if ($network != Protocol::DFRN) {
+ return $network;
+ }
+
+ $apcontact = APContact::getByURL($url);
+ if (!empty($apcontact) && !empty($apcontact['generator'])) {
+ return Protocol::ACTIVITYPUB;
+ } else {
+ return $network;
+ }
+ }
+
/**
* Takes a $uid and a url/handle and adds a new contact
* Currently if the contact is DFRN, interactive needs to be true, to redirect to the
$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
}
- if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($contact)) {
+ $protocol = self::getProtocol($url, $ret['network']);
+
+ if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) {
if ($interactive) {
if (strlen($a->getURLPath())) {
$myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
}
// This extra param just confuses things, remove it
- if ($ret['network'] === Protocol::DIASPORA) {
+ if ($protocol === Protocol::DIASPORA) {
$ret['url'] = str_replace('?absolute=true', '', $ret['url']);
}
return $result;
}
- if ($ret['network'] === Protocol::OSTATUS && Config::get('system', 'ostatus_disabled')) {
+ if ($protocol === Protocol::OSTATUS && Config::get('system', 'ostatus_disabled')) {
$result['message'] .= L10n::t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
$ret['notify'] = '';
}
$result['message'] .= L10n::t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
}
- $writeable = ((($ret['network'] === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0);
+ $writeable = ((($protocol === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0);
- $subhub = (($ret['network'] === Protocol::OSTATUS) ? true : false);
+ $subhub = (($protocol === Protocol::OSTATUS) ? true : false);
- $hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0);
+ $hidden = (($protocol === Protocol::MAIL) ? 1 : 0);
- $pending = in_array($ret['network'], [Protocol::ACTIVITYPUB]);
+ $pending = in_array($protocol, [Protocol::ACTIVITYPUB]);
- if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
+ if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
$writeable = 1;
}
$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
DBA::update('contact', $fields, ['id' => $contact['id']]);
} else {
- $new_relation = (in_array($ret['network'], [Protocol::MAIL]) ? self::FRIEND : self::SHARING);
+ $new_relation = (in_array($protocol, [Protocol::MAIL]) ? self::FRIEND : self::SHARING);
// create contact record
DBA::insert('contact', [
'name' => $ret['name'],
'nick' => $ret['nick'],
'network' => $ret['network'],
+ 'protocol' => $protocol,
'pubkey' => $ret['pubkey'],
'rel' => $new_relation,
'priority'=> $ret['priority'],
$owner = User::getOwnerDataById($uid);
if (DBA::isResult($owner)) {
- if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
+ if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
// create a follow slap
$item = [];
$item['verb'] = ACTIVITY_FOLLOW;
if (!empty($contact['notify'])) {
Salmon::slapper($owner, $contact['notify'], $slap);
}
- } elseif ($contact['network'] == Protocol::DIASPORA) {
+ } elseif ($protocol == Protocol::DIASPORA) {
$ret = Diaspora::sendShare($a->user, $contact);
Logger::log('share returns: ' . $ret);
- } elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
+ } elseif ($protocol == Protocol::ACTIVITYPUB) {
$activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id);
if (empty($activity_id)) {
// This really should never happen
return $contact;
}
- public static function addRelationship($importer, $contact, $datarray, $item = '', $sharing = false) {
+ /**
+ * @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']);
$nick = $pub_contact['nick'];
$network = $pub_contact['network'];
- if (is_array($contact)) {
+ if (!empty($contact)) {
+ // Contact is blocked at user-level
+ if (!empty($contact['id']) && !empty($importer['id']) &&
+ self::isBlockedByUser($contact['id'], $importer['id'])) {
+ return false;
+ }
+
+ // Make sure that the existing contact isn't archived
+ self::unmarkForArchival($contact);
+
if (($contact['rel'] == self::SHARING)
|| ($sharing && $contact['rel'] == self::FOLLOWER)) {
- DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true],
+ DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true, 'pending' => false],
['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?
+ return true;
} else {
+ // 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(),
if (is_array($contact_record)) {
DBA::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
- 'blocked' => false, 'knowyou' => false,
+ 'blocked' => false, 'knowyou' => false, 'note' => $note,
'hash' => $hash, 'datetime' => DateTimeFormat::utcNow()]);
}
'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']]);
-
- if ($contact['network'] == 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 = "")
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);
}
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 != '') {
// 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;
+ }
}