<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Protocol;
use Friendica\Content\Feature;
-use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown;
use Friendica\Core\Cache\Duration;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\FContact;
+use Friendica\Model\GServer;
use Friendica\Model\Item;
use Friendica\Model\ItemURI;
use Friendica\Model\Mail;
* 'key' => The public key of the author
* @throws \Exception
*/
- private static function message($guid, $server, $level = 0)
+ public static function message($guid, $server, $level = 0)
{
if ($level > 5) {
return false;
Logger::log("Fetch post from ".$source_url, Logger::DEBUG);
- $envelope = DI::httpRequest()->fetch($source_url);
+ $envelope = DI::httpClient()->fetch($source_url);
if ($envelope) {
Logger::log("Envelope was fetched.", Logger::DEBUG);
$x = self::verifyMagicEnvelope($envelope);
return false;
}
+ if (!empty($contact['gsid'])) {
+ GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+ }
+
$message_id = self::messageExists($importer["uid"], $guid);
if ($message_id) {
return true;
// Will be overwritten for sharing accounts in Item::insert
if ($fetched) {
- $datarray["post-type"] = Item::PT_FETCHED;
+ $datarray["post-reason"] = Item::PR_FETCHED;
} elseif ($datarray["uid"] == 0) {
- $datarray["post-type"] = Item::PT_GLOBAL;
+ $datarray["post-reason"] = Item::PR_GLOBAL;
} else {
- $datarray["post-type"] = Item::PT_COMMENT;
+ $datarray["post-reason"] = Item::PR_COMMENT;
}
$datarray["guid"] = $guid;
$datarray['thr-parent'] = $thr_parent ?: $toplevel_parent_item['uri'];
$datarray["object-type"] = Activity\ObjectType::COMMENT;
+ $datarray["post-type"] = Item::PT_NOTE;
$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
$datarray["source"] = $xml;
return false;
}
+ if (!empty($contact['gsid'])) {
+ GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+ }
+
$conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
if (!DBA::isResult($conversation)) {
$r = q(
return false;
}
+ if (!empty($contact['gsid'])) {
+ GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+ }
+
$message_id = self::messageExists($importer["uid"], $guid);
if ($message_id) {
return true;
return false;
}
+ if (!empty($contact['gsid'])) {
+ GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+ }
+
$conversation = null;
$condition = ['uid' => $importer["uid"], 'guid' => $conversation_guid];
return false;
}
+ if (!empty($contact['gsid'])) {
+ GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+ }
+
if (self::messageExists($importer["uid"], $guid)) {
return true;
}
return true;
} else {
Logger::log("Author ".$author." doesn't want to follow us anymore.", Logger::DEBUG);
- Contact::removeFollower($importer, $contact);
+ Contact::removeFollower($contact);
return true;
}
}
$item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
- // Add OEmbed and other information to the body
- $item["body"] = PageInfo::searchAndAppendToBody($item["body"], false, true);
-
return $item;
} else {
return $item;
return false;
}
+ if (!empty($contact['gsid'])) {
+ GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+ }
+
$message_id = self::messageExists($importer["uid"], $guid);
if ($message_id) {
return true;
Tag::storeFromBody($datarray['uri-id'], $datarray["body"]);
- Post\Media::copy($original_item['uri-id'], $datarray['uri-id']);
$datarray["app"] = $original_item["app"];
$datarray["plink"] = self::plink($author, $guid);
return false;
}
+ if (!empty($contact['gsid'])) {
+ GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
+ }
+
$message_id = self::messageExists($importer["uid"], $guid);
if ($message_id) {
return true;
if ($data->photo) {
foreach ($data->photo as $photo) {
self::storePhotoAsMedia($datarray['uri-id'], $photo);
- $body = "[img]".XML::unescape($photo->remote_photo_path).
- XML::unescape($photo->remote_photo_name)."[/img]\n".$body;
}
$datarray["object-type"] = Activity\ObjectType::IMAGE;
+ $datarray["post-type"] = Item::PT_IMAGE;
} else {
$datarray["object-type"] = Activity\ObjectType::NOTE;
-
- // Add OEmbed and other information to the body
- if (!self::isHubzilla($contact["url"])) {
- $body = PageInfo::searchAndAppendToBody($body, false, true);
- }
+ $datarray["post-type"] = Item::PT_NOTE;
}
/// @todo enable support for polls
$datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
if ($fetched) {
- $datarray["post-type"] = Item::PT_FETCHED;
+ $datarray["post-reason"] = Item::PR_FETCHED;
} elseif ($datarray["uid"] == 0) {
- $datarray["post-type"] = Item::PT_GLOBAL;
+ $datarray["post-reason"] = Item::PR_GLOBAL;
}
$datarray["body"] = self::replacePeopleGuid($body, $contact["url"]);
return false;
}
- $aes_key = openssl_random_pseudo_bytes(32);
+ $aes_key = random_bytes(32);
$b_aes_key = base64_encode($aes_key);
- $iv = openssl_random_pseudo_bytes(16);
+ $iv = random_bytes(16);
$b_iv = base64_encode($iv);
$ciphertext = self::aesEncrypt($aes_key, $iv, $msg);
if (!intval(DI::config()->get("system", "diaspora_test"))) {
$content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
- $postResult = DI::httpRequest()->post($dest_url . "/", $envelope, ["Content-Type: " . $content_type]);
+ $postResult = DI::httpClient()->post($dest_url . "/", $envelope, ['Content-Type' => $content_type]);
$return_code = $postResult->getReturnCode();
} else {
Logger::log("test_mode");
{
$msg = self::buildPostXml($type, $message);
- Logger::log('message: '.$msg, Logger::DATA);
- Logger::log('send guid '.$guid, Logger::DEBUG);
-
// Fallback if the private key wasn't transmitted in the expected field
if (empty($owner['uprvkey'])) {
$owner['uprvkey'] = $owner['prvkey'];
if (!empty($fcontact)) {
$pubkey = $fcontact['pubkey'];
}
+ } else {
+ // The "addr" field should always be filled.
+ // If this isn't the case, it will raise a notice some lines later.
+ // And in the log we will see where it came from and we can handle it there.
+ Logger::notice('Empty addr', ['contact' => $contact ?? [], 'callstack' => System::callstack(20)]);
}
$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $pubkey, $public_batch);
$return_code = self::transmit($owner, $contact, $envelope, $public_batch, $guid);
- Logger::log("guid: ".$guid." result ".$return_code, Logger::DEBUG);
+ Logger::info('Transmitted message', ['owner' => $owner['uid'], 'target' => $contact['addr'], 'type' => $type, 'guid' => $guid, 'result' => $return_code]);
return $return_code;
}
// In fact it doesn't matter which user sends this - but it is needed by the protocol.
// 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];
$first_user = DBA::selectFirst('user', ['uid'], $condition, ['order' => ['uid']]);
$type = "reshare";
} else {
$title = $item["title"];
- $body = $item["body"];
+ $body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['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')) {
$thread_parent_item = Post::selectFirst(['guid', 'author-id', 'author-link', 'gravity'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
}
- $body = $item["body"];
+ $body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
// The replied to autor mention is prepended for clarity if:
// - Item replied isn't yours
$dob = '';
if ($profile['dob'] && ($profile['dob'] > '0000-00-00')) {
- list($year, $month, $day) = sscanf($profile['dob'], '%4d-%2d-%2d');
+ [$year, $month, $day] = sscanf($profile['dob'], '%4d-%2d-%2d');
if ($year < 1004) {
$year = 1004;
}
}
if (!$recips) {
- $recips = q(
- "SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
- AND `uid` = %d AND `rel` != %d",
- DBA::escape(Protocol::DIASPORA),
- intval($uid),
- intval(Contact::SHARING)
- );
+ $recips = DBA::selectToArray('contact', [], ['network' => Protocol::DIASPORA, 'uid' => $uid, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]);
}
if (!$recips) {
/**
* Creates the signature for Comments that are created on our system
*
- * @param integer $uid The user of that comment
* @param array $item Item array
*
* @return array Signed content
* @throws \Exception
*/
- public static function createCommentSignature($uid, array $item)
+ public static function createCommentSignature(array $item)
{
+ if (!empty($item['author-link'])) {
+ $url = $item['author-link'];
+ } else {
+ $contact = Contact::getById($item['author-id'], ['url']);
+ if (empty($contact['url'])) {
+ Logger::warning('Author Contact not found', ['author-id' => $item['author-id']]);
+ return false;
+ }
+ $url = $contact['url'];
+ }
+
+ $uid = User::getIdForURL($url);
+ if (empty($uid)) {
+ Logger::info('No owner post, so not storing signature', ['url' => $contact['url']]);
+ return false;
+ }
+
$owner = User::getOwnerDataById($uid);
if (empty($owner)) {
Logger::info('No owner post, so not storing signature');
return false;
}
- $parent = Post::selectFirst(['parent-uri'], ['uri' => $item['thr-parent']]);
- if (!DBA::isResult($parent)) {
- return;
+ // This is only needed for the automated tests
+ if (empty($owner['uprvkey'])) {
+ return false;
}
- $item['parent-uri'] = $parent['parent-uri'];
-
$message = self::constructComment($item, $owner);
if ($message === false) {
return false;