Opps, tpzo found ...

[friendica.git] / include / follow.php

diff --git a/include/follow.php b/include/follow.php
index 8e6094cb4d5644d25040702c10e8fadaf0162a8a..f753206efcde106f36f06bb48d60bccbf0c1d174 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,5 +1,7 @@
 <?php
 require_once("include/Scrape.php");
+require_once("include/socgraph.php");
+require_once('include/group.php');
 
 function update_contact($id) {
        /*
@@ -43,6 +45,9 @@ function update_contact($id) {
                intval($id)
        );
 
+       // Update the corresponding gcontact entry
+       poco_last_updated($ret["url"]);
+
        return true;
 }
 
@@ -168,12 +173,12 @@ function new_contact($uid,$url,$interactive = false) {
                dbesc($ret['network'])
        );
 
-       if(!count($r))
+       if (!dbm::is_result($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)) {
+       if (dbm::is_result($r)) {
                // update contact
                if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
                        q("UPDATE `contact` SET `rel` = %d , `subhub` = %d, `readonly` = 0 WHERE `id` = %d AND `uid` = %d",
@@ -191,7 +196,7 @@ function new_contact($uid,$url,$interactive = false) {
                $r = q("select count(*) as total from contact where uid = %d and pending = 0 and self = 0",
                        intval($uid)
                );
-               if(count($r))
+               if (dbm::is_result($r))
                        $total_contacts = $r[0]['total'];
 
                if(! service_class_allows($uid,'total_contacts',$total_contacts)) {
@@ -203,7 +208,7 @@ function new_contact($uid,$url,$interactive = false) {
                        intval($uid),
                        dbesc($network)
                );
-               if(count($r))
+               if (dbm::is_result($r))
                        $total_network = $r[0]['total'];
 
                if(! service_class_allows($uid,'total_contacts_' . $network,$total_network)) {
@@ -245,7 +250,7 @@ function new_contact($uid,$url,$interactive = false) {
                intval($uid)
        );
 
-       if(! count($r)) {
+       if(! dbm::is_result($r)) {
                $result['message'] .=  t('Unable to retrieve contact information.') . EOL;
                return $result;
        }
@@ -254,41 +259,18 @@ function new_contact($uid,$url,$interactive = false) {
        $contact_id  = $r[0]['id'];
        $result['cid'] = $contact_id;
 
-       $g = q("select def_gid from user where uid = %d limit 1",
-               intval($uid)
-       );
-       if($g && intval($g[0]['def_gid'])) {
-               require_once('include/group.php');
-               group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
-       }
+       $def_gid = get_default_group($uid, $contact["network"]);
+       if (intval($def_gid))
+               group_add_member($uid, '', $contact_id, $def_gid);
 
        require_once("include/Photo.php");
 
-       $photos = import_profile_photo($ret['photo'],$uid,$contact_id);
-
-       $r = q("UPDATE `contact` SET
-                       `avatar` = '%s',
-                       `photo` = '%s',
-                       `thumb` = '%s',
-                       `micro` = '%s',
-                       `name-date` = '%s',
-                       `uri-date` = '%s',
-                       `avatar-date` = '%s'
-                       WHERE `id` = %d",
-                       dbesc($ret['photo']),
-                       dbesc($photos[0]),
-                       dbesc($photos[1]),
-                       dbesc($photos[2]),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       intval($contact_id)
-               );
-
+       // Update the avatar
+       update_contact_avatar($ret['photo'],$uid,$contact_id);
 
        // pull feed and consume it, which should subscribe to the hub.
 
-       proc_run('php',"include/onepoll.php","$contact_id", "force");
+       proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
 
        // create a follow slap
 
@@ -313,15 +295,15 @@ function new_contact($uid,$url,$interactive = false) {
                        intval($uid)
        );
 
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
                        require_once('include/salmon.php');
                        slapper($r[0],$contact['notify'],$slap);
                }
                if($contact['network'] == NETWORK_DIASPORA) {
                        require_once('include/diaspora.php');
-                       $ret = diaspora_share($a->user,$contact);
-                       logger('mod_follow: diaspora_share returns: ' . $ret);
+                       $ret = diaspora::send_share($a->user,$contact);
+                       logger('share returns: '.$ret);
                }
        }