Send a salmon notice whenever an OStatus user is mentioned.

diff --git a/include/notifier.php b/include/notifier.php
index f5a898e89e21e943234d55bdef4cb63019bbe10d..24dc63d69648281a0d24645b842d150e4a0e6eab 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -234,6 +234,11 @@ function notifier_run(&$argv, &$argc){
 
                $parent = $items[0];
 
+               $thr_parent = q("SELECT `network` FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
+                       dbesc($target_item["thr-parent"]), intval($target_item["uid"]));
+
+               logger('Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG);
+
                // This is IMPORTANT!!!!
 
                // We will only send a "notify owner to relay" or followup message if the referenced post
@@ -301,33 +306,12 @@ function notifier_run(&$argv, &$argc){
                                        $target_item['deny_cid'].$target_item['deny_gid']) == 0))
                                $push_notify = true;
 
-                       $thr_parent = q("SELECT `network` FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
-                               dbesc($target_item["thr-parent"]), intval($target_item["uid"]));
-
-                       logger('Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG);
-
-                       // 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.
+                       // We notify Friendica users in the thread when it is an OStatus thread.
+                       // Hopefully this transfers the messages to the other Friendica servers. (Untested)
                        if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
 
                                $push_notify = true;
 
-                               // Send a salmon notification to every person we mentioned in the post
-                               $arr = explode(',',$target_item['tag']);
-                               foreach($arr as $x) {
-                                       //logger('Checking tag '.$x, LOGGER_DEBUG);
-                                       $matches = null;
-                                       if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
-                                               $probed_contact = probe_url($matches[1]);
-                                               if ($probed_contact["notify"] != "") {
-                                                       logger('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
-                                                       $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
-                                               }
-                                       }
-                               }
-
-                               // We notify Friendica users in the thread when it is an OStatus thread.
-                               // Hopefully this transfers the messages to the other Friendica servers. (Untested)
                                if ($parent["network"] == NETWORK_OSTATUS) {
                                        $r = q("SELECT `author-link` FROM `item` WHERE `parent` = %d AND `author-link` != '%s'",
                                                intval($target_item["parent"]), dbesc($owner['url']));
@@ -405,6 +389,25 @@ function notifier_run(&$argv, &$argc){
                        $conversant_str = dbesc(implode(', ',$conversants));
                }
 
+               // 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 AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) {
+
+                       // Send a salmon notification to every person we mentioned in the post
+                       $arr = explode(',',$target_item['tag']);
+                       foreach($arr as $x) {
+                               //logger('Checking tag '.$x, LOGGER_DEBUG);
+                               $matches = null;
+                               if(preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
+                                               $probed_contact = probe_url($matches[1]);
+                                       if ($probed_contact["notify"] != "") {
+                                               logger('Notify mentioned user '.$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 `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
 
                if(count($r))
@@ -516,13 +519,16 @@ function notifier_run(&$argv, &$argc){
                $recipients_relocate = q("SELECT * FROM contact WHERE uid = %d  AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
                unset($photos);
        } else {
+
+               $slap = atom_entry($target_item,'html',null,$owner,false);
+
                if($followup) {
                        foreach($items as $item) {  // there is only one item
                                if(! $item['parent'])
                                        continue;
                                if($item['id'] == $item_id) {
                                        logger('notifier: followup: item: ' . print_r($item,true), LOGGER_DATA);
-                                       $slap  = atom_entry($item,'html',null,$owner,false);
+                                       //$slap  = atom_entry($item,'html',null,$owner,false);
                                        $atom .= atom_entry($item,'text',null,$owner,false);
                                }
                        }
@@ -932,7 +938,8 @@ function notifier_run(&$argv, &$argc){
 
        // send additional slaps to mentioned remote tags (@foo@example.com)
 
-       if($slap && count($url_recipients) && ($followup || $top_level) && ($public_message || $push_notify) && (! $expire)) {
+       //if($slap && count($url_recipients) && ($followup || $top_level) && ($public_message || $push_notify) && (! $expire)) {
+       if($slap && count($url_recipients) && ($public_message || $push_notify) && (!$expire)) {
                if(! get_config('system','dfrn_only')) {
                        foreach($url_recipients as $url) {
                                if($url) {