X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffollow.php;h=d0411a466af0411045ed9455f2c25019a67a3c00;hb=d0b8f2092de0b839e956043de4442a46044fb59e;hp=21c05c8f3ef139062963dfbd05446b96f492d9a4;hpb=48309a25eccbd15ec02a62bda116c721859b53fe;p=friendica.git

diff --git a/include/follow.php b/include/follow.php
index 21c05c8f3e..d0411a466a 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,5 +1,6 @@
 <?php
 require_once("include/Scrape.php");
+require_once("include/socgraph.php");
 
 function update_contact($id) {
 	/*
@@ -43,6 +44,9 @@ function update_contact($id) {
 		intval($id)
 	);
 
+	// Update the corresponding gcontact entry
+	poco_last_updated($ret["url"]);
+
 	return true;
 }
 
@@ -254,34 +258,16 @@ 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'])) {
+	$def_gid = get_default_group($uid, $contact["network"]);
+	if (intval($def_gid)) {
 		require_once('include/group.php');
-		group_add_member($uid,'',$contact_id,$g[0]['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.
 
@@ -317,8 +303,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);
 		}
 	}