Merge remote branch 'upstream/master'

3 files changed, 91 insertions, 63 deletions

diff --git a/include/Scrape.php b/include/Scrape.php
index 7fc0c964b..1a9c03c8e 100644
--- a/include/Scrape.php
+++ b/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,76 +415,94 @@ 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)) {
+	
+		if(((! isset($vcard)) && (! $poll)) || ($twitter)) {
 
-			$ret = scrape_feed($url);
-			logger('probe_url: scrape_feed returns: ' . print_r($ret,true), LOGGER_DATA);
-			if(count($ret) && ($ret['feed_atom'] || $ret['feed_rss'])) {
-				$poll = ((x($ret,'feed_atom')) ? unamp($ret['feed_atom']) : unamp($ret['feed_rss']));
+			$feedret = scrape_feed($url);
+			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'];
-				require_once('simplepie/simplepie.inc');
-			    $feed = new SimplePie();
-				$xml = fetch_url($poll);
-
-    			$feed->set_raw_data($xml);
-
-			    $feed->init();
-
-				if(! x($vcard,'photo'))
-					$vcard['photo'] = $feed->get_image_url();
-				$author = $feed->get_author();
-				if($author) {			
-					$vcard['fn'] = unxmlify(trim($author->get_name()));
-					if(! $vcard['fn'])
-						$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 {
-					$item = $feed->get_item(0);
-					if($item) {
-						$author = $item->get_author();
-						if($author) {			
-							$vcard['fn'] = trim(unxmlify($author->get_name()));
-							if(! $vcard['fn'])
-								$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']) {
-							$rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
-							if($rawmedia && $rawmedia[0]['attribs']['']['url'])
-								$vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
-						}
+			}
+
+			if(x($feedret,'photo'))
+				$vcard['photo'] = $feedret['photo'];
+			require_once('simplepie/simplepie.inc');
+		    $feed = new SimplePie();
+			$xml = fetch_url($poll);
+
+   			$feed->set_raw_data($xml);
+
+		    $feed->init();
+
+			if(! x($vcard,'photo'))
+				$vcard['photo'] = $feed->get_image_url();
+			$author = $feed->get_author();
+			if($author) {			
+				$vcard['fn'] = unxmlify(trim($author->get_name()));
+				if(! $vcard['fn'])
+					$vcard['fn'] = trim(unxmlify($author->get_email()));
+				if(strpos($vcard['fn'],'@') !== false)
+					$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
+				$email = unxmlify($author->get_email());
+			}
+			else {
+				$item = $feed->get_item(0);
+				if($item) {
+					$author = $item->get_author();
+					if($author) {			
+						$vcard['fn'] = trim(unxmlify($author->get_name()));
+						if(! $vcard['fn'])
+							$vcard['fn'] = trim(unxmlify($author->get_email()));
+						if(strpos($vcard['fn'],'@') !== false)
+							$vcard['fn'] = substr($vcard['fn'],0,strpos($vcard['fn'],'@'));
+						$email = unxmlify($author->get_email());
+					}
+					if(! $vcard['photo']) {
+						$rawmedia = $item->get_item_tags('http://search.yahoo.com/mrss/','thumbnail');
+						if($rawmedia && $rawmedia[0]['attribs']['']['url'])
+							$vcard['photo'] = unxmlify($rawmedia[0]['attribs']['']['url']);
 					}
 				}
-				if((! $vcard['photo']) && strlen($email))
-					$vcard['photo'] = gravatar_img($email);
-				if($poll === $profile)
-					$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());
-				$network = 'feed';
-				$priority = 2;
 			}
+			if((! $vcard['photo']) && strlen($email))
+				$vcard['photo'] = gravatar_img($email);
+			if($poll === $profile)
+				$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;
 		}
 	}
 
diff --git a/include/conversation.php b/include/conversation.php
index 5f761ccf0..4fa4b92ad 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -357,7 +357,7 @@ function conversation(&$a, $items, $mode, $update) {
 
 			if($page_writeable) {
 				if($toplevelpost) {
-					$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
+					$likebuttons = replace_macros((($item['private'] || ($profile_owner != local_user())) ? $noshare_tpl : $like_tpl),array(
 						'$id' => $item['id'],
 						'$likethis' => t("I like this \x28toggle\x29"),
 						'$nolike' => t("I don't like this \x28toggle\x29"),
diff --git a/include/items.php b/include/items.php
index 55b17158a..cbf5e4d24 100644
--- a/include/items.php
+++ b/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);