/*
* The notifier is typically called with:
*
- * proc_run('php', "include/notifier.php", COMMAND, ITEM_ID);
+ * proc_run(PRIORITY_HIGH, "include/notifier.php", COMMAND, ITEM_ID);
*
* where COMMAND is one of the following:
*
$recipients[] = $suggest[0]['cid'];
$item = $suggest[0];
} elseif($cmd === 'removeme') {
- $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($item_id));
- if (! $r)
+ $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
+ `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
+ `user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`, `user`.`guid`
+ FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
+ WHERE `contact`.`uid` = %d AND `contact`.`self` LIMIT 1",
+ intval($item_id));
+ if (!$r)
return;
$user = $r[0];
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($item_id));
- if (! $r)
+
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($item_id));
+ if (!$r)
return;
$self = $r[0];
- $r = q("SELECT * FROM `contact` WHERE `self` = 0 AND `uid` = %d", intval($item_id));
- if(! $r)
+
+ $r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id));
+ if(!$r)
return;
require_once('include/Contact.php');
intval($item_id)
);
- if((! count($r)) || (! intval($r[0]['parent']))) {
+ if((! dbm::is_result($r)) || (! intval($r[0]['parent']))) {
return;
}
$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
- `user`.`page-flags`, `user`.`prvnets`
+ `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(! count($r))
+ if(! dbm::is_result($r))
return;
$owner = $r[0];
intval($uid),
dbesc(NETWORK_DFRN)
);
- if(count($r))
+ if (dbm::is_result($r))
foreach($r as $rr)
$recipients_followup[] = $rr['id'];
}
// a delivery fork. private groups (forum_mode == 2) do not uplink
if((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
- proc_run('php','include/notifier.php','uplink',$item_id);
+ proc_run(PRIORITY_HIGH,'include/notifier.php','uplink',$item_id);
}
$conversants = array();
$conversants = array_unique($conversants);
- logger('Allow data for '.$target_item["guid"].". People: ".implode(', ', $allow_people)." - Groups: ".implode(', ', $allow_groups), LOGGER_DEBUG);
$recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups));
$deny = array_unique(array_merge($deny_people,$deny_groups));
// We have not only to look at the parent, since it could be a Friendica thread.
if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
- logger('Some parent is OStatus for '.$target_item["guid"], LOGGER_DEBUG);
+ logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent[0]['author-link']." - Owner: ".$thr_parent[0]['owner-link'], LOGGER_DEBUG);
// Send a salmon to the parent author
- $probed_contact = probe_url($thr_parent[0]['author-link']);
+ $r = q("SELECT `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
+ dbesc(normalise_link($thr_parent[0]['author-link'])),
+ intval($uid));
+ if ($r)
+ $probed_contact = $r[0];
+ else
+ $probed_contact = probe_url($thr_parent[0]['author-link']);
+
if ($probed_contact["notify"] != "") {
logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]);
$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
}
// Send a salmon to the parent owner
- $probed_contact = probe_url($thr_parent[0]['owner-link']);
+ $r = q("SELECT `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
+ dbesc(normalise_link($thr_parent[0]['owner-link'])),
+ intval($uid));
+ if ($r)
+ $probed_contact = $r[0];
+ else
+ $probed_contact = probe_url($thr_parent[0]['owner-link']);
if ($probed_contact["notify"] != "") {
logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
$r = q("SELECT * FROM `contact` WHERE `id` IN ($conversant_str) AND NOT `blocked` AND NOT `pending` AND NOT `archive`".$sql_extra);
- if(count($r))
+ if (dbm::is_result($r))
$contacts = $r;
} else
intval($uid),
dbesc(NETWORK_MAIL)
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
foreach($r as $rr)
$recipients[] = $rr['id'];
}
else
$recip_str = implode(', ', $recipients);
- logger('Recipients for '.$target_item["guid"]." (Followup: ".$followup."): ".$recip_str, LOGGER_DEBUG);
-
if ($relocate)
$r = $recipients_relocate;
else
// delivery loop
- if(count($r)) {
+ if (dbm::is_result($r)) {
foreach($r as $contact) {
if(!$contact['self']) {
$this_batch[] = $contact['id'];
if(count($this_batch) >= $deliveries_per_process) {
- proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch);
+ proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$this_batch);
$this_batch = array();
if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
// be sure to pick up any stragglers
if(count($this_batch))
- proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch);
+ proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$this_batch);
}
// send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
$r0 = array();
$r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
- AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
+ AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
dbesc(NETWORK_DIASPORA),
intval($owner['uid']),
intval(CONTACT_IS_SHARING)
$r = array_merge($r2,$r1,$r0);
- if(count($r)) {
+ if (dbm::is_result($r)) {
logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
// throw everything into the queue in case we get killed
foreach($r as $rr) {
if((! $mail) && (! $fsuggest) && (! $followup)) {
- q("insert into deliverq ( `cmd`,`item`,`contact` ) values ('%s', %d, %d )",
- dbesc($cmd),
- intval($item_id),
- intval($rr['id'])
+ q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)
+ ON DUPLICATE KEY UPDATE `cmd` = '%s', `item` = %d, `contact` = %d",
+ dbesc($cmd), intval($item_id), intval($rr['id']),
+ dbesc($cmd), intval($item_id), intval($rr['id'])
);
}
}
if((! $mail) && (! $fsuggest) && (! $followup)) {
logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
- proc_run('php','include/delivery.php',$cmd,$item_id,$rr['id']);
+ proc_run(PRIORITY_HIGH,'include/delivery.php',$cmd,$item_id,$rr['id']);
if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
}
if ($h === '[internal]') {
// 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'", dbesc($owner['nickname']));
+ q("UPDATE `push_subscriber` SET `push` = 1 ".
+ "WHERE `nickname` = '%s' AND `push` = 0", dbesc($owner['nickname']));
logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
}
// Handling the pubsubhubbub requests
- proc_run('php','include/pubsubpublish.php');
+ proc_run(PRIORITY_HIGH,'include/pubsubpublish.php');
}
logger('notifier: calling hooks', LOGGER_DEBUG);
projects / friendica.git / blobdiff