X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdiaspora.php;h=05d17dd9c41f8ea858566574bd6af9fb1ab205b9;hb=1f074cb44c5deda5b480f5ff814ff3640ec843d0;hp=4f0df19444071b78820ed9090d2a943c1e3b7fbc;hpb=0c24784f5e92e0c8269f255e962312574871f2f0;p=friendica.git

diff --git a/include/diaspora.php b/include/diaspora.php
old mode 100644
new mode 100755
index 4f0df19444..05d17dd9c4
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -69,7 +69,7 @@ function diaspora_dispatch($importer,$msg) {
 		$ret = diaspora_retraction($importer,$xmlbase->retraction,$msg);
 	}
 	elseif($xmlbase->signed_retraction) {
-		$ret = diaspora_signed_retraction($importer,$xmlbase->retraction,$msg);
+		$ret = diaspora_signed_retraction($importer,$xmlbase->signed_retraction,$msg);
 	}
 	elseif($xmlbase->photo) {
 		$ret = diaspora_photo($importer,$xmlbase->photo,$msg);
@@ -77,6 +77,9 @@ function diaspora_dispatch($importer,$msg) {
 	elseif($xmlbase->conversation) {
 		$ret = diaspora_conversation($importer,$xmlbase->conversation,$msg);
 	}
+	elseif($xmlbase->message) {
+		$ret = diaspora_message($importer,$xmlbase->message,$msg);
+	}
 	else {
 		logger('diaspora_dispatch: unknown message type: ' . print_r($xmlbase,true));
 	}
@@ -185,6 +188,13 @@ function diaspora_msg_build($msg,$user,$contact,$prvkey,$pubkey,$public = false)
 
 	logger('diaspora_msg_build: ' . $msg, LOGGER_DATA);
 
+	// without a public key nothing will work
+
+	if(! $pubkey) {
+		logger('diaspora_msg_build: pubkey missing: contact id: ' . $contact['id']);
+		return '';
+	}
+
 	$inner_aes_key = random_string(32);
 	$b_inner_aes_key = base64_encode($inner_aes_key);
 	$inner_iv = random_string(16);
@@ -454,7 +464,7 @@ function diaspora_request($importer,$xml) {
 			intval($importer['uid'])
 		);
 
-		if((count($r)) && ($r[0]['hide-friends'] == 0)) {
+		if((count($r)) && (! $r[0]['hide-friends']) && (! $contact['hidden'])) {
 			require_once('include/items.php');
 
 			$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
@@ -517,6 +527,8 @@ 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`,`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']),
@@ -540,9 +552,15 @@ function diaspora_request($importer,$xml) {
 
 	$contact_record = diaspora_get_contact_by_handle($importer['uid'],$sender_handle);
 
-	$hash = random_string() . (string) time();   // Generate a confirm_key
+	if(! $contact_record) {
+		logger('diaspora_request: unable to locate newly created contact record.');
+		return;
+	}
+
+	if($importer['page-flags'] == PAGE_NORMAL) {
+
+		$hash = random_string() . (string) time();   // Generate a confirm_key
 	
-	if($contact_record) {
 		$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime` )
 			VALUES ( %d, %d, %d, %d, '%s', '%s', '%s' )",
 			intval($importer['uid']),
@@ -554,6 +572,49 @@ function diaspora_request($importer,$xml) {
 			dbesc(datetime_convert())
 		);
 	}
+	else {
+
+		// automatic friend approval
+
+		require_once('include/Photo.php');
+
+		$photos = import_profile_photo($contact_record['photo'],$importer['uid'],$contact_record['id']);
+		
+		// technically they are sharing with us (CONTACT_IS_SHARING), 
+		// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
+		// we are going to change the relationship and make them a follower.
+
+		if($importer['page-flags'] == PAGE_FREELOVE)
+			$new_relation = CONTACT_IS_FRIEND;
+		else
+			$new_relation = CONTACT_IS_FOLLOWER;
+
+		$r = q("UPDATE `contact` SET 
+			`photo` = '%s', 
+			`thumb` = '%s',
+			`micro` = '%s', 
+			`rel` = %d, 
+			`name-date` = '%s', 
+			`uri-date` = '%s', 
+			`avatar-date` = '%s', 
+			`blocked` = 0, 
+			`pending` = 0,
+			WHERE `id` = %d LIMIT 1
+			",
+			dbesc($photos[0]),
+			dbesc($photos[1]),
+			dbesc($photos[2]),
+			intval($new_relation),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			dbesc(datetime_convert()),
+			intval($contact_record['id'])
+		);
+
+		$u = q("select * from user where id = %d limit 1",intval($importer['uid']));
+		if($u)
+			$ret = diaspora_share($u[0],$contact_record);
+	}
 
 	return;
 }
@@ -1127,7 +1188,6 @@ function diaspora_conversation($importer,$xml,$msg) {
 		return;
 	}
 
-
 	foreach($messages as $mesg) {
 
 		$reply = 0;
@@ -1145,16 +1205,10 @@ function diaspora_conversation($importer,$xml,$msg) {
 			continue;
 		}
 
-		// Is this right?
-
-		if($msg_parent_guid != $guid)
-			$reply = 1;
-			
 		$body = diaspora2bb($msg_text);
 		$message_id = $msg_diaspora_handle . ':' . $msg_guid;
 
 		$author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($mesg->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid;
-//		$author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . $msg_diaspora_handle;
 
 		$author_signature = base64_decode($msg_author_signature);
 
@@ -1199,7 +1253,7 @@ function diaspora_conversation($importer,$xml,$msg) {
 			continue;
 		}
 
-		q("insert into mail ( `uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`replied`,`uri`,`parent-uri`,`created`) values ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
+		q("insert into mail ( `uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`) values ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
 			intval($importer['uid']),
 			dbesc($msg_guid),
 			intval($conversation['id']),
@@ -1210,29 +1264,139 @@ function diaspora_conversation($importer,$xml,$msg) {
 			dbesc($subject),
 			dbesc($body),
 			0,
-			intval($reply),
+			0,
 			dbesc($message_id),
 			dbesc($parent_uri),
 			dbesc($msg_created_at)
 		);			
 
-		q("updated conv set updated = '%s' where id = %d limit 1",
+		q("update conv set updated = '%s' where id = %d limit 1",
 			dbesc(datetime_convert()),
 			intval($conversation['id'])
 		);		
+
+		require_once('include/enotify.php');
+		notification(array(			
+			'type' => NOTIFY_MAIL,
+			'notify_flags' => $importer['notify-flags'],
+			'language' => $importer['language'],
+			'to_name' => $importer['username'],
+			'to_email' => $importer['email'],
+			'item' => array('subject' => $subject, 'body' => $body),
+			'source_name' => $person['name'],
+			'source_link' => $person['url'],
+			'source_photo' => $person['thumb'],
+			'verb' => ACTIVITY_POST,
+			'otype' => 'mail'
+		));
 	}	
 
 	return;
 }
 
+function diaspora_message($importer,$xml,$msg) {
+
+	$a = get_app();
+
+	$msg_guid = notags(unxmlify($xml->guid));
+	$msg_parent_guid = notags(unxmlify($xml->parent_guid));
+	$msg_parent_author_signature = notags(unxmlify($xml->parent_author_signature));
+	$msg_author_signature = notags(unxmlify($xml->author_signature));
+	$msg_text = unxmlify($xml->text);
+	$msg_created_at = datetime_convert('UTC','UTC',notags(unxmlify($xml->created_at)));
+	$msg_diaspora_handle = notags(unxmlify($xml->diaspora_handle));
+	$msg_conversation_guid = notags(unxmlify($xml->conversation_guid));
+
+	$parent_uri = $diaspora_handle . ':' . $msg_parent_guid;
+ 
+	$contact = diaspora_get_contact_by_handle($importer['uid'],$msg_diaspora_handle);
+	if(! $contact) {
+		logger('diaspora_message: cannot find contact: ' . $msg_diaspora_handle);
+		return;
+	}
+
+	if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { 
+		logger('diaspora_message: Ignoring this author.');
+		return 202;
+	}
+
+	$conversation = null;
+
+	$c = q("select * from conv where uid = %d and guid = '%s' limit 1",
+		intval($importer['uid']),
+		dbesc($msg_conversation_guid)
+	);
+	if(count($c))
+		$conversation = $c[0];
+	else {
+		logger('diaspora_message: conversation not available.');
+		return;
+	}
+
+	$reply = 0;
+			
+	$body = diaspora2bb($msg_text);
+	$message_id = $msg_diaspora_handle . ':' . $msg_guid;
+
+	$author_signed_data = $msg_guid . ';' . $msg_parent_guid . ';' . $msg_text . ';' . unxmlify($xml->created_at) . ';' . $msg_diaspora_handle . ';' . $msg_conversation_guid;
+
+
+	$author_signature = base64_decode($msg_author_signature);
+
+	$person = find_diaspora_person_by_handle($msg_diaspora_handle);	
+	if(is_array($person) && x($person,'pubkey'))
+		$key = $person['pubkey'];
+	else {
+		logger('diaspora_message: unable to find author details');
+		return;
+	}
+
+	if(! rsa_verify($author_signed_data,$author_signature,$key,'sha256')) {
+		logger('diaspora_message: verification failed.');
+		return;
+	}
 
+	$r = q("select id from mail where `uri` = '%s' and uid = %d limit 1",
+		dbesc($message_id),
+		intval($importer['uid'])
+	);
+	if(count($r)) {
+		logger('diaspora_message: duplicate message already delivered.', LOGGER_DEBUG);
+		return;
+	}
 
+	q("insert into mail ( `uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`) values ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
+		intval($importer['uid']),
+		dbesc($msg_guid),
+		intval($conversation['id']),
+		dbesc($person['name']),
+		dbesc($person['photo']),
+		dbesc($person['url']),
+		intval($contact['id']),	 
+		dbesc($conversation['subject']),
+		dbesc($body),
+		0,
+		1,
+		dbesc($message_id),
+		dbesc($parent_uri),
+		dbesc($msg_created_at)
+	);			
 
+	q("update conv set updated = '%s' where id = %d limit 1",
+		dbesc(datetime_convert()),
+		intval($conversation['id'])
+	);		
+	
+	return;
+}
 
 
 function diaspora_photo($importer,$xml,$msg) {
 
 	$a = get_app();
+
+	logger('diaspora_photo: init',LOGGER_DEBUG);
+
 	$remote_photo_path = notags(unxmlify($xml->remote_photo_path));
 
 	$remote_photo_name = notags(unxmlify($xml->remote_photo_name));
@@ -1247,10 +1411,13 @@ function diaspora_photo($importer,$xml,$msg) {
 
 	$created_at = notags(unxmlify($xml_created_at));
 
+	logger('diaspora_photo: status_message_guid: ' . $status_message_guid, LOGGER_DEBUG);
 
 	$contact = diaspora_get_contact_by_handle($importer['uid'],$msg['author']);
-	if(! $contact)
+	if(! $contact) {
+		logger('diaspora_photo: contact record not found: ' . $msg['author'] . ' handle: ' . $diaspora_handle);
 		return;
+	}
 
 	if(($contact['rel'] == CONTACT_IS_FOLLOWER) || ($contact['blocked']) || ($contact['readonly'])) { 
 		logger('diaspora_photo: Ignoring this author.');
@@ -1265,6 +1432,7 @@ function diaspora_photo($importer,$xml,$msg) {
 		logger('diaspora_photo: parent item not found: parent: ' . $parent_guid . ' item: ' . $guid);
 		return;
 	}
+
 	$parent_item = $r[0];
 
 	$link_text = '[img]' . $remote_photo_path . $remote_photo_name . '[/img]' . "\n";
@@ -1474,6 +1642,7 @@ EOT;
 
 function diaspora_retraction($importer,$xml) {
 
+
 	$guid = notags(unxmlify($xml->guid));
 	$diaspora_handle = notags(unxmlify($xml->diaspora_handle));
 	$type = notags(unxmlify($xml->type));
@@ -1505,7 +1674,8 @@ function diaspora_retraction($importer,$xml) {
 	// NOTREACHED
 }
 
-function diaspora_signed_retraction($importer,$xml) {
+function diaspora_signed_retraction($importer,$xml,$msg) {
+
 
 	$guid = notags(unxmlify($xml->target_guid));
 	$diaspora_handle = notags(unxmlify($xml->sender_handle));
@@ -1513,8 +1683,10 @@ function diaspora_signed_retraction($importer,$xml) {
 	$sig = notags(unxmlify($xml->target_author_signature));
 
 	$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
-	if(! $contact)
+	if(! $contact) {
+		logger('diaspora_signed_retraction: no contact');
 		return;
+	}
 
 	// this may not yet work for comments. Need to see how the relaying works
 	// and figure out who signs it.
@@ -1533,7 +1705,7 @@ function diaspora_signed_retraction($importer,$xml) {
 
 	if($type === 'StatusMessage') {
 		$r = q("select * from item where guid = '%s' and uid = %d limit 1",
-			dbesc('guid'),
+			dbesc($guid),
 			intval($importer['uid'])
 		);
 		if(count($r)) {
@@ -1545,6 +1717,8 @@ function diaspora_signed_retraction($importer,$xml) {
 			}
 		}
 	}
+	else
+		logger('diaspora_signed_retraction: unknown type: ' . $type);
 
 	return 202;
 	// NOTREACHED
@@ -1584,6 +1758,12 @@ function diaspora_profile($importer,$xml) {
 
 	$birthday = datetime_convert('UTC','UTC',$birthday,'Y-m-d');
 
+	// this is to prevent multiple birthday notifications in a single year
+	// if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year
+
+	if(substr($birthday,5) === substr($contact['bd'],5))
+		$birthday = $contact['bd'];
+
 	$r = q("UPDATE `contact` SET `name` = '%s', `name-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' , `bd` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		dbesc($name),
 		dbesc(datetime_convert()),
@@ -1612,27 +1792,6 @@ function diaspora_profile($importer,$xml) {
 
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 function diaspora_share($me,$contact) {
 	$a = get_app();
 	$myaddr = $me['nickname'] . '@' .  substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
@@ -1976,16 +2135,6 @@ function diaspora_send_mail($item,$owner,$contact) {
 	}
 	$cnv = $r[0];
 
-	$parent = null;
-
-	if($item['parent-uri'] != $item['uri']) {
-		$r = q("select * from mail where uri = '%s' and uid = %d limit 1",
-			dbesc($item['parent-uri']),
-			intval($item['uid'])
-		);
-		$parent = $r[0];
-	}
-
 	$conv = array(
 		'guid' => xmlify($cnv['guid']),
 		'subject' => xmlify($cnv['subject']),
@@ -1996,17 +2145,16 @@ function diaspora_send_mail($item,$owner,$contact) {
 
 	$body = bb2diaspora($item['body']);
 	$created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C');
-	$parent_guid = (($item['parent-uri'] == $item['uri']) ? $cnv['guid'] : $parent['guid']);
  
-	$signed_text =  $item['guid'] . ';' . $parent_guid . ';' . $body .  ';' 
+	$signed_text =  $item['guid'] . ';' . $cnv['guid'] . ';' . $body .  ';' 
 		. $created . ';' . $myaddr . ';' . $cnv['guid'];
 
 	$sig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
 
 	$msg = array(
 		'guid' => xmlify($item['guid']),
-		'parent_guid' => (($item['parent-uri'] == $item['uri']) ? xmlify($cnv['guid']) : xmlify($parent['guid'])),
-		'parent_author_signature' => (($item['parent-uri'] == $item['uri']) ? xmlify($sig) : null),
+		'parent_guid' => xmlify($cnv['guid']),
+		'parent_author_signature' => (($item['reply']) ? null : xmlify($sig)),
 		'author_signature' => xmlify($sig),
 		'text' => xmlify($body),
 		'created_at' => xmlify($created),
@@ -2014,14 +2162,19 @@ function diaspora_send_mail($item,$owner,$contact) {
 		'conversation_guid' => xmlify($cnv['guid'])
 	);
 
-	$conv['messages'] = array($msg);
-
-	$tpl = get_markup_template('diaspora_conversation.tpl');
-	$msg = replace_macros($tpl, array('$conv' => $conv));
+	if($item['reply']) {
+		$tpl = get_markup_template('diaspora_message.tpl');
+		$xmsg = replace_macros($tpl, array('$msg' => $msg));
+	}
+	else {
+		$conv['messages'] = array($msg);
+		$tpl = get_markup_template('diaspora_conversation.tpl');
+		$xmsg = replace_macros($tpl, array('$conv' => $conv));
+	}
 
-	logger('diaspora_conversation: ' . print_r($msg,true));
+	logger('diaspora_conversation: ' . print_r($xmsg,true), LOGGER_DATA);
 
-	$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],false)));
+	$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($xmsg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],false)));
 
 	return(diaspora_transmit($owner,$contact,$slap,false));