*/
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/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;
$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;
}
Worker::add($a->queue['priority'], 'Notifier', 'uplink', $item_id);
}
- $conversants = [];
-
foreach ($items as $item) {
$recipients[] = $item['contact-id'];
$conversants[] = $item['contact-id'];
// 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;
}
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;
}