// ZRL
if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend() && !$this->session->getLocalUserId()) {
- // Only continue when the given profile link seems valid
+ // Only continue when the given profile link seems valid.
// Valid profile links contain a path with "/profile/" and no query parameters
if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == '') &&
- strstr(parse_url($_GET['zrl'], PHP_URL_PATH), '/profile/')) {
+ strpos(parse_url($_GET['zrl'], PHP_URL_PATH) ?? '', '/profile/') !== false) {
if ($this->session->get('visitor_home') != $_GET['zrl']) {
$this->session->set('my_url', $_GET['zrl']);
$this->session->set('authenticated', 0);
private static function getFilename(string $url): string
{
- $guid = Item::guidFromUri($url, parse_url($url, PHP_URL_HOST));
+ $guid = Item::guidFromUri($url);
return substr($guid, 0, 2) . '/' . substr($guid, 3, 2) . '/' . substr($guid, 5, 3) . '/' .
substr($guid, 9, 2) .'/' . substr($guid, 11, 2) . '/' . substr($guid, 13, 4). '/' . substr($guid, 18) . '-';
return $fetched_contact;
}
- $parts = parse_url($apcontact['url']);
- unset($parts['scheme']);
- unset($parts['path']);
-
if (empty($apcontact['addr'])) {
- if (!empty($apcontact['nick']) && is_array($parts)) {
- $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
- } else {
+ try {
+ $apcontact['addr'] = $apcontact['nick'] . '@' . (new Uri($apcontact['url']))->getAuthority();
+ } catch (\Throwable $e) {
+ Logger::warning('Unable to coerce APContact URL into a UriInterface object', ['url' => $apcontact['url'], 'error' => $e->getMessage()]);
$apcontact['addr'] = '';
}
}
if ($static) {
$query_params['static'] = true;
}
-
+
return $url . ($guid ?: $cid) . (!empty($query_params) ? '?' . http_build_query($query_params) : '');
}
}
$update = false;
- $guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url'], parse_url($ret['url'], PHP_URL_HOST));
+ $guid = ($ret['guid'] ?? '') ?: Item::guidFromUri($ret['url']);
// make sure to not overwrite existing values with blank entries except some technical fields
$keep = ['batch', 'notify', 'poll', 'request', 'confirm', 'poco', 'baseurl'];
* Posts that are created on this system are using System::createUUID.
* Received ActivityPub posts are using Processor::getGUIDByURL.
*
- * @param string $uri uri of an item entry
+ * @param string $uri uri of an item entry
* @param string|null $host hostname for the GUID prefix
* @return string Unique guid
+ * @throws \Exception
*/
public static function guidFromUri(string $uri, string $host = null): string
{
// Remove the scheme to make sure that "https" and "http" doesn't make a difference
unset($parsed['scheme']);
+ $hostPart = $host ?? $parsed['host'] ?? '';
+ if (!$hostPart) {
+ Logger::warning('Empty host GUID part', ['uri' => $uri, 'host' => $host, 'parsed' => $parsed, 'callstack' => System::callstack(10)]);
+ }
+
// Glue it together to be able to make a hash from it
$host_id = implode('/', $parsed);
// Use a mixture of several hashes to provide some GUID like experience
- return hash('crc32', $host) . '-'. hash('joaat', $host_id) . '-'. hash('fnv164', $host_id);
+ return hash('crc32', $hostPart) . '-' . hash('joaat', $host_id) . '-' . hash('fnv164', $host_id);
}
/**
}
if (empty($msg['guid'])) {
- $host = parse_url($msg['from-url'], PHP_URL_HOST);
- $msg['guid'] = Item::guidFromUri($msg['uri'], $host);
+ $msg['guid'] = Item::guidFromUri($msg['uri'], parse_url($msg['from-url'], PHP_URL_HOST));
}
$msg['created'] = (!empty($msg['created']) ? DateTimeFormat::utc($msg['created']) : DateTimeFormat::utcNow());
// We display the last activity (post or login), reduced to year and week number
$last_active = strtotime($owner['last-item']);
- if ($last_active < strtotime($owner['last-activity'])) {
+ if ($owner['last-activity'] && $last_active < strtotime($owner['last-activity'])) {
$last_active = strtotime($owner['last-activity']);
}
$json_info['last-activity'] = date('o-W', $last_active);
*/
protected function content(array $request = []): string
{
- if (strlen($this->config->get('system', 'singleuser'))) {
+ if ($this->config->get('system', 'singleuser')) {
$this->baseUrl->redirect('profile/' . $this->config->get('system', 'singleuser'));
}
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;
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)) {
}
$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 [];
}
$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
private static function processContent(array $activity, array $item)
{
if (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/markdown')) {
- $item['title'] = strip_tags($activity['name']);
+ $item['title'] = strip_tags($activity['name'] ?? '');
$content = Markdown::toBBCode($activity['content']);
} elseif (!empty($activity['mediatype']) && ($activity['mediatype'] == 'text/bbcode')) {
$item['title'] = $activity['name'];
foreach ($receivers[$element] as $receiver) {
if ($receiver == ActivityPub::PUBLIC_COLLECTION) {
$name = Receiver::PUBLIC_COLLECTION;
+ } elseif ($path = parse_url($receiver, PHP_URL_PATH)) {
+ $name = trim($path, '/');
} else {
- $name = trim(parse_url($receiver, PHP_URL_PATH), '/');
+ Logger::warning('Unable to coerce name from receiver', ['receiver' => $receiver]);
+ $name = '';
}
$target = Tag::getTargetType($receiver);
Logger::notice('No object data found', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor, 'activity' => $activity]);
return;
}
-
+
if (self::routeActivities($object_data, $type, true)) {
Logger::debug('Handled activity', ['type' => $type, 'object_type' => $object_type, 'object_id' => $object_id, 'actor' => $actor]);
} else {
continue;
}
- $element = ['type' => str_replace('as:', '', JsonLD::fetchElement($tag, '@type')),
+ $element = ['type' => str_replace('as:', '', JsonLD::fetchElement($tag, '@type') ?? ''),
'href' => JsonLD::fetchElement($tag, 'as:href', '@id'),
'name' => JsonLD::fetchElement($tag, 'as:name', '@value')];
$notify = Item::isRemoteSelf($contact, $item);
- // Distributed items should have a well formatted URI.
- // Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
+ // Distributed items should have a well-formatted URI.
+ // Additionally, we have to avoid conflicts with identical URI between imported feeds and these items.
if ($notify) {
$item['guid'] = Item::guidFromUri($orig_plink, DI::baseUrl()->getHostname());
$item['uri'] = Item::newURI($item['guid']);
projects / friendica.git / commitdiff