use DOMDocument;
use DomXPath;
-use Friendica\Core\Cache\Duration;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
+use Friendica\Model\Contact;
use Friendica\Model\GServer;
use Friendica\Model\Profile;
use Friendica\Model\User;
"community", "keywords", "location", "about", "hide",
"batch", "notify", "poll", "request", "confirm", "subscribe", "poco",
"following", "followers", "inbox", "outbox", "sharedinbox",
- "priority", "network", "pubkey", "baseurl", "gsid"];
+ "priority", "network", "pubkey", "manually-approve", "baseurl", "gsid"];
+
+ $numeric_fields = ["gsid", "hide", "account-type", "manually-approve"];
$newdata = [];
foreach ($fields as $field) {
if (isset($data[$field])) {
- if (in_array($field, ["gsid", "hide", "account-type"])) {
+ if (in_array($field, $numeric_fields)) {
$newdata[$field] = (int)$data[$field];
} else {
$newdata[$field] = $data[$field];
}
- } elseif ($field != "gsid") {
+ } elseif (!in_array($field, $numeric_fields)) {
$newdata[$field] = "";
} else {
$newdata[$field] = null;
Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
$xrd = null;
- $curlResult = DI::httpRequest()->get($ssl_url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+ $curlResult = DI::httpRequest()->get($ssl_url, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isSuccess()) {
$xml = $curlResult->getBody();
}
if (!is_object($xrd) && !empty($url)) {
- $curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+ $curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
if ($curlResult->isTimeout()) {
Logger::info('Probing timeout', ['url' => $url]);
* @return string profile link
* @throws HTTPException\InternalServerErrorException
*/
- public static function webfingerDfrn($webbie, &$hcard_url)
+ public static function webfingerDfrn(string $webbie, string &$hcard_url)
{
$profile_link = '';
*/
public static function uri($uri, $network = '', $uid = -1)
{
+ // Local profiles aren't probed via network
+ if (empty($network) && strpos($uri, DI::baseUrl()->getHostname())) {
+ $data = self::localProbe($uri);
+ if (!empty($data)) {
+ return $data;
+ }
+ }
+
if ($uid == -1) {
$uid = local_user();
}
}
if (empty($data['photo'])) {
- $data['photo'] = DI::baseUrl() . '/images/person-300.jpg';
+ $data['photo'] = DI::baseUrl() . Contact::DEFAULT_AVATAR_PHOTO;
}
if (empty($data['name'])) {
Logger::info('Probing start', ['uri' => $uri]);
- $data = self::getWebfingerArray($uri);
+ if (!empty($ap_profile['addr']) && ($ap_profile['addr'] != $uri)) {
+ $data = self::getWebfingerArray($ap_profile['addr']);
+ }
+
+ if (empty($data)) {
+ $data = self::getWebfingerArray($uri);
+ }
+
if (empty($data)) {
if (!empty($parts['scheme'])) {
return self::feed($uri);
{
$xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
- $curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+ $curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
if ($curlResult->isTimeout()) {
self::$istimeout = true;
return [];
&& !empty($hcard_url)
) {
$data["network"] = Protocol::DIASPORA;
+ $data["manually-approve"] = false;
// The Diaspora handle must always be lowercase
if (!empty($data["addr"])) {
&& isset($data["url"])
) {
$data["network"] = Protocol::OSTATUS;
+ $data["manually-approve"] = false;
} else {
return $short ? false : [];
}
$hrefParts = parse_url($href);
- // Root path case (/path) including relative scheme case (//host/path)
- if ($hrefParts['path'] && $hrefParts['path'][0] == '/') {
- $path = $hrefParts['path'];
- } else {
- $path = $path . '/' . $hrefParts['path'];
-
- // Resolve arbitrary relative path
- // Lifted from https://www.php.net/manual/en/function.realpath.php#84012
- $parts = array_filter(explode('/', $path), 'strlen');
- $absolutes = array();
- foreach ($parts as $part) {
- if ('.' == $part) continue;
- if ('..' == $part) {
- array_pop($absolutes);
- } else {
- $absolutes[] = $part;
+ if (!empty($hrefParts['path'])) {
+ // Root path case (/path) including relative scheme case (//host/path)
+ if ($hrefParts['path'] && $hrefParts['path'][0] == '/') {
+ $path = $hrefParts['path'];
+ } else {
+ $path = $path . '/' . $hrefParts['path'];
+
+ // Resolve arbitrary relative path
+ // Lifted from https://www.php.net/manual/en/function.realpath.php#84012
+ $parts = array_filter(explode('/', $path), 'strlen');
+ $absolutes = array();
+ foreach ($parts as $part) {
+ if ('.' == $part) continue;
+ if ('..' == $part) {
+ array_pop($absolutes);
+ } else {
+ $absolutes[] = $part;
+ }
}
- }
- $path = '/' . implode('/', $absolutes);
+ $path = '/' . implode('/', $absolutes);
+ }
}
// Relative scheme case (//host/path)
*/
public static function getLastUpdate(array $data)
{
+ $uid = User::getIdForURL($data['url']);
+ if (!empty($uid)) {
+ $contact = Contact::selectFirst(['url', 'last-item'], ['self' => true, 'uid' => $uid]);
+ if (!empty($contact['last-item'])) {
+ return $contact['last-item'];
+ }
+ }
+
if ($lastUpdate = self::updateFromNoScrape($data)) {
return $lastUpdate;
}
return '';
}
+
+ /**
+ * Probe data from local profiles without network traffic
+ *
+ * @param string $url
+ * @return array probed data
+ */
+ private static function localProbe(string $url)
+ {
+ $uid = User::getIdForURL($url);
+ if (empty($uid)) {
+ return [];
+ }
+
+ $profile = User::getOwnerDataById($uid);
+ if (empty($profile)) {
+ return [];
+ }
+
+ $approfile = ActivityPub\Transmitter::getProfile($uid);
+ if (empty($approfile)) {
+ return [];
+ }
+
+ if (empty($profile['gsid'])) {
+ $profile['gsid'] = GServer::getID($approfile['generator']['url']);
+ }
+
+ $data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
+ 'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
+ 'photo' => $profile['photo'], 'account-type' => $profile['contact-type'],
+ 'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+ 'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'],
+ 'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
+ 'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],
+ 'subscribe' => $approfile['generator']['url'] . '/follow?url={uri}', 'poco' => $profile['poco'],
+ 'following' => $approfile['following'], 'followers' => $approfile['followers'],
+ 'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
+ 'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN,
+ 'pubkey' => $profile['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $profile['gsid'],
+ 'manually-approve' => in_array($profile['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])];
+ return self::rearrangeData($data);
+ }
}
projects / friendica.git / blobdiff