X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffollow.php;h=77f0bbe2f102f246e8abab9cf68dc311207d8684;hb=099f51c7b5698cfe0d8cddd4362dac10c041d929;hp=d0411a466af0411045ed9455f2c25019a67a3c00;hpb=1b64aadfcdf9690f2a5db70757d41afd7f316c61;p=friendica.git

diff --git a/include/follow.php b/include/follow.php
index d0411a466a..77f0bbe2f1 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,6 +1,11 @@
 <?php
 require_once("include/Scrape.php");
 require_once("include/socgraph.php");
+require_once('include/group.php');
+require_once('include/salmon.php');
+require_once('include/ostatus.php');
+require_once("include/Photo.php");
+require_once('include/diaspora.php');
 
 function update_contact($id) {
 	/*
@@ -259,50 +264,32 @@ function new_contact($uid,$url,$interactive = false) {
 	$result['cid'] = $contact_id;
 
 	$def_gid = get_default_group($uid, $contact["network"]);
-	if (intval($def_gid)) {
-		require_once('include/group.php');
+	if (intval($def_gid))
 		group_add_member($uid, '', $contact_id, $def_gid);
-	}
-
-	require_once("include/Photo.php");
 
 	// 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");
-
-	// create a follow slap
-
-	$tpl = get_markup_template('follow_slap.tpl');
-	$slap = replace_macros($tpl, array(
-		'$name' => $a->user['username'],
-		'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
-		'$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:' . get_guid(32),
-		'$title' => '',
-		'$type' => 'text',
-		'$content' => t('following'),
-		'$nick' => $a->user['nickname'],
-		'$verb' => ACTIVITY_FOLLOW,
-		'$ostat_follow' => ''
-	));
+	proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
 
 	$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
-			WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
+			WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
 			intval($uid)
 	);
 
-	if(count($r)) {
-		if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
-			require_once('include/salmon.php');
-			slapper($r[0],$contact['notify'],$slap);
+	if (dbm::is_result($r)) {
+		if (($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
+
+			// create a follow slap
+			$item = array();
+			$item['verb'] = ACTIVITY_FOLLOW;
+			$item['follow'] = $contact["url"];
+			$slap = ostatus::salmon($item, $r[0]);
+			slapper($r[0], $contact['notify'], $slap);
 		}
-		if($contact['network'] == NETWORK_DIASPORA) {
-			require_once('include/diaspora.php');
+		if ($contact['network'] == NETWORK_DIASPORA) {
 			$ret = diaspora::send_share($a->user,$contact);
 			logger('share returns: '.$ret);
 		}