better handling of api comments/replies

2 files changed, 29 insertions, 6 deletions

diff --git a/include/api.php b/include/api.php
index 62dc78506..0d446d1a7 100644
--- a/include/api.php
+++ b/include/api.php
@@ -401,8 +401,16 @@
 
 		// convert $_POST array items to the form we use for web posts.
 
+		// logger('api_post: ' . print_r($_POST,true));
+
 		$_POST['body'] = urldecode(requestdata('status'));
-		$_POST['parent'] = requestdata('in_reply_to_status_id');
+
+		$parent = requestdata('in_reply_to_status_id');
+		if(ctype_digit($parent))
+			$_POST['parent'] = $parent;
+		else
+			$_POST['parent_uri'] = $parent;
+
 		if(requestdata('lat') && requestdata('long'))
 			$_POST['coord'] = sprintf("%s %s",requestdata('lat'),requestdata('long'));
 		$_POST['profile_uid'] = local_user();
diff --git a/mod/item.php b/mod/item.php
index f6f665a18..c4b4351c1 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -34,21 +34,34 @@ function item_post(&$a) {
 	call_hooks('post_local_start', $_POST);
 
 	$parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0);
+	$parent_uri = ((x($_POST,'parent_uri')) ? trim($_POST['parent_uri']) : '');
 
 	$parent_item = null;
 	$parent_contact = null;
+	$r = false;
 
-	if($parent) {
-		$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
-			intval($parent)
-		);
-		if(! count($r)) {
+	if($parent || $parent_uri) {
+		if($parent) {
+			$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
+				intval($parent)
+			);
+		}
+		elseif($parent_uri && local_user()) {
+			// This is coming from an API source, we are logged in
+			$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+				dbesc($parent_uri),
+				intval(local_user())
+			);
+		}
+
+		if(($r === false) || (! count($r))) {
 			notice( t('Unable to locate original post.') . EOL);
 			if(x($_POST,'return')) 
 				goaway($a->get_baseurl() . "/" . $_POST['return'] );
 			killme();
 		}
 		$parent_item = $r[0];
+		$parent = $r[0]['id'];
 		if($parent_item['contact-id'] && $uid) {
 			$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($parent_item['contact-id']),
@@ -59,6 +72,8 @@ function item_post(&$a) {
 		}
 	}
 
+	if($parent) logger('mod_post: parent=' . $parent);
+
 	$profile_uid = ((x($_POST,'profile_uid')) ? intval($_POST['profile_uid']) : 0);
 	$post_id     = ((x($_POST['post_id']))    ? intval($_POST['post_id'])     : 0);
 	$app         = ((x($_POST['source']))     ? strip_tags($_POST['source'])  : '');