Diaspora: The "new friend" notification now respects the corresponding setting/"new...

diff --git a/include/diaspora.php b/include/diaspora.php
index affd59d489fa8887802cca18a4bc4760398fd764..9edda5a9efce0f39193a6533ddeda899e4671822 100755 (executable)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -589,7 +589,7 @@ function diaspora_request($importer,$xml) {
                        intval($importer['uid'])
                );
 
-               if((count($r)) && (! $r[0]['hide-friends']) && (! $contact['hidden'])) {
+               if((count($r)) && (!$r[0]['hide-friends']) && (!$contact['hidden']) && intval(get_pconfig($importer['uid'],'system','post_newfriend'))) {
                        require_once('include/items.php');
 
                        $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",

diff --git a/include/items.php b/include/items.php
index 344b06ec8b3dca05b04449d299cf15d06ea7fe87..0a64ad448dbdaacc41d94c0a91b83c7744e0c6de 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -2715,6 +2715,10 @@ function item_is_remote_self($contact, &$datarray) {
        if ($datarray["app"] == $a->get_hostname())
                return false;
 
+       // Only forward posts
+       if ($datarray["verb"] != ACTIVITY_POST)
+               return false;
+
        if (($contact['network'] != NETWORK_FEED) AND $datarray['private'])
                return false;