1 files changed, 137 insertions, 32 deletions

diff --git a/include/diaspora.php b/include/diaspora.php
index 99ef5025d..7e1e034d6 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -4,6 +4,7 @@ require_once('include/crypto.php');
 require_once('include/items.php');
 require_once('include/bb2diaspora.php');
 require_once('include/contact_selectors.php');
+require_once('include/queue_fn.php');
 
 
 function diaspora_dispatch_public($msg) {
@@ -64,6 +65,9 @@ function diaspora_dispatch($importer,$msg) {
 	elseif($xmlbase->retraction) {
 		$ret = diaspora_retraction($importer,$xmlbase->retraction,$msg);
 	}
+	elseif($xmlbase->signed_retraction) {
+		$ret = diaspora_signed_retraction($importer,$xmlbase->retraction,$msg);
+	}
 	elseif($xmlbase->photo) {
 		$ret = diaspora_photo($importer,$xmlbase->photo,$msg);
 	}
@@ -91,12 +95,14 @@ function find_diaspora_person_by_handle($handle) {
 		dbesc($handle)
 	);
 	if(count($r)) {
+		logger('find_diaspora_person_by handle: in cache ' . print_r($r,true), LOGGER_DEBUG);
 		// update record occasionally so it doesn't get stale
 		$d = strtotime($r[0]['updated'] . ' +00:00');
 		if($d > strtotime('now - 14 days'))
 			return $r[0];
 		$update = true;
 	}
+	logger('find_diaspora_person_by_handle: refresh',LOGGER_DEBUG);
 	require_once('include/Scrape.php');
 	$r = probe_url($handle, PROBE_DIASPORA);
 	if((count($r)) && ($r['network'] === NETWORK_DIASPORA)) {
@@ -448,13 +454,14 @@ function diaspora_request($importer,$xml) {
 
 	$batch = (($ret['batch']) ? $ret['batch'] : implode('/', array_slice(explode('/',$ret['url']),0,3)) . '/receive/public');
 
-	$r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
-		VALUES ( %d, '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d) ",
+	$r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
+		VALUES ( %d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d) ",
 		intval($importer['uid']),
 		dbesc($ret['network']),
 		dbesc($ret['addr']),
 		datetime_convert(),
 		dbesc($ret['url']),
+		dbesc(normalise_link($ret['url'])),
 		dbesc($batch),
 		dbesc($ret['name']),
 		dbesc($ret['nick']),
@@ -589,10 +596,13 @@ function diaspora_post($importer,$xml) {
 
 function diaspora_reshare($importer,$xml) {
 
+	logger('diaspora_reshare: init: ' . print_r($xml,true));
+
 	$a = get_app();
 	$guid = notags(unxmlify($xml->guid));
 	$diaspora_handle = notags(unxmlify($xml->diaspora_handle));
 
+
 	$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
 	if(! $contact)
 		return;
@@ -624,15 +634,23 @@ function diaspora_reshare($importer,$xml) {
 		logger('diaspora_reshare: unable to fetch source url ' . $source_url);
 		return;
 	}
+	logger('diaspora_reshare: source: ' . $x);
+
 	$x = str_replace(array('<activity_streams-photo>','</activity_streams-photo>'),array('<asphoto>','</asphoto>'),$x);
 	$source_xml = parse_xml_string($x,false);
 
-	if(strlen($source_xml->asphoto->objectId) && ($source_xml->asphoto->objectId != 0) && ($source_xml->asphoto->image_url))
-		$body = '[url=' . notags(unxmlify($source_xml->asphoto->image_url)) . '][img]' . notags(unxmlify($source_xml->asphoto->objectId)) . '[/img][/url]' . "\n";
-	elseif($source_xml->asphoto->image_url)
-		$body = '[img]' . notags(unxmlify($source_xml->asphoto->image_url)) . '[/img]' . "\n";
-	elseif($source_xml->status_message) {
-		$body = diaspora2bb($source_xml->status_message->raw_message);
+	if(strlen($source_xml->post->asphoto->objectId) && ($source_xml->post->asphoto->objectId != 0) && ($source_xml->post->asphoto->image_url)) {
+		$body = '[url=' . notags(unxmlify($source_xml->post->asphoto->image_url)) . '][img]' . notags(unxmlify($source_xml->post->asphoto->objectId)) . '[/img][/url]' . "\n";
+		$body = scale_diaspora_images($body,false);
+	}
+	elseif($source_xml->post->asphoto->image_url) {
+		$body = '[img]' . notags(unxmlify($source_xml->post->asphoto->image_url)) . '[/img]' . "\n";
+		$body = scale_diaspora_images($body);
+	}
+	elseif($source_xml->post->status_message) {
+		$body = diaspora2bb($source_xml->post->status_message->raw_message);
+		$body = scale_diaspora_images($body);
+
 	}
 	else {
 		logger('diaspora_reshare: no reshare content found: ' . print_r($source_xml,true));
@@ -668,8 +686,6 @@ function diaspora_reshare($importer,$xml) {
 	$created = unxmlify($xml->created_at);
 	$private = ((unxmlify($xml->public) == 'false') ? 1 : 0);
 
-	$body = diaspora2bb($xml->raw_message);
-
 	$datarray = array();
 
 	$str_tags = '';
@@ -765,16 +781,19 @@ function diaspora_asphoto($importer,$xml) {
 	$created = unxmlify($xml->created_at);
 	$private = ((unxmlify($xml->public) == 'false') ? 1 : 0);
 
-	if(strlen($xml->objectId) && ($xml->objectId != 0) && ($xml->image_url))
+	if(strlen($xml->objectId) && ($xml->objectId != 0) && ($xml->image_url)) {
 		$body = '[url=' . notags(unxmlify($xml->image_url)) . '][img]' . notags(unxmlify($xml->objectId)) . '[/img][/url]' . "\n";
-	elseif($xml->image_url)
+		$body = scale_diaspora_images($body,false);
+	}
+	elseif($xml->image_url) {
 		$body = '[img]' . notags(unxmlify($xml->image_url)) . '[/img]' . "\n";
+		$body = scale_diaspora_images($body);
+	}
 	else {
 		logger('diaspora_asphoto: no photo url found.');
 		return;
 	}
 
-
 	$datarray = array();
 
 	
@@ -943,7 +962,10 @@ function diaspora_comment($importer,$xml,$msg) {
 	$datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']);
 	$datarray['body'] = $body;
 	$datarray['tag'] = $str_tags;
-	$datarray['app']  = 'Diaspora';
+
+	// We can't be certain what the original app is if the message is relayed.
+	if(($parent_item['origin']) && (! $parent_author_signature)) 
+		$datarray['app']  = 'Diaspora';
 
 	$message_id = item_store($datarray);
 
@@ -954,7 +976,7 @@ function diaspora_comment($importer,$xml,$msg) {
 		);
 	}
 
-	if(! $parent_author_signature) {
+	if(($parent_item['origin']) && (! $parent_author_signature)) {
 		q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
 			intval($message_id),
 			dbesc($author_signed_data),
@@ -1010,6 +1032,8 @@ function diaspora_photo($importer,$xml,$msg) {
 
 	$link_text = '[img]' . $remote_photo_path . $remote_photo_name . '[/img]' . "\n";
 
+	$link_text = scale_diaspora_images($link_text);
+
 	if(strpos($parent_item['body'],$link_text) === false) {
 		$r = q("update item set `body` = '%s', `visible` = 1 where `id` = %d and `uid` = %d limit 1",
 			dbesc($link_text . $parent_item['body']),
@@ -1159,9 +1183,9 @@ EOT;
 	$arr['parent'] = $parent_item['id'];
 	$arr['parent-uri'] = $parent_item['uri'];
 
-	$arr['owner-name'] = $contact['name'];
-	$arr['owner-link'] = $contact['url'];
-	$arr['owner-avatar'] = $contact['thumb'];
+	$arr['owner-name'] = $parent_item['name'];
+	$arr['owner-link'] = $parent_item['url'];
+	$arr['owner-avatar'] = $parent_item['thumb'];
 
 	$arr['author-name'] = $person['name'];
 	$arr['author-link'] = $person['url'];
@@ -1203,9 +1227,9 @@ EOT;
 
 	// if the message isn't already being relayed, notify others
 	// the existence of parent_author_signature means the parent_author or owner
-	// is already relaying.
+	// is already relaying. The parent_item['origin'] indicates the message was created on our system
 
-	if(! $parent_author_signature)
+	if(($parent_item['origin']) && (! $parent_author_signature))
 		proc_run('php','include/notifier.php','comment',$message_id);
 
 	return;
@@ -1243,6 +1267,51 @@ function diaspora_retraction($importer,$xml) {
 	// NOTREACHED
 }
 
+function diaspora_signed_retraction($importer,$xml) {
+
+	$guid = notags(unxmlify($xml->target_guid));
+	$diaspora_handle = notags(unxmlify($xml->sender_handle));
+	$type = notags(unxmlify($xml->target_type));
+	$sig = notags(unxmlify($xml->target_author_signature));
+
+	$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
+	if(! $contact)
+		return;
+
+	// this may not yet work for comments. Need to see how the relaying works
+	// and figure out who signs it.
+
+
+	$signed_data = $guid . ';' . $type ;
+
+	$sig = base64_decode($sig);
+
+	$key = $msg['key'];
+
+	if(! rsa_verify($signed_data,$sig,$key,'sha256')) {
+		logger('diaspora_signed_retraction: owner verification failed.' . print_r($msg,true));
+		return;
+	}
+
+	if($type === 'StatusMessage') {
+		$r = q("select * from item where guid = '%s' and uid = %d limit 1",
+			dbesc('guid'),
+			intval($importer['uid'])
+		);
+		if(count($r)) {
+			if(link_compare($r[0]['author-link'],$contact['url'])) {
+				q("update item set `deleted` = 1, `changed` = '%s' where `id` = %d limit 1",
+					dbesc(datetime_convert()),			
+					intval($r[0]['id'])
+				);
+			}
+		}
+	}
+
+	return 202;
+	// NOTREACHED
+}
+
 function diaspora_profile($importer,$xml) {
 
 	$a = get_app();
@@ -1372,6 +1441,14 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
 
 	$body = $item['body'];
 
+/*
+	// We're trying to match Diaspora's split message/photo protocol but
+	// all the photos are displayed on D* as links and not img's - even
+	// though we're sending pretty much precisely what they send us when
+	// doing the same operation.  
+	// Commented out for now, we'll use bb2diaspora to convert photos to markdown
+	// which seems to get through intact.
+
 	$cnt = preg_match_all('|\[img\](.*?)\[\/img\]|',$body,$matches,PREG_SET_ORDER);
 	if($cnt) {
 		foreach($matches as $mtch) {
@@ -1382,12 +1459,24 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
 			$detail['guid'] = $item['guid'];
 			$detail['handle'] = $myaddr;
 			$images[] = $detail;
-			$body = str_replace($detail['str'],t('link'),$body);
+			$body = str_replace($detail['str'],$mtch[1],$body);
 		}
 	}	
+*/
 
 	$body = xmlify(html_entity_decode(bb2diaspora($body)));
 
+	if($item['attach']) {
+		$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism',$item['attach'],$matches,PREG_SET_ORDER);
+		if(cnt) {
+			$body .= "\n" . t('Attachments:') . "\n";
+			foreach($matches as $mtch) {
+				$body .= '[' . $mtch[3] . '](' . $mtch[1] . ')' . "\n";
+			}
+		}
+	}	
+
+
 	$public = (($item['private']) ? 'false' : 'true');
 
 	require_once('include/datetime.php');
@@ -1618,11 +1707,14 @@ function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) {
 	$a = get_app();
 	$myaddr = $owner['nickname'] . '@' .  substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
 
-	$tpl = get_markup_template('diaspora_retract.tpl');
+	$signed_text = $item['guid'] . ';' . 'StatusMessage';
+
+	$tpl = get_markup_template('diaspora_signed_retract.tpl');
 	$msg = replace_macros($tpl, array(
 		'$guid'   => $item['guid'],
-		'$type'   => 'Post',
-		'$handle' => $myaddr
+		'$type'   => 'StatusMessage',
+		'$handle' => $myaddr,
+		'$signature' => base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'))
 	));
 
 	$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
@@ -1636,22 +1728,35 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch) {
 
 	$a = get_app();
 	$logid = random_string(4);
-	logger('diaspora_transmit: ' . $logid . ' ' . (($public_batch) ? $contact['batch'] : $contact['notify']));
-	post_url((($public_batch) ? $contact['batch'] : $contact['notify']) . '/',$slap);
+	$dest_url = (($public_batch) ? $contact['batch'] : $contact['notify']);
+	if(! $dest_url) {
+		logger('diaspora_transmit: no url for contact: ' . $contact['id'] . ' batch mode =' . $public_batch);
+		return 0;
+	} 
+
+	logger('diaspora_transmit: ' . $logid . ' ' . $dest_url);
+
+	post_url($dest_url . '/', $slap);
+
 	$return_code = $a->get_curl_code();
 	logger('diaspora_transmit: ' . $logid . ' returns: ' . $return_code);
 
-	if((! $return_code) || (($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after')))) {
+	if((! $return_code) || (($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))) {
 		logger('diaspora_transmit: queue message');
-		// queue message for redelivery
-		q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`,`batch`)
-			VALUES ( %d, '%s', '%s', '%s', %d) ",
+
+		$r = q("SELECT id from queue where cid = %d and network = '%s' and content = '%s' and batch = %d limit 1",
 			intval($contact['id']),
-			dbesc(datetime_convert()),
-			dbesc(datetime_convert()),
+			dbesc(NETWORK_DIASPORA),
 			dbesc($slap),
 			intval($public_batch)
 		);
+		if(count($r)) {
+			logger('diaspora_transmit: add_to_queue ignored - identical item already in queue');
+		}
+		else {
+			// queue message for redelivery
+			add_to_queue($contact['id'],NETWORK_DIASPORA,$slap,$public_batch);
+		}
 	}