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;
* @deprecated since version 2019.03
* @see User::PAGE_FLAGS_NORMAL
*/
- const PAGE_NORMAL = 0;
- const PAGE_SOAPBOX = 1;
- const PAGE_COMMUNITY = 2;
- const PAGE_FREELOVE = 3;
- const PAGE_BLOG = 4;
- const PAGE_PRVGROUP = 5;
const PAGE_NORMAL = User::PAGE_FLAGS_NORMAL;
/**
* @deprecated since version 2019.03
*/
/**
- * @name account types
+ * Account types
*
- * ACCOUNT_TYPE_PERSON - the account belongs to a person
+ * 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
*
- * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation
+ * TYPE_ORGANISATION - the account belongs to an organisation
* Associated page type: PAGE_SOAPBOX
*
- * ACCOUNT_TYPE_NEWS - the account is a news reflector
+ * TYPE_NEWS - the account is a news reflector
* Associated page type: PAGE_SOAPBOX
*
- * ACCOUNT_TYPE_COMMUNITY - the account is community forum
+ * TYPE_COMMUNITY - the account is community forum
* Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
*
- * ACCOUNT_TYPE_RELAY - the account is a relay
+ * TYPE_RELAY - the account is a relay
* This will only be assigned to contacts, not to user accounts
* @{
*/
- const ACCOUNT_TYPE_PERSON = 0;
- const ACCOUNT_TYPE_ORGANISATION = 1;
- const ACCOUNT_TYPE_NEWS = 2;
- const ACCOUNT_TYPE_COMMUNITY = 3;
- const ACCOUNT_TYPE_RELAY = 4;
+ const TYPE_UNKNOWN = -1;
+ const TYPE_PERSON = User::ACCOUNT_TYPE_PERSON;
+ const TYPE_ORGANISATION = User::ACCOUNT_TYPE_ORGANISATION;
+ const TYPE_NEWS = User::ACCOUNT_TYPE_NEWS;
+ const TYPE_COMMUNITY = User::ACCOUNT_TYPE_COMMUNITY;
+ const TYPE_RELAY = User::ACCOUNT_TYPE_RELAY;
/**
* @}
*/
* @}
*/
+ /**
+ * @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
+ * @throws \Exception
+ */
+ public static function getById($id)
+ {
+ return DBA::selectFirst('contact', [], ['id' => $id]);
+ }
+
/**
* @brief Tests if the given contact is a follower
*
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
*
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
*
}
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);
+ }
}
/**
}
if ($update) {
- $fields['name-date'] = DateTimeFormat::utcNow();
+ 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', ['archive' => true, 'network' => Protocol::PHANTOM, 'deleted' => true], ['id' => $id]);
// Delete it in the background
- Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
+ Worker::add(PRIORITY_MEDIUM, 'RemoveContact', $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 (!isset($contact['url']) && !empty($contact['id'])) {
$fields = ['id', 'url', 'archive', 'self', 'term-date'];
- $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+ $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]);
if (!DBA::isResult($contact)) {
return;
}
if (!isset($contact['url']) && !empty($contact['id'])) {
$fields = ['id', 'url', 'batch'];
- $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+ $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]);
if (!DBA::isResult($contact)) {
return;
}
DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url'])]);
if (!empty($contact['batch'])) {
- $condition = ['batch' => $contact['batch'], 'contact-type' => self::ACCOUNT_TYPE_RELAY];
+ $condition = ['batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
DBA::update('contact', $fields, $condition);
}
}
$sparkle = false;
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'];
}
}
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'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) {
)", 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
+ * @param integer $cid Contact ID
+ *
+ * @return array Contact array in the "probe" structure
+ */
+ 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);
+
+ $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
+ 'photo', 'keywords', 'location', 'about', 'network',
+ 'priority', 'batch', 'request', 'confirm', 'poco'];
+
+ if (!empty($cid)) {
+ $data = DBA::selectFirst('contact', $fields, ['id' => $cid]);
+ if (DBA::isResult($data)) {
+ return $data;
+ }
+ }
+
+ $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
*
/// @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' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]);
+ $contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated', 'network'], ['nurl' => Strings::normaliseLink($url), 'uid' => $uid, 'deleted' => false]);
// Then the addr (nick@server.tld)
if (!DBA::isResult($contact)) {
- $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]);
+ $contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated', 'network'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]);
}
// Then the alias (which could be anything)
// 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` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, $uid];
- $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
+ $contact = DBA::selectFirst('contact', ['id', 'avatar', 'updated', 'network'], $condition);
}
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 (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 && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+ Worker::add(PRIORITY_LOW, "UpdateContact", $contact_id);
+ }
+
if (!$update_contact || $no_update) {
return $contact_id;
}
return 0;
}
- // When we don't want to update, we look if some of our users already know this contact
- if ($no_update) {
- $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)) {
- // For security reasons we don't fetch key data from our users
- $data["pubkey"] = '';
- }
+ // 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, $contact_id);
+ $background_update = true;
} else {
$data = [];
+ $background_update = false;
}
if (empty($data)) {
return 0;
}
- // Get data from the gcontact table
- $fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'];
- $contact = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]);
- if (!DBA::isResult($contact)) {
- $contact = DBA::selectFirst('contact', $fields, ['nurl' => Strings::normaliseLink($url)]);
- }
-
- if (!DBA::isResult($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]);
- }
-
- if (!DBA::isResult($contact)) {
- // The link could be provided as http although we stored it as https
- $ssl_url = str_replace('http://', 'https://', $url);
- $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
- $contact = DBA::selectFirst('contact', $fields, $condition);
- }
-
- if (!DBA::isResult($contact)) {
- $fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
- 'photo', 'network', 'priority', 'batch', 'request', 'confirm'];
- $condition = ['url' => [$url, Strings::normaliseLink($url), $ssl_url]];
- $contact = DBA::selectFirst('fcontact', $fields, $condition);
+ $contact = array_merge(self::getProbeDataFromDatabase($url, $contact_id), $default);
+ if (empty($contact)) {
+ return 0;
}
- if (!empty($default)) {
- $contact = $default;
- }
+ $data = array_merge($data, $contact);
+ }
- if (!DBA::isResult($contact)) {
- return 0;
- } else {
- $data = array_merge($data, $contact);
- }
+ if (empty($data)) {
+ return 0;
}
- if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url) && !$in_loop) {
+ if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $url) && !$in_loop) {
$contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
}
$fields = [
'uid' => $uid,
'created' => DateTimeFormat::utcNow(),
- 'url' => $data["url"],
- 'nurl' => Strings::normaliseLink($data["url"]),
- 'addr' => $data["addr"],
- 'alias' => $data["alias"],
- 'notify' => $data["notify"],
- 'poll' => $data["poll"],
- 'name' => $data["name"],
- 'nick' => $data["nick"],
- 'photo' => $data["photo"],
- 'keywords' => $data["keywords"],
- 'location' => $data["location"],
- 'about' => $data["about"],
- 'network' => $data["network"],
- 'pubkey' => $data["pubkey"],
+ 'url' => $data['url'],
+ 'nurl' => Strings::normaliseLink($data['url']),
+ 'addr' => defaults($data, 'addr', ''),
+ 'alias' => defaults($data, 'alias', ''),
+ 'notify' => defaults($data, 'notify', ''),
+ 'poll' => defaults($data, 'poll', ''),
+ 'name' => defaults($data, 'name', ''),
+ 'nick' => defaults($data, 'nick', ''),
+ 'photo' => defaults($data, 'photo', ''),
+ 'keywords' => defaults($data, 'keywords', ''),
+ 'location' => defaults($data, 'location', ''),
+ 'about' => defaults($data, 'about', ''),
+ 'network' => $data['network'],
+ 'pubkey' => defaults($data, 'pubkey', ''),
'rel' => self::SHARING,
- 'priority' => $data["priority"],
- 'batch' => $data["batch"],
- 'request' => $data["request"],
- 'confirm' => $data["confirm"],
- 'poco' => $data["poco"],
+ 'priority' => defaults($data, 'priority', 0),
+ 'batch' => defaults($data, 'batch', ''),
+ 'request' => defaults($data, 'request', ''),
+ 'confirm' => defaults($data, 'confirm', ''),
+ 'poco' => defaults($data, 'poco', ''),
'name-date' => DateTimeFormat::utcNow(),
'uri-date' => DateTimeFormat::utcNow(),
'avatar-date' => DateTimeFormat::utcNow(),
$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' => Strings::normaliseLink($data["url"])]);
if (DBA::isResult($gcontact)) {
// Only use the information when the probing hadn't fetched these values
- if ($data['keywords'] != '') {
+ if (!empty($data['keywords'])) {
unset($gcontact['keywords']);
}
- if ($data['location'] != '') {
+ if (!empty($data['location'])) {
unset($gcontact['location']);
}
- if ($data['about'] != '') {
+ if (!empty($data['about'])) {
unset($gcontact['about']);
}
DBA::update('contact', $gcontact, ['id' => $contact_id]);
}
}
- self::updateAvatar($data["photo"], $uid, $contact_id);
+ if (!empty($data['photo'])) {
+ 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]);
}
$updated = ['addr' => $data['addr'],
- 'alias' => $data['alias'],
+ 'alias' => defaults($data, 'alias', ''),
'url' => $data['url'],
'nurl' => Strings::normaliseLink($data['url']),
'name' => $data['name'],
'nick' => $data['nick']];
- if ($data['keywords'] != '') {
+ if (!empty($data['keywords'])) {
$updated['keywords'] = $data['keywords'];
}
- if ($data['location'] != '') {
+ if (!empty($data['location'])) {
$updated['location'] = $data['location'];
}
// Update the technical stuff as well - if filled
- if ($data['notify'] != '') {
+ if (!empty($data['notify'])) {
$updated['notify'] = $data['notify'];
}
- if ($data['poll'] != '') {
+ if (!empty($data['poll'])) {
$updated['poll'] = $data['poll'];
}
- if ($data['batch'] != '') {
+ if (!empty($data['batch'])) {
$updated['batch'] = $data['batch'];
}
- if ($data['request'] != '') {
+ if (!empty($data['request'])) {
$updated['request'] = $data['request'];
}
- if ($data['confirm'] != '') {
+ if (!empty($data['confirm'])) {
$updated['confirm'] = $data['confirm'];
}
- if ($data['poco'] != '') {
+ if (!empty($data['poco'])) {
$updated['poco'] = $data['poco'];
}
$updated['pubkey'] = $data['pubkey'];
}
- if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) {
+ if (($data['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
$updated['uri-date'] = DateTimeFormat::utcNow();
}
if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) {
$updated['name-date'] = DateTimeFormat::utcNow();
}
- $updated['avatar-date'] = DateTimeFormat::utcNow();
+ $updated['updated'] = DateTimeFormat::utcNow();
DBA::update('contact', $updated, ['id' => $contact_id], $contact);
{
$a = self::getApp();
- $cid = Self::getIdForURL($contact_url);
+ $cid = self::getIdForURL($contact_url);
$contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
if (!DBA::isResult($contact)) {
$sql = "`item`.`uid` = ?";
}
- $contact_field = ($contact["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
+ $contact_field = ($contact["contact-type"] == self::TYPE_COMMUNITY ? 'owner-id' : 'author-id');
if ($thread_mode) {
$condition = ["`$contact_field` = ? AND `gravity` = ? AND " . $sql,
|| (isset($contact['prv']) && intval($contact['prv']))
|| (isset($contact['community']) && intval($contact['community']))
) {
- $type = self::ACCOUNT_TYPE_COMMUNITY;
+ $type = self::TYPE_COMMUNITY;
} else {
- $type = self::ACCOUNT_TYPE_PERSON;
+ $type = self::TYPE_PERSON;
}
// The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
}
switch ($type) {
- case self::ACCOUNT_TYPE_ORGANISATION:
+ case self::TYPE_ORGANISATION:
$account_type = L10n::t("Organisation");
break;
- case self::ACCOUNT_TYPE_NEWS:
+ case self::TYPE_NEWS:
$account_type = L10n::t('News');
break;
- case self::ACCOUNT_TYPE_COMMUNITY:
+ case self::TYPE_COMMUNITY:
$account_type = L10n::t("Forum");
break;
/**
* @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, $network = '')
+ 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'];
+ $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"], $network);
+ $uid = $contact['uid'];
+ unset($contact['uid']);
+
+ $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 (($ret["network"] != $contact["network"]) && !in_array($ret["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, $network])) {
+ if (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network'])) {
+ return false;
+ }
+
+ if (!in_array($ret['network'], Protocol::NATIVE_SUPPORT)) {
return false;
}
// 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;
}
}
return true;
}
- DBA::update(
- 'contact', [
- 'url' => $ret['url'],
- 'nurl' => Strings::normaliseLink($ret['url']),
- 'network' => $ret['network'],
- 'addr' => $ret['addr'],
- 'alias' => $ret['alias'],
- 'batch' => $ret['batch'],
- 'notify' => $ret['notify'],
- 'poll' => $ret['poll'],
- 'poco' => $ret['poco']
- ],
- ['id' => $id]
- );
+ $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"]);
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']);
}
} 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'] === 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);
}
/**
{
$contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
- return self::magicLinkbyContact($contact, $url);
+ return self::magicLinkByContact($contact, $url);
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function magicLinkbyContact($contact, $url = '')
+ public static function magicLinkByContact($contact, $url = '')
{
if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) {
return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
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']);
+ }
}
projects / friendica.git / blobdiff