X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FNotifier.php;h=edb0df33adbbcf0d63968dcb6b5ae1cfc055f61d;hb=885d79495825df15c7e9dc597745ba0e525ec1b0;hp=e64351f17d0e69b7e5329ffeeece8dc04ba11124;hpb=f21feb975db4d47071bc174494c5c0f2a5816664;p=friendica.git diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php index e64351f17d..edb0df33ad 100644 --- a/src/Worker/Notifier.php +++ b/src/Worker/Notifier.php @@ -4,21 +4,21 @@ */ namespace Friendica\Worker; +use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\Worker; use Friendica\Database\DBM; +use Friendica\Model\Contact; +use Friendica\Model\Group; +use Friendica\Model\User; use Friendica\Network\Probe; -use Friendica\Object\Contact; use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; +use Friendica\Protocol\Salmon; use dba; -require_once 'include/queue_fn.php'; -require_once 'include/html2plain.php'; -require_once 'include/salmon.php'; -require_once 'include/datetime.php'; +require_once 'include/dba.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 @@ -39,7 +39,6 @@ require_once 'include/bbcode.php'; * 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) @@ -58,15 +57,15 @@ class Notifier { 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; @@ -74,25 +73,12 @@ class Notifier { $message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1", intval($item_id) ); - if (! count($message)) { + if (!count($message)) { return; } $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; @@ -100,7 +86,7 @@ class Notifier { $suggest = q("SELECT * FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item_id) ); - if (! count($suggest)) { + if (!count($suggest)) { return; } $uid = $suggest[0]['uid']; @@ -113,9 +99,9 @@ class Notifier { FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`uid` = %d AND `contact`.`self` LIMIT 1", intval($item_id)); - if (!$r) + if (!$r) { return; - + } $user = $r[0]; $r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id)); @@ -135,30 +121,28 @@ class Notifier { intval($uid), NETWORK_DFRN, NETWORK_DIASPORA); } else { // find ancestors - $r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1", - intval($item_id) - ); + $target_item = dba::fetch_first("SELECT `item`.*, `contact`.`uid` AS `cuid` FROM `item` + INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + WHERE `item`.`id` = ? AND `visible` AND NOT `moderated`", $item_id); - if ((! DBM::is_result($r)) || (! intval($r[0]['parent']))) { + if (!DBM::is_result($target_item) || !intval($target_item['parent'])) { return; } - $target_item = $r[0]; - $parent_id = intval($r[0]['parent']); - $uid = $r[0]['uid']; - $updated = $r[0]['edited']; + $parent_id = intval($target_item['parent']); + $uid = $target_item['cuid']; + $updated = $target_item['edited']; $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` - FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC", + FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible AND NOT moderated ORDER BY `id` ASC", intval($parent_id) ); - if (! count($items)) { + if (!count($items)) { return; } // avoid race condition with deleting entries - if ($items[0]['deleted']) { foreach ($items as $item) { $item['deleted'] = 1; @@ -169,24 +153,14 @@ class Notifier { logger('notifier: top level post'); $top_level = true; } - } - $r = q("SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`, - `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, - `user`.`page-flags`, `user`.`prvnets`, `user`.`account-type` - FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` - WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", - intval($uid) - ); - - if (! DBM::is_result($r)) { + $owner = User::getOwnerDataById($uid); + if (!$owner) { return; } - $owner = $r[0]; - - $walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false); + $walltowall = ($top_level && ($owner['id'] != $items[0]['contact-id']) ? true : false); // Should the post be transmitted to Diaspora? $diaspora_delivery = true; @@ -203,12 +177,14 @@ class Notifier { // 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); - require_once 'include/group.php'; - $parent = $items[0]; $thr_parent = q("SELECT `network`, `author-link`, `owner-link` FROM `item` WHERE `uri` = '%s' AND `uid` = %d", @@ -225,18 +201,6 @@ class Notifier { // 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,':')); @@ -251,7 +215,7 @@ class Notifier { $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; } @@ -264,7 +228,7 @@ class Notifier { // we will just use it as a fallback test // later we will be able to use it as the primary test of whether or not to relay. - if (! $target_item['origin']) { + if (!$target_item['origin']) { $relay_to_owner = false; } if ($parent['origin']) { @@ -276,9 +240,9 @@ class Notifier { ($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; @@ -291,13 +255,14 @@ class Notifier { } } 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'] && @@ -306,7 +271,6 @@ class Notifier { $push_notify = true; if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) { - $push_notify = true; if ($parent["network"] == NETWORK_OSTATUS) { @@ -336,32 +300,30 @@ class Notifier { // don't send deletions onward for other people's stuff - if ($target_item['deleted'] && (! intval($target_item['wall']))) { + if ($target_item['deleted'] && !intval($target_item['wall'])) { logger('notifier: ignoring delete notification for non-wall item'); return; } - if ((strlen($parent['allow_cid'])) - || (strlen($parent['allow_gid'])) - || (strlen($parent['deny_cid'])) - || (strlen($parent['deny_gid']))) { + if (strlen($parent['allow_cid']) + || strlen($parent['allow_gid']) + || strlen($parent['deny_cid']) + || strlen($parent['deny_gid'])) { $public_message = false; // private recipients, not public } $allow_people = expand_acl($parent['allow_cid']); - $allow_groups = expand_groups(expand_acl($parent['allow_gid']),true); + $allow_groups = Group::expand(expand_acl($parent['allow_gid']),true); $deny_people = expand_acl($parent['deny_cid']); - $deny_groups = expand_groups(expand_acl($parent['deny_gid'])); + $deny_groups = Group::expand(expand_acl($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 ((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) { + if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== 'uplink')) { Worker::add($a->queue['priority'], 'Notifier', 'uplink', $item_id); } - $conversants = array(); - foreach ($items as $item) { $recipients[] = $item['contact-id']; $conversants[] = $item['contact-id']; @@ -379,12 +341,12 @@ class Notifier { } } - if (count($url_recipients)) + if (count($url_recipients)) { logger('notifier: '.$target_item["guid"].' url_recipients ' . print_r($url_recipients,true)); + } $conversants = array_unique($conversants); - $recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups)); $deny = array_unique(array_merge($deny_people,$deny_groups)); $recipients = array_diff($recipients,$deny); @@ -395,7 +357,6 @@ class Notifier { // If the thread parent is OStatus then do some magic to distribute the messages. // We have not only to look at the parent, since it could be a Friendica thread. if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) { - $diaspora_delivery = false; logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent[0]['author-link']." - Owner: ".$thr_parent[0]['owner-link'], LOGGER_DEBUG); @@ -447,7 +408,7 @@ class Notifier { // It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')"; } else { - $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."', '".NETWORK_MAIL2."')"; + $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."')"; } } else { $public_message = false; @@ -457,10 +418,10 @@ class Notifier { $mail_disabled = ((function_exists('imap_open') && (!Config::get('system','imap_disabled'))) ? 0 : 1); - if (! $mail_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']))) { + if (!$mail_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'])) { $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'", intval($uid), dbesc(NETWORK_MAIL) @@ -496,7 +457,7 @@ class Notifier { } 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']); } } @@ -505,11 +466,11 @@ class Notifier { // They are especially used for notifications to OStatus users that don't follow us. if ($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) { - if (!Config::get('system','dfrn_only')) { + if (!Config::get('system', 'dfrn_only')) { foreach ($url_recipients as $url) { if ($url) { logger('notifier: urldelivery: ' . $url); - $deliver_status = slapper($owner,$url,$slap); + $deliver_status = Salmon::slapper($owner, $url, $slap); /// @TODO Redeliver/queue these items on failure, though there is no contact record } } @@ -519,8 +480,8 @@ class Notifier { if ($public_message) { - $r0 = array(); - $r1 = array(); + $r0 = []; + $r1 = []; if ($diaspora_delivery) { if (!$followup) { @@ -534,17 +495,22 @@ class Notifier { 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); + } $r2 = q("SELECT `id`, `name`,`network` FROM `contact` - WHERE `network` in ('%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `rel` != %d", + WHERE `network` in ('%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `rel` != %d", dbesc(NETWORK_DFRN), - dbesc(NETWORK_MAIL2), intval($owner['uid']), intval(CONTACT_IS_SHARING) ); - $r = array_merge($r2,$r1,$r0); + + $r = array_merge($r2, $r1, $r0); if (DBM::is_result($r)) { logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG); @@ -554,14 +520,14 @@ class Notifier { // 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)) { + 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']); } } @@ -581,17 +547,17 @@ class Notifier { 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; }