more improvements in twitter handling, reduce duplicates from FB when double friended

include/Scrape.php

@@ -292,7 +292,9 @@ function probe_url($url) {
 	$diaspora = false;	
 	$email_conversant = false;
 
-	if($url) {
+	$twitter = ((strpos($url,'twitter.com') !== false) ? true : false);
+
+	if(! $twitter) {
 		$links = lrdd($url);
 
 		if(count($links)) {
@@ -413,19 +415,33 @@ function probe_url($url) {
 				$profile = $url;
 		}
 
+		if($twitter) {		
+			logger('twitter: setup');
+			$tid = basename($url);
+			$tapi = 'https://api.twitter.com/1/statuses/user_timeline.rss';
+			if(intval($tid))
+				$poll = $tapi . '?user_id=' . $tid;
+			else
+				$poll = $tapi . '?screen_name=' . $tid;
+			$profile = 'http://twitter.com/!#/' . $tid;
+		}
+
 		if(! x($vcard,'fn'))
 			if(x($vcard,'nick'))
 				$vcard['fn'] = $vcard['nick'];
 
-		if((! isset($vcard)) && (! $poll)) {
 	
-			$ret = scrape_feed($url);
+		if(((! isset($vcard)) && (! $poll)) || ($twitter)) {
-			logger('probe_url: scrape_feed returns: ' . print_r($ret,true), LOGGER_DATA);
+
-			if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) {
+			$feedret = scrape_feed($url);
-				$poll = ((x($ret,'feed_atom')) ? unamp($ret['feed_atom']) : unamp($ret['feed_rss']));
+			logger('probe_url: scrape_feed returns: ' . print_r($feedret,true), LOGGER_DATA);
+			if(count($feedret) && ($feedret['feed_atom'] || $feedret['feed_rss'])) {
+				$poll = ((x($feedret,'feed_atom')) ? unamp($feedret['feed_atom']) : unamp($feedret['feed_rss']));
 				$vcard = array();
-					if(x($ret,'photo'))
+			}
-						$vcard['photo'] = $ret['photo'];
+
+			if(x($feedret,'photo'))
+				$vcard['photo'] = $feedret['photo'];
 			require_once('simplepie/simplepie.inc');
 		    $feed = new SimplePie();
 			$xml = fetch_url($poll);
@@ -443,9 +459,6 @@ function probe_url($url) {
 					$vcard['fn'] = trim(unxmlify($author->get_email()));
 				if(strpos($vcard['fn'],'@') !== false)
 					$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
-					$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
-					if(strpos($vcard['nick'],' '))
-						$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
 				$email = unxmlify($author->get_email());
 			}
 			else {
@@ -458,9 +471,6 @@ function probe_url($url) {
 							$vcard['fn'] = trim(unxmlify($author->get_email()));
 						if(strpos($vcard['fn'],'@') !== false)
 							$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
-							$vcard['nick'] = strtolower(unxmlify($vcard['fn']));
-							if(strpos($vcard['nick'],' '))
-								$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
 						$email = unxmlify($author->get_email());
 					}
 					if(! $vcard['photo']) {
@@ -476,15 +486,25 @@ function probe_url($url) {
 				$lnk = $feed->get_permalink();
 			if(isset($lnk) && strlen($lnk))
 				$profile = $lnk;	
+
 			if(! (x($vcard,'fn')))
 				$vcard['fn'] = notags($feed->get_title());
 			if(! (x($vcard,'fn')))
 				$vcard['fn'] = notags($feed->get_description());
+
+			if(strpos($vcard['fn'],'Twitter / ') !== false) {
+				$vcard['fn'] = substr($vcard['fn'],strpos($vcard['fn'],'/')+1);
+				$vcard['fn'] = trim($vcard['fn']);
+			}
+			if(! x($vcard,'nick')) {
+				$vcard['nick'] = strtolower(notags(unxmlify($vcard['fn'])));
+				if(strpos($vcard['nick'],' '))
+					$vcard['nick'] = trim(substr($vcard['nick'],0,strpos($vcard['nick'],' ')));
+			}
 			$network = 'feed';
 			$priority = 2;
 		}
 	}
-	}
 
 	if(! x($vcard,'photo')) {
 		$a = get_app();

include/items.php

@@ -384,6 +384,9 @@ function get_atom_elements($feed,$item) {
 	else
 		$res['private'] = 0;
 
+	$extid = $item->get_item_tags(NAMESPACE_DFRN,'extid');
+	if($extid && $extid[0]['data'])
+		$res['extid'] = $extid[0]['data'];
 
 	$rawlocation = $item->get_item_tags(NAMESPACE_DFRN, 'location');
 	if($rawlocation)
@@ -634,6 +637,7 @@ function item_store($arr,$force_parent = false) {
 
 	$arr['wall']          = ((x($arr,'wall'))          ? intval($arr['wall'])                : 0);
 	$arr['uri']           = ((x($arr,'uri'))           ? notags(trim($arr['uri']))           : random_string());
+	$arr['extid']         = ((x($arr,'extid'))         ? notags(trim($arr['extid']))         : '');
 	$arr['author-name']   = ((x($arr,'author-name'))   ? notags(trim($arr['author-name']))   : '');
 	$arr['author-link']   = ((x($arr,'author-link'))   ? notags(trim($arr['author-link']))   : '');
 	$arr['author-avatar'] = ((x($arr,'author-avatar')) ? notags(trim($arr['author-avatar'])) : '');
@@ -1568,6 +1572,10 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 	if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
 		$o .= '<dfrn:private>1</dfrn:private>' . "\r\n";
 
+	if($item['extid'])
+		$o .= '<dfrn:extid>' . $item['extid'] . '</dfrn:extid>' . "\r\n";
+
+
 	$verb = construct_verb($item);
 	$o .= '<as:verb>' . xmlify($verb) . '</as:verb>' . "\r\n";
 	$actobj = construct_activity_object($item);

mod/follow.php

@@ -12,7 +12,7 @@ function follow_post(&$a) {
 
 	$url = $orig_url = notags(trim($_POST['url']));
 
-	// remove ajax junk
+	// remove ajax junk, e.g. Twitter
 
 	$url = str_replace('/#!/','/',$url);
 
@@ -41,6 +41,14 @@ function follow_post(&$a) {
 	
 	if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
 		notice( t('The profile address specified does not provide adequate information.') . EOL);
+		if(! x($ret,'poll'))
+			notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
+		if(! x($ret,'name'))
+			notice( t('An author or name was not found.') . EOL);
+		if(! x($ret,'url'))
+			notice( t('No browser URL could be matched to this address.') . EOL);
+		if(strpos($url,'@') !== false)
+			notice('Unable to match @-style Identity Address with a known protocol or email contact');
 		goaway($_SESSION['return_url']);
 	}