<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
-use Friendica\Model\APContact;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\Group;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus;
-use Friendica\Protocol\Relay;
use Friendica\Protocol\Salmon;
+use Friendica\Util\Network;
+use Friendica\Util\Strings;
/*
* The notifier is typically called with:
class Notifier
{
- public static function execute($cmd, $target_id)
+ public static function execute(string $cmd, int $post_uriid, int $sender_uid = 0)
{
$a = DI::app();
- Logger::info('Invoked', ['cmd' => $cmd, 'target' => $target_id]);
+ Logger::info('Invoked', ['cmd' => $cmd, 'target' => $post_uriid, 'sender_uid' => $sender_uid]);
+ $target_id = $post_uriid;
$top_level = false;
$recipients = [];
$url_recipients = [];
$thr_parent = [];
$items = [];
$delivery_queue_count = 0;
+ $ap_contacts = [];
if ($cmd == Delivery::MAIL) {
$message = DBA::selectFirst('mail', ['uid', 'contact-id'], ['id' => $target_id]);
$mail = ActivityPub\Transmitter::ItemArrayFromMail($target_id);
$inboxes = ActivityPub\Transmitter::fetchTargetInboxes($mail, $uid, true);
- foreach ($inboxes as $inbox) {
+ foreach ($inboxes as $inbox => $receivers) {
+ $ap_contacts = array_merge($ap_contacts, $receivers);
Logger::info('Delivery via ActivityPub', ['cmd' => $cmd, 'target' => $target_id, 'inbox' => $inbox]);
Worker::add(['priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true],
- 'APDelivery', $cmd, $target_id, $inbox, $uid);
+ 'APDelivery', $cmd, $target_id, $inbox, $uid, $receivers, $post_uriid);
}
} elseif ($cmd == Delivery::SUGGESTION) {
$suggest = DI::fsuggest()->getById($target_id);
$condition = ['uid' => $target_id, 'self' => false, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
$delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'addr', 'network', 'protocol', 'batch'], $condition);
} else {
+ $post = Post::selectFirst(['id'], ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
+ if (!DBA::isResult($post)) {
+ Logger::warning('Post not found', ['uri-id' => $post_uriid, 'uid' => $sender_uid]);
+ return;
+ }
+ $target_id = $post['id'];
+
// find ancestors
- $condition = ['id' => $target_id, 'visible' => true, 'moderated' => false];
- $target_item = Item::selectFirst([], $condition);
+ $condition = ['id' => $target_id, 'visible' => true];
+ $target_item = Post::selectFirst(Item::DELIVER_FIELDLIST, $condition);
if (!DBA::isResult($target_item) || !intval($target_item['parent'])) {
Logger::info('No target item', ['cmd' => $cmd, 'target' => $target_id]);
return;
}
- $condition = ['parent' => $target_item['parent'], 'visible' => true, 'moderated' => false];
+ $condition = ['parent' => $target_item['parent'], 'visible' => true];
$params = ['order' => ['id']];
- $items_stmt = Item::select([], $condition, $params);
+ $items_stmt = Post::select(Item::DELIVER_FIELDLIST, $condition, $params);
if (!DBA::isResult($items_stmt)) {
Logger::info('No item found', ['cmd' => $cmd, 'target' => $target_id]);
return;
}
- $items = Item::inArray($items_stmt);
+ $items = Post::toArray($items_stmt);
// avoid race condition with deleting entries
if ($items[0]['deleted']) {
$fields = ['network', 'author-id', 'author-link', 'author-network', 'owner-id'];
$condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]];
- $thr_parent = Item::selectFirst($fields, $condition);
+ $thr_parent = Post::selectFirst($fields, $condition);
if (empty($thr_parent)) {
$thr_parent = $parent;
}
Logger::log('GUID: ' . $target_item["guid"] . ': Parent is ' . $parent['network'] . '. Thread parent is ' . $thr_parent['network'], Logger::DEBUG);
if (!self::isRemovalActivity($cmd, $owner, Protocol::ACTIVITYPUB)) {
- $delivery_queue_count += self::activityPubDelivery($cmd, $target_item, $parent, $thr_parent, $a->queue['priority'], $a->queue['created'], $owner);
+ $apdelivery = self::activityPubDelivery($cmd, $target_item, $parent, $thr_parent, $a->queue['priority'], $a->queue['created'], $owner);
+ $ap_contacts = $apdelivery['contacts'];
+ $delivery_queue_count += $apdelivery['count'];
}
// Only deliver threaded replies (comment to a comment) to Diaspora
$direct_forum_delivery = true;
}
+ $exclusive_delivery = false;
+
+ $exclusive_targets = Tag::getByURIId($parent['uri-id'], [Tag::EXCLUSIVE_MENTION]);
+ if (!empty($exclusive_targets)) {
+ $exclusive_delivery = true;
+ Logger::info('Possible Exclusively delivering', ['uid' => $target_item['uid'], 'guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id']]);
+ foreach ($exclusive_targets as $target) {
+ if (Strings::compareLink($owner['url'], $target['url'])) {
+ $exclusive_delivery = false;
+ Logger::info('False Exclusively delivering', ['uid' => $target_item['uid'], 'guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'url' => $target['url']]);
+ }
+ }
+ }
+
if ($relay_to_owner) {
// local followup to remote post
$followup = true;
}
Logger::log('Notify ' . $target_item["guid"] .' via PuSH: ' . ($push_notify ? "Yes":"No"), Logger::DEBUG);
+ } elseif ($exclusive_delivery) {
+ $followup = true;
+
+ foreach ($exclusive_targets as $target) {
+ $cid = Contact::getIdForURL($target['url'], $uid, false);
+ if ($cid) {
+ $recipients_followup[] = $cid;
+ Logger::info('Exclusively delivering', ['uid' => $target_item['uid'], 'guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'url' => $target['url']]);
+ }
+ }
} else {
$followup = false;
if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== Delivery::UPLINK)
&& ($target_item['verb'] != Activity::ANNOUNCE)) {
- Worker::add($a->queue['priority'], 'Notifier', Delivery::UPLINK, $target_id);
+ Worker::add($a->queue['priority'], 'Notifier', Delivery::UPLINK, $post_uriid, $sender_uid);
}
foreach ($items as $item) {
$batch_delivery = false;
if ($public_message && !in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$followup) {
- $relay_list = [];
+ $participants = [];
if ($diaspora_delivery && !$unlisted) {
$batch_delivery = true;
- $relay_list_stmt = DBA::p(
+ $participants_stmt = DBA::p(
"SELECT
`batch`, `network`, `protocol`,
ANY_VALUE(`id`) AS `id`,
$owner['uid'],
Contact::SHARING
);
- $relay_list = DBA::toArray($relay_list_stmt);
+ $participants = DBA::toArray($participants_stmt);
// Fetch the participation list
// The function will ensure that there are no duplicates
- $relay_list = Diaspora::participantsForThread($target_item, $relay_list);
-
- // Add the relay to the list, avoid duplicates.
- // Don't send community posts to the relay. Forum posts via the Diaspora protocol are looking ugly.
- if (!$followup && !Item::isForumPost($target_item, $owner) && !self::isForumPost($target_item)) {
- $relay_list = Relay::getList($target_id, $relay_list, [Protocol::DFRN, Protocol::DIASPORA]);
- }
+ $participants = Diaspora::participantsForThread($target_item, $participants);
}
$condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false,
'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
- $r2 = DBA::toArray(DBA::select('contact', ['id', 'url', 'addr', 'name', 'network', 'protocol'], $condition));
-
- $r = array_merge($r2, $relay_list);
-
- if (DBA::isResult($r)) {
- foreach ($r as $rr) {
- // Ensure that local contacts are delivered via DFRN
- if (Contact::isLocal($rr['url'])) {
- $contact['network'] = Protocol::DFRN;
- }
+ $contacts = DBA::toArray(DBA::select('contact', ['id', 'url', 'addr', 'name', 'network', 'protocol'], $condition));
- if (!empty($rr['addr']) && ($rr['network'] == Protocol::ACTIVITYPUB) && !DBA::exists('fcontact', ['addr' => $rr['addr']])) {
- Logger::info('Contact is AP only, so skip delivery via legacy DFRN/Diaspora', ['target' => $target_id, 'contact' => $rr['url']]);
- continue;
- }
+ $conversants = array_merge($contacts, $participants);
- if (!empty($rr['id']) && Contact::isArchived($rr['id'])) {
- Logger::info('Contact is archived, so skip delivery', ['target' => $target_id, 'contact' => $rr['url']]);
- continue;
- }
+ $delivery_queue_count += self::delivery($cmd, $post_uriid, $sender_uid, $target_item, $thr_parent, $owner, $batch_delivery, true, $conversants, $ap_contacts, []);
- if (self::isRemovalActivity($cmd, $owner, $rr['network'])) {
- Logger::info('Contact does no supports account removal commands, so skip delivery', ['target' => $target_id, 'contact' => $rr['url']]);
- continue;
- }
+ $push_notify = true;
+ }
- if (self::skipDFRN($rr, $target_item, $parent, $thr_parent, $owner, $cmd)) {
- Logger::info('Content will be delivered via AP, so skip delivery via legacy DFRN/Diaspora', ['id' => $target_id, 'url' => $rr['url']]);
- continue;
- }
+ $contacts = DBA::toArray($delivery_contacts_stmt);
+ $delivery_queue_count += self::delivery($cmd, $post_uriid, $sender_uid, $target_item, $thr_parent, $owner, $batch_delivery, false, $contacts, $ap_contacts, $conversants);
- if (self::skipActivityPubForDiaspora($rr, $target_item, $thr_parent)) {
- Logger::info('Contact is from Diaspora, but the replied author is from ActivityPub, so skip delivery via Diaspora', ['id' => $target_id, 'url' => $rr['url']]);
- continue;
- }
+ $delivery_queue_count += self::deliverOStatus($target_id, $target_item, $owner, $url_recipients, $public_message, $push_notify);
- $conversants[] = $rr['id'];
+ if (!empty($target_item)) {
+ Logger::log('Calling hooks for ' . $cmd . ' ' . $target_id, Logger::DEBUG);
- Logger::info('Public delivery', ['target' => $target_id, 'guid' => $target_item["guid"], 'to' => $rr]);
+ Hook::fork($a->queue['priority'], 'notifier_normal', $target_item);
- // Ensure that posts with our own protocol arrives before Diaspora posts arrive.
- // Situation is that sometimes Friendica servers receive Friendica posts over the Diaspora protocol first.
- // The conversion in Markdown reduces the formatting, so these posts should arrive after the Friendica posts.
- // This is only important for high and medium priority tasks and not for Low priority jobs like deletions.
- if (($rr['network'] == Protocol::DIASPORA) && in_array($a->queue['priority'], [PRIORITY_HIGH, PRIORITY_MEDIUM])) {
- $deliver_options = ['priority' => $a->queue['priority'], 'dont_fork' => true];
- } else {
- $deliver_options = ['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true];
- }
+ Hook::callAll('notifier_end', $target_item);
- if (Worker::add($deliver_options, 'Delivery', $cmd, $target_id, (int)$rr['id'])) {
- $delivery_queue_count++;
- }
+ // Workaround for pure connector posts
+ if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
+ if ($delivery_queue_count == 0) {
+ Post\DeliveryData::incrementQueueDone($target_item['uri-id']);
+ $delivery_queue_count = 1;
}
- }
- $push_notify = true;
+ Post\DeliveryData::incrementQueueCount($target_item['uri-id'], $delivery_queue_count);
+ }
}
- // delivery loop
- while ($contact = DBA::fetch($delivery_contacts_stmt)) {
- // Ensure that local contacts are delivered via DFRN
- if (Contact::isLocal($contact['url'])) {
- $contact['network'] = Protocol::DFRN;
- }
+ return;
+ }
- if (!empty($contact['addr']) && ($contact['network'] == Protocol::ACTIVITYPUB) && !DBA::exists('fcontact', ['addr' => $contact['addr']])) {
- Logger::info('Contact is AP only, so skip delivery via legacy DFRN/Diaspora', ['target' => $target_id, 'contact' => $contact['url']]);
+ /**
+ * Deliver the message to the contacts
+ *
+ * @param string $cmd
+ * @param int $post_uriid
+ * @param int $sender_uid
+ * @param array $target_item
+ * @param array $thr_parent
+ * @param array $owner
+ * @param bool $batch_delivery
+ * @param array $contacts
+ * @param array $ap_contacts
+ * @param array $conversants
+ * @return int
+ * @throws InternalServerErrorException
+ * @throws Exception
+ */
+ private static function delivery(string $cmd, int $post_uriid, int $sender_uid, array $target_item, array $thr_parent, array $owner, bool $batch_delivery, bool $in_batch, array $contacts, array $ap_contacts, array $conversants = [])
+ {
+ $a = DI::app();
+ $delivery_queue_count = 0;
+
+ foreach ($contacts as $contact) {
+ // Direct delivery of local contacts
+ if (!in_array($cmd, [Delivery::RELOCATION, Delivery::SUGGESTION, Delivery::DELETION, Delivery::MAIL]) && $target_uid = User::getIdForURL($contact['url'])) {
+ Logger::info('Direct delivery', ['uri-id' => $target_item['uri-id'], 'target' => $target_uid]);
+ $fields = ['protocol' => Conversation::PARCEL_LOCAL_DFRN, 'direction' => Conversation::PUSH];
+ Item::storeForUserByUriId($target_item['uri-id'], $target_uid, $fields, $target_item['uid']);
continue;
}
- if (!empty($contact['id']) && Contact::isArchived($contact['id'])) {
- Logger::info('Contact is archived, so skip delivery', ['target' => $target_id, 'contact' => $contact['url']]);
+ // Deletions are always sent via DFRN as well.
+ // This is done until we can perform deletions of foreign comments on our own threads via AP.
+ if (($cmd != Delivery::DELETION) && in_array($contact['id'], $ap_contacts)) {
+ Logger::info('Contact is already delivered via AP, so skip delivery via legacy DFRN/Diaspora', ['target' => $post_uriid, 'uid' => $sender_uid, 'contact' => $contact['url']]);
continue;
}
- if (self::isRemovalActivity($cmd, $owner, $contact['network'])) {
- Logger::info('Contact does no supports account removal commands, so skip delivery', ['target' => $target_id, 'contact' => $contact['url']]);
+ if (!empty($contact['id']) && Contact::isArchived($contact['id'])) {
+ Logger::info('Contact is archived, so skip delivery', ['target' => $post_uriid, 'uid' => $sender_uid, 'contact' => $contact['url']]);
continue;
}
- if (self::skipDFRN($contact, $target_item, $parent, $thr_parent, $owner, $cmd)) {
- Logger::info('Content will be delivered via AP, so skip delivery via legacy DFRN/Diaspora', ['target' => $target_id, 'url' => $contact['url']]);
+ if (self::isRemovalActivity($cmd, $owner, $contact['network'])) {
+ Logger::info('Contact does no supports account removal commands, so skip delivery', ['target' => $post_uriid, 'uid' => $sender_uid, 'contact' => $contact['url']]);
continue;
}
if (self::skipActivityPubForDiaspora($contact, $target_item, $thr_parent)) {
- Logger::info('Contact is from Diaspora, but the replied author is from ActivityPub, so skip delivery via Diaspora', ['id' => $target_id, 'url' => $contact['url']]);
+ Logger::info('Contact is from Diaspora, but the replied author is from ActivityPub, so skip delivery via Diaspora', ['id' => $post_uriid, 'uid' => $sender_uid, 'url' => $contact['url']]);
continue;
}
// Don't deliver to Diaspora if it already had been done as batch delivery
- if (($contact['network'] == Protocol::DIASPORA) && $batch_delivery) {
- Logger::log('Already delivered id ' . $target_id . ' via batch to ' . json_encode($contact), Logger::DEBUG);
+ if (!$in_batch && $batch_delivery && ($contact['network'] == Protocol::DIASPORA)) {
+ Logger::info('Diaspora contact is already delivered via batch', ['id' => $post_uriid, 'uid' => $sender_uid, 'contact' => $contact]);
continue;
}
// Don't deliver to folks who have already been delivered to
if (in_array($contact['id'], $conversants)) {
- Logger::log('Already delivered id ' . $target_id. ' to ' . json_encode($contact), Logger::DEBUG);
+ Logger::info('Already delivery', ['id' => $post_uriid, 'uid' => $sender_uid, 'contact' => $contact]);
continue;
}
- Logger::info('Delivery', ['id' => $target_id, 'to' => $contact]);
+ Logger::info('Delivery', ['batch' => $in_batch, 'target' => $post_uriid, 'uid' => $sender_uid, 'guid' => $target_item['guid'] ?? '', 'to' => $contact]);
// Ensure that posts with our own protocol arrives before Diaspora posts arrive.
// Situation is that sometimes Friendica servers receive Friendica posts over the Diaspora protocol first.
// The conversion in Markdown reduces the formatting, so these posts should arrive after the Friendica posts.
- if ($contact['network'] == Protocol::DIASPORA) {
+ // This is only important for high and medium priority tasks and not for Low priority jobs like deletions.
+ if (($contact['network'] == Protocol::DIASPORA) && in_array($a->queue['priority'], [PRIORITY_HIGH, PRIORITY_MEDIUM])) {
$deliver_options = ['priority' => $a->queue['priority'], 'dont_fork' => true];
} else {
$deliver_options = ['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true];
}
- if (Worker::add($deliver_options, 'Delivery', $cmd, $target_id, (int)$contact['id'])) {
+ if (Worker::add($deliver_options, 'Delivery', $cmd, $post_uriid, (int)$contact['id'], $sender_uid)) {
$delivery_queue_count++;
}
}
- DBA::close($delivery_contacts_stmt);
+ return $delivery_queue_count;
+ }
+
+ /**
+ * Deliver the message via OStatus
+ *
+ * @param int $target_id
+ * @param array $target_item
+ * @param array $owner
+ * @param array $url_recipients
+ * @param bool $public_message
+ * @param bool $push_notify
+ * @return int
+ * @throws InternalServerErrorException
+ * @throws Exception
+ */
+ private static function deliverOStatus(int $target_id, array $target_item, array $owner, array $url_recipients, bool $public_message, bool $push_notify)
+ {
+ $a = DI::app();
+ $delivery_queue_count = 0;
$url_recipients = array_filter($url_recipients);
// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
if (!DI::config()->get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) {
$slap = OStatus::salmon($target_item, $owner);
foreach ($url_recipients as $url) {
- Logger::log('Salmon delivery of item ' . $target_id . ' to ' . $url);
- /// @TODO Redeliver/queue these items on failure, though there is no contact record
+ Logger::info('Salmon delivery', ['item' => $target_id, 'to' => $url]);
+
$delivery_queue_count++;
Salmon::slapper($owner, $url, $slap);
Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Post\DeliveryData::OSTATUS);
// Notify PuSH subscribers (Used for OStatus distribution of regular posts)
if ($push_notify) {
- Logger::log('Activating internal PuSH for item '.$target_id, Logger::DEBUG);
+ Logger::info('Activating internal PuSH', ['item' => $target_id]);
// Handling the pubsubhubbub requests
PushSubscriber::publishFeed($owner['uid'], $a->queue['priority']);
}
-
- if (!empty($target_item)) {
- Logger::log('Calling hooks for ' . $cmd . ' ' . $target_id, Logger::DEBUG);
-
- Hook::fork($a->queue['priority'], 'notifier_normal', $target_item);
-
- Hook::callAll('notifier_end', $target_item);
-
- // Workaround for pure connector posts
- if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
- if ($delivery_queue_count == 0) {
- Post\DeliveryData::incrementQueueDone($target_item['uri-id']);
- $delivery_queue_count = 1;
- }
-
- Post\DeliveryData::incrementQueueCount($target_item['uri-id'], $delivery_queue_count);
- }
- }
-
- return;
+ return $delivery_queue_count;
}
/**
return false;
}
- /**
- * Checks if the current delivery process needs to be transported via DFRN.
- *
- * @param array $contact Receiver of the post
- * @param array $item The post
- * @param array $parent The parent
- * @param array $thr_parent The thread parent
- * @param array $owner Owner array
- * @param string $cmd Notifier command
- * @return bool
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @throws \ImagickException
- */
- private static function skipDFRN($contact, $item, $parent, $thr_parent, $owner, $cmd)
- {
- if (empty($parent['network'])) {
- return false;
- }
-
- // Don't skip when the starting post is delivered via Diaspora
- if ($parent['network'] == Protocol::DIASPORA) {
- return false;
- }
-
- // Also don't skip when the direct thread parent was delivered via Diaspora
- if ($thr_parent['network'] == Protocol::DIASPORA) {
- return false;
- }
-
- // Use DFRN if we are on the same site
- if (!empty($contact['url']) && Contact::isLocal($contact['url'])) {
- return false;
- }
-
- // Don't skip when author or owner don't have AP profiles
- if ((!empty($item['author-link']) && empty(APContact::getByURL($item['author-link'], false))) || (!empty($item['owner-link']) && empty(APContact::getByURL($item['owner-link'], false)))) {
- return false;
- }
-
- // Don't skip DFRN delivery for these commands
- if (in_array($cmd, [Delivery::SUGGESTION, Delivery::REMOVAL, Delivery::RELOCATION, Delivery::POKE])) {
- return false;
- }
-
- // We deliver reshares via AP whenever possible
- if (ActivityPub\Transmitter::isAnnounce($item)) {
- return true;
- }
-
- // For the time being we always deliver forum post via DFRN if possible
- // This can be removed possible at the end of 2020 when hopefully most system can process AP forum posts
- if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
- return false;
- }
-
- // Skip DFRN when the item will be (forcefully) delivered via AP
- if (DI::config()->get('debug', 'total_ap_delivery') && ($contact['network'] == Protocol::DFRN) && !empty(APContact::getByURL($contact['url'], false))) {
- return true;
- }
-
- // Skip DFRN delivery if the contact speaks ActivityPub
- return in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && ($contact['protocol'] == Protocol::ACTIVITYPUB);
- }
-
/**
* Checks if the current action is a deletion command of a account removal activity
* For Diaspora and ActivityPub we don't need to send single item deletion calls.
DBA::close($contacts_stmt);
$inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser(0);
- foreach ($inboxes as $inbox) {
+ foreach ($inboxes as $inbox => $receivers) {
Logger::info('Account removal via ActivityPub', ['uid' => $self_user_id, 'inbox' => $inbox]);
Worker::add(['priority' => PRIORITY_NEGLIGIBLE, 'created' => $created, 'dont_fork' => true],
- 'APDelivery', Delivery::REMOVAL, '', $inbox, $self_user_id);
+ 'APDelivery', Delivery::REMOVAL, 0, $inbox, $self_user_id, $receivers);
}
return true;
* @param array $thr_parent
* @param int $priority The priority the Notifier queue item was created with
* @param string $created The date the Notifier queue item was created on
- * @return int The number of delivery tasks created
+ * @return array 'count' => The number of delivery tasks created, 'contacts' => their contact ids
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
private static function activityPubDelivery($cmd, array $target_item, array $parent, array $thr_parent, $priority, $created, $owner)
{
+ // Don't deliver via AP when the starting post isn't from a federated network
+ if (!in_array($parent['network'], Protocol::FEDERATED)) {
+ return ['count' => 0, 'contacts' => []];
+ }
+
// Don't deliver via AP when the starting post is delivered via Diaspora
if ($parent['network'] == Protocol::DIASPORA) {
- return 0;
+ return ['count' => 0, 'contacts' => []];
}
// Also don't deliver when the direct thread parent was delivered via Diaspora
if ($thr_parent['network'] == Protocol::DIASPORA) {
- return 0;
+ return ['count' => 0, 'contacts' => []];
}
// Posts from Diaspora contacts are transmitted via Diaspora
if ($target_item['network'] == Protocol::DIASPORA) {
- return 0;
+ return ['count' => 0, 'contacts' => []];
}
$inboxes = [];
Logger::log('Forum item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG);
} elseif (!DBA::exists('conversation', ['item-uri' => $target_item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB])) {
Logger::log('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' is no AP post. It will not be distributed.', Logger::DEBUG);
- return 0;
+ return ['count' => 0, 'contacts' => []];
} elseif ($parent['origin']) {
// Remote items are transmitted via the personal inboxes.
// Doing so ensures that the dedicated receiver will get the message.
if (empty($inboxes) && empty($relay_inboxes)) {
Logger::log('No inboxes found for item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . '. It will not be distributed.', Logger::DEBUG);
- return 0;
+ return ['count' => 0, 'contacts' => []];
}
// Fill the item cache
ActivityPub\Transmitter::createCachedActivityFromItem($target_item['id'], true);
$delivery_queue_count = 0;
+ $contacts = [];
foreach ($inboxes as $inbox => $receivers) {
+ $contacts = array_merge($contacts, $receivers);
+
+ if ((count($receivers) == 1) && Network::isLocalLink($inbox)) {
+ $contact = Contact::getById($receivers[0], ['url']);
+ if ($target_uid = User::getIdForURL($contact['url'])) {
+ $fields = ['protocol' => Conversation::PARCEL_LOCAL_DFRN, 'direction' => Conversation::PUSH, 'post-reason' => Item::PR_BCC];
+ Item::storeForUserByUriId($target_item['uri-id'], $target_uid, $fields, $target_item['uid']);
+ Logger::info('Delivered locally', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
+ continue;
+ }
+ }
+
Logger::info('Delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
if (Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true],
- 'APDelivery', $cmd, $target_item['id'], $inbox, $uid, $receivers)) {
+ 'APDelivery', $cmd, $target_item['id'], $inbox, $uid, $receivers, $target_item['uri-id'])) {
$delivery_queue_count++;
}
}
// We deliver posts to relay servers slightly delayed to priorize the direct delivery
- foreach ($relay_inboxes as $inbox => $receivers) {
+ foreach ($relay_inboxes as $inbox) {
Logger::info('Delivery to relay servers via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]);
- if (Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, $target_item['id'], $inbox, $uid, $receivers)) {
+ if (Worker::add(['priority' => $priority, 'dont_fork' => true], 'APDelivery', $cmd, $target_item['id'], $inbox, $uid, [], $target_item['uri-id'])) {
$delivery_queue_count++;
}
}
- return $delivery_queue_count;
+ return ['count' => $delivery_queue_count, 'contacts' => $contacts];
}
/**
*/
public static function isForumPost(array $item)
{
- return !empty($item['forum_mode']);
+ return ($item['gravity'] == GRAVITY_PARENT) && !empty($item['forum_mode']);
}
}
projects / friendica.git / blobdiff