X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FNotifier.php;h=d69419eb1817ce14fe3a8d2fc68cfee6b1c0d8b7;hb=7d7d310cc4f8661751fd2a62e33405c98f78aa62;hp=4af1bc91484777ecb628ca0253414242e318a3f0;hpb=e2b8d5379b1ed0dc17bcf186c969b136c1f49b15;p=friendica.git diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 4af1bc9148..d69419eb18 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -39,9 +39,9 @@ use Friendica\Protocol\Activity; 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: @@ -86,7 +86,7 @@ class Notifier 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], + Worker::add(['priority' => PRIORITY_HIGH, 'created' => $a->getQueueValue('created'), 'dont_fork' => true], 'APDelivery', $cmd, $target_id, $inbox, $uid, $receivers, $post_uriid); } } elseif ($cmd == Delivery::SUGGESTION) { @@ -94,7 +94,7 @@ class Notifier $uid = $suggest->uid; $recipients[] = $suggest->cid; } elseif ($cmd == Delivery::REMOVAL) { - return self::notifySelfRemoval($target_id, $a->queue['priority'], $a->queue['created']); + return self::notifySelfRemoval($target_id, $a->getQueueValue('priority'), $a->getQueueValue('created')); } elseif ($cmd == Delivery::RELOCATION) { $uid = $target_id; @@ -179,10 +179,10 @@ class Notifier $thr_parent = $parent; } - Logger::log('GUID: ' . $target_item["guid"] . ': Parent is ' . $parent['network'] . '. Thread parent is ' . $thr_parent['network'], Logger::DEBUG); + Logger::info('Got post', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'network' => $target_item['network'], 'parent-network' => $parent['network'], 'thread-parent-network' => $thr_parent['network']]); if (!self::isRemovalActivity($cmd, $owner, Protocol::ACTIVITYPUB)) { - $apdelivery = 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->getQueueValue('priority'), $a->getQueueValue('created'), $owner); $ap_contacts = $apdelivery['contacts']; $delivery_queue_count += $apdelivery['count']; } @@ -249,6 +249,20 @@ class Notifier $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; @@ -283,14 +297,14 @@ class Notifier } Logger::log('Notify ' . $target_item["guid"] .' via PuSH: ' . ($push_notify ? "Yes":"No"), Logger::DEBUG); - } elseif ($targets = Tag::getByURIId($target_item['uri-id'], [Tag::EXCLUSIVE_MENTION])) { + } elseif ($exclusive_delivery) { $followup = true; - foreach ($targets as $target) { + foreach ($exclusive_targets as $target) { $cid = Contact::getIdForURL($target['url'], $uid, false); if ($cid) { $recipients_followup[] = $cid; - Logger::info('Exclusively delivering', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'url' => $target['url']]); + Logger::info('Exclusively delivering', ['uid' => $target_item['uid'], 'guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'url' => $target['url']]); } } } else { @@ -325,7 +339,7 @@ class Notifier if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== Delivery::UPLINK) && ($target_item['verb'] != Activity::ANNOUNCE)) { - Worker::add($a->queue['priority'], 'Notifier', Delivery::UPLINK, $post_uriid, $sender_uid); + Worker::add($a->getQueueValue('priority'), 'Notifier', Delivery::UPLINK, $post_uriid, $sender_uid); } foreach ($items as $item) { @@ -427,12 +441,12 @@ class Notifier $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`, @@ -451,17 +465,11 @@ class Notifier $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, @@ -469,7 +477,7 @@ class Notifier $contacts = DBA::toArray(DBA::select('contact', ['id', 'url', 'addr', 'name', 'network', 'protocol'], $condition)); - $conversants = array_merge($contacts, $relay_list); + $conversants = array_merge($contacts, $participants); $delivery_queue_count += self::delivery($cmd, $post_uriid, $sender_uid, $target_item, $thr_parent, $owner, $batch_delivery, true, $conversants, $ap_contacts, []); @@ -484,7 +492,7 @@ class Notifier if (!empty($target_item)) { Logger::log('Calling hooks for ' . $cmd . ' ' . $target_id, Logger::DEBUG); - Hook::fork($a->queue['priority'], 'notifier_normal', $target_item); + Hook::fork($a->getQueueValue('priority'), 'notifier_normal', $target_item); Hook::callAll('notifier_end', $target_item); @@ -526,7 +534,7 @@ class Notifier foreach ($contacts as $contact) { // Direct delivery of local contacts - if ($target_uid = User::getIdForURL($contact['url'])) { + 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']); @@ -573,10 +581,10 @@ class Notifier // 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 (($contact['network'] == Protocol::DIASPORA) && in_array($a->queue['priority'], [PRIORITY_HIGH, PRIORITY_MEDIUM])) { - $deliver_options = ['priority' => $a->queue['priority'], 'dont_fork' => true]; + if (($contact['network'] == Protocol::DIASPORA) && in_array($a->getQueueValue('priority'), [PRIORITY_HIGH, PRIORITY_MEDIUM])) { + $deliver_options = ['priority' => $a->getQueueValue('priority'), 'dont_fork' => true]; } else { - $deliver_options = ['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true]; + $deliver_options = ['priority' => $a->getQueueValue('priority'), 'created' => $a->getQueueValue('created'), 'dont_fork' => true]; } if (Worker::add($deliver_options, 'Delivery', $cmd, $post_uriid, (int)$contact['id'], $sender_uid)) { @@ -607,7 +615,7 @@ class Notifier $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 (!DI::config()->get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) { + if (count($url_recipients) && ($public_message || $push_notify) && !empty($target_item)) { $slap = OStatus::salmon($target_item, $owner); foreach ($url_recipients as $url) { Logger::info('Salmon delivery', ['item' => $target_id, 'to' => $url]); @@ -623,7 +631,7 @@ class Notifier Logger::info('Activating internal PuSH', ['item' => $target_id]); // Handling the pubsubhubbub requests - PushSubscriber::publishFeed($owner['uid'], $a->queue['priority']); + PushSubscriber::publishFeed($owner['uid'], $a->getQueueValue('priority')); } return $delivery_queue_count; } @@ -695,7 +703,7 @@ class Notifier } while($contact = DBA::fetch($contacts_stmt)) { - Contact::terminateFriendship($owner, $contact, true); + Protocol::terminateFriendship($owner, $contact, true); } DBA::close($contacts_stmt); @@ -724,21 +732,25 @@ class Notifier { // Don't deliver via AP when the starting post isn't from a federated network if (!in_array($parent['network'], Protocol::FEDERATED)) { + Logger::info('Parent network is no federated network, so no AP delivery', ['network' => $parent['network']]); return ['count' => 0, 'contacts' => []]; } // Don't deliver via AP when the starting post is delivered via Diaspora if ($parent['network'] == Protocol::DIASPORA) { + Logger::info('Parent network is Diaspora, so no AP delivery'); return ['count' => 0, 'contacts' => []]; } // Also don't deliver when the direct thread parent was delivered via Diaspora if ($thr_parent['network'] == Protocol::DIASPORA) { + Logger::info('Thread parent network is Diaspora, so no AP delivery'); return ['count' => 0, 'contacts' => []]; } // Posts from Diaspora contacts are transmitted via Diaspora if ($target_item['network'] == Protocol::DIASPORA) { + Logger::info('Post network is Diaspora, so no AP delivery'); return ['count' => 0, 'contacts' => []]; }