X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FWorker%2FNotifier.php;h=a677cef60442fcd4fd873bc72e8c1ce3a8425a54;hb=41dc243186ebf5241e668ce6dcf4309d924b16b4;hp=e0108ddcfef503a1abebf83c3e49dc0ea900bec2;hpb=8821d33f73785884cfce83e7b23d3ef19cc1bc11;p=friendica.git diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index e0108ddcfe..a677cef604 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -5,17 +5,18 @@ namespace Friendica\Worker; use Friendica\BaseObject; -use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\Model\APContact; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\Group; use Friendica\Model\Item; +use Friendica\Model\ItemDeliveryData; use Friendica\Model\PushSubscriber; use Friendica\Model\User; use Friendica\Network\Probe; @@ -24,7 +25,6 @@ use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; use Friendica\Protocol\Salmon; -require_once 'include/dba.php'; require_once 'include/items.php'; /* @@ -32,113 +32,82 @@ require_once 'include/items.php'; * * Worker::add(PRIORITY_HIGH, "Notifier", COMMAND, ITEM_ID); * - * where COMMAND is one of the following: - * - * activity (in diaspora.php, dfrn_confirm.php, profiles.php) - * comment-import (in diaspora.php, items.php) - * comment-new (in item.php) - * drop (in diaspora.php, items.php, photos.php) - * edit_post (in item.php) - * event (in events.php) - * like (in like.php, poke.php) - * mail (in message.php) - * suggest (in fsuggest.php) - * tag (in photos.php, poke.php, tagger.php) - * tgroup (in items.php) - * wall-new (in photos.php, item.php) - * removeme (in Contact.php) - * relocate (in uimport.php) - * + * where COMMAND is one of the constants that are defined in Worker/Delivery.php * and ITEM_ID is the id of the item in the database that needs to be sent to others. */ class Notifier { - public static function execute($cmd, $item_id) + public static function execute($cmd, $target_id) { $a = BaseObject::getApp(); - Logger::log('Invoked: ' . $cmd . ': ' . $item_id, Logger::DEBUG); + Logger::log('Invoked: ' . $cmd . ': ' . $target_id, Logger::DEBUG); $top_level = false; $recipients = []; $url_recipients = []; - $normal_mode = true; - $recipients_relocate = []; + $delivery_contacts_stmt = null; + $target_item = []; + $items = []; + $delivery_queue_count = 0; if ($cmd == Delivery::MAIL) { - $normal_mode = false; - $message = DBA::selectFirst('mail', ['uid', 'contact-id'], ['id' => $item_id]); + $message = DBA::selectFirst('mail', ['uid', 'contact-id'], ['id' => $target_id]); if (!DBA::isResult($message)) { return; } $uid = $message['uid']; $recipients[] = $message['contact-id']; + + $mail = ActivityPub\Transmitter::ItemArrayFromMail($target_id); + $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($mail, $uid, true); + foreach ($inboxes as $inbox) { + Logger::info('Delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_id, 'inbox' => $inbox]); + Worker::add(['priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true], + 'APDelivery', $cmd, $target_id, $inbox, $uid); + } } elseif ($cmd == Delivery::SUGGESTION) { - $normal_mode = false; - $suggest = DBA::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $item_id]); + $suggest = DBA::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $target_id]); if (!DBA::isResult($suggest)) { return; } $uid = $suggest['uid']; $recipients[] = $suggest['cid']; } elseif ($cmd == Delivery::REMOVAL) { - $r = q("SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`, - `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, - `user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`, `user`.`guid` - FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` - WHERE `contact`.`uid` = %d AND `contact`.`self` LIMIT 1", - intval($item_id)); - if (!$r) { - return; - } - $user = $r[0]; - - $r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id)); - if (!$r) { - return; - } - foreach ($r as $contact) { - Contact::terminateFriendship($user, $contact, true); - } - - $inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser(0); - foreach ($inboxes as $inbox) { - Logger::log('Account removal for user ' . $item_id . ' to ' . $inbox .' via ActivityPub', Logger::DEBUG); - Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true], - 'APDelivery', Delivery::REMOVAL, '', $inbox, $item_id); - } - - return; + return self::notifySelfRemoval($target_id, $a->queue['priority'], $a->queue['created']); } elseif ($cmd == Delivery::RELOCATION) { - $normal_mode = false; - $uid = $item_id; + $uid = $target_id; - $recipients_relocate = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND `network` IN ('%s', '%s')", - intval($uid), Protocol::DFRN, Protocol::DIASPORA); + $condition = ['uid' => $target_id, 'self' => false, 'network' => [Protocol::DFRN, Protocol::DIASPORA]]; + $delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'network', 'protocol', 'batch'], $condition); } else { // find ancestors - $condition = ['id' => $item_id, 'visible' => true, 'moderated' => false]; + $condition = ['id' => $target_id, 'visible' => true, 'moderated' => false]; $target_item = Item::selectFirst([], $condition); if (!DBA::isResult($target_item) || !intval($target_item['parent'])) { return; } - $parent_id = intval($target_item['parent']); - $uid = $target_item['contact-uid']; - $updated = $target_item['edited']; + if (!empty($target_item['contact-uid'])) { + $uid = $target_item['contact-uid']; + } elseif (!empty($target_item['uid'])) { + $uid = $target_item['uid']; + } else { + Logger::log('Only public users for item ' . $target_id, Logger::DEBUG); + return; + } - $condition = ['parent' => $parent_id, 'visible' => true, 'moderated' => false]; + $condition = ['parent' => $target_item['parent'], 'visible' => true, 'moderated' => false]; $params = ['order' => ['id']]; - $ret = Item::select([], $condition, $params); - - if (!DBA::isResult($ret)) { + $items_stmt = Item::select([], $condition, $params); + if (!DBA::isResult($items_stmt)) { return; } - $items = Item::inArray($ret); + $items = Item::inArray($items_stmt); // avoid race condition with deleting entries if ($items[0]['deleted']) { @@ -158,8 +127,6 @@ class Notifier return; } - $walltowall = ($top_level && ($owner['id'] != $items[0]['contact-id']) ? true : false); - // Should the post be transmitted to Diaspora? $diaspora_delivery = true; @@ -175,10 +142,12 @@ class Notifier $followup = false; $recipients_followup = []; - if (!in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION, Delivery::RELOCATION])) { + if (!empty($target_item) && !empty($items)) { $parent = $items[0]; - self::activityPubDelivery($a, $cmd, $item_id, $uid, $target_item, $parent); + if (!self::isRemovalActivity($cmd, $owner, Protocol::ACTIVITYPUB)) { + $delivery_queue_count += self::activityPubDelivery($cmd, $target_item, $parent, $a->queue['priority'], $a->queue['created'], $owner); + } $fields = ['network', 'author-id', 'owner-id']; $condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]]; @@ -214,7 +183,7 @@ class Notifier } - if (($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && !$top_level) { + if (($cmd === Delivery::UPLINK) && (intval($parent['forum_mode']) == 1) && !$top_level) { $relay_to_owner = true; } @@ -230,13 +199,13 @@ class Notifier } // Special treatment for forum posts - if (self::isForumPost($target_item, $owner)) { + if (Item::isForumPost($target_item, $owner)) { $relay_to_owner = true; $direct_forum_delivery = true; } // Avoid that comments in a forum thread are sent to OStatus - if (self::isForumPost($parent, $owner)) { + if (Item::isForumPost($parent, $owner)) { $direct_forum_delivery = true; } @@ -261,15 +230,12 @@ class Notifier if ($parent["network"] == Protocol::OSTATUS) { // Distribute the message to the DFRN contacts as if this wasn't a followup since OStatus can't relay comments // Currently it is work at progress - $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND NOT `blocked` AND NOT `pending` AND NOT `archive`", - intval($uid), - DBA::escape(Protocol::DFRN) - ); - if (DBA::isResult($r)) { - foreach ($r as $rr) { - $recipients_followup[] = $rr['id']; - } + $condition = ['uid' => $uid, 'network' => Protocol::DFRN, 'blocked' => false, 'pending' => false, 'archive' => false]; + $followup_contacts_stmt = DBA::select('contact', ['id'], $condition); + while($followup_contact = DBA::fetch($followup_contacts_stmt)) { + $recipients_followup[] = $followup_contact['id']; } + DBA::close($followup_contacts_stmt); } } @@ -305,8 +271,8 @@ class Notifier // if our parent is a public forum (forum_mode == 1), uplink to the origional author causing // a delivery fork. private groups (forum_mode == 2) do not uplink - if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== 'uplink')) { - Worker::add($a->queue['priority'], 'Notifier', 'uplink', $item_id); + if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== Delivery::UPLINK)) { + Worker::add($a->queue['priority'], 'Notifier', Delivery::UPLINK, $target_id); } foreach ($items as $item) { @@ -325,12 +291,26 @@ class Notifier } if (count($url_recipients)) { - Logger::log('Deliver ' . $target_item["guid"] . ' to _recipients ' . json_decode($url_recipients)); + Logger::log('Deliver ' . $target_item["guid"] . ' to _recipients ' . json_encode($url_recipients)); } $recipients = array_unique(array_merge($recipients, $allow_people, $allow_groups)); $deny = array_unique(array_merge($deny_people, $deny_groups)); $recipients = array_diff($recipients, $deny); + + // If this is a public message and pubmail is set on the parent, include all your email contacts + if ( + function_exists('imap_open') + && !Config::get('system','imap_disabled') + && $public_message + && intval($target_item['pubmail']) + ) { + $mail_contacts_stmt = DBA::select('contact', ['id'], ['uid' => $uid, 'network' => Protocol::MAIL]); + while ($mail_contact = DBA::fetch($mail_contacts_stmt)) { + $recipients[] = $mail_contact['id']; + } + DBA::close($mail_contacts_stmt); + } } // If the thread parent is OStatus then do some magic to distribute the messages. @@ -377,26 +357,7 @@ class Notifier $public_message = false; } - // If this is a public message and pubmail is set on the parent, include all your email contacts - if (!empty($target_item) && function_exists('imap_open') && !Config::get('system','imap_disabled')) { - if (!strlen($target_item['allow_cid']) && !strlen($target_item['allow_gid']) - && !strlen($target_item['deny_cid']) && !strlen($target_item['deny_gid']) - && intval($target_item['pubmail'])) { - $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'", - intval($uid), - DBA::escape(Protocol::MAIL) - ); - if (DBA::isResult($r)) { - foreach ($r as $rr) { - $recipients[] = $rr['id']; - } - } - } - } - - if (($cmd == Delivery::RELOCATION)) { - $contacts = $recipients_relocate; - } else { + if (empty($delivery_contacts_stmt)) { if ($followup) { $recipients = $recipients_followup; } @@ -405,50 +366,92 @@ class Notifier if (!empty($networks)) { $condition['network'] = $networks; } - $result = DBA::select('contact', ['id', 'url', 'network', 'batch'], $condition); - $contacts = DBA::toArray($result); + $delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'network', 'protocol', 'batch'], $condition); } $conversants = []; $batch_delivery = false; if ($public_message && !in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$followup) { - $r1 = []; + $relay_list = []; if ($diaspora_delivery) { $batch_delivery = true; - $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network` - FROM `contact` WHERE `network` = '%s' AND `batch` != '' - AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`", - DBA::escape(Protocol::DIASPORA), - intval($owner['uid']), - intval(Contact::SHARING) + $relay_list_stmt = DBA::p( + "SELECT + `batch`, + ANY_VALUE(`id`) AS `id`, + ANY_VALUE(`name`) AS `name`, + ANY_VALUE(`network`) AS `network`, + ANY_VALUE(`protocol`) AS `protocol` + FROM `contact` + WHERE `network` = ? + AND `batch` != '' + AND `uid` = ? + AND `rel` != ? + AND NOT `blocked` + AND NOT `pending` + AND NOT `archive` + GROUP BY `batch`", + Protocol::DIASPORA, + $owner['uid'], + Contact::SHARING ); + $relay_list = DBA::toArray($relay_list_stmt); // Fetch the participation list // The function will ensure that there are no duplicates - $r1 = Diaspora::participantsForThread($item_id, $r1); + $relay_list = Diaspora::participantsForThread($target_id, $relay_list); - // Add the relay to the list, avoid duplicates - if (!$followup) { - $r1 = Diaspora::relayList($item_id, $r1); + // 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)) { + $relay_list = Diaspora::relayList($target_id, $relay_list); } } $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', 'name', 'network'], $condition)); + $r2 = DBA::toArray(DBA::select('contact', ['id', 'url', 'name', 'network', 'protocol'], $condition)); - $r = array_merge($r2, $r1); + $r = array_merge($r2, $relay_list); if (DBA::isResult($r)) { foreach ($r as $rr) { + if (self::isRemovalActivity($cmd, $owner, $rr['network'])) { + Logger::log('Skipping dropping for ' . $rr['url'] . ' since the network supports account removal commands.', Logger::DEBUG); + continue; + } + + if (in_array($rr['network'], [Protocol::DFRN, Protocol::DIASPORA]) && ($rr['protocol'] == Protocol::ACTIVITYPUB) && + !in_array($cmd, [Delivery::SUGGESTION, Delivery::REMOVAL, Delivery::RELOCATION, Delivery::POKE])) { + Logger::info('Contact is Friendica AP, so skipping delivery via legacy DFRN', ['url' => $rr['url']]); + continue; + } + + if (Config::get('debug', 'total_ap_delivery') && !empty($rr['url']) && ($rr['network'] == Protocol::DFRN) && !empty(APContact::getByURL($rr['url'], false))) { + Logger::log('Skipping contact ' . $rr['url'] . ' since it will be delivered via AP', Logger::DEBUG); + continue; + } + $conversants[] = $rr['id']; - Logger::log('Public delivery of item ' . $target_item["guid"] . ' (' . $item_id . ') to ' . json_encode($rr), Logger::DEBUG); - Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true], - 'Delivery', $cmd, $item_id, (int)$rr['id']); + + $delivery_queue_count++; + + Logger::log('Public delivery of item ' . $target_item["guid"] . ' (' . $target_id . ') to ' . json_encode($rr), Logger::DEBUG); + + // 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]; + } + Worker::add($deliver_options, 'Delivery', $cmd, $target_id, (int)$rr['id']); } } @@ -456,113 +459,187 @@ class Notifier } // delivery loop - if (DBA::isResult($contacts)) { - foreach ($contacts as $contact) { - // 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 ' . $item_id . ' via batch to ' . json_encode($contact), Logger::DEBUG); - continue; - } + while ($contact = DBA::fetch($delivery_contacts_stmt)) { + if (self::isRemovalActivity($cmd, $owner, $contact['network'])) { + Logger::log('Skipping dropping for ' . $contact['url'] . ' since the network supports account removal commands.', Logger::DEBUG); + continue; + } - // Don't deliver to folks who have already been delivered to - if (in_array($contact['id'], $conversants)) { - Logger::log('Already delivered id ' . $item_id. ' to ' . json_encode($contact), Logger::DEBUG); - continue; - } + if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && ($contact['protocol'] == Protocol::ACTIVITYPUB) && + !in_array($cmd, [Delivery::SUGGESTION, Delivery::REMOVAL, Delivery::RELOCATION, Delivery::POKE])) { + Logger::info('Contact is Friendica AP, so skipping delivery via legacy DFRN', ['url' => $contact['url']]); + continue; + } + + if (Config::get('debug', 'total_ap_delivery') && ($contact['network'] == Protocol::DFRN) && !empty(APContact::getByURL($contact['url'], false))) { + Logger::log('Skipping contact ' . $contact['url'] . ' since it will be delivered via AP', Logger::DEBUG); + 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); + 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); + continue; + } + + $delivery_queue_count++; + + Logger::log('Delivery of item ' . $target_id . ' to ' . json_encode($contact), Logger::DEBUG); - Logger::log('Delivery of item ' . $item_id . ' to ' . json_encode($contact), Logger::DEBUG); - Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true], - 'Delivery', $cmd, $item_id, (int)$contact['id']); + // 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) { + $deliver_options = ['priority' => $a->queue['priority'], 'dont_fork' => true]; + } else { + $deliver_options = ['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true]; } + Worker::add($deliver_options, 'Delivery', $cmd, $target_id, (int)$contact['id']); } + DBA::close($delivery_contacts_stmt); + $url_recipients = array_filter($url_recipients); // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts // They are especially used for notifications to OStatus users that don't follow us. - if (!Config::get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) { + if (!Config::get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) { + $delivery_queue_count += count($url_recipients); $slap = OStatus::salmon($target_item, $owner); foreach ($url_recipients as $url) { - if ($url) { - Logger::log('Salmon delivery of item ' . $item_id . ' to ' . $url); - $deliver_status = Salmon::slapper($owner, $url, $slap); - /// @TODO Redeliver/queue these items on failure, though there is no contact record - } + Logger::log('Salmon delivery of item ' . $target_id . ' to ' . $url); + /// @TODO Redeliver/queue these items on failure, though there is no contact record + Salmon::slapper($owner, $url, $slap); + ItemDeliveryData::incrementQueueDone($target_id); } } // Notify PuSH subscribers (Used for OStatus distribution of regular posts) if ($push_notify) { - Logger::log('Activating internal PuSH for item '.$item_id, Logger::DEBUG); + Logger::log('Activating internal PuSH for item '.$target_id, Logger::DEBUG); // Handling the pubsubhubbub requests PushSubscriber::publishFeed($owner['uid'], $a->queue['priority']); } - Logger::log('Calling hooks for ' . $cmd . ' ' . $item_id, Logger::DEBUG); + if (!empty($target_item)) { + Logger::log('Calling hooks for ' . $cmd . ' ' . $target_id, Logger::DEBUG); + + if (in_array($cmd, [Delivery::POST, Delivery::POKE])) { + ItemDeliveryData::update($target_item['id'], ['queue_count' => $delivery_queue_count]); + } - if ($normal_mode) { Hook::fork($a->queue['priority'], 'notifier_normal', $target_item); - } - Addon::callHooks('notifier_end',$target_item); + Hook::callAll('notifier_end', $target_item); + } return; } - private static function activityPubDelivery($a, $cmd, $item_id, $uid, $target_item, $parent) + /** + * 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. + * These protocols do have a dedicated command for deleting a whole account. + * + * @param string $cmd Notifier command + * @param array $owner Sender of the post + * @param string $network Receiver network + * @return bool + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + private static function isRemovalActivity($cmd, $owner, $network) + { + return ($cmd == Delivery::DELETION) && $owner['account_removed'] && in_array($network, [Protocol::ACTIVITYPUB, Protocol::DIASPORA]); + } + + /** + * @param int $self_user_id + * @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 bool + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + private static function notifySelfRemoval($self_user_id, $priority, $created) + { + $owner = User::getOwnerDataById($self_user_id); + if (!$owner) { + return false; + } + + $contacts_stmt = DBA::select('contact', [], ['self' => false, 'uid' => $self_user_id]); + if (!DBA::isResult($contacts_stmt)) { + return false; + } + + while($contact = DBA::fetch($contacts_stmt)) { + Contact::terminateFriendship($owner, $contact, true); + } + DBA::close($contacts_stmt); + + $inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser(0); + foreach ($inboxes as $inbox) { + 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); + } + + return true; + } + + /** + * @param string $cmd + * @param array $target_item + * @param array $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 + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + private static function activityPubDelivery($cmd, array $target_item, array $parent, $priority, $created, $owner) { $inboxes = []; - $personal = false; + + $uid = $target_item['contact-uid'] ?: $target_item['uid']; if ($target_item['origin']) { $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid); - Logger::log('Origin item ' . $item_id . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG); + Logger::log('Origin item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG); + } elseif (Item::isForumPost($target_item, $owner)) { + $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid, false, 0, true); + 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 ' . $item_id . ' with URL ' . $target_item['uri'] . ' is no AP post. It will not be distributed.', Logger::DEBUG); - return; - } else { + 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; + } elseif ($parent['origin']) { // Remote items are transmitted via the personal inboxes. // Doing so ensures that the dedicated receiver will get the message. - $personal = true; - Logger::log('Remote item ' . $item_id . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG); - } - - if ($parent['origin']) { - $parent_inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $uid, $personal); - $inboxes = array_merge($inboxes, $parent_inboxes); + $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $uid, true, $target_item['id']); + Logger::log('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG); } if (empty($inboxes)) { - Logger::log('No inboxes found for item ' . $item_id . ' with URL ' . $target_item['uri'] . '. It will not be distributed.', Logger::DEBUG); - return; + Logger::log('No inboxes found for item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . '. It will not be distributed.', Logger::DEBUG); + return 0; } // Fill the item cache - ActivityPub\Transmitter::createCachedActivityFromItem($item_id, true); + ActivityPub\Transmitter::createCachedActivityFromItem($target_item['id'], true); foreach ($inboxes as $inbox) { - Logger::log('Deliver ' . $item_id .' to ' . $inbox .' via ActivityPub', Logger::DEBUG); + Logger::info('Delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'inbox' => $inbox]); - Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true], - 'APDelivery', $cmd, $item_id, $inbox, $uid); - } - } - - private static function isForumPost($item, $owner) { - if (($item['author-id'] == $item['owner-id']) || - ($owner['id'] == $item['contact-id']) || - ($item['uri'] != $item['parent-uri'])) { - return false; - } - - $fields = ['forum', 'prv']; - $condition = ['id' => $item['contact-id']]; - $contact = DBA::selectFirst('contact', $fields, $condition); - if (!DBA::isResult($contact)) { - // Should never happen - return false; + Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true], + 'APDelivery', $cmd, $target_item['id'], $inbox, $uid); } - // Is the post from a forum? - return ($contact['forum'] || $contact['prv']); + return count($inboxes); } }