The repair option is added to the settings

[friendica.git] / include / follow.php

diff --git a/include/follow.php b/include/follow.php
index 79666f30dc92cae709bd5e5c5f0f443820a64a38..217b9d07b7b37c22de81af99793c6cd968b1146f 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,4 +1,5 @@
 <?php
+require_once("include/Scrape.php");
 
 function update_contact($id) {
        /*
@@ -169,6 +170,11 @@ function new_contact($uid,$url,$interactive = false) {
                dbesc($ret['network'])
        );
 
+       if(!count($r))
+               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
+                       intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
+       );
+
        if(count($r)) {
                // update contact
                if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
@@ -179,7 +185,6 @@ function new_contact($uid,$url,$interactive = false) {
                                intval($uid)
                        );
                }
-
        } else {
 
 
@@ -284,7 +289,7 @@ function new_contact($uid,$url,$interactive = false) {
 
        // pull feed and consume it, which should subscribe to the hub.
 
-       proc_run('php',"include/poller.php","$contact_id");
+       proc_run('php',"include/onepoll.php","$contact_id", "force");
 
        // create a follow slap
 
@@ -295,7 +300,7 @@ function new_contact($uid,$url,$interactive = false) {
                '$photo' => $a->contact['photo'],
                '$thumb' => $a->contact['thumb'],
                '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
-               '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':follow:' . random_string(),
+               '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':follow:' . get_guid(32),
                '$title' => '',
                '$type' => 'text',
                '$content' => t('following'),