<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
namespace Friendica\Worker;
+use Friendica\Contact\FriendSuggest\Collection\FriendSuggests;
+use Friendica\Contact\FriendSuggest\Exception\FriendSuggestNotFoundException;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Email;
use Friendica\Protocol\Activity;
-use Friendica\Util\Strings;
use Friendica\Util\Network;
use Friendica\Core\Worker;
use Friendica\Model\FContact;
+use Friendica\Model\Item;
use Friendica\Protocol\Relay;
class Delivery
const DELETION = 'drop';
const POST = 'wall-new';
const POKE = 'poke';
- const UPLINK = 'uplink';
const REMOVAL = 'removeme';
const PROFILEUPDATE = 'profileupdate';
- public static function execute($cmd, $target_id, $contact_id)
+ public static function execute(string $cmd, int $post_uriid, int $contact_id, int $sender_uid = 0)
{
- Logger::info('Invoked', ['cmd' => $cmd, 'target' => $target_id, 'contact' => $contact_id]);
+ Logger::info('Invoked', ['cmd' => $cmd, 'target' => $post_uriid, 'sender_uid' => $sender_uid, 'contact' => $contact_id]);
$top_level = false;
$followup = false;
$items = [];
if ($cmd == self::MAIL) {
- $target_item = DBA::selectFirst('mail', [], ['id' => $target_id]);
+ $target_item = DBA::selectFirst('mail', [], ['id' => $post_uriid]);
if (!DBA::isResult($target_item)) {
return;
}
$uid = $target_item['uid'];
} elseif ($cmd == self::SUGGESTION) {
- $target_item = DBA::selectFirst('fsuggest', [], ['id' => $target_id]);
- if (!DBA::isResult($target_item)) {
+ try {
+ $target_item = DI::fsuggest()->selectOneById($post_uriid)->toArray();
+ } catch (FriendSuggestNotFoundException $e) {
+ DI::logger()->info('Cannot find FriendSuggestion', ['id' => $post_uriid]);
return;
}
$uid = $target_item['uid'];
} elseif ($cmd == self::RELOCATION) {
- $uid = $target_id;
+ $uid = $post_uriid;
$target_item = [];
} else {
- $item = Model\Item::selectFirst(['parent'], ['id' => $target_id]);
+ $item = Model\Post::selectFirst(['id', 'parent'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
if (!DBA::isResult($item) || empty($item['parent'])) {
+ Logger::warning('Post not found', ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
return;
}
+ $target_id = intval($item['id']);
$parent_id = intval($item['parent']);
- $condition = ['id' => [$target_id, $parent_id], 'visible' => true, 'moderated' => false];
+ $condition = ['id' => [$target_id, $parent_id], 'visible' => true];
$params = ['order' => ['id']];
- $itemdata = Model\Item::select([], $condition, $params);
+ $itemdata = Model\Post::select(Item::DELIVER_FIELDLIST, $condition, $params);
- while ($item = Model\Item::fetch($itemdata)) {
+ while ($item = Model\Post::fetch($itemdata)) {
if ($item['verb'] == Activity::ANNOUNCE) {
continue;
}
DBA::close($itemdata);
if (empty($target_item)) {
- Logger::log('Item ' . $target_id . "wasn't found. Quitting here.");
+ Logger::notice('Item ' . $target_id . "wasn't found. Quitting here.");
return;
}
if (empty($parent)) {
- Logger::log('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
+ Logger::notice('Parent ' . $parent_id . ' for item ' . $target_id . "wasn't found. Quitting here.");
self::setFailedQueue($cmd, $target_item);
return;
}
} elseif (!empty($target_item['uid'])) {
$uid = $target_item['uid'];
} else {
- Logger::log('Only public users for item ' . $target_id, Logger::DEBUG);
+ Logger::info('Only public users for item ' . $target_id);
self::setFailedQueue($cmd, $target_item);
return;
}
$condition = ['uri' => $target_item['thr-parent'], 'uid' => $target_item['uid']];
- $thr_parent = Model\Item::selectFirst(['network', 'object'], $condition);
+ $thr_parent = Model\Post::selectFirst(['network', 'object'], $condition);
if (!DBA::isResult($thr_parent)) {
// Shouldn't happen. But when this does, we just take the parent as thread parent.
// That's totally okay for what we use this variable here.
}
}
- // When commenting too fast after delivery, a post wasn't recognized as top level post.
- // The count then showed more than one entry. The additional check should help.
- // The check for the "count" should be superfluous, but I'm not totally sure by now, so we keep it.
- if ((($parent['id'] == $target_id) || (count($items) == 1)) && ($parent['uri'] === $parent['parent-uri'])) {
- Logger::log('Top level post');
- $top_level = true;
- }
+ $top_level = $target_item['gravity'] == GRAVITY_PARENT;
// This is IMPORTANT!!!!
*/
if (!$top_level && ($parent['wall'] == 0) && stristr($target_item['uri'], $localhost)) {
- Logger::log('Followup ' . $target_item["guid"], Logger::DEBUG);
+ Logger::info('Followup ' . $target_item["guid"]);
// local followup to remote post
$followup = true;
}
}
if (empty($items)) {
- Logger::log('No delivery data for ' . $cmd . ' - Item ID: ' .$target_id . ' - Contact ID: ' . $contact_id);
+ Logger::notice('No delivery data', ['command' => $cmd, 'uri-id' => $post_uriid, 'cid' => $contact_id]);
}
$owner = Model\User::getOwnerDataById($uid);
return;
}
+ $protocol = Model\GServer::getProtocol($contact['gsid'] ?? 0);
+
// Transmit via Diaspora if the thread had started as Diaspora post.
// Also transmit via Diaspora if this is a direct answer to a Diaspora comment.
// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
- if (!empty($parent) && !empty($thr_parent) && in_array(Protocol::DIASPORA, [$parent['network'], $thr_parent['network']])) {
+ // Also transmit relayed posts from Diaspora contacts via Diaspora.
+ if (($contact['network'] != Protocol::DIASPORA) && in_array(Protocol::DIASPORA, [$parent['network'] ?? '', $thr_parent['network'] ?? '', $target_item['network']] ?? '')) {
+ Logger::info('Enforcing the Diaspora protocol', ['id' => $contact['id'], 'network' => $contact['network'], 'parent' => $parent['network'], 'thread-parent' => $thr_parent['network'], 'post' => $target_item['network']]);
$contact['network'] = Protocol::DIASPORA;
}
- // Ensure that local contacts are delivered locally
- if (Model\Contact::isLocal($contact['url'])) {
- $contact['network'] = Protocol::DFRN;
- }
-
- Logger::notice('Delivering', ['cmd' => $cmd, 'target' => $target_id, 'followup' => $followup, 'network' => $contact['network']]);
+ Logger::notice('Delivering', ['cmd' => $cmd, 'uri-id' => $post_uriid, 'followup' => $followup, 'network' => $contact['network']]);
switch ($contact['network']) {
case Protocol::DFRN:
- self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
+ self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup, $protocol);
break;
case Protocol::DIASPORA:
/**
* Deliver content via DFRN
*
- * @param string $cmd Command
- * @param array $contact Contact record of the receiver
- * @param array $owner Owner record of the sender
- * @param array $items Item record of the content and the parent
- * @param array $target_item Item record of the content
- * @param boolean $public_message Is the content public?
- * @param boolean $top_level Is it a thread starter?
- * @param boolean $followup Is it an answer to a remote post?
+ * @param string $cmd Command
+ * @param array $contact Contact record of the receiver
+ * @param array $owner Owner record of the sender
+ * @param array $items Item record of the content and the parent
+ * @param array $target_item Item record of the content
+ * @param boolean $public_message Is the content public?
+ * @param boolean $top_level Is it a thread starter?
+ * @param boolean $followup Is it an answer to a remote post?
+ * @param int $server_protocol The protocol of the server
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
+ private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup, $server_protocol)
{
// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
- if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByURL($contact['addr'], false))) {
+ if (Diaspora::isReshare($target_item['body'] ?? '') && !empty(FContact::getByURL($contact['addr'], false))) {
Logger::info('Reshare will be transmitted via Diaspora', ['url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return;
} elseif ($cmd == self::SUGGESTION) {
$item = $target_item;
$atom = DFRN::fsuggest($item, $owner);
- DBA::delete('fsuggest', ['id' => $item['id']]);
+ DI::fsuggest()->delete(new FriendSuggests([DI::fsuggest()->selectOneById($item['id'])]));
} elseif ($cmd == self::RELOCATION) {
$atom = DFRN::relocate($owner, $owner['uid']);
} elseif ($followup) {
$msgitems = [$target_item];
$atom = DFRN::entries($msgitems, $owner);
} else {
- $msgitems = [];
- foreach ($items as $item) {
- // Only add the parent when we don't delete other items.
- if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) {
- $item["entry:comment-allow"] = true;
- $item["entry:cid"] = ($top_level ? $contact['id'] : 0);
- $msgitems[] = $item;
+ if ($target_item['deleted']) {
+ $msgitems = [$target_item];
+ } else {
+ $msgitems = [];
+ foreach ($items as $item) {
+ // Only add the parent when we don't delete other items.
+ if (($target_item['id'] == $item['id']) || ($cmd != self::DELETION)) {
+ $item["entry:comment-allow"] = true;
+ $item["entry:cid"] = ($top_level ? $contact['id'] : 0);
+ $msgitems[] = $item;
+ }
}
}
$atom = DFRN::entries($msgitems, $owner);
Logger::debug('Notifier entry: ' . $contact["url"] . ' ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' entry: ' . $atom);
- // perform local delivery if we are on the same site
- if (Model\Contact::isLocal($contact['url'])) {
- $condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true];
- $target_self = DBA::selectFirst('contact', ['uid'], $condition);
- if (!DBA::isResult($target_self)) {
- return;
- }
- $target_uid = $target_self['uid'];
-
- // Check if the user has got this contact
- $cid = Model\Contact::getIdForURL($owner['url'], $target_uid);
- if (!$cid) {
- // Otherwise there should be a public contact
- $cid = Model\Contact::getIdForURL($owner['url']);
- if (!$cid) {
- return;
- }
- }
-
- $target_importer = DFRN::getImporter($cid, $target_uid);
- if (empty($target_importer)) {
- // This should never happen
- return;
- }
-
- DFRN::import($atom, $target_importer);
-
- if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
- Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::DFRN);
- }
-
- return;
- }
-
$protocol = Model\Post\DeliveryData::DFRN;
// We don't have a relationship with contacts on a public post.
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
if (($deliver_status >= 200) && ($deliver_status <= 299)) {
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
+
+ Model\GServer::setProtocol($contact['gsid'] ?? 0, $protocol);
} else {
Model\Post\DeliveryData::incrementQueueFailed($target_item['uri-id']);
}
return;
}
- if (($deliver_status < 200) || ($deliver_status > 299)) {
+ if ((($deliver_status < 200) || ($deliver_status > 299)) && (empty($server_protocol) || ($server_protocol == Model\Post\DeliveryData::LEGACY_DFRN))) {
// Transmit via Diaspora if not possible via Friendica
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
return;
}
- } elseif ($cmd != self::RELOCATION) {
+ } else {
// DFRN payload over Diaspora transport layer
$deliver_status = DFRN::transmit($owner, $contact, $atom);
- if ($deliver_status < 200) {
- // Legacy DFRN
- $deliver_status = DFRN::deliver($owner, $contact, $atom);
- $protocol = Model\Post\DeliveryData::LEGACY_DFRN;
- }
- } else {
- $deliver_status = DFRN::deliver($owner, $contact, $atom);
- $protocol = Model\Post\DeliveryData::LEGACY_DFRN;
}
Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id'], 'return' => $deliver_status]);
// We successfully delivered a message, the contact is alive
Model\Contact::unmarkForArchival($contact);
+ Model\GServer::setProtocol($contact['gsid'] ?? 0, $protocol);
+
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], $protocol);
}
Logger::notice('Deliver via Diaspora', ['target' => $target_item['id'], 'guid' => $target_item['guid'], 'to' => $loc]);
- if (DI::config()->get('system', 'dfrn_only') || !DI::config()->get('system', 'diaspora_enabled')) {
+ if (!DI::config()->get('system', 'diaspora_enabled')) {
return;
}
$deliver_status = Diaspora::sendAccountMigration($owner, $contact, $owner['uid']);
} elseif ($target_item['deleted'] && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
// top-level retraction
- Logger::log('diaspora retract: ' . $loc);
+ Logger::notice('diaspora retract: ' . $loc);
$deliver_status = Diaspora::sendRetraction($target_item, $owner, $contact, $public_message);
} elseif ($followup) {
// send comments and likes to owner to relay
- Logger::log('diaspora followup: ' . $loc);
+ Logger::notice('diaspora followup: ' . $loc);
$deliver_status = Diaspora::sendFollowup($target_item, $owner, $contact, $public_message);
} elseif ($target_item['uri'] !== $target_item['parent-uri']) {
// we are the relay - send comments, likes and relayable_retractions to our conversants
- Logger::log('diaspora relay: ' . $loc);
+ Logger::notice('diaspora relay: ' . $loc);
$deliver_status = Diaspora::sendRelay($target_item, $owner, $contact, $public_message);
} elseif ($top_level && !$walltowall) {
// currently no workable solution for sending walltowall
- Logger::log('diaspora status: ' . $loc);
+ Logger::notice('diaspora status: ' . $loc);
$deliver_status = Diaspora::sendStatus($target_item, $owner, $contact, $public_message);
} else {
- Logger::log('Unknown mode ' . $cmd . ' for ' . $loc);
+ Logger::notice('Unknown mode ' . $cmd . ' for ' . $loc);
return;
}
// We successfully delivered a message, the contact is alive
Model\Contact::unmarkForArchival($contact);
+ Model\GServer::setProtocol($contact['gsid'] ?? 0, Model\Post\DeliveryData::DIASPORA);
+
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
Model\Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Model\Post\DeliveryData::DIASPORA);
}
*/
private static function deliverMail($cmd, $contact, $owner, $target_item, $thr_parent)
{
- if (DI::config()->get('system','dfrn_only')) {
+ if (DI::config()->get('system','imap_disabled')) {
return;
}
if (empty($target_item['title'])) {
$condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
- $title = Model\Item::selectFirst(['title'], $condition);
+ $title = Model\Post::selectFirst(['title'], $condition);
if (DBA::isResult($title) && ($title['title'] != '')) {
$subject = $title['title'];
} else {
$condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
- $title = Model\Item::selectFirst(['title'], $condition);
+ $title = Model\Post::selectFirst(['title'], $condition);
if (DBA::isResult($title) && ($title['title'] != '')) {
$subject = $title['title'];
projects / friendica.git / blobdiff