<?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
// Once we have the author URI, go to the web and try to find their public key
// (first this will look it up locally if it is in the diaspora-contact cache)
// This will also convert diaspora public key from pkcs#1 to pkcs#8
- Logger::notice('Fetching key for ' . $author);
+ Logger::info('Fetching key for ' . $author);
$key = self::key($author);
if (!$key) {
Logger::notice('Could not retrieve author key.');
throw new \Friendica\Network\HTTPException\BadRequestException();
}
- Logger::notice('Message verified.');
+ Logger::info('Message verified.');
return [
'message' => $inner_decrypted,
}
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);
}
{
// Check for Diaspora (and Friendica) typical paths
if (!preg_match('=(https?://.+)/(?:posts|display|objects)/([a-zA-Z0-9-_@.:%]+[a-zA-Z0-9])=i', $url, $matches)) {
- Logger::info('Invalid url', ['url' => $url]);
+ Logger::notice('Invalid url', ['url' => $url]);
return false;
}
Logger::info('Found', ['id' => $item['id']]);
return $item['id'];
} else {
- Logger::info('Not found', ['guid' => $guid, 'uid' => $uid]);
+ Logger::notice('Not found', ['guid' => $guid, 'uid' => $uid]);
return false;
}
}
*/
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);
Logger::notice('Parent item not found: parent: ' . $guid . ' - user: ' . $uid);
return false;
} else {
- Logger::notice('Parent item found: parent: ' . $guid . ' - user: ' . $uid);
+ Logger::info('Parent item found: parent: ' . $guid . ' - user: ' . $uid);
return $item;
}
}
return false;
}
- Logger::notice('Got migration for ' . $old_author . ', to ' . $new_author . ' with user ' . $importer['uid']);
+ Logger::info('Got migration for ' . $old_author . ', to ' . $new_author . ' with user ' . $importer['uid']);
// Check signature
$signed_text = 'AccountMigration:' . $old_author . ':' . $new_author;
Contact::update($fields, ['addr' => $old_author->getAddr()]);
- Logger::notice('Contacts are updated.');
+ Logger::info('Contacts are updated.');
return true;
}
}
DBA::close($contacts);
- Logger::notice('Removed contacts for ' . $author_handle);
+ Logger::info('Removed contacts for ' . $author_handle);
return true;
}
} 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']]);
}
/**
- * Processes poll participations - unssupported
+ * Processes poll participations - unsupported
*
* @param array $importer Array of the importer user
* @param object $data The message object
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;
$author = WebFingerUri::fromString($author_handle);
// the current protocol version doesn't know these fields
- // That means that we will assume their existance
+ // That means that we will assume their existence
if (isset($data->following)) {
$following = (XML::unescape($data->following) == 'true');
} else {
} elseif (!$following && $sharing) {
Logger::info("Author " . $author . " wants to share with us.");
} elseif ($following && $sharing) {
- Logger::info("Author " . $author . " wants to have a bidirectional conection.");
+ Logger::info("Author " . $author . " wants to have a bidirectional connection.");
} elseif ($following && !$sharing) {
Logger::info("Author " . $author . " wants to listen to us.");
}
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;
}
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;
* ************************************************************************************** */
/**
- * returnes the handle of a contact
+ * returns the handle of a contact
*
* @param array $contact contact array
*
}
// Normally we should have a filled "addr" field - but in the past this wasn't the case
- // So - just in case - we build the the address here.
+ // So - just in case - we build the address here.
if ($contact['nickname'] != '') {
$nick = $contact['nickname'];
} else {
$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 0;
}
- Logger::notice('transmit: ' . $logid . '-' . $guid . ' ' . $dest_url);
+ Logger::info('transmit: ' . $logid . '-' . $guid . ' ' . $dest_url);
if (!intval(DI::config()->get('system', 'diaspora_test'))) {
$content_type = (($public_batch) ? 'application/magic-envelope+xml' : 'application/json');
return 200;
}
- Logger::notice('transmit: ' . $logid . '-' . $guid . ' to ' . $dest_url . ' returns: ' . $return_code);
+ 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::info('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::parentSupportDiaspora($item['thr-parent-id'])) {
+ if (!self::parentSupportDiaspora($item['thr-parent-id'], $uid)) {
Logger::info('One of the parents does not support Diaspora. A signature will not be created.', ['uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
return false;
}
* Check if the parent and their parents support Diaspora
*
* @param integer $parent_id
+ * @param integer $uid
* @return boolean
* @throws InternalServerErrorException
* @throws \ImagickException
*/
- private static function parentSupportDiaspora(int $parent_id): bool
+ private static function parentSupportDiaspora(int $parent_id, int $uid): bool
{
- $parent_post = Post::selectFirstPost(['gravity', 'signed_text', 'author-link', 'thr-parent-id'], ['uri-id' => $parent_id]);
+ $parent_post = Post::selectFirst(['gravity', 'signed_text', 'author-link', 'thr-parent-id', 'protocol'], ['uri-id' => $parent_id, 'uid' => [0, $uid]]);
if (empty($parent_post['thr-parent-id'])) {
Logger::warning('Parent post does not exist.', ['parent-id' => $parent_id]);
return false;
return false;
}
- if (($parent_post['gravity'] == Item::GRAVITY_COMMENT) && empty($parent_post['signed_text'])) {
+ if (($parent_post['protocol'] != Conversation::PARCEL_DIASPORA) && ($parent_post['gravity'] == Item::GRAVITY_COMMENT) && empty($parent_post['signed_text'])) {
Logger::info('Parent comment has got no Diaspora signature.', ['parent-id' => $parent_id]);
return false;
}
if ($parent_post['gravity'] == Item::GRAVITY_COMMENT) {
- return self::parentSupportDiaspora($parent_post['thr-parent-id']);
+ return self::parentSupportDiaspora($parent_post['thr-parent-id'], $uid);
}
return true;
'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