namespace Friendica\Model;
use Friendica\App\BaseURL;
-use Friendica\BaseObject;
use Friendica\Content\Pager;
use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
-use Friendica\Core\System;
use Friendica\Core\Session;
+use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Network\Probe;
-use Friendica\Object\Image;
+use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus;
-use Friendica\Protocol\PortableContact;
use Friendica\Protocol\Salmon;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Images;
use Friendica\Util\Network;
use Friendica\Util\Strings;
/**
- * @brief functions for interacting with a contact
+ * functions for interacting with a contact
*/
-class Contact extends BaseObject
+class Contact
{
/**
* @deprecated since version 2019.03
}
/**
- * @brief Tests if the given contact is a follower
+ * 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
}
/**
- * @brief Tests if the given contact url is a follower
+ * Tests if the given contact url is a follower
*
* @param string $url Contact URL
* @param int $uid User ID
}
/**
- * @brief Tests if the given user follow the given contact
+ * Tests if the given user follow the given contact
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Tests if the given user follow the given contact url
+ * Tests if the given user follow the given contact url
*
* @param string $url Contact URL
* @param int $uid User ID
}
/**
- * @brief Get the basepath for a given contact link
+ * Get the basepath for a given contact link
*
* @param string $url The contact link
+ * @param boolean $dont_update Don't update the contact
*
* @return string basepath
- * @return boolean $dont_update Don't update the contact
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
public static function getBasepath($url, $dont_update = false)
{
- $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
+ $contact = DBA::selectFirst('contact', ['id', 'baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
+ if (!DBA::isResult($contact)) {
+ return '';
+ }
+
if (!empty($contact['baseurl'])) {
return $contact['baseurl'];
} elseif ($dont_update) {
return '';
}
- self::updateFromProbeByURL($url, true);
+ // Update the existing contact
+ self::updateFromProbe($contact['id'], '', true);
- $contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
- if (!empty($contact['baseurl'])) {
- return $contact['baseurl'];
+ // And fetch the result
+ $contact = DBA::selectFirst('contact', ['baseurl'], ['id' => $contact['id']]);
+ if (empty($contact['baseurl'])) {
+ Logger::info('No baseurl for contact', ['url' => $url]);
+ return '';
}
- return '';
+ Logger::info('Found baseurl for contact', ['url' => $url, 'baseurl' => $contact['baseurl']]);
+ return $contact['baseurl'];
}
/**
*/
public static function isLocal($url)
{
- return Strings::compareLink(self::getBasepath($url, true), System::baseUrl());
+ return Strings::compareLink(self::getBasepath($url, true), DI::baseUrl());
+ }
+
+ /**
+ * Check if the given contact ID is on the same server
+ *
+ * @param string $url The contact link
+ *
+ * @return boolean Is it the same server?
+ */
+ public static function isLocalById(int $cid)
+ {
+ $contact = DBA::selectFirst('contact', ['url', 'baseurl'], ['id' => $cid]);
+ if (!DBA::isResult($contact)) {
+ return false;
+ }
+
+ if (empty($contact['baseurl'])) {
+ $baseurl = self::getBasepath($contact['url'], true);
+ } else {
+ $baseurl = $contact['baseurl'];
+ }
+
+ return Strings::compareLink($baseurl, DI::baseUrl());
}
/**
* @param integer $uid User ID
*
* @return integer|boolean Public contact id for given user id
- * @throws Exception
+ * @throws \Exception
*/
public static function getPublicIdByUserId($uid)
{
}
/**
- * @brief Returns the contact id for the user and the public contact id for a given contact id
+ * Returns the contact id for the user and the public contact id for a given contact id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Block contact id for user id
+ * Block contact id for user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid 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);
- }
}
/**
- * @brief Returns "block" state for contact id and user id
+ * Returns "block" state for contact id and user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Ignore contact id for user id
+ * Ignore contact id for user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Returns "ignore" state for contact id and user id
+ * Returns "ignore" state for contact id and user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Set "collapsed" for contact id and user id
+ * Set "collapsed" for contact id and user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Returns "collapsed" state for contact id and user id
+ * Returns "collapsed" state for contact id and user id
*
* @param int $cid Either public contact id or user's contact id
* @param int $uid User ID
}
/**
- * @brief Returns a list of contacts belonging in a group
+ * Returns a list of contacts belonging in a group
*
* @param int $gid
* @return array
}
/**
- * @brief Returns the count of OStatus contacts in a group
+ * Returns the count of OStatus contacts in a group
*
* @param int $gid
* @return int
'self' => 1,
'name' => $user['username'],
'nick' => $user['nickname'],
- 'photo' => System::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg',
- 'thumb' => System::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg',
- 'micro' => System::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg',
+ 'photo' => DI::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg',
+ 'thumb' => DI::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg',
+ 'micro' => DI::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg',
'blocked' => 0,
'pending' => 0,
- 'url' => System::baseUrl() . '/profile/' . $user['nickname'],
- 'nurl' => Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']),
- 'addr' => $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3),
- 'request' => System::baseUrl() . '/dfrn_request/' . $user['nickname'],
- 'notify' => System::baseUrl() . '/dfrn_notify/' . $user['nickname'],
- 'poll' => System::baseUrl() . '/dfrn_poll/' . $user['nickname'],
- 'confirm' => System::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
- 'poco' => System::baseUrl() . '/poco/' . $user['nickname'],
+ 'url' => DI::baseUrl() . '/profile/' . $user['nickname'],
+ 'nurl' => Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']),
+ 'addr' => $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3),
+ 'request' => DI::baseUrl() . '/dfrn_request/' . $user['nickname'],
+ 'notify' => DI::baseUrl() . '/dfrn_notify/' . $user['nickname'],
+ 'poll' => DI::baseUrl() . '/dfrn_poll/' . $user['nickname'],
+ 'confirm' => DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'],
+ 'poco' => DI::baseUrl() . '/poco/' . $user['nickname'],
'name-date' => DateTimeFormat::utcNow(),
'uri-date' => DateTimeFormat::utcNow(),
'avatar-date' => DateTimeFormat::utcNow(),
}
// Creating the path to the avatar, beginning with the file suffix
- $types = Image::supportedTypes();
+ $types = Images::supportedTypes();
if (isset($types[$avatar['type']])) {
$file_suffix = $types[$avatar['type']];
}
// We are adding a timestamp value so that other systems won't use cached content
$timestamp = strtotime($fields['avatar-date']);
- $prefix = System::baseUrl() . '/photo/' .$avatar['resource-id'] . '-';
+ $prefix = DI::baseUrl() . '/photo/' .$avatar['resource-id'] . '-';
$suffix = '.' . $file_suffix . '?ts=' . $timestamp;
$fields['photo'] = $prefix . '4' . $suffix;
$fields['micro'] = $prefix . '6' . $suffix;
} else {
// We hadn't found a photo entry, so we use the default avatar
- $fields['photo'] = System::baseUrl() . '/images/person-300.jpg';
- $fields['thumb'] = System::baseUrl() . '/images/person-80.jpg';
- $fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
+ $fields['photo'] = DI::baseUrl() . '/images/person-300.jpg';
+ $fields['thumb'] = DI::baseUrl() . '/images/person-80.jpg';
+ $fields['micro'] = DI::baseUrl() . '/images/person-48.jpg';
}
- $fields['avatar'] = System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix;
+ $fields['avatar'] = DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix;
$fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
$fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
$fields['unsearchable'] = $user['hidewall'] || !$profile['net-publish'];
// it seems as if ported accounts can have wrong values, so we make sure that now everything is fine.
- $fields['url'] = System::baseUrl() . '/profile/' . $user['nickname'];
+ $fields['url'] = DI::baseUrl() . '/profile/' . $user['nickname'];
$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['confirm'] = System::baseUrl() . '/dfrn_confirm/' . $user['nickname'];
- $fields['poco'] = System::baseUrl() . '/poco/' . $user['nickname'];
+ $fields['addr'] = $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
+ $fields['request'] = DI::baseUrl() . '/dfrn_request/' . $user['nickname'];
+ $fields['notify'] = DI::baseUrl() . '/dfrn_notify/' . $user['nickname'];
+ $fields['poll'] = DI::baseUrl() . '/dfrn_poll/'. $user['nickname'];
+ $fields['confirm'] = DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'];
+ $fields['poco'] = DI::baseUrl() . '/poco/' . $user['nickname'];
$update = false;
DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
// Update the profile
- $fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
- 'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
+ $fields = ['photo' => DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
+ 'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
}
}
/**
- * @brief Marks a contact for removal
+ * Marks a contact for removal
*
* @param int $id contact id
* @return null
}
/**
- * @brief Sends an unfriend message. Does not remove the contact
+ * Sends an unfriend message. Does not remove the contact
*
* @param array $user User unfriending
* @param array $contact Contact unfriended
} elseif (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
// create an unfollow slap
$item = [];
- $item['verb'] = NAMESPACE_OSTATUS . "/unfollow";
+ $item['verb'] = Activity::O_UNFOLLOW;
$item['follow'] = $contact["url"];
$item['body'] = '';
$item['title'] = '';
}
/**
- * @brief Marks a contact for archival after a communication issue delay
+ * Marks a contact for archival after a communication issue delay
*
* Contact has refused to recognise us as a friend. We will start a countdown.
* If they still don't recognise us in 32 days, the relationship is over,
*/
/// @todo Check for contact vitality via probing
- $archival_days = Config::get('system', 'archival_days', 32);
+ $archival_days = DI::config()->get('system', 'archival_days', 32);
$expiry = $contact['term-date'] . ' + ' . $archival_days . ' days ';
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) {
}
/**
- * @brief Cancels the archival countdown
+ * Cancels the archival countdown
*
* @see Contact::markForArchival()
*
}
/**
- * @brief Get contact data for a given profile link
+ * Get contact data for a given profile link
*
* The function looks at several places (contact table and gcontact table) for the contact
* It caches its result for the same script execution to prevent duplicate calls
$ssl_url = str_replace('http://', 'https://', $url);
+ $nurl = Strings::normaliseLink($url);
+
// Fetch contact data from the contact table for the given user
$s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
- FROM `contact` WHERE `nurl` = ? AND `uid` = ?", Strings::normaliseLink($url), $uid);
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`
+ FROM `contact` WHERE `nurl` = ? AND `uid` = ?", $nurl, $uid);
$r = DBA::toArray($s);
// Fetch contact data from the contact table for the given user, checking with the alias
if (!DBA::isResult($r)) {
$s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
- FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?", Strings::normaliseLink($url), $url, $ssl_url, $uid);
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`
+ FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?", $nurl, $url, $ssl_url, $uid);
$r = DBA::toArray($s);
}
// Fetch the data from the contact table with "uid=0" (which is filled automatically)
if (!DBA::isResult($r)) {
$s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
- FROM `contact` WHERE `nurl` = ? AND `uid` = 0", Strings::normaliseLink($url));
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`
+ FROM `contact` WHERE `nurl` = ? AND `uid` = 0", $nurl);
$r = DBA::toArray($s);
}
// Fetch the data from the contact table with "uid=0" (which is filled automatically) - checked with the alias
if (!DBA::isResult($r)) {
$s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
- FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0", Strings::normaliseLink($url), $url, $ssl_url);
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`
+ FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0", $nurl, $url, $ssl_url);
$r = DBA::toArray($s);
}
// Fetch the data from the gcontact table
if (!DBA::isResult($r)) {
$s = DBA::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
- `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
- FROM `gcontact` WHERE `nurl` = ?", Strings::normaliseLink($url));
+ `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`, 2 AS `rel`, 0 AS `pending`
+ FROM `gcontact` WHERE `nurl` = ?", $nurl);
$r = DBA::toArray($s);
}
}
/**
- * @brief Get contact data for a given address
+ * Get contact data for a given address
*
* The function looks at several places (contact table and gcontact table) for the contact
*
// Fetch contact data from the contact table for the given user
$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`, `rel`, `pending`
FROM `contact` WHERE `addr` = '%s' AND `uid` = %d AND NOT `deleted`",
DBA::escape($addr),
intval($uid)
// Fetch the data from the contact table with "uid=0" (which is filled automatically)
if (!DBA::isResult($r)) {
$r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`, `rel`, `pending`
FROM `contact` WHERE `addr` = '%s' AND `uid` = 0 AND NOT `deleted`",
DBA::escape($addr)
);
// Fetch the data from the gcontact table
if (!DBA::isResult($r)) {
$r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
- `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
+ `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`, 2 AS `rel`, 0 AS `pending`
FROM `gcontact` WHERE `addr` = '%s'",
DBA::escape($addr)
);
}
/**
- * @brief Returns the data array for the photo menu of a given contact
+ * Returns the data array for the photo menu of a given contact
*
* @param array $contact contact
* @param int $uid optional, default 0
if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
if ($uid == 0) {
$profile_link = self::magicLink($contact['url']);
- $menu = ['profile' => [L10n::t('View Profile'), $profile_link, true]];
+ $menu = ['profile' => [DI::l10n()->t('View Profile'), $profile_link, true]];
return $menu;
}
$sparkle = false;
if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
$sparkle = true;
- $profile_link = System::baseUrl() . '/redir/' . $contact['id'];
+ $profile_link = DI::baseUrl() . '/redir/' . $contact['id'];
} else {
$profile_link = $contact['url'];
}
}
if (self::canReceivePrivateMessages($contact) && empty($contact['pending'])) {
- $pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
+ $pm_url = DI::baseUrl() . '/message/new/' . $contact['id'];
}
if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) {
- $poke_link = System::baseUrl() . '/poke/?c=' . $contact['id'];
+ $poke_link = DI::baseUrl() . '/poke/?c=' . $contact['id'];
}
- $contact_url = System::baseUrl() . '/contact/' . $contact['id'];
+ $contact_url = DI::baseUrl() . '/contact/' . $contact['id'];
- $posts_link = System::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
+ $posts_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
if (!$contact['self']) {
- $contact_drop_link = System::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
+ $contact_drop_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
+ }
+
+ $follow_link = '';
+ $unfollow_link = '';
+ if (!$contact['self'] && in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+ if ($contact['uid'] && in_array($contact['rel'], [self::SHARING, self::FRIEND])) {
+ $unfollow_link = 'unfollow?url=' . urlencode($contact['url']);
+ } elseif(!$contact['pending']) {
+ $follow_link = 'follow?url=' . urlencode($contact['url']);
+ }
}
/**
* "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
*/
if (empty($contact['uid'])) {
- $connlnk = 'follow/?url=' . $contact['url'];
$menu = [
- 'profile' => [L10n::t('View Profile'), $profile_link, true],
- 'network' => [L10n::t('Network Posts'), $posts_link, false],
- 'edit' => [L10n::t('View Contact'), $contact_url, false],
- 'follow' => [L10n::t('Connect/Follow'), $connlnk, true],
+ 'profile' => [DI::l10n()->t('View Profile') , $profile_link , true],
+ 'network' => [DI::l10n()->t('Network Posts') , $posts_link , false],
+ 'edit' => [DI::l10n()->t('View Contact') , $contact_url , false],
+ 'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true],
+ 'unfollow'=> [DI::l10n()->t('UnFollow') , $unfollow_link, true],
];
} else {
$menu = [
- 'status' => [L10n::t('View Status'), $status_link, true],
- 'profile' => [L10n::t('View Profile'), $profile_link, true],
- 'photos' => [L10n::t('View Photos'), $photos_link, true],
- 'network' => [L10n::t('Network Posts'), $posts_link, false],
- 'edit' => [L10n::t('View Contact'), $contact_url, false],
- 'drop' => [L10n::t('Drop Contact'), $contact_drop_link, false],
- 'pm' => [L10n::t('Send PM'), $pm_url, false],
- 'poke' => [L10n::t('Poke'), $poke_link, false],
+ 'status' => [DI::l10n()->t('View Status') , $status_link , true],
+ 'profile' => [DI::l10n()->t('View Profile') , $profile_link , true],
+ 'photos' => [DI::l10n()->t('View Photos') , $photos_link , true],
+ 'network' => [DI::l10n()->t('Network Posts') , $posts_link , false],
+ 'edit' => [DI::l10n()->t('View Contact') , $contact_url , false],
+ 'drop' => [DI::l10n()->t('Drop Contact') , $contact_drop_link, false],
+ 'pm' => [DI::l10n()->t('Send PM') , $pm_url , false],
+ 'poke' => [DI::l10n()->t('Poke') , $poke_link , false],
+ 'follow' => [DI::l10n()->t('Connect/Follow'), $follow_link , true],
+ 'unfollow'=> [DI::l10n()->t('UnFollow') , $unfollow_link , true],
];
if (!empty($contact['pending'])) {
$intro = DBA::selectFirst('intro', ['id'], ['contact-id' => $contact['id']]);
if (DBA::isResult($intro)) {
- $menu['follow'] = [L10n::t('Approve'), 'notifications/intros/' . $intro['id'], true];
+ $menu['follow'] = [DI::l10n()->t('Approve'), 'notifications/intros/' . $intro['id'], true];
}
}
}
}
/**
- * @brief Returns ungrouped contact count or list for user
+ * Returns ungrouped contact count or list for user
*
* Returns either the total number of ungrouped contacts for the given user
* id or a paginated list of ungrouped contacts.
}
/**
- * @brief Fetch the contact id for a given URL and user
+ * Fetch the contact id for a given URL and user
*
* First lookup in the contact table to find a record matching either `url`, `nurl`,
* `addr` or `alias`.
if (DBA::isResult($contact)) {
$contact_id = $contact["id"];
+ $update_contact = false;
+
+ // Update the contact every 7 days (Don't update mail or feed contacts)
+ if (in_array($contact['network'], Protocol::FEDERATED)) {
+ $update_contact = ($contact['updated'] < DateTimeFormat::utc('now -7 days'));
- // Update the contact every 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;
+ }
+ } elseif (empty($default) && in_array($contact['network'], [Protocol::MAIL, Protocol::PHANTOM]) && ($uid == 0)) {
+ // Update public mail accounts via their user's accounts
+ $fields = ['network', 'addr', 'name', 'nick', 'avatar', 'photo', 'thumb', 'micro'];
+ $mailcontact = DBA::selectFirst('contact', $fields, ["`addr` = ? AND `network` = ? AND `uid` != 0", $url, Protocol::MAIL]);
+ if (!DBA::isResult($mailcontact)) {
+ $mailcontact = DBA::selectFirst('contact', $fields, ["`nurl` = ? AND `network` = ? AND `uid` != 0", $url, Protocol::MAIL]);
+ }
- // We force the update if the avatar is empty
- if (empty($contact['avatar'])) {
- $update_contact = true;
+ if (DBA::isResult($mailcontact)) {
+ DBA::update('contact', $mailcontact, ['id' => $contact_id]);
+ }
}
// Update the contact in the background if needed but it is called by the frontend
$data = array_merge($data, $default);
}
- if (empty($data)) {
+ if (empty($data) || ($data['network'] == Protocol::PHANTOM)) {
+ Logger::info('No valid network found', ['url' => $url, 'data' => $data, 'callstack' => System::callstack(20)]);
return 0;
}
}
/**
- * @brief Checks if the contact is archived
+ * Checks if the contact is archived
*
* @param int $cid contact id
*
}
/**
- * @brief Checks if the contact is blocked
+ * Checks if the contact is blocked
*
* @param int $cid contact id
*
}
/**
- * @brief Checks if the contact is hidden
+ * Checks if the contact is hidden
*
* @param int $cid contact id
*
}
/**
- * @brief Returns posts from a given contact url
+ * Returns posts from a given contact url
*
* @param string $contact_url Contact URL
*
*/
public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0)
{
- $a = self::getApp();
+ $a = DI::app();
$cid = self::getIdForURL($contact_url);
$sql = "`item`.`uid` = ?";
}
- $contact_field = ($contact["contact-type"] == self::TYPE_COMMUNITY ? 'owner-id' : 'author-id');
+ $contact_field = ((($contact["contact-type"] == self::TYPE_COMMUNITY) || ($contact['network'] == Protocol::MAIL)) ? 'owner-id' : 'author-id');
if ($thread_mode) {
$condition = ["`$contact_field` = ? AND `gravity` = ? AND " . $sql,
$cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
}
- $pager = new Pager($a->query_string);
+ $pager = new Pager(DI::args()->getQueryString());
$params = ['order' => ['received' => true],
'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
}
/**
- * @brief Returns the account type name
+ * Returns the account type name
*
* The function can be called with either the user or the contact array
*
switch ($type) {
case self::TYPE_ORGANISATION:
- $account_type = L10n::t("Organisation");
+ $account_type = DI::l10n()->t("Organisation");
break;
case self::TYPE_NEWS:
- $account_type = L10n::t('News');
+ $account_type = DI::l10n()->t('News');
break;
case self::TYPE_COMMUNITY:
- $account_type = L10n::t("Forum");
+ $account_type = DI::l10n()->t("Forum");
break;
default:
}
/**
- * @brief Blocks a contact
+ * Blocks a contact
*
* @param int $cid
* @return bool
}
/**
- * @brief Unblocks a contact
+ * Unblocks a contact
*
* @param int $cid
* @return bool
}
/**
- * @brief Updates the avatar links in a contact only if needed
+ * Updates the avatar links in a contact only if needed
*
* @param string $avatar Link to avatar picture
* @param int $uid User id of contact owner
$data = [$contact["photo"], $contact["thumb"], $contact["micro"]];
}
+ foreach ($data as $image_uri) {
+ $image_rid = Photo::ridFromURI($image_uri);
+ if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
+ Logger::info('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
+ $force = true;
+ }
+ }
+
if (($contact["avatar"] != $avatar) || $force) {
$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
return $data;
}
- /**
- * @brief Helper function for "updateFromProbe". Updates personal and public contact
+ /**
+ * Helper function for "updateFromProbe". Updates personal and public contact
*
* @param integer $id contact id
* @param integer $uid user id
DBA::update('contact', $fields, $condition);
}
- /**
- * @brief Remove duplicated contacts
+ /**
+ * Remove duplicated contacts
*
* @param string $nurl Normalised contact url
* @param integer $uid User id
if ($force) {
self::updateContact($id, $uid, $ret['url'], ['last-update' => $updated, 'success_update' => $updated]);
}
+
+ // Update the public contact
+ if ($uid != 0) {
+ self::updateFromProbeByURL($ret['url']);
+ }
+
return true;
}
/**
* 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
* dfrn_request page.
*
* $return['success'] boolean true if successful
* $return['message'] error text if success is false.
*
- * @brief Takes a $uid and a url/handle and adds a new contact
+ * Takes a $uid and a url/handle and adds a new contact
* @param int $uid
* @param string $url
* @param bool $interactive
{
$result = ['cid' => -1, 'success' => false, 'message' => ''];
- $a = \get_app();
+ $a = DI::app();
// remove ajax junk, e.g. Twitter
$url = str_replace('/#!/', '/', $url);
if (!Network::isUrlAllowed($url)) {
- $result['message'] = L10n::t('Disallowed profile URL.');
+ $result['message'] = DI::l10n()->t('Disallowed profile URL.');
return $result;
}
if (Network::isUrlBlocked($url)) {
- $result['message'] = L10n::t('Blocked domain');
+ $result['message'] = DI::l10n()->t('Blocked domain');
return $result;
}
if (!$url) {
- $result['message'] = L10n::t('Connect URL missing.');
+ $result['message'] = DI::l10n()->t('Connect URL missing.');
return $result;
}
Hook::callAll('follow', $arr);
if (empty($arr)) {
- $result['message'] = L10n::t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.');
+ $result['message'] = DI::l10n()->t('The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page.');
return $result;
}
if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) {
if ($interactive) {
- if (strlen($a->getURLPath())) {
- $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
+ if (strlen(DI::baseUrl()->getUrlPath())) {
+ $myaddr = bin2hex(DI::baseUrl() . '/profile/' . $a->user['nickname']);
} else {
- $myaddr = bin2hex($a->user['nickname'] . '@' . $a->getHostName());
+ $myaddr = bin2hex($a->user['nickname'] . '@' . DI::baseUrl()->getHostname());
}
- $a->internalRedirect($ret['request'] . "&addr=$myaddr");
+ DI::baseUrl()->redirect($ret['request'] . "&addr=$myaddr");
// NOTREACHED
}
- } 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;
+ } elseif (DI::config()->get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) {
+ $result['message'] = DI::l10n()->t('This site is not configured to allow communications with other networks.') . EOL;
+ $result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL;
return $result;
}
// do we have enough information?
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;
+ $result['message'] .= DI::l10n()->t('The profile address specified does not provide adequate information.') . EOL;
if (empty($ret['poll'])) {
- $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
+ $result['message'] .= DI::l10n()->t('No compatible communication protocols or feeds were discovered.') . EOL;
}
if (empty($ret['name'])) {
- $result['message'] .= L10n::t('An author or name was not found.') . EOL;
+ $result['message'] .= DI::l10n()->t('An author or name was not found.') . EOL;
}
if (empty($ret['url'])) {
- $result['message'] .= L10n::t('No browser URL could be matched to this address.') . EOL;
+ $result['message'] .= DI::l10n()->t('No browser URL could be matched to this address.') . EOL;
}
if (strpos($url, '@') !== false) {
- $result['message'] .= L10n::t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
- $result['message'] .= L10n::t('Use mailto: in front of address to force email check.') . EOL;
+ $result['message'] .= DI::l10n()->t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
+ $result['message'] .= DI::l10n()->t('Use mailto: in front of address to force email check.') . EOL;
}
return $result;
}
- 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;
+ if ($protocol === Protocol::OSTATUS && DI::config()->get('system', 'ostatus_disabled')) {
+ $result['message'] .= DI::l10n()->t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
$ret['notify'] = '';
}
if (!$ret['notify']) {
- $result['message'] .= L10n::t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
+ $result['message'] .= DI::l10n()->t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
}
$writeable = ((($protocol === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0);
$hidden = (($protocol === Protocol::MAIL) ? 1 : 0);
- $pending = in_array($protocol, [Protocol::ACTIVITYPUB]);
+ $pending = false;
+ if ($protocol == Protocol::ACTIVITYPUB) {
+ $apcontact = APContact::getByURL($url, false);
+ if (isset($apcontact['manually-approve'])) {
+ $pending = (bool)$apcontact['manually-approve'];
+ }
+ }
if (in_array($protocol, [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
$writeable = 1;
$contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
if (!DBA::isResult($contact)) {
- $result['message'] .= L10n::t('Unable to retrieve contact information.') . EOL;
+ $result['message'] .= DI::l10n()->t('Unable to retrieve contact information.') . EOL;
return $result;
}
if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
// create a follow slap
$item = [];
- $item['verb'] = ACTIVITY_FOLLOW;
+ $item['verb'] = Activity::FOLLOW;
$item['follow'] = $contact["url"];
$item['body'] = '';
$item['title'] = '';
}
/**
- * @brief Updated contact's SSL policy
+ * Updated contact's SSL policy
*
* @param array $contact Contact array
* @param string $new_policy New policy, valid: self,full
'to_name' => $user['username'],
'to_email' => $user['email'],
'uid' => $user['uid'],
- 'link' => System::baseUrl() . '/notifications/intro',
- 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')),
+ 'link' => DI::baseUrl() . '/notifications/intro',
+ 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : DI::l10n()->t('[Name Withheld]')),
'source_link' => $contact_record['url'],
'source_photo' => $contact_record['photo'],
- 'verb' => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW),
+ 'verb' => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
'otype' => 'intro'
]);
}
}
/**
- * @brief Create a birthday event.
+ * Create a birthday event.
*
* Update the year and the birthday.
*/
* Remove the unavailable contact ids from the provided list
*
* @param array $contact_ids Contact id list
+ * @return array
* @throws \Exception
*/
- public static function pruneUnavailable(array &$contact_ids)
+ public static function pruneUnavailable(array $contact_ids)
{
if (empty($contact_ids)) {
- return;
- }
-
- $str = DBA::escape(implode(',', $contact_ids));
-
- $stmt = DBA::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
-
- $return = [];
- while($contact = DBA::fetch($stmt)) {
- $return[] = $contact['id'];
+ return [];
}
- DBA::close($stmt);
+ $contacts = Contact::selectToArray(['id'], [
+ 'id' => $contact_ids,
+ 'blocked' => false,
+ 'pending' => false,
+ 'archive' => false,
+ ]);
- $contact_ids = $return;
+ return array_column($contacts, 'id');
}
/**
- * @brief Returns a magic link to authenticate remote visitors
+ * Returns a magic link to authenticate remote visitors
*
* @todo check if the return is either a fully qualified URL or a relative path to Friendica basedir
*
}
/**
- * @brief Returns a magic link to authenticate remote visitors
+ * Returns a magic link to authenticate remote visitors
*
* @param integer $cid The contact id of the target contact profile
* @param string $url An url that we will be redirected to after the authentication
}
/**
- * @brief Returns a magic link to authenticate remote visitors
+ * Returns a magic link to authenticate remote visitors
*
* @param array $contact The contact array with "uid", "network" and "url"
* @param string $url An url that we will be redirected to after the authentication
projects / friendica.git / blobdiff