first shot at getting like/unlike functions to work consistently

4 files changed, 31 insertions, 20 deletions

diff --git a/include/delivery.php b/include/delivery.php
index 235b766c5..e6cfc8155 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -509,17 +509,17 @@ function delivery_run($argv, $argc){
 					// unsupported
 					break;
 				}
-				elseif(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
-				logger('delivery: diaspora retract: ' . $loc);
-					// diaspora delete, 
+				elseif(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri'])) {
+					// top-level retraction
+					logger('delivery: diaspora retract: ' . $loc);
+
 					diaspora_send_retraction($target_item,$owner,$contact,$public_message);
 					break;
 				}
 				elseif($target_item['uri'] !== $target_item['parent-uri']) {
+					// we are the relay - send comments, likes and relayable_retractions to our conversants
+					logger('delivery: diaspora relay: ' . $loc);
 
-				logger('delivery: diaspora relay: ' . $loc);
-
-					// we are the relay - send comments, likes, unlikes and relayable_retractions to our conversants
 					diaspora_send_relay($target_item,$owner,$contact,$public_message);
 					break;
 				}		
diff --git a/include/diaspora.php b/include/diaspora.php
index 10c56564b..3bf4a9cc6 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2125,7 +2125,8 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
 		$tpl = get_markup_template('diaspora_like.tpl');
 		$like = true;
 		$target_type = 'Post';
-		$positive = (($item['deleted']) ? 'false' : 'true');
+//		$positive = (($item['deleted']) ? 'false' : 'true');
+		$positive = 'true';
 	}
 	else {
 		$tpl = get_markup_template('diaspora_comment.tpl');
@@ -2202,7 +2203,8 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 		$tpl = get_markup_template('diaspora_like_relay.tpl');
 		$like = true;
 		$target_type = 'Post';
-		$positive = (($item['deleted']) ? 'false' : 'true');
+//		$positive = (($item['deleted']) ? 'false' : 'true');
+		$positive = 'true';
 	}
 	else {
 		$tpl = get_markup_template('diaspora_comment_relay.tpl');
@@ -2220,9 +2222,6 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 	// owner (parent author) signature
 	// Note that mod/item.php seems to take care of creating a signature for Diaspora for replies
 	// created on our own account
-	//
-	// comments from other networks will be relayed under our name, with a brief 
-	// preamble to describe what's happening and noting the real author
 
 	$r = q("select * from sign where " . $sql_sign_id . " = %d limit 1",
 		intval($item['id'])
@@ -2235,6 +2234,12 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 	}
 	else {
 
+		// Author signature information (for likes, comments, and retractions of likes or comments,
+		// whether from Diaspora or Friendica) must be placed in the `sign` table before this 
+		// function is called
+		logger('diaspora_send_relay: original author signature not found, cannot send relayable');
+		return;
+/*
 		$itemcontact = q("select * from contact where `id` = %d limit 1",
 			intval($item['contact-id'])
 		);
@@ -2273,6 +2278,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 				dbesc($handle)
 			);
 		}
+*/
 	}
 
 	// sign it with the top-level owner's signature
@@ -2306,11 +2312,11 @@ 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);
 
-	// Check if the retraction is for a top-level post, or whether it's for a comment
-	if( $item['id'] !== $item['parent'] ) {
+	// Check whether the retraction is for a top-level post or whether it's a relayable
+	if( $item['uri'] !== $item['parent-uri'] ) {
 
 		$tpl = get_markup_template('diaspora_relay_retraction.tpl');
-		$target_type = 'Comment';
+		$target_type = (($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
 	}
 	else {
 		
diff --git a/include/items.php b/include/items.php
index 897036c26..6b16810b2 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3281,9 +3281,11 @@ function drop_item($id,$interactive = true) {
 			}
 
 			// Add a relayable_retraction signature for Diaspora. Note that we can't add a target_author_signature
-			// if the comment/like was deleted by a remote user. That should be ok, because if a remote user is deleting
-			// the comment/like, that means we're the home of the post, and Diaspora will only
+			// if the comment was deleted by a remote user. That should be ok, because if a remote user is deleting
+			// the comment, that means we're the home of the post, and Diaspora will only
 			// check the parent_author_signature of retractions that it doesn't have to relay further
+			//
+			// I don't think this function gets called for an "unlike," but I'll check anyway
 			$signed_text = $item['guid'] . ';' . ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
 
 			if(local_user() == $item['uid']) {
@@ -3296,6 +3298,8 @@ function drop_item($id,$interactive = true) {
 					$item['contact-id']
 				);
 				if(count($r)) {
+					// The below handle only works for NETWORK_DFRN. I think that's ok, because this function
+					// only handles DFRN deletes
 					$handle = $r['nick'] . '@' . substr($r['url'], strpos($r['url'],'://') + 3, strpos($r['url'],'/profile') - 1);
 					$authorsig = '';
 				}
diff --git a/include/notifier.php b/include/notifier.php
index be50366d5..f0a1940d4 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -738,18 +738,19 @@ function notifier_run($argv, $argc){
 						// unsupported
 						break;
 					}
-					elseif(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
-						// diaspora delete, including relayable_retractions that need to be relayed
+					elseif(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
+						// send both top-level retractions and relayable retractions for owner to relay
 						diaspora_send_retraction($target_item,$owner,$contact);
 						break;
 					}
 					elseif($followup) {
-						// send comments, likes and retractions of likes to owner to relay
+						// send comments and likes to owner to relay
 						diaspora_send_followup($target_item,$owner,$contact);
 						break;
 					}
 					elseif($target_item['uri'] !== $target_item['parent-uri']) {
-						// we are the relay - send comments, likes, unlikes and relayable_retractions to our conversants
+						// we are the relay - send comments, likes and relayable_retractions
+						// (of comments and likes) to our conversants
 						diaspora_send_relay($target_item,$owner,$contact);
 						break;
 					}