X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffollow.php;h=f753206efcde106f36f06bb48d60bccbf0c1d174;hb=1c82ad073463097ba7e3918be7fbc0863789ee7c;hp=ca0228cc0f89542f3f66ae7531de0fe3c68e6329;hpb=67638118e7eed76ee9b7a783af9ae0fc6f77f262;p=friendica.git

diff --git a/include/follow.php b/include/follow.php
index ca0228cc0f..f753206efc 100644
--- 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;
 }
 
@@ -154,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
@@ -172,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",
@@ -195,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)) {
@@ -207,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)) {
@@ -215,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`,
@@ -251,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;
 	}
@@ -260,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_HIGH, "include/onepoll.php", $contact_id, "force");
 
 	// create a follow slap
 
@@ -316,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);
 		}
 	}