Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

include/items.php

@@ -2327,6 +2327,16 @@ function send_status_notifications($post_id,$item) {
 
 	$parent = 0;
 
+	if(array_key_exists('verb',$item) && (activity_match($item['verb'], ACTIVITY_LIKE) || activity_match($item['verb'], ACTIVITY_DISLIKE))) {
+
+		$r = q("select id from item where mid = '%s' and uid = %d limit 1",
+			dbesc($item['thr_parent']),
+			intval($item['uid'])
+		);
+
+		$thr_parent_id = $r[0]['id'];
+	}
+
 	$r = q("select channel_hash from channel where channel_id = %d limit 1",
 		intval($item['uid'])
 	);
@@ -2392,10 +2402,10 @@ function send_status_notifications($post_id,$item) {
 		'to_xchan'     => $r[0]['channel_hash'],
 		'item'         => $item,
 		'link'         => $link,
-		'verb'         => ACTIVITY_POST,
+		'verb'         => $item['verb'],
 		'otype'        => 'item',
-		'parent'       => $parent,
-		'parent_mid'   => $item['parent_mid']
+		'parent'       => $thr_parent_id ? $thr_parent_id : $parent,
+		'parent_mid'   => $thr_parent_id ? $item['thr_parent'] : $item['parent_mid']
 	));
 }