Merge remote-tracking branch 'upstream/dev' into dev

1 files changed, 30 insertions, 3 deletions

diff --git a/include/connections.php b/include/connections.php
index d97ea3887..e942503f0 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -373,19 +373,46 @@ function contact_remove($channel_id, $abook_id) {
 	if(intval($abook['abook_self']))
 		return false;
 
-	$r = q("select id from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d and item_retained = 0 and item_starred = 0",
+	$r = q("select id, parent from item where (owner_xchan = '%s' or author_xchan = '%s') and uid = %d and item_retained = 0 and item_starred = 0",
 		dbesc($abook['abook_xchan']),
 		dbesc($abook['abook_xchan']),
 		intval($channel_id)
 	);
 	if($r) {
+		$already_saved = [];
 		foreach($r as $rr) {
-			$x = q("select uid from term where otype = %d and oid = %d and ttype = %d limit 1",
+			$w = $x = $y = null;
+			
+			// optimise so we only process newly seen parent items
+			if (in_array($rr['parent'],$already_saved)) {
+				continue;
+			}
+			// if this isn't the parent, fetch the parent's item_retained  and item_starred to see if the conversation
+			// should be retained
+			if($rr['id'] != $rr['parent']) {
+				$w = q("select id, item_retained, item_starred from item where id = %d",
+					intval($rr['parent'])
+				);
+				if($w) {
+					// see if the conversation was filed
+					$x = q("select uid from term where otype = %d and oid = %d and ttype = %d limit 1",
+						intval(TERM_OBJ_POST),
+						intval($w[0]['id']),
+						intval(TERM_FILE)
+					);
+					if (intval($w[0]['item_retained']) || intval($w[0]['item_starred']) || $x) {
+						$already_saved[] = $rr['parent'];
+						continue;
+					}
+				}
+			}
+			// see if this item was filed
+			$y = q("select uid from term where otype = %d and oid = %d and ttype = %d limit 1",
 				intval(TERM_OBJ_POST),
 				intval($rr['id']),
 				intval(TERM_FILE)
 			);
-			if($x) {
+			if ($y) {
 				continue;
 			}
 			drop_item($rr['id'],false);