From b763c810fb02ba322e9232bfd23da3a04ecd271e Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 29 May 2015 10:35:13 +0200 Subject: [PATCH] OStatus: Trying to deliver a comment to all contacts - not only the thread owner. (Not working by now) --- include/delivery.php | 47 ++++++++++++++++++++++---------------------- include/notifier.php | 32 ++++++++++++++++++++---------- include/salmon.php | 2 +- include/text.php | 8 +++++++- 4 files changed, 54 insertions(+), 35 deletions(-) diff --git a/include/delivery.php b/include/delivery.php index a913e13170..e3e477bf64 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -88,25 +88,23 @@ function delivery_run(&$argv, &$argc){ if($cmd === 'expire') { $normal_mode = false; $expire = true; - $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 + $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE", intval($item_id) ); $uid = $item_id; $item_id = 0; if(! count($items)) - continue; + continue; } else { - // find ancestors $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1", intval($item_id) ); - if((! count($r)) || (! intval($r[0]['parent']))) { + if((! count($r)) || (! intval($r[0]['parent']))) continue; - } $target_item = $r[0]; $parent_id = intval($r[0]['parent']); @@ -118,14 +116,13 @@ function delivery_run(&$argv, &$argc){ continue; - $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` + $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", intval($parent_id) ); - if(! count($items)) { + if(! count($items)) continue; - } $icontacts = null; $contacts_arr = array(); @@ -133,8 +130,8 @@ function delivery_run(&$argv, &$argc){ if(! in_array($item['contact-id'],$contacts_arr)) $contacts_arr[] = intval($item['contact-id']); if(count($contacts_arr)) { - $str_contacts = implode(',',$contacts_arr); - $icontacts = q("SELECT * FROM `contact` + $str_contacts = implode(',',$contacts_arr); + $icontacts = q("SELECT * FROM `contact` WHERE `id` IN ( $str_contacts ) " ); } @@ -154,10 +151,10 @@ function delivery_run(&$argv, &$argc){ } } - $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, - `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, + $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` - FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` + FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", intval($uid) ); @@ -201,6 +198,13 @@ function delivery_run(&$argv, &$argc){ if(strpos($localhost,':')) $localhost = substr($localhost,0,strpos($localhost,':')); + $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0", + intval($contact_id) + ); + + if(count($r)) + $contact = $r[0]; + /** * * Be VERY CAREFUL if you make any changes to the following line. Seemingly innocuous changes @@ -209,7 +213,7 @@ function delivery_run(&$argv, &$argc){ * */ - if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) { + if(!$top_level && ($parent["network"] != NETWORK_OSTATUS) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) { logger('relay denied for delivery agent.'); /* no relay allowed for direct contact delivery */ @@ -223,13 +227,6 @@ function delivery_run(&$argv, &$argc){ $public_message = false; // private recipients, not public } - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0", - intval($contact_id) - ); - - if(count($r)) - $contact = $r[0]; - $hubxml = feed_hublinks(); logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA); @@ -390,11 +387,15 @@ function delivery_run(&$argv, &$argc){ if(! $item_contact) continue; - if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) + // For OStatus don't notify all contacts in the thread + if (!$top_level AND ($parent["network"] == NETWORK_OSTATUS) AND ($item["id"] != $item["parent"])) + continue; + + if(($top_level OR ($parent["network"] == NETWORK_OSTATUS)) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire)) $slaps[] = atom_entry($item,'html',null,$owner,true); } - logger('notifier: slapdelivery: ' . $contact['name']); + logger('slapdelivery item '.$item_id.' to ' . $contact['name']); foreach($slaps as $slappy) { if($contact['notify']) { if(! was_recently_delayed($contact['id'])) diff --git a/include/notifier.php b/include/notifier.php index 067251b429..9084bcb475 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -114,7 +114,7 @@ function notifier_run(&$argv, &$argc){ elseif($cmd === 'expire') { $normal_mode = false; $expire = true; - $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 + $items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1 AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 10 MINUTE", intval($item_id) ); @@ -178,7 +178,7 @@ function notifier_run(&$argv, &$argc){ if(! $parent_id) return; - $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` + $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", intval($parent_id) ); @@ -224,6 +224,9 @@ function notifier_run(&$argv, &$argc){ // fill this in with a single salmon slap if applicable $slap = ''; + // List of OStatus receiptians of follow up messages + $ostatus_recip_str = ""; + if(! ($mail || $fsuggest || $relocate)) { require_once('include/group.php'); @@ -284,8 +287,6 @@ function notifier_run(&$argv, &$argc){ if($parent['origin']) $relay_to_owner = false; - - if($relay_to_owner) { logger('notifier: followup', LOGGER_DEBUG); // local followup to remote post @@ -295,6 +296,15 @@ function notifier_run(&$argv, &$argc){ $recipients = array($parent['contact-id']); if ($parent['network'] == NETWORK_OSTATUS) { + $ostatus_recipients = array(); + + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `network` = '%s'", intval($uid), dbesc(NETWORK_OSTATUS)); + if(count($r)) { + foreach($r as $rr) + $ostatus_recipients[] = $rr['id']; + + $ostatus_recip_str = ", ".implode(', ', $ostatus_recipients); + } // Check if the recipient isn't in your contact list $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", $parent['contact-id']); @@ -553,7 +563,7 @@ function notifier_run(&$argv, &$argc){ } if($followup) - $recip_str = $parent['contact-id']; + $recip_str = $parent['contact-id'].$ostatus_recip_str; else $recip_str = implode(', ', $recipients); @@ -574,7 +584,7 @@ function notifier_run(&$argv, &$argc){ if(count($r)) { foreach($r as $contact) { - if((! $mail) && (! $fsuggest) && (! $followup) && (!$relocate) && (! $contact['self'])) { + if((! $mail) && (! $fsuggest) && (!$followup OR ($parent['contact-id'] != $contact['id'])) && (!$relocate) && (! $contact['self'])) { if(($contact['network'] === NETWORK_DIASPORA) && ($public_message)) continue; q("insert into deliverq ( `cmd`,`item`,`contact` ) values ('%s', %d, %d )", @@ -608,10 +618,12 @@ function notifier_run(&$argv, &$argc){ if($contact['self']) continue; + logger("Deliver to ".$contact['url'], LOGGER_DEBUG); + // potentially more than one recipient. Start a new process and space them out a bit. // we will deliver single recipient types of message and email recipients here. - if((! $mail) && (! $fsuggest) && (!$relocate) && (! $followup)) { + if((! $mail) && (! $fsuggest) && (!$relocate) && (!$followup OR ($parent['contact-id'] != $contact['id']))) { $this_batch[] = $contact['id']; @@ -713,7 +725,7 @@ function notifier_run(&$argv, &$argc){ break; if($followup && $contact['notify']) { - logger('notifier: slapdelivery: ' . $contact['name']); + logger('slapdelivery followup item '.$item_id.' to ' . $contact['name']); $deliver_status = slapper($owner,$contact['notify'],$slap); if($deliver_status == (-1)) { @@ -726,7 +738,7 @@ function notifier_run(&$argv, &$argc){ // a public hub, it's ok to send a salmon if((count($slaps)) && ($public_message) && (! $expire)) { - logger('notifier: slapdelivery: ' . $contact['name']); + logger('slapdelivery item '.$item_id.' to ' . $contact['name']); foreach($slaps as $slappy) { if($contact['notify']) { $deliver_status = slapper($owner,$contact['notify'],$slappy); @@ -938,7 +950,7 @@ function notifier_run(&$argv, &$argc){ // throw everything into the queue in case we get killed foreach($r as $rr) { - if((! $mail) && (! $fsuggest) && (! $followup)) { + if((! $mail) && (! $fsuggest) && (!$followup OR ($parent['contact-id'] != $contact['id']))) { q("insert into deliverq ( `cmd`,`item`,`contact` ) values ('%s', %d, %d )", dbesc($cmd), intval($item_id), diff --git a/include/salmon.php b/include/salmon.php index 3d525f51ad..aeb14adc8c 100644 --- a/include/salmon.php +++ b/include/salmon.php @@ -66,7 +66,7 @@ function get_salmon_key($uri,$keyhash) { function slapper($owner,$url,$slap) { - logger('slapper called. Data: ' . $slap); + logger('slapper called for '.$owner['url'].' to '.$url.' . Data: ' . $slap); // does contact have a salmon endpoint? diff --git a/include/text.php b/include/text.php index 0f6c83234b..f8bbfcee24 100644 --- a/include/text.php +++ b/include/text.php @@ -835,10 +835,16 @@ function get_mentions($item) { foreach($arr as $x) { $matches = null; if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) { - $o .= "\t\t" . '' . "\r\n"; $o .= "\t\t" . '' . "\r\n"; + $o .= "\t\t" . '' . "\r\n"; } } + + if (!$item['private']) { + $o .= "\t\t".''."\r\n"; + $o .= "\t\t".''."\r\n"; + } + return $o; }} -- 2.39.5