Merge branch 'newui' of github.com:fabrixxm/friendika into newui

[friendica.git] / mod / pubsub.php

diff --git a/mod/pubsub.php b/mod/pubsub.php
index edb0a7fe164acccab0a29a86ca7c1314611ccd28..4dff5d531ab27a9450ebe2b37c6c37a7645ad0e1 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -111,8 +111,8 @@ function pubsub_post(&$a) {
                AND ( `rel` = %d OR `rel` = %d ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
                intval($contact_id),
                intval($importer['uid']),
-               intval(REL_FAN),
-               intval(REL_BUD) 
+               intval(CONTACT_IS_SHARING),
+               intval(CONTACT_IS_FRIEND)       
        );
 
        if(! count($r)) {
@@ -122,6 +122,12 @@ function pubsub_post(&$a) {
 
        $contact = $r[0];
 
+       // we have no way to match Diaspora guid's with atom post id's and could get duplicates.
+       // we'll assume that direct delivery is robust (and this is a bad assumption, but the duplicates are messy).
+
+       if($r[0]['network'] === NETWORK_DIASPORA)
+               hub_post_return();
+
        $feedhub = '';
 
        require_once('include/items.php');