Merge pull request #2901 from tobiasd/20161110-helptxt

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index d184fe12e1758cef5f904a19b070060d1a37740b..7c0ba63a6b41b9649cf30e925df64cf089e6ccd8 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -178,7 +178,7 @@ 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`,
-                       `user`.`page-flags`, `user`.`prvnets`
+                       `user`.`page-flags`, `user`.`account-type`, `user`.`prvnets`
                        FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
                        WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
                        intval($uid)
@@ -243,7 +243,8 @@ function delivery_run(&$argv, &$argc){
                        if ((strlen($parent['allow_cid']))
                                || (strlen($parent['allow_gid']))
                                || (strlen($parent['deny_cid']))
-                               || (strlen($parent['deny_gid']))) {
+                               || (strlen($parent['deny_gid']))
+                               || $parent["private"]) {
                                $public_message = false; // private recipients, not public
                        }
 
@@ -501,7 +502,6 @@ function delivery_run(&$argv, &$argc){
 
                                if ($mail) {
                                        diaspora::send_mail($item,$owner,$contact);
-                                       //diaspora_send_mail($item,$owner,$contact);
                                        break;
                                }
 
@@ -522,27 +522,23 @@ function delivery_run(&$argv, &$argc){
 
                                if (($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
                                        // top-level retraction
-                                       logger('delivery: diaspora retract: '.$loc);
-
+                                       logger('diaspora retract: '.$loc);
                                        diaspora::send_retraction($target_item,$owner,$contact,$public_message);
-                                       //diaspora_send_retraction($target_item,$owner,$contact,$public_message);
                                        break;
                                } elseif ($followup) {
                                        // send comments and likes to owner to relay
+                                       logger('diaspora followup: '.$loc);
                                        diaspora::send_followup($target_item,$owner,$contact,$public_message);
-                                       //diaspora_send_followup($target_item,$owner,$contact,$public_message);
                                        break;
                                } elseif ($target_item['uri'] !== $target_item['parent-uri']) {
                                        // we are the relay - send comments, likes and relayable_retractions to our conversants
-                                       logger('delivery: diaspora relay: '.$loc);
+                                       logger('diaspora relay: '.$loc);
                                        diaspora::send_relay($target_item,$owner,$contact,$public_message);
-                                       //diaspora_send_relay($target_item,$owner,$contact,$public_message);
                                        break;
                                } elseif ($top_level && !$walltowall) {
                                        // currently no workable solution for sending walltowall
-                                       logger('delivery: diaspora status: '.$loc);
+                                       logger('diaspora status: '.$loc);
                                        diaspora::send_status($target_item,$owner,$contact,$public_message);
-                                       //diaspora_send_status($target_item,$owner,$contact,$public_message);
                                        break;
                                }