<?php
/**
- * @file src/Worker/Notifier.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
*/
+
namespace Friendica\Worker;
-use Friendica\BaseObject;
-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\DI;
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\Post;
use Friendica\Model\PushSubscriber;
+use Friendica\Model\Tag;
use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Protocol\ActivityPub;
{
public static function execute($cmd, $target_id)
{
- $a = BaseObject::getApp();
+ $a = DI::app();
- Logger::log('Invoked: ' . $cmd . ': ' . $target_id, Logger::DEBUG);
+ Logger::info('Invoked', ['cmd' => $cmd, 'target' => $target_id]);
$top_level = false;
$recipients = [];
$delivery_contacts_stmt = null;
$target_item = [];
+ $parent = [];
+ $thr_parent = [];
$items = [];
$delivery_queue_count = 0;
$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]);
+ 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);
}
} elseif ($cmd == Delivery::SUGGESTION) {
- $suggest = DBA::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $target_id]);
- if (!DBA::isResult($suggest)) {
- return;
- }
- $uid = $suggest['uid'];
- $recipients[] = $suggest['cid'];
+ $suggest = DI::fsuggest()->getById($target_id);
+ $uid = $suggest->uid;
+ $recipients[] = $suggest->cid;
} elseif ($cmd == Delivery::REMOVAL) {
return self::notifySelfRemoval($target_id, $a->queue['priority'], $a->queue['created']);
} elseif ($cmd == Delivery::RELOCATION) {
$uid = $target_id;
$condition = ['uid' => $target_id, 'self' => false, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
- $delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'network', 'protocol', 'batch'], $condition);
+ $delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'addr', 'network', 'protocol', 'batch'], $condition);
} else {
// find ancestors
$condition = ['id' => $target_id, 'visible' => true, 'moderated' => false];
$target_item = Item::selectFirst([], $condition);
if (!DBA::isResult($target_item) || !intval($target_item['parent'])) {
+ Logger::info('No target item', ['cmd' => $cmd, 'target' => $target_id]);
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, quitting', ['target' => $target_id]);
return;
}
$params = ['order' => ['id']];
$items_stmt = Item::select([], $condition, $params);
if (!DBA::isResult($items_stmt)) {
+ Logger::info('No item found', ['cmd' => $cmd, 'target' => $target_id]);
return;
}
}
if ((count($items) == 1) && ($items[0]['id'] === $target_item['id']) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
- Logger::log('Top level post');
+ Logger::info('Top level post', ['target' => $target_id]);
$top_level = true;
}
}
$owner = User::getOwnerDataById($uid);
if (!$owner) {
+ Logger::info('Owner not found', ['cmd' => $cmd, 'target' => $target_id]);
return;
}
// If this is a public conversation, notify the feed hub
$public_message = true;
+ $unlisted = false;
+
// Do a PuSH
$push_notify = false;
if (!empty($target_item) && !empty($items)) {
$parent = $items[0];
- 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', 'author-link', 'owner-id'];
+ $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);
+ 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);
+ }
+
// Only deliver threaded replies (comment to a comment) to Diaspora
// when the original comment author does support the Diaspora protocol.
if ($target_item['parent-uri'] != $target_item['thr-parent']) {
Logger::info('Threaded comment', ['diaspora_delivery' => (int)$diaspora_delivery]);
}
+ $unlisted = $target_item['private'] == Item::UNLISTED;
+
// This is IMPORTANT!!!!
// We will only send a "notify owner to relay" or followup message if the referenced post
// 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->getHostName());
+ $localhost = str_replace('www.','', DI::baseUrl()->getHostname());
if (strpos($localhost,':')) {
$localhost = substr($localhost,0,strpos($localhost,':'));
}
$relay_to_owner = true;
}
-
if (($cmd === Delivery::UPLINK) && (intval($parent['forum_mode']) == 1) && !$top_level) {
$relay_to_owner = true;
}
$recipients = [$parent['contact-id']];
$recipients_followup = [$parent['contact-id']];
- Logger::log('Followup ' . $target_item['guid'] . ' to ' . $parent['contact-id'], Logger::DEBUG);
+ Logger::info('Followup', ['target' => $target_id, 'guid' => $target_item['guid'], 'to' => $parent['contact-id']]);
- //if (!$target_item['private'] && $target_item['wall'] &&
- if (!$target_item['private'] &&
+ if (($target_item['private'] != Item::PRIVATE) &&
(strlen($target_item['allow_cid'].$target_item['allow_gid'].
$target_item['deny_cid'].$target_item['deny_gid']) == 0))
$push_notify = true;
} else {
$followup = false;
- Logger::log('Distributing directly ' . $target_item["guid"], Logger::DEBUG);
+ Logger::info('Distributing directly', ['target' => $target_id, 'guid' => $target_item['guid']]);
// don't send deletions onward for other people's stuff
$public_message = false; // private recipients, not public
}
- $allow_people = expand_acl($parent['allow_cid']);
- $allow_groups = Group::expand($uid, expand_acl($parent['allow_gid']),true);
- $deny_people = expand_acl($parent['deny_cid']);
- $deny_groups = Group::expand($uid, expand_acl($parent['deny_gid']));
+ $aclFormatter = DI::aclFormatter();
+
+ $allow_people = $aclFormatter->expand($parent['allow_cid']);
+ $allow_groups = Group::expand($uid, $aclFormatter->expand($parent['allow_gid']),true);
+ $deny_people = $aclFormatter->expand($parent['deny_cid']);
+ $deny_groups = Group::expand($uid, $aclFormatter->expand($parent['deny_gid']));
// 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 (count($url_recipients)) {
- Logger::log('Deliver ' . $target_item["guid"] . ' to _recipients ' . json_encode($url_recipients));
+ Logger::notice('Deliver', ['target' => $target_id, 'guid' => $target_item['guid'], 'recipients' => $url_recipients]);
}
$recipients = array_unique(array_merge($recipients, $allow_people, $allow_groups));
// 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')
+ && !DI::config()->get('system','imap_disabled')
&& $public_message
&& intval($target_item['pubmail'])
) {
}
// Send a salmon notification to every person we mentioned in the post
- $arr = explode(',',$target_item['tag']);
- foreach ($arr as $x) {
- //Logger::log('Checking tag '.$x, Logger::DEBUG);
- $matches = null;
- if (preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
- $probed_contact = Probe::uri($matches[1]);
- if ($probed_contact["notify"] != "") {
- Logger::log('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
- $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
- }
+ foreach (Tag::getByURIId($target_item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION, Tag::IMPLICIT_MENTION]) as $tag) {
+ $probed_contact = Probe::uri($tag['url']);
+ if ($probed_contact["notify"] != "") {
+ Logger::log('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
+ $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
}
}
$networks = [Protocol::DFRN];
} elseif ($diaspora_delivery) {
$networks = [Protocol::DFRN, Protocol::DIASPORA, Protocol::MAIL];
+ if (($parent['network'] == Protocol::DIASPORA) || ($thr_parent['network'] == Protocol::DIASPORA)) {
+ Logger::info('Add AP contacts', ['target' => $target_id, 'guid' => $target_item['guid']]);
+ $networks[] = Protocol::ACTIVITYPUB;
+ }
} else {
$networks = [Protocol::DFRN, Protocol::MAIL];
}
if (!empty($networks)) {
$condition['network'] = $networks;
}
- $delivery_contacts_stmt = DBA::select('contact', ['id', 'url', 'network', 'protocol', 'batch'], $condition);
+ $delivery_contacts_stmt = DBA::select('contact', ['id', 'addr', 'url', 'network', 'protocol', 'batch'], $condition);
}
$conversants = [];
if ($public_message && !in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$followup) {
$relay_list = [];
- if ($diaspora_delivery) {
+ if ($diaspora_delivery && !$unlisted) {
$batch_delivery = true;
$relay_list_stmt = DBA::p(
"SELECT
`batch`,
ANY_VALUE(`id`) AS `id`,
+ ANY_VALUE(`url`) AS `url`,
ANY_VALUE(`name`) AS `name`,
ANY_VALUE(`network`) AS `network`,
ANY_VALUE(`protocol`) AS `protocol`
// Fetch the participation list
// The function will ensure that there are no duplicates
- $relay_list = Diaspora::participantsForThread($target_id, $relay_list);
+ $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.
$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', 'name', 'network', 'protocol'], $condition));
+ $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;
+ }
+
+ if (!empty($rr['addr']) && ($rr['network'] == Protocol::ACTIVITYPUB) && !DBA::exists('fcontact', ['addr' => $rr['addr']])) {
+ Logger::info('Contact is AP omly, so skip delivery via legacy DFRN/Diaspora', ['target' => $target_id, 'contact' => $rr['url']]);
+ continue;
+ }
+
if (!empty($rr['id']) && Contact::isArchived($rr['id'])) {
- Logger::info('Contact is archived', $rr);
+ Logger::info('Contact is archived, so skip delivery', ['target' => $target_id, 'contact' => $rr['url']]);
continue;
}
if (self::isRemovalActivity($cmd, $owner, $rr['network'])) {
- Logger::log('Skipping dropping for ' . $rr['url'] . ' since the network supports account removal commands.', Logger::DEBUG);
+ Logger::info('Contact does no supports account removal commands, so skip delivery', ['target' => $target_id, 'contact' => $rr['url']]);
+ continue;
+ }
+
+ if (self::skipDFRN($rr, $target_item, $parent, $thr_parent, $cmd)) {
+ Logger::info('Contact can be delivered via AP, so skip delivery via legacy DFRN/Diaspora', ['id' => $target_id, 'url' => $rr['url']]);
continue;
}
- if (self::skipDFRN($rr, $target_item, $cmd)) {
- Logger::info('Contact can be delivered via AP, so skip delivery via legacy DFRN', ['url' => $rr['url']]);
+ 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;
}
$conversants[] = $rr['id'];
- Logger::log('Public delivery of item ' . $target_item["guid"] . ' (' . $target_id . ') to ' . json_encode($rr), Logger::DEBUG);
+ Logger::info('Public delivery', ['target' => $target_id, 'guid' => $target_item["guid"], 'to' => $rr]);
// 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.
// 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;
+ }
+
+ if (!empty($contact['addr']) && ($contact['network'] == Protocol::ACTIVITYPUB) && !DBA::exists('fcontact', ['addr' => $contact['addr']])) {
+ Logger::info('Contact is AP omly, so skip delivery via legacy DFRN/Diaspora', ['target' => $target_id, 'contact' => $contact['url']]);
+ continue;
+ }
+
if (!empty($contact['id']) && Contact::isArchived($contact['id'])) {
- Logger::info('Contact is archived', $contact);
+ Logger::info('Contact is archived, so skip delivery', ['target' => $target_id, 'contact' => $contact['url']]);
continue;
}
if (self::isRemovalActivity($cmd, $owner, $contact['network'])) {
- Logger::log('Skipping dropping for ' . $contact['url'] . ' since the network supports account removal commands.', Logger::DEBUG);
+ Logger::info('Contact does no supports account removal commands, so skip delivery', ['target' => $target_id, 'contact' => $contact['url']]);
+ continue;
+ }
+
+ if (self::skipDFRN($contact, $target_item, $parent, $thr_parent, $cmd)) {
+ Logger::info('Contact can be delivered via AP, so skip delivery via legacy DFRN/Diaspora', ['target' => $target_id, 'url' => $contact['url']]);
continue;
}
- if (self::skipDFRN($contact, $target_item, $cmd)) {
- Logger::info('Contact can be delivered via AP, so skip delivery via legacy DFRN', ['url' => $contact['url']]);
+ 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' => $rr['url']]);
continue;
}
continue;
}
- Logger::log('Delivery of item ' . $target_id . ' to ' . json_encode($contact), Logger::DEBUG);
+ Logger::info('Delivery', ['id' => $target_id, '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.
$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) && !empty($target_item)) {
+ 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
$delivery_queue_count++;
Salmon::slapper($owner, $url, $slap);
- ItemDeliveryData::incrementQueueDone($target_id, ItemDeliveryData::OSTATUS);
+ Post\DeliveryData::incrementQueueDone($target_item['uri-id'], Post\DeliveryData::OSTATUS);
}
}
// Workaround for pure connector posts
if (in_array($cmd, [Delivery::POST, Delivery::POKE])) {
if ($delivery_queue_count == 0) {
- ItemDeliveryData::incrementQueueDone($target_item['id']);
+ Post\DeliveryData::incrementQueueDone($target_item['uri-id']);
$delivery_queue_count = 1;
}
- ItemDeliveryData::incrementQueueCount($target_item['id'], $delivery_queue_count);
+ Post\DeliveryData::incrementQueueCount($target_item['uri-id'], $delivery_queue_count);
}
}
return;
}
+ /**
+ * Checks if the current delivery shouldn't be transported to Diaspora.
+ * This is done for posts from AP authors or posts that are comments to AP authors.
+ *
+ * @param array $contact Receiver of the post
+ * @param array $item The post
+ * @param array $thr_parent The thread parent
+ * @return bool
+ */
+ private static function skipActivityPubForDiaspora(array $contact, array $item, array $thr_parent)
+ {
+ // No skipping needs to be done when delivery isn't done to Diaspora
+ if ($contact['network'] != Protocol::DIASPORA) {
+ return false;
+ }
+
+ // Skip the delivery to Diaspora if the item is from an ActivityPub author
+ if ($item['author-network'] == Protocol::ACTIVITYPUB) {
+ return true;
+ }
+
+ // Skip the delivery to Diaspora if the thread parent is from an ActivityPub author
+ if ($thr_parent['author-network'] == Protocol::ACTIVITYPUB) {
+ return true;
+ }
+
+ 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 string $cmd Notifier command
+ * @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 string $cmd Notifier command
* @return bool
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function skipDFRN($contact, $item, $cmd)
+ private static function skipDFRN($contact, $item, $parent, $thr_parent, $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;
return false;
}
+ // We deliver reshares via AP whenever possible
+ if (ActivityPub\Transmitter::isAnnounce($item)) {
+ return true;
+ }
+
// Skip DFRN when the item will be (forcefully) delivered via AP
- if (Config::get('debug', 'total_ap_delivery') && ($contact['network'] == Protocol::DFRN) && !empty(APContact::getByURL($contact['url'], false))) {
+ if (DI::config()->get('debug', 'total_ap_delivery') && ($contact['network'] == Protocol::DFRN) && !empty(APContact::getByURL($contact['url'], false))) {
return true;
}
* @param string $cmd
* @param array $target_item
* @param array $parent
+ * @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
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function activityPubDelivery($cmd, array $target_item, array $parent, $priority, $created, $owner)
+ 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 is delivered via Diaspora
+ if ($parent['network'] == Protocol::DIASPORA) {
+ return 0;
+ }
+
+ // Also don't deliver when the direct thread parent was delivered via Diaspora
+ if ($thr_parent['network'] == Protocol::DIASPORA) {
+ return 0;
+ }
+
$inboxes = [];
$uid = $target_item['contact-uid'] ?: $target_item['uid'];
projects / friendica.git / blobdiff