<?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\HttpClientAccept;
use Friendica\Network\HTTPException;
use Friendica\Network\Probe;
+use Friendica\Protocol\Delivery;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map;
use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML;
-use Friendica\Worker\Delivery;
use GuzzleHttp\Psr7\Uri;
use SimpleXMLElement;
return $contacts;
}
- $items = Post::select(['author-id', 'author-link', 'parent-author-link', 'parent-guid', 'guid'],
- ['parent' => $item['parent'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]);
+ $items = Post::select(
+ ['author-id', 'author-link', 'parent-author-link', 'parent-guid', 'guid'],
+ ['parent' => $item['parent'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]
+ );
while ($item = Post::fetch($items)) {
- $contact = DBA::selectFirst('contact', ['id', 'url', 'name', 'protocol', 'batch', 'network'],
- ['id' => $item['author-id']]);
- if (!DBA::isResult($contact) || empty($contact['batch']) ||
+ $contact = DBA::selectFirst(
+ 'contact',
+ ['id', 'url', 'name', 'protocol', 'batch', 'network'],
+ ['id' => $item['author-id']]
+ );
+ if (
+ !DBA::isResult($contact) || empty($contact['batch']) ||
($contact['network'] != Protocol::DIASPORA) ||
- Strings::compareLink($item['parent-author-link'], $item['author-link'])) {
+ Strings::compareLink($item['parent-author-link'], $item['author-link'])
+ ) {
continue;
}
$basedom = XML::parseString($xml, true);
if (!is_object($basedom)) {
- Logger::notice('Received data does not seem to be an XML. Discarding. '.$xml);
+ Logger::notice('Received data does not seem to be an XML. Discarding. ' . $xml);
if ($no_exit) {
return false;
} else {
$alg = $base->alg;
- $signed_data = $data.'.'.Strings::base64UrlEncode($type).'.'.Strings::base64UrlEncode($encoding).'.'.Strings::base64UrlEncode($alg);
+ $signed_data = $data . '.' . Strings::base64UrlEncode($type) . '.' . Strings::base64UrlEncode($encoding) . '.' . Strings::base64UrlEncode($alg);
// decode the data
}
if (!($fields = self::validPosting($msg))) {
- Logger::warning('Invalid posting', ['msg' => $msg]);
+ Logger::notice('Invalid posting', ['msg' => $msg]);
return false;
}
if (is_null($fields)) {
$private = true;
if (!($fields = self::validPosting($msg))) {
- Logger::warning('Invalid posting', ['msg' => $msg]);
+ Logger::notice('Invalid posting', ['msg' => $msg]);
return false;
}
} else {
$signed_data .= $entry;
}
- if (!in_array($fieldname, ['parent_author_signature', 'target_author_signature'])
+ if (
+ !in_array($fieldname, ['parent_author_signature', 'target_author_signature'])
|| ($orig_type == 'relayable_retraction')
) {
XML::copy($entry, $fields, $fieldname);
*/
private static function key(WebFingerUri $uri): string
{
- Logger::notice('Fetching diaspora key', ['handle' => $uri->getAddr(), 'callstack' => System::callstack(20)]);
+ Logger::info('Fetching diaspora key', ['handle' => $uri->getAddr(), 'callstack' => System::callstack(20)]);
try {
return DI::dsprContact()->getByAddr($uri)->pubKey;
- } catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+ } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
return '';
}
}
*/
private static function contactByHandle(int $uid, WebFingerUri $uri): array
{
+ Contact::updateByUrlIfNeeded($uri->getAddr());
return Contact::getByURL($uri->getAddr(), null, [], $uid);
}
*/
public static function isSupportedByContactUrl(string $url, ?bool $update = null): bool
{
- $contact = Contact::getByURL($url, $update);
+ $contact = Contact::getByURL($url, $update, ['uri-id', 'network']);
+
+ $supported = DI::dsprContact()->existsByUriId($contact['uri-id'] ?? 0);
- return DI::dsprContact()->existsByUriId($contact['uri-id'] ?? 0);
+ if (!$supported && is_null($update) && ($contact['network'] == Protocol::DFRN)) {
+ $supported = self::isSupportedByContactUrl($url, true);
+ }
+
+ return $supported;
}
/**
*/
private static function parentItem(int $uid, string $guid, WebFingerUri $author, array $contact)
{
- $fields = ['id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin',
+ $fields = [
+ 'id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin',
'author-name', 'author-link', 'author-avatar', 'gravity',
- 'owner-name', 'owner-link', 'owner-avatar'];
+ 'owner-name', 'owner-link', 'owner-avatar'
+ ];
$condition = ['uid' => $uid, 'guid' => $guid];
$item = Post::selectFirst($fields, $condition);
} elseif ($person_uri) {
try {
return DI::dsprContact()->selectOneByAddr($person_uri)->baseurl . '/objects/' . $guid;
- } catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+ } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
return '';
}
}
$contact = DI::dsprContact()->getByUrl(new Uri($match[3]));
Tag::storeByHash($uriid, $match[1], $contact->name ?: $contact->nick, $contact->url);
} catch (\Throwable $e) {
-
}
}
}
try {
$author_url = (string)DI::dsprContact()->getByAddr($author)->url;
- } catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+ } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
Logger::notice('Unable to find author details', ['author' => $author->getAddr()]);
return false;
}
try {
$author_url = (string)DI::dsprContact()->getByAddr($author)->url;
- } catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+ } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
Logger::notice('Unable to find author details', ['author' => $author->getAddr()]);
return false;
}
try {
$author = DI::dsprContact()->getByAddr($author_uri);
- } catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+ } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
Logger::notice('Unable to find author details', ['author' => $author_uri->getAddr()]);
return false;
}
try {
$author_url = (string)DI::dsprContact()->getByAddr($author)->url;
- } catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+ } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
Logger::notice('unable to find author details', ['author' => $author->getAddr()]);
return false;
}
Logger::info('Participation stored', ['id' => $message_id, 'guid' => $guid, 'parent_guid' => $parent_guid, 'author' => $author]);
// Send all existing comments and likes to the requesting server
- $comments = Post::select(['id', 'uri-id', 'parent-author-network', 'author-network', 'verb', 'gravity'],
- ['parent' => $toplevel_parent_item['id'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]);
+ $comments = Post::select(
+ ['id', 'uri-id', 'parent-author-network', 'author-network', 'verb', 'gravity'],
+ ['parent' => $toplevel_parent_item['id'], 'gravity' => [Item::GRAVITY_COMMENT, Item::GRAVITY_ACTIVITY]]
+ );
while ($comment = Post::fetch($comments)) {
if (($comment['gravity'] == Item::GRAVITY_ACTIVITY) && !in_array($comment['verb'], [Activity::LIKE, Activity::DISLIKE])) {
Logger::info('Unsupported activities are not relayed', ['item' => $comment['id'], 'verb' => $comment['verb']]);
return false;
}
- $name = XML::unescape($data->first_name).((strlen($data->last_name)) ? ' ' . XML::unescape($data->last_name) : '');
+ $name = XML::unescape($data->first_name) . ((strlen($data->last_name)) ? ' ' . XML::unescape($data->last_name) : '');
$image_url = XML::unescape($data->image_url);
$birthday = XML::unescape($data->birthday);
$about = Markdown::toBBCode(XML::unescape($data->bio));
$birthday = $contact['bd'];
}
- $fields = ['name' => $name, 'location' => $location,
+ $fields = [
+ 'name' => $name, 'location' => $location,
'name-date' => DateTimeFormat::utcNow(), 'about' => $about,
'addr' => $author->getAddr(), 'nick' => $author->getUser(), 'keywords' => $keywords,
- 'unsearchable' => !$searchable, 'sensitive' => $nsfw];
+ 'unsearchable' => !$searchable, 'sensitive' => $nsfw
+ ];
if (!empty($birthday)) {
$fields['bd'] = $birthday;
try {
$author_url = (string)DI::dsprContact()->getByAddr($author)->url;
- } catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+ } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
Logger::notice('Cannot resolve diaspora handle for recipient', ['author' => $author->getAddr(), 'recipient' => $recipient]);
return false;
}
return true;
}
- /**
- * Stores a reshare activity
- *
- * @param array $item Array of reshare post
- * @param integer $parent_message_id Id of the parent post
- * @param string $guid GUID string of reshare action
- * @param WebFingerUri $author Author handle
- * @return false|void
- * @throws InternalServerErrorException
- * @throws \ImagickException
- */
- private static function addReshareActivity(array $item, int $parent_message_id, string $guid, WebFingerUri $author)
- {
- $parent = Post::selectFirst(['uri', 'guid'], ['id' => $parent_message_id]);
-
- $datarray = [];
-
- $datarray['uid'] = $item['uid'];
- $datarray['contact-id'] = $item['contact-id'];
- $datarray['network'] = $item['network'];
-
- $datarray['author-link'] = $item['author-link'];
- $datarray['author-id'] = $item['author-id'];
-
- $datarray['owner-link'] = $datarray['author-link'];
- $datarray['owner-id'] = $datarray['author-id'];
-
- $datarray['guid'] = $parent['guid'] . '-' . $guid;
- $datarray['uri'] = self::getUriFromGuid($datarray['guid'], $author);
- $datarray['thr-parent'] = $parent['uri'];
-
- $datarray['verb'] = $datarray['body'] = Activity::ANNOUNCE;
- $datarray['gravity'] = Item::GRAVITY_ACTIVITY;
- $datarray['object-type'] = Activity\ObjectType::NOTE;
-
- $datarray['protocol'] = $item['protocol'];
- $datarray['source'] = $item['source'];
- $datarray['direction'] = $item['direction'];
- $datarray['post-reason'] = $item['post-reason'];
-
- $datarray['plink'] = self::plink($author, $datarray['guid']);
- $datarray['private'] = $item['private'];
- $datarray['changed'] = $datarray['created'] = $datarray['edited'] = $item['created'];
-
- if (Item::isTooOld($datarray)) {
- Logger::info('Reshare activity is too old', ['created' => $datarray['created'], 'uid' => $datarray['uid'], 'guid' => $datarray['guid']]);
- return false;
- }
-
- $message_id = Item::insert($datarray);
-
- if ($message_id) {
- Logger::info('Stored reshare activity.', ['guid' => $guid, 'id' => $message_id]);
- if ($datarray['uid'] == 0) {
- Item::distribute($message_id);
- }
- }
- }
-
/**
* Processes a reshare message
*
self::sendParticipation($contact, $datarray);
- $root_message_id = self::messageExists($importer['uid'], $root_guid);
- if ($root_message_id) {
- self::addReshareActivity($datarray, $root_message_id, $guid, $author);
- }
-
if ($message_id) {
Logger::info('Stored reshare ' . $datarray['guid'] . ' with message id ' . $message_id);
if ($datarray['uid'] == 0) {
try {
$author = DI::dsprContact()->getByAddr($author_uri);
- } catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
+ } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
Logger::notice('Unable to find details for author', ['author' => $author_uri->getAddr()]);
return false;
}
private static function storePhotoAsMedia(int $uriid, $photo)
{
// @TODO Need to find object type, roland@f.haeder.net
- Logger::debug('photo='.get_class($photo));
+ Logger::debug('photo=' . get_class($photo));
$data = [];
$data['uri-id'] = $uriid;
$data['type'] = Post\Media::IMAGE;
$namespaces = ['me' => ActivityNamespace::SALMON_ME];
- return XML::fromArray($xmldata, $xml, false, $namespaces);
+ return XML::fromArray($xmldata, $dummy, false, $namespaces);
}
/**
try {
$target = DI::dsprContact()->getByAddr(WebFingerUri::fromString($contact['addr']));
$dest_url = $public_batch ? $target->batch : $target->notify;
- } catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
-
+ } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
}
if (empty($dest_url)) {
return 200;
}
+ if (!empty($contact['gsid']) && (empty($return_code) || $postResult->isTimeout())) {
+ GServer::setFailureById($contact['gsid']);
+ } elseif (!empty($contact['gsid']) && ($return_code >= 200) && ($return_code <= 299)) {
+ GServer::setReachableById($contact['gsid'], Protocol::DIASPORA);
+ }
+
Logger::notice('transmit: ' . $logid . '-' . $guid . ' to ' . $dest_url . ' returns: ' . $return_code);
return $return_code ? $return_code : -1;
* @param array $message The message data
*
* @return string The post XML
+ * @throws \Exception
*/
public static function buildPostXml(string $type, array $message): string
{
- $data = [$type => $message];
-
- return XML::fromArray($data, $xml);
+ return XML::fromArray([$type => $message]);
}
/**
if (!empty($contact['addr'])) {
try {
$pubkey = DI::dsprContact()->getByAddr(WebFingerUri::fromString($contact['addr']))->pubKey;
- } catch (HTTPException\NotFoundException|\InvalidArgumentException $e) {
-
+ } catch (HTTPException\NotFoundException | \InvalidArgumentException $e) {
}
} else {
// The "addr" field should always be filled.
// If the item belongs to a user, we take this user id.
if ($item['uid'] == 0) {
// @todo Possibly use an administrator account?
- $condition = ['verified' => true, 'blocked' => false,
- 'account_removed' => false, 'account_expired' => false, 'account-type' => User::ACCOUNT_TYPE_PERSON];
+ $condition = [
+ 'verified' => true, 'blocked' => false,
+ 'account_removed' => false, 'account_expired' => false, 'account-type' => User::ACCOUNT_TYPE_PERSON
+ ];
$first_user = DBA::selectFirst('user', ['uid'], $condition, ['order' => ['uid']]);
$owner = User::getOwnerDataById($first_user['uid']);
} else {
$old_handle = DI::pConfig()->get($uid, 'system', 'previous_addr');
$profile = self::createProfileData($uid);
- $signed_text = 'AccountMigration:'.$old_handle.':'.$profile['author'];
+ $signed_text = 'AccountMigration:' . $old_handle . ':' . $profile['author'];
$signature = base64_encode(Crypto::rsaSign($signed_text, $owner['uprvkey'], 'sha256'));
$message = [
$type = 'reshare';
} else {
+ $native_photos = DI::config()->get('diaspora', 'native_photos');
+ if ($native_photos) {
+ $item['body'] = Post\Media::removeFromEndOfBody($item['body']);
+ $attach_media = [Post\Media::AUDIO, Post\Media::VIDEO];
+ } else {
+ $attach_media = [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO];
+ }
+
$title = $item['title'];
- $body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
+ $body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item), $attach_media);
+ $body = Post\Media::addHTMLLinkToBody($item['uri-id'], $body);
// Fetch the title from an attached link - if there is one
if (empty($item['title']) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
- $page_data = BBCode::getAttachmentData($item['body']);
- if (!empty($page_data['type']) && !empty($page_data['title']) && ($page_data['type'] == 'link')) {
- $title = $page_data['title'];
+ $media = Post\Media::getByURIId($item['uri-id'], [Post\Media::HTML]);
+ if (!empty($media) && !empty($media[0]['name']) && ($media[0]['name'] != $media[0]['url'])) {
+ $title = $media[0]['name'];
}
}
'location' => $location
];
+ if ($native_photos) {
+ $message = self::addPhotos($item, $message);
+ }
+
// Diaspora rejects messages when they contain a location without "lat" or "lng"
if (!isset($location['lat']) || !isset($location['lng'])) {
unset($message['location']);
if (count($event)) {
$message['event'] = $event;
- if (!empty($event['location']['address']) &&
+ if (
+ !empty($event['location']['address']) &&
!empty($event['location']['lat']) &&
- !empty($event['location']['lng'])) {
+ !empty($event['location']['lng'])
+ ) {
$message['location'] = $event['location'];
}
return $msg;
}
+ /**
+ * Add photo elements to the message array
+ *
+ * @param array $item
+ * @param array $message
+ * @return array
+ */
+ private static function addPhotos(array $item, array $message): array
+ {
+ $medias = Post\Media::getByURIId($item['uri-id'], [Post\Media::IMAGE]);
+ $public = ($item['private'] == Item::PRIVATE ? 'false' : 'true');
+
+ $counter = 0;
+ foreach ($medias as $media) {
+ if (Item::containsLink($item['body'], $media['preview'] ?? $media['url'], $media['type'])) {
+ continue;
+ }
+
+ $name = basename($media['url']);
+ $path = str_replace($name, '', $media['url']);
+
+ $message[++$counter . ':photo'] = [
+ 'guid' => Item::guid(['uri' => $media['url']], false),
+ 'author' => $item['author-addr'],
+ 'public' => $public,
+ 'created_at' => $item['created'],
+ 'remote_photo_path' => $path,
+ 'remote_photo_name' => $name,
+ 'status_message_guid' => $item['guid'],
+ 'height' => $media['height'],
+ 'width' => $media['width'],
+ 'text' => $media['description'],
+ ];
+ }
+
+ return $message;
+ }
+
private static function prependParentAuthorMention(string $body, string $profile_url): string
{
$profile = Contact::getByURL($profile_url, false, ['addr', 'name']);
- if (!empty($profile['addr'])
+ if (
+ !empty($profile['addr'])
&& !strstr($body, $profile['addr'])
&& !strstr($body, $profile_url)
) {
}
$body = Post\Media::addAttachmentsToBody($item['uri-id'], DI::contentItem()->addSharedPost($item));
+ $body = Post\Media::addHTMLLinkToBody($item['uri-id'], $body);
// The replied to autor mention is prepended for clarity if:
// - Item replied isn't yours
$kw = str_replace(' ', ' ', $kw);
$arr = explode(' ', $kw);
if (count($arr)) {
- for ($x = 0; $x < 5; $x ++) {
+ for ($x = 0; $x < 5; $x++) {
if (!empty($arr[$x])) {
- $data['tag_string'] .= '#'. trim($arr[$x]) .' ';
+ $data['tag_string'] .= '#' . trim($arr[$x]) . ' ';
}
}
}
return false;
}
- if (!self::isSupportedByContactUrl($parent_post['author-link'], false)) {
+ if (!self::isSupportedByContactUrl($parent_post['author-link'])) {
Logger::info('Parent author is no Diaspora contact.', ['parent-id' => $parent_id]);
return false;
}
'body' => '',
'quote-uri-id' => $UriId,
'allow_cid' => $owner['allow_cid'] ?? '',
- 'allow_gid' => $owner['allow_gid']?? '',
+ 'allow_gid' => $owner['allow_gid'] ?? '',
'deny_cid' => $owner['deny_cid'] ?? '',
'deny_gid' => $owner['deny_gid'] ?? '',
];
projects / friendica.git / blobdiff