<?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\Core\Hook;
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;
'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) {
// 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];
- $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)) {
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
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;
}
// 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"];
}
}
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(
// 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.
}
if (!empty($rr['addr']) && ($rr['network'] == Protocol::ACTIVITYPUB) && !DBA::exists('fcontact', ['addr' => $rr['addr']])) {
- Logger::info('Contact is AP omly', ['target' => $target_id, 'contact' => $rr['url']]);
+ 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', ['target' => $target_id, 'contact' => $rr['url']]);
+ 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;
}
continue;
}
+ 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::info('Public delivery', ['target' => $target_id, 'guid' => $target_item["guid"], 'to' => $rr]);
}
if (!empty($contact['addr']) && ($contact['network'] == Protocol::ACTIVITYPUB) && !DBA::exists('fcontact', ['addr' => $contact['addr']])) {
- Logger::info('Contact is AP omly', ['target' => $target_id, 'contact' => $contact['url']]);
+ 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', ['target' => $target_id, 'contact' => $contact['url']]);
+ 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;
}
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' => $rr['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);
/// @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.
*
projects / friendica.git / blobdiff