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;
$recipients = [];
$url_recipients = [];
- $normal_mode = true;
$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' => $target_id]);
if (!DBA::isResult($message)) {
return;
$uid = $message['uid'];
$recipients[] = $message['contact-id'];
} elseif ($cmd == Delivery::SUGGESTION) {
- $normal_mode = false;
$suggest = DBA::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $target_id]);
if (!DBA::isResult($suggest)) {
return;
} elseif ($cmd == Delivery::REMOVAL) {
return self::notifySelfRemoval($target_id, $a->queue['priority'], $a->queue['created']);
} elseif ($cmd == Delivery::RELOCATION) {
- $normal_mode = false;
$uid = $target_id;
$condition = ['uid' => $target_id, 'self' => false, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
if (!empty($target_item) && !empty($items)) {
$parent = $items[0];
- self::activityPubDelivery($cmd, $target_item, $parent, $a->queue['priority'], $a->query_string['created']);
+ $delivery_queue_count += self::activityPubDelivery($cmd, $target_item, $parent, $a->queue['priority'], $a->queue['created']);
$fields = ['network', 'author-id', 'owner-id'];
$condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]];
$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.
$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'])) {
- $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 (empty($delivery_contacts_stmt)) {
if ($followup) {
$recipients = $recipients_followup;
$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'], $condition));
$r = array_merge($r2, $relay_list);
if (DBA::isResult($r)) {
foreach ($r as $rr) {
+ 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'];
+
+ $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.
// delivery loop
while ($contact = DBA::fetch($delivery_contacts_stmt)) {
+ 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;
}
+ $delivery_queue_count++;
+
Logger::log('Delivery of item ' . $target_id . ' to ' . json_encode($contact), Logger::DEBUG);
// Ensure that posts with our own protocol arrives before Diaspora posts arrive.
}
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 ' . $target_id . ' to ' . $url);
- /// @TODO Redeliver/queue these items on failure, though there is no contact record
- Salmon::slapper($owner, $url, $slap);
- }
+ 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);
}
}
PushSubscriber::publishFeed($owner['uid'], $a->queue['priority']);
}
- Logger::log('Calling hooks for ' . $cmd . ' ' . $target_id, Logger::DEBUG);
+ if (!empty($target_item)) {
+ Logger::log('Calling hooks for ' . $cmd . ' ' . $target_id, Logger::DEBUG);
+
+ if (in_array($cmd, [Delivery::POST, Delivery::COMMENT])) {
+ ItemDeliveryData::update($target_item['id'], ['queue_count' => $delivery_queue_count]);
+ }
- if ($normal_mode) {
Hook::fork($a->queue['priority'], 'notifier_normal', $target_item);
- }
- Hook::callAll('notifier_end',$target_item);
+ Hook::callAll('notifier_end', $target_item);
+ }
return;
}
/**
* @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
+ * @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)
{
* @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
+ * @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)
{
$inboxes = [];
+ $uid = $target_item['contact-uid'] ?: $target_item['uid'];
+
if ($target_item['origin']) {
- $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $target_item['contact-uid']);
+ $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid);
Logger::log('Origin 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 ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' is no AP post. It will not be distributed.', Logger::DEBUG);
- return;
+ return 0;
} elseif ($parent['origin']) {
// Remote items are transmitted via the personal inboxes.
// Doing so ensures that the dedicated receiver will get the message.
- $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $target_item['contact-uid'], true, $target_item['id']);
+ $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 ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . '. It will not be distributed.', Logger::DEBUG);
- return;
+ return 0;
}
// Fill the item cache
Logger::log('Deliver ' . $target_item['id'] .' to ' . $inbox .' via ActivityPub', Logger::DEBUG);
Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true],
- 'APDelivery', $cmd, $target_item['id'], $inbox, $target_item['contact-uid']);
+ 'APDelivery', $cmd, $target_item['id'], $inbox, $uid);
}
+
+ return count($inboxes);
}
private static function isForumPost(array $item, array $owner)
return false;
}
+ return self::isForum($item['contact-id']);
+ }
+
+ private static function isForum($contactid)
+ {
$fields = ['forum', 'prv'];
- $condition = ['id' => $item['contact-id']];
+ $condition = ['id' => $contactid];
$contact = DBA::selectFirst('contact', $fields, $condition);
if (!DBA::isResult($contact)) {
// Should never happen
return false;
}
- // Is the post from a forum?
+ // Is it a forum?
return ($contact['forum'] || $contact['prv']);
}
}
projects / friendica.git / blobdiff