Merge pull request #2758 from annando/1609-sql-charset

[friendica.git] / include / follow.php

diff --git a/include/follow.php b/include/follow.php
index 217b9d07b7b37c22de81af99793c6cd968b1146f..08e74e02f3443d3b8a5849442ca4aee4710a20b6 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) {
        /*
@@ -9,13 +11,13 @@ function update_contact($id) {
 
        $r = q("SELECT `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `network` FROM `contact` WHERE `id` = %d", intval($id));
        if (!$r)
-               return;
+               return false;
 
        $ret = probe_url($r[0]["url"]);
 
        // If probe_url fails the network code will be different
        if ($ret["network"] != $r[0]["network"])
-               return;
+               return false;
 
        $update = false;
 
@@ -29,7 +31,7 @@ function update_contact($id) {
        }
 
        if (!$update)
-               return;
+               return true;
 
        q("UPDATE `contact` SET `url` = '%s', `nurl` = '%s', `addr` = '%s', `alias` = '%s', `batch` = '%s', `notify` = '%s', `poll` = '%s', `poco` = '%s' WHERE `id` = %d",
                dbesc($ret['url']),
@@ -42,6 +44,11 @@ function update_contact($id) {
                dbesc($ret['poco']),
                intval($id)
        );
+
+       // Update the corresponding gcontact entry
+       poco_last_updated($ret["url"]);
+
+       return true;
 }
 
 //
@@ -152,11 +159,7 @@ function new_contact($uid,$url,$interactive = false) {
 
        $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
 
-       if($ret['network'] === NETWORK_MAIL) {
-               $writeable = 1;
-
-       }
-       if($ret['network'] === NETWORK_DIASPORA)
+       if(in_array($ret['network'], array(NETWORK_MAIL, NETWORK_DIASPORA)))
                $writeable = 1;
 
        // check if we already have a contact
@@ -213,9 +216,7 @@ function new_contact($uid,$url,$interactive = false) {
                        return $result;
                }
 
-               $new_relation = (($ret['network'] === NETWORK_MAIL) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
-               if($ret['network'] === NETWORK_DIASPORA)
-                       $new_relation = CONTACT_IS_FOLLOWER;
+               $new_relation = ((in_array($ret['network'], array(NETWORK_MAIL, NETWORK_DIASPORA))) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
                // create contact record
                $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `network`, `pubkey`, `rel`, `priority`,
@@ -258,38 +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 `photo` = '%s',
-                       `thumb` = '%s',
-                       `micro` = '%s',
-                       `name-date` = '%s',
-                       `uri-date` = '%s',
-                       `avatar-date` = '%s'
-                       WHERE `id` = %d",
-                       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_MEDIUM, "include/onepoll.php", $contact_id, "force");
 
        // create a follow slap
 
@@ -321,8 +302,8 @@ function new_contact($uid,$url,$interactive = false) {
                }
                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);
                }
        }