*/
namespace Friendica\Worker;
+use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
use dba;
require_once 'include/dba.php';
-require_once 'include/queue_fn.php';
-require_once 'include/html2plain.php';
-require_once 'include/datetime.php';
require_once 'include/items.php';
-require_once 'include/bbcode.php';
/*
* This file was at one time responsible for doing all deliveries, but this caused
* drop (in diaspora.php, items.php, photos.php)
* edit_post (in item.php)
* event (in events.php)
- * expire (in items.php)
* like (in like.php, poke.php)
* mail (in message.php)
* suggest (in fsuggest.php)
logger('notifier: invoked: '.$cmd.': '.$item_id, LOGGER_DEBUG);
- $expire = false;
$mail = false;
$fsuggest = false;
$relocate = false;
$top_level = false;
- $recipients = array();
- $url_recipients = array();
+ $recipients = [];
+ $url_recipients = [];
$normal_mode = true;
+ $recipients_relocate = [];
if ($cmd === 'mail') {
$normal_mode = false;
$uid = $message[0]['uid'];
$recipients[] = $message[0]['contact-id'];
$item = $message[0];
-
- } elseif ($cmd === 'expire') {
- $normal_mode = false;
- $expire = true;
- $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
- AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 10 MINUTE",
- intval($item_id)
- );
- $uid = $item_id;
- $item_id = 0;
- if (!count($items)) {
- return;
- }
} elseif ($cmd === 'suggest') {
$normal_mode = false;
$fsuggest = true;
// fill this in with a single salmon slap if applicable
$slap = '';
+ $followup = false;
+ $recipients_followup = [];
+ $conversants = [];
+ $sql_extra = '';
if (! ($mail || $fsuggest || $relocate)) {
$slap = OStatus::salmon($target_item, $owner);
// if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot.
- // expire sends an entire group of expire messages and cannot be forwarded.
- // However the conversation owner will be a part of the conversation and will
- // be notified during this run.
- // Other DFRN conversation members will be alerted during polled updates.
-
-
-
- // Diaspora members currently are not notified of expirations, and other networks have
- // either limited or no ability to process deletions. We should at least fix Diaspora
- // by stringing togther an array of retractions and sending them onward.
-
-
$localhost = str_replace('www.','',$a->get_hostname());
if (strpos($localhost,':')) {
$localhost = substr($localhost,0,strpos($localhost,':'));
$relay_to_owner = false;
- if (!$top_level && ($parent['wall'] == 0) && !$expire && (stristr($target_item['uri'],$localhost))) {
+ if (!$top_level && ($parent['wall'] == 0) && (stristr($target_item['uri'],$localhost))) {
$relay_to_owner = true;
}
($owner['id'] != $target_item['contact-id']) &&
($target_item['uri'] === $target_item['parent-uri'])) {
- $fields = array('forum', 'prv');
- $condition = array('id' => $target_item['contact-id']);
- $contact = dba::select('contact', $fields, $condition, array('limit' => 1));
+ $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 ($relay_to_owner) {
- logger('notifier: followup '.$target_item["guid"], LOGGER_DEBUG);
// local followup to remote post
$followup = true;
$public_message = false; // not public
$conversant_str = dbesc($parent['contact-id']);
- $recipients = array($parent['contact-id']);
- $recipients_followup = array($parent['contact-id']);
+ $recipients = [$parent['contact-id']];
+ $recipients_followup = [$parent['contact-id']];
+
+ logger('notifier: followup '.$target_item["guid"].' to '.$conversant_str, LOGGER_DEBUG);
//if (!$target_item['private'] && $target_item['wall'] &&
if (!$target_item['private'] &&
Worker::add($a->queue['priority'], 'Notifier', 'uplink', $item_id);
}
- $conversants = array();
-
foreach ($items as $item) {
$recipients[] = $item['contact-id'];
$conversants[] = $item['contact-id'];
}
logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
- Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+ Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
'Delivery', $cmd, $item_id, (int)$contact['id']);
}
}
if ($public_message) {
-
- $r0 = array();
- $r1 = array();
+ $r1 = [];
if ($diaspora_delivery) {
- if (!$followup) {
- $r0 = Diaspora::relayList();
- }
-
$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`",
intval($owner['uid']),
intval(CONTACT_IS_SHARING)
);
+
+ // Fetch the participation list
+ // The function will ensure that there are no duplicates
+ $r1 = Diaspora::participantsForThread($item_id, $r1);
+
+ // Add the relay to the list, avoid duplicates
+ if (!$followup) {
+ $r1 = Diaspora::relayList($item_id, $r1);
+ }
}
- $r2 = q("SELECT `id`, `name`,`network` FROM `contact`
- WHERE `network` in ('%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `rel` != %d",
- dbesc(NETWORK_DFRN),
- intval($owner['uid']),
- intval(CONTACT_IS_SHARING)
- );
+ $condition = ['network' => NETWORK_DFRN, 'uid' => $owner['uid'], 'blocked' => false,
+ 'pending' => false, 'archive' => false, 'rel' => [CONTACT_IS_FOLLOWER, CONTACT_IS_FRIEND]];
+ $r2 = dba::inArray(dba::select('contact', ['id', 'name', 'network'], $condition));
- $r = array_merge($r2,$r1,$r0);
+ $r = array_merge($r2, $r1);
if (DBM::is_result($r)) {
logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
// 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'] !== NETWORK_DIASPORA) && (in_array($rr['id'], $conversants))) {
logger('notifier: already delivered id=' . $rr['id']);
continue;
}
if (!$mail && !$fsuggest && !$followup) {
logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
- Worker::add(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true),
+ Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
'Delivery', $cmd, $item_id, (int)$rr['id']);
}
}
if ($push_notify) {
// Set push flag for PuSH subscribers to this topic,
// they will be notified in queue.php
- q("UPDATE `push_subscriber` SET `push` = 1 ".
- "WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname']));
+ $condition = ['push' => false, 'nickname' => $owner['nickname']];
+ dba::update('push_subscriber', ['push' => true], $condition);
logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
// Handling the pubsubhubbub requests
- Worker::add(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),
+ Worker::add(['priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true],
'PubSubPublish');
}
logger('notifier: calling hooks', LOGGER_DEBUG);
if ($normal_mode) {
- call_hooks('notifier_normal',$target_item);
+ Addon::forkHooks($a->queue['priority'], 'notifier_normal', $target_item);
}
- call_hooks('notifier_end',$target_item);
+ Addon::callHooks('notifier_end',$target_item);
return;
}