Edits are now possible - but unsuccessful on the receiver side

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index c110984dde0f9021f4d40e48809eec77446fd565..17eb578d18a0b80d485a2e36ea506cf0987f1215 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -149,7 +149,8 @@ function notifier_run(&$argv, &$argc){
                $relocate = true;
                $uid = $item_id;
 
-               $recipients_relocate = q("SELECT * FROM contact WHERE uid = %d  AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
+               $recipients_relocate = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND `network` IN ('%s', '%s')",
+                                       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",
@@ -205,8 +206,6 @@ function notifier_run(&$argv, &$argc){
 
        $walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
 
-       $hub = get_config('system','huburl');
-
        // Should the post be transmitted to Diaspora?
        $diaspora_delivery = true;
 
@@ -286,6 +285,25 @@ function notifier_run(&$argv, &$argc){
                if ($parent['origin']) {
                        $relay_to_owner = false;
                }
+
+               // Special treatment for forum posts
+               if (($target_item['author-link'] != $target_item['owner-link']) &&
+                       ($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));
+                       if (!dbm::is_result($contact)) {
+                               // Should never happen
+                               return false;
+                       }
+
+                       // Is the post from a forum?
+                       if ($contact['forum'] || $contact['prv']) {
+                               $relay_to_owner = true;
+                       }
+               }
                if ($relay_to_owner) {
                        logger('notifier: followup '.$target_item["guid"], LOGGER_DEBUG);
                        // local followup to remote post
@@ -519,8 +537,8 @@ function notifier_run(&$argv, &$argc){
                        }
 
                        $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network`
-                               FROM `contact` WHERE `network` = '%s'
-                               AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()",
+                               FROM `contact` WHERE `network` = '%s' AND `batch` != ''
+                               AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`",
                                dbesc(NETWORK_DIASPORA),
                                intval($owner['uid']),
                                intval(CONTACT_IS_SHARING)
@@ -528,8 +546,7 @@ function notifier_run(&$argv, &$argc){
                }
 
                $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 order by rand() ",
+                       WHERE `network` in ('%s', '%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']),
@@ -564,34 +581,13 @@ function notifier_run(&$argv, &$argc){
        }
 
        // Notify PuSH subscribers (Used for OStatus distribution of regular posts)
-       if ($push_notify && strlen($hub)) {
-               $hubs = explode(',', $hub);
-               if (count($hubs)) {
-                       foreach ($hubs as $h) {
-                               $h = trim($h);
-                               if (! strlen($h)) {
-                                       continue;
-                               }
+       if ($push_notify) {
+               // 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' AND `push` = 0", dbesc($owner['nickname']));
 
-                               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' AND `push` = 0", dbesc($owner['nickname']));
-
-                                       logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
-
-                               } else {
-
-                                       $params = 'hub.mode=publish&hub.url=' . urlencode( App::get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
-                                       post_url($h,$params);
-                                       logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
-                               }
-                               if (count($hubs) > 1) {
-                                       sleep(7);                               // try and avoid multiple hubs responding at precisely the same time
-                               }
-                       }
-               }
+               logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
 
                // Handling the pubsubhubbub requests
                proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true),