use Friendica\Util\Network;
use Friendica\Util\Strings;
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
/**
* @brief functions for interacting with a contact
*/
* @}
*/
+ /**
+ * @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?
+ */
+ 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
+ */
+ 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);
+ }
+
/**
* @brief Returns the contact id for the user and the public contact id for a given contact id
*
*
* @return array with public and user's contact id
*/
- private static function getPublicAndUserContacID($cid, $uid)
+ public static function getPublicAndUserContacID($cid, $uid)
{
if (empty($uid) || empty($cid)) {
return [];
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',
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'];
+ '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['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;
foreach ($fields as $field => $content) {
- if (isset($self[$field]) && $self[$field] != $content) {
+ if ($self[$field] != $content) {
$update = true;
}
}
} elseif ($contact['network'] == Protocol::DIASPORA) {
Diaspora::sendUnshare($user, $contact);
} elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
- ActivityPub\Transmitter::sendContactUndo($contact['url'], $user['uid']);
+ ActivityPub\Transmitter::sendContactUndo($contact['url'], $contact['id'], $user['uid']);
if ($dissolve) {
ActivityPub\Transmitter::sendContactReject($contact['url'], $contact['hub-verify'], $user['uid']);
public static function photoMenu(array $contact, $uid = 0)
{
// @todo Unused, to be removed
- $a = get_app();
+ $a = \get_app();
$contact_url = '';
$pm_url = '';
FROM `contact`
WHERE `uid` = %d
AND NOT `self`
+ AND NOT `deleted`
AND NOT `blocked`
AND NOT `pending`
AND `id` NOT IN (
$update_contact = ($contact['avatar-date'] < 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;
}
if (!$update_contact || $no_update) {
$url = $data["url"];
if (!$contact_id) {
- DBA::insert('contact', [
+ $fields = [
'uid' => $uid,
'created' => DateTimeFormat::utcNow(),
'url' => $data["url"],
'writable' => 1,
'blocked' => 0,
'readonly' => 0,
- 'pending' => 0]
- );
+ 'pending' => 0];
+
+ $condition = ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid, 'deleted' => false];
+
+ DBA::update('contact', $fields, $condition, true);
- $s = DBA::select('contact', ['id'], ['nurl' => Strings::normaliseLink($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
+ $s = DBA::select('contact', ['id'], $condition, ['order' => ['id'], 'limit' => 2]);
$contacts = DBA::toArray($s);
if (!DBA::isResult($contacts)) {
return 0;
}
if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
- DBA::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
- Strings::normaliseLink($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);
}
}
{
$a = self::getApp();
- require_once 'include/conversation.php';
-
$cid = Self::getIdForURL($contact_url);
$contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
{
$result = ['cid' => -1, 'success' => false, 'message' => ''];
- $a = get_app();
+ $a = \get_app();
// remove ajax junk, e.g. Twitter
$url = str_replace('/#!/', '/', $url);
return $result;
}
- if (x($arr['contact'], 'name')) {
+ if (!empty($arr['contact']['name'])) {
$ret = $arr['contact'];
} else {
$ret = Probe::uri($url, $network, $uid, false);
}
// 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) {
$hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0);
+ $pending = in_array($ret['network'], [Protocol::ACTIVITYPUB]);
+
if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
$writeable = 1;
}
'hidden' => $hidden,
'blocked' => 0,
'readonly'=> 0,
- 'pending' => 0,
+ 'pending' => $pending,
'subhub' => $subhub
]);
}
$ret = Diaspora::sendShare($a->user, $contact);
Logger::log('share returns: ' . $ret);
} elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
- $ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid);
+ $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);
}
}
*/
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;
$contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
return self::magicLinkbyContact($contact, $url);
- }
+ }
/**
* @brief Returns a magic link to authenticate remote visitors
*/
public static function magicLinkbyContact($contact, $url = '')
{
- if ($contact['network'] != Protocol::DFRN) {
+ if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) {
return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
}
projects / friendica.git / blobdiff