<?php
/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Protocol\ActivityNamespace;
use Friendica\Protocol\ActivityPub;
+use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Email;
use Friendica\Protocol\Feed;
use Friendica\Protocol\Salmon;
$numeric_fields = ['gsid', 'hide', 'account-type', 'manually-approve'];
+ if (!empty($data['photo'])) {
+ $data['photo'] = Network::addBasePath($data['photo'], $data['url']);
+
+ if (!Network::isValidHttpUrl($data['photo'])) {
+ Logger::warning('Invalid URL for photo', ['url' => $data['url'], 'photo' => $data['photo']]);
+ unset($data['photo']);
+ }
+ }
+
$newdata = [];
foreach ($fields as $field) {
if (isset($data[$field])) {
}
}
- $newdata['networks'] = $data['networks'] ?? [];
+ $newdata['networks'] = [];
foreach ([Protocol::DIASPORA, Protocol::OSTATUS] as $network) {
- if (empty($newdata['networks'][$network])) {
- unset($newdata['networks'][$network]);
+ if (!empty($data['networks'][$network])) {
+ $data['networks'][$network]['subscribe'] = $newdata['subscribe'] ?? '';
+ if (empty($data['networks'][$network]['baseurl'])) {
+ $data['networks'][$network]['baseurl'] = $newdata['baseurl'] ?? '';
+ } else {
+ $newdata['baseurl'] = $data['networks'][$network]['baseurl'];
+ }
+ if (!empty($newdata['baseurl'])) {
+ $newdata['gsid'] = $data['networks'][$network]['gsid'] = GServer::getID($newdata['baseurl']);
+ } else {
+ $newdata['gsid'] = $data['networks'][$network]['gsid'] = null;
+ }
+
+ $newdata['networks'][$network] = self::rearrangeData($data['networks'][$network]);
+ unset($newdata['networks'][$network]['networks']);
}
}
if (empty($data) || (!empty($ap_profile) && empty($network) && (($data['network'] ?? '') != Protocol::DFRN))) {
$networks = $data['networks'] ?? [];
unset($data['networks']);
- $networks[$data['network']] = $data;
+ if (!empty($data['network'])) {
+ $networks[$data['network']] = $data;
+ }
$data = $ap_profile;
$data['networks'] = $networks;
} elseif (!empty($ap_profile)) {
* @return array Webfinger data
* @throws HTTPException\InternalServerErrorException
*/
- private static function getWebfingerArray(string $uri): array
+ public static function getWebfingerArray(string $uri): array
{
$parts = parse_url($uri);
}
$parts = parse_url($uri);
- if (empty($parts['scheme']) && empty($parts['host']) && !strstr($parts['path'], '@')) {
+ if (empty($parts['scheme']) && empty($parts['host']) && (empty($parts['path']) || strpos($parts['path'], '@') === false)) {
Logger::info('URI was not detectable', ['uri' => $uri]);
return [];
}
$result = self::zot($webfinger, $result, $baseurl);
}
if ((!$result && ($network == '')) || ($network == Protocol::PUMPIO)) {
- $result = self::pumpio($webfinger, $addr);
+ $result = self::pumpio($webfinger, $addr, $baseurl);
}
if (empty($result['network']) && empty($ap_profile['network']) || ($network == Protocol::FEED)) {
$result = self::feed($uri);
} else {
// We overwrite the detected nick with our try if the previois routines hadn't detected it.
- // Additionally it is overwritten when the nickname doesn't make sense (contains spaces).
+ // Additionally, it is overwritten when the nickname doesn't make sense (contains spaces).
if ((empty($result['nick']) || (strstr($result['nick'], ' '))) && ($nick != '')) {
$result['nick'] = $nick;
}
*
* @return array Profile data
*/
- private static function pumpioProfileData(string $profile_link): array
+ private static function pumpioProfileData(string $profile_link, string $baseurl): array
{
$curlResult = DI::httpClient()->get($profile_link, HttpClientAccept::HTML);
if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
}
if ($avatar) {
foreach ($avatar->attributes as $attribute) {
- if ($attribute->name == 'src') {
- $data['photo'] = trim($attribute->value);
+ if (($attribute->name == 'src') && !empty($attribute->value)) {
+ $data['photo'] = Network::addBasePath($attribute->value, $baseurl);
}
}
}
*
* @return array pump.io data
*/
- private static function pumpio(array $webfinger, string $addr): array
+ private static function pumpio(array $webfinger, string $addr, string $baseurl): array
{
$data = [];
// The array is reversed to take into account the order of preference for same-rel links
return [];
}
- $profile_data = self::pumpioProfileData($data['url']);
+ $profile_data = self::pumpioProfileData($data['url'], $baseurl);
if (!$profile_data) {
return [];
*/
private static function feed(string $url, bool $probe = true): array
{
- $curlResult = DI::httpClient()->get($url, HttpClientAccept::FEED_XML);
+ try {
+ $curlResult = DI::httpClient()->get($url, HttpClientAccept::FEED_XML);
+ } catch(\Throwable $e) {
+ DI::logger()->info('Error requesting feed URL', ['url' => $url, 'exception' => $e]);
+ return [];
+ }
+
if ($curlResult->isTimeout()) {
self::$isTimeout = true;
return [];
}
+
$feed = $curlResult->getBody();
$feed_data = Feed::import($feed);
$owner = User::getOwnerDataById($uid);
$approfile = ActivityPub\Transmitter::getProfile($uid);
+ $split_name = Diaspora::splitName($owner['name']);
+
if (empty($owner['gsid'])) {
$owner['gsid'] = GServer::getID($approfile['generator']['url']);
}
'inbox' => $approfile['inbox'], 'outbox' => $approfile['outbox'],
'sharedinbox' => $approfile['endpoints']['sharedInbox'], 'network' => Protocol::DFRN,
'pubkey' => $owner['upubkey'], 'baseurl' => $approfile['generator']['url'], 'gsid' => $owner['gsid'],
- 'manually-approve' => in_array($owner['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])
+ 'manually-approve' => in_array($owner['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]),
+ 'networks' => [
+ Protocol::DIASPORA => [
+ 'name' => $owner['name'],
+ 'given_name' => $split_name['first'],
+ 'family_name' => $split_name['last'],
+ 'nick' => $owner['nick'],
+ 'guid' => $approfile['diaspora:guid'],
+ 'url' => $owner['url'],
+ 'addr' => $owner['addr'],
+ 'alias' => $owner['alias'],
+ 'photo' => $owner['photo'],
+ 'photo_medium' => $owner['thumb'],
+ 'photo_small' => $owner['micro'],
+ 'batch' => $approfile['generator']['url'] . '/receive/public',
+ 'notify' => $owner['notify'],
+ 'poll' => $owner['poll'],
+ 'poco' => $owner['poco'],
+ 'network' => Protocol::DIASPORA,
+ 'pubkey' => $owner['upubkey'],
+ ]
+ ]
];
} catch (Exception $e) {
// Default values for non existing targets
projects / friendica.git / blobdiff