From eebcf1ae86f16bf3022f4c9a7d91d878ed2d2298 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Wed, 11 Nov 2020 22:58:34 -0500
Subject: [PATCH] Separate $parent_item and $toplevel_item in mod/item

---
 mod/item.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/mod/item.php b/mod/item.php
index 3869ea910..d70353d9b 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -100,29 +100,32 @@ function item_post(App $a) {
 	}
 
 	// Is this a reply to something?
-	$toplevel_item_id = intval($_REQUEST['parent'] ?? 0);
+	$parent_item_id = intval($_REQUEST['parent'] ?? 0);
 	$thr_parent_uri = trim($_REQUEST['parent_uri'] ?? '');
 
+	$parent_item = null;
 	$toplevel_item = null;
-	$parent_user = null;
+	$toplevel_item_id = null;
+	$toplevel_user_id = null;
 
 	$objecttype = null;
 	$profile_uid = ($_REQUEST['profile_uid'] ?? 0) ?: local_user();
 	$posttype = ($_REQUEST['post_type'] ?? '') ?: Item::PT_ARTICLE;
 
-	if ($toplevel_item_id || $thr_parent_uri) {
-		if ($toplevel_item_id) {
-			$toplevel_item = Item::selectFirst([], ['id' => $toplevel_item_id]);
+	if ($parent_item_id || $thr_parent_uri) {
+		if ($parent_item_id) {
+			$parent_item = Item::selectFirst([], ['id' => $parent_item_id]);
 		} elseif ($thr_parent_uri) {
-			$toplevel_item = Item::selectFirst([], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]);
+			$parent_item = Item::selectFirst([], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]);
 		}
 
 		// if this isn't the top-level parent of the conversation, find it
-		if (DBA::isResult($toplevel_item)) {
+		if (DBA::isResult($parent_item)) {
 			// The URI and the contact is taken from the direct parent which needn't to be the top parent
-			$thr_parent_uri = $toplevel_item['uri'];
+			$thr_parent_uri = $parent_item['uri'];
+			$toplevel_item = $parent_item;
 
-			if ($toplevel_item['gravity'] != GRAVITY_PARENT) {
+			if ($parent_item['gravity'] != GRAVITY_PARENT) {
 				$toplevel_item = Item::selectFirst([], ['id' => $toplevel_item['parent']]);
 			}
 		}
@@ -146,7 +149,7 @@ function item_post(App $a) {
 		}
 
 		$toplevel_item_id = $toplevel_item['id'];
-		$parent_user = $toplevel_item['uid'];
+		$toplevel_user_id = $toplevel_item['uid'];
 
 		$objecttype = Activity\ObjectType::COMMENT;
 	}
@@ -168,8 +171,8 @@ function item_post(App $a) {
 	}
 
 	// Ensure that the user id in a thread always stay the same
-	if (!is_null($parent_user) && in_array($parent_user, [local_user(), 0])) {
-		$profile_uid = $parent_user;
+	if (!is_null($toplevel_user_id) && in_array($toplevel_user_id, [local_user(), 0])) {
+		$profile_uid = $toplevel_user_id;
 	}
 
 	// Check for multiple posts with the same message id (when the post was created via API)