use Friendica\Protocol\OStatus;
use Friendica\Protocol\PortableContact;
use Friendica\Protocol\Salmon;
+use Friendica\Util\BaseURL;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
* @}
*/
+ /**
+ * @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 select(array $fields = [], array $condition = [], array $params = [])
+ {
+ $statement = DBA::select('contact', $fields, $condition, $params);
+
+ return DBA::toArray($statement);
+ }
+
/**
* @param integer $id
* @return array|boolean Contact record if it exists, false otherwise
return ['public' => $pcid, 'user' => $ucid];
}
+ /**
+ * Returns contact details for a given contact id in combination with a user id
+ *
+ * @param int $cid A contact ID
+ * @param int $uid The User ID
+ * @param array $fields The selected fields for the contact
+ *
+ * @return array The contact details
+ *
+ * @throws \Exception
+ */
+ public static function getContactForUser($cid, $uid, array $fields = [])
+ {
+ $contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => $uid]);
+
+ if (!DBA::isResult($contact)) {
+ return [];
+ } else {
+ return $contact;
+ }
+ }
+
/**
* @brief Block contact id for user 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) {
*
* @return array Contact array in the "probe" structure
*/
- private static function getProbeDataFromDatabase($url, $cid)
+ private static function getProbeDataFromDatabase($url, $cid = null)
{
// The link could be provided as http although we stored it as https
$ssl_url = str_replace('http://', 'https://', $url);
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
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:')) {
+ if ((intval($new_policy) == BaseURL::SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
$ssl_changed = true;
$contact['url'] = str_replace('https:', 'http:', $contact['url']);
$contact['request'] = str_replace('https:', 'http:', $contact['request']);
$contact['poco'] = str_replace('https:', 'http:', $contact['poco']);
}
- if ((intval($new_policy) == SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'], 'http:')) {
+ if ((intval($new_policy) == BaseURL::SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'], 'http:')) {
$ssl_changed = true;
$contact['url'] = str_replace('http:', 'https:', $contact['url']);
$contact['request'] = str_replace('http:', 'https:', $contact['request']);
return $contact;
}
- public static function addRelationship($importer, $contact, $datarray, $item = '', $sharing = false) {
+ public static function addRelationship($importer, $contact, $datarray, $item = '', $sharing = false, $note = '') {
// Should always be set
if (empty($datarray['author-id'])) {
return;
$network = $pub_contact['network'];
if (is_array($contact)) {
+ // 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],
+ DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true, 'pending' => false],
['id' => $contact['id'], 'uid' => $importer['uid']]);
}
- if ($contact['network'] == Protocol::ACTIVITYPUB) {
+ if ($protocol == Protocol::ACTIVITYPUB) {
ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']);
}
// send email notification to owner?
} else {
+ $protocol = self::getProtocol($url, $network);
+
if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($url), 'uid' => $importer['uid'], 'pending' => true])) {
Logger::log('ignoring duplicated connection request from pending contact ' . $url);
return;
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()]);
}
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 ($contact['network'] == Protocol::ACTIVITYPUB) {
+ if ($protocol == Protocol::ACTIVITYPUB) {
ActivityPub\Transmitter::sendContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']);
}
}
return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
}
- $cid = self::getIdForURL($contact_url, 0, true);
- if (empty($cid)) {
+ $data = self::getProbeDataFromDatabase($contact_url);
+ if (empty($data)) {
return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
}
- return self::magicLinkbyId($cid, $url);
+ return self::magicLinkByContact($data, $contact_url);
}
/**
projects / friendica.git / blobdiff