X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FNotifier.php;h=ad33c3245d4be9d33e1381cb9d1cb00b40851842;hb=481b0ac138511825f3736342b40dd9b3a2e2a8d5;hp=7ba8b60b3fe4078f12f350b82c148bdf2328ccc6;hpb=4db98eb43d90a56b1e983628910641c9cc567b8a;p=friendica.git diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index 7ba8b60b3f..ad33c3245d 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -7,18 +7,20 @@ namespace Friendica\Worker; use Friendica\BaseObject; use Friendica\Core\Addon; use Friendica\Core\Config; +use Friendica\Core\Protocol; use Friendica\Core\Worker; use Friendica\Database\DBA; -use Friendica\Database\DBM; use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\PushSubscriber; use Friendica\Model\User; use Friendica\Network\Probe; +use Friendica\Protocol\ActivityPub; use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; use Friendica\Protocol\Salmon; +use Friendica\Model\Conversation; require_once 'include/dba.php'; require_once 'include/items.php'; @@ -66,7 +68,7 @@ class Notifier if ($cmd == Delivery::MAIL) { $normal_mode = false; $message = DBA::selectFirst('mail', ['uid', 'contact-id'], ['id' => $item_id]); - if (!DBM::is_result($message)) { + if (!DBA::isResult($message)) { return; } $uid = $message['uid']; @@ -74,7 +76,7 @@ class Notifier } elseif ($cmd == Delivery::SUGGESTION) { $normal_mode = false; $suggest = DBA::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $item_id]); - if (!DBM::is_result($suggest)) { + if (!DBA::isResult($suggest)) { return; } $uid = $suggest['uid']; @@ -96,21 +98,29 @@ class Notifier return; } foreach ($r as $contact) { - Contact::terminateFriendship($user, $contact); + Contact::terminateFriendship($user, $contact, true); } + + $inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser(0); + foreach ($inboxes as $inbox) { + logger('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; } elseif ($cmd == Delivery::RELOCATION) { $normal_mode = false; $uid = $item_id; $recipients_relocate = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND `network` IN ('%s', '%s')", - intval($uid), NETWORK_DFRN, NETWORK_DIASPORA); + intval($uid), Protocol::DFRN, Protocol::DIASPORA); } else { // find ancestors $condition = ['id' => $item_id, 'visible' => true, 'moderated' => false]; $target_item = Item::selectFirst([], $condition); - if (!DBM::is_result($target_item) || !intval($target_item['parent'])) { + if (!DBA::isResult($target_item) || !intval($target_item['parent'])) { return; } @@ -122,7 +132,7 @@ class Notifier $params = ['order' => ['id']]; $ret = Item::select([], $condition, $params); - if (!DBM::is_result($ret)) { + if (!DBA::isResult($ret)) { return; } @@ -167,6 +177,8 @@ class Notifier if (!in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION, Delivery::RELOCATION])) { $parent = $items[0]; + self::activityPubDelivery($a, $cmd, $item_id, $uid, $target_item, $parent); + $fields = ['network', 'author-id', 'owner-id']; $condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]]; $thr_parent = Item::selectFirst($fields, $condition); @@ -182,7 +194,7 @@ class Notifier // if $parent['wall'] == 1 we will already have the parent message in our array // and we will relay the whole lot. - $localhost = str_replace('www.','',$a->get_hostname()); + $localhost = str_replace('www.','',$a->getHostName()); if (strpos($localhost,':')) { $localhost = substr($localhost,0,strpos($localhost,':')); } @@ -217,29 +229,21 @@ class Notifier } // Special treatment for forum posts - if (($target_item['author-id'] != $target_item['owner-id']) && - ($owner['id'] != $target_item['contact-id']) && - ($target_item['uri'] === $target_item['parent-uri'])) { - - $fields = ['forum', 'prv']; - $condition = ['id' => $target_item['contact-id']]; - $contact = DBA::selectFirst('contact', $fields, $condition); - if (!DBM::is_result($contact)) { - // Should never happen - return false; - } + if (self::isForumPost($target_item, $owner)) { + $relay_to_owner = true; + $direct_forum_delivery = true; + } - // Is the post from a forum? - if ($contact['forum'] || $contact['prv']) { - $relay_to_owner = true; - $direct_forum_delivery = true; - } + // Avoid that comments in a forum thread are sent to OStatus + if (self::isForumPost($parent, $owner)) { + $direct_forum_delivery = true; } + if ($relay_to_owner) { // local followup to remote post $followup = true; $public_message = false; // not public - $conversant_str = dbesc($parent['contact-id']); + $conversant_str = DBA::escape($parent['contact-id']); $recipients = [$parent['contact-id']]; $recipients_followup = [$parent['contact-id']]; @@ -251,17 +255,17 @@ class Notifier $target_item['deny_cid'].$target_item['deny_gid']) == 0)) $push_notify = true; - if (($thr_parent && ($thr_parent['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) { + if (($thr_parent && ($thr_parent['network'] == Protocol::OSTATUS)) || ($parent['network'] == Protocol::OSTATUS)) { $push_notify = true; - if ($parent["network"] == NETWORK_OSTATUS) { + 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), - dbesc(NETWORK_DFRN) + DBA::escape(Protocol::DFRN) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { foreach ($r as $rr) { $recipients_followup[] = $rr['id']; } @@ -332,26 +336,26 @@ class Notifier $deny = array_unique(array_merge($deny_people,$deny_groups)); $recipients = array_diff($recipients,$deny); - $conversant_str = dbesc(implode(', ',$conversants)); + $conversant_str = DBA::escape(implode(', ',$conversants)); } // If the thread parent is OStatus then do some magic to distribute the messages. // We have not only to look at the parent, since it could be a Friendica thread. - if (($thr_parent && ($thr_parent['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) { + if (($thr_parent && ($thr_parent['network'] == Protocol::OSTATUS)) || ($parent['network'] == Protocol::OSTATUS)) { $diaspora_delivery = false; logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent['author-id']." - Owner: ".$thr_parent['owner-id'], LOGGER_DEBUG); // Send a salmon to the parent author $probed_contact = DBA::selectFirst('contact', ['url', 'notify'], ['id' => $thr_parent['author-id']]); - if (DBM::is_result($probed_contact) && !empty($probed_contact["notify"])) { + if (DBA::isResult($probed_contact) && !empty($probed_contact["notify"])) { logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]); $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; } // Send a salmon to the parent owner $probed_contact = DBA::selectFirst('contact', ['url', 'notify'], ['id' => $thr_parent['owner-id']]); - if (DBM::is_result($probed_contact) && !empty($probed_contact["notify"])) { + if (DBA::isResult($probed_contact) && !empty($probed_contact["notify"])) { logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]); $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; } @@ -371,9 +375,9 @@ class Notifier } // It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora - $networks = [NETWORK_OSTATUS, NETWORK_DFRN]; + $networks = [Protocol::OSTATUS, Protocol::DFRN]; } else { - $networks = [NETWORK_OSTATUS, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_MAIL]; + $networks = [Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA, Protocol::MAIL]; } } else { $public_message = false; @@ -386,9 +390,9 @@ class Notifier && intval($target_item['pubmail'])) { $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'", intval($uid), - dbesc(NETWORK_MAIL) + DBA::escape(Protocol::MAIL) ); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { foreach ($r as $rr) { $recipients[] = $rr['id']; } @@ -412,7 +416,7 @@ class Notifier } // delivery loop - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { foreach ($r as $contact) { logger("Deliver ".$item_id." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG); @@ -441,9 +445,9 @@ class Notifier $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`", - dbesc(NETWORK_DIASPORA), + DBA::escape(Protocol::DIASPORA), intval($owner['uid']), - intval(CONTACT_IS_SHARING) + intval(Contact::SHARING) ); // Fetch the participation list @@ -456,20 +460,21 @@ class Notifier } } - $condition = ['network' => NETWORK_DFRN, 'uid' => $owner['uid'], 'blocked' => false, - 'pending' => false, 'archive' => false, 'rel' => [CONTACT_IS_FOLLOWER, CONTACT_IS_FRIEND]]; + $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)); $r = array_merge($r2, $r1); - if (DBM::is_result($r)) { + if (DBA::isResult($r)) { logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG); foreach ($r as $rr) { // except for Diaspora batch jobs // Don't deliver to folks who have already been delivered to - if (($rr['network'] !== NETWORK_DIASPORA) && (in_array($rr['id'], $conversants))) { + if (($rr['network'] !== Protocol::DIASPORA) && (in_array($rr['id'], $conversants))) { logger('notifier: already delivered id=' . $rr['id']); continue; } @@ -503,4 +508,58 @@ class Notifier return; } + + private static function activityPubDelivery($a, $cmd, $item_id, $uid, $target_item, $parent) + { + $inboxes = []; + + if ($target_item['origin']) { + $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid); + logger('Origin item ' . $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('Remote item ' . $item_id . ' with URL ' . $target_item['uri'] . ' is no AP post. It will not be distributed.', LOGGER_DEBUG); + return; + } else { + logger('Remote item ' . $item_id . ' with URL ' . $target_item['uri'] . ' will be distributed.', LOGGER_DEBUG); + } + + if ($parent['origin']) { + $parent_inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $uid); + $inboxes = array_merge($inboxes, $parent_inboxes); + } + + if (empty($inboxes)) { + logger('No inboxes found for item ' . $item_id . ' with URL ' . $target_item['uri'] . '. It will not be distributed.', LOGGER_DEBUG); + return; + } + + // Fill the item cache + ActivityPub\Transmitter::createCachedActivityFromItem($item_id); + + foreach ($inboxes as $inbox) { + logger('Deliver ' . $item_id .' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG); + + 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; + } + + // Is the post from a forum? + return ($contact['forum'] || $contact['prv']); + } }