From b0a9ec0a73183e48158a4e42db49943c56db9098 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 31 Jul 2011 17:52:36 -0700
Subject: better handling of api comments/replies

---
 mod/item.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'mod/item.php')

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'])  : '');
-- 
cgit v1.2.3


From 996425206f86967a50923cf61e18776749a49e52 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 31 Jul 2011 20:01:00 -0700
Subject: api profiles

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

(limited to 'mod/item.php')

diff --git a/mod/item.php b/mod/item.php
index c4b4351c1..4b9f3d091 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -33,11 +33,18 @@ function item_post(&$a) {
 
 	call_hooks('post_local_start', $_POST);
 
+
+	/**
+	 * Is this a reply to something?
+	 */
+
 	$parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0);
 	$parent_uri = ((x($_POST,'parent_uri')) ? trim($_POST['parent_uri']) : '');
 
 	$parent_item = null;
 	$parent_contact = null;
+	$thr_parent = '';
+	$parid = 0;
 	$r = false;
 
 	if($parent || $parent_uri) {
@@ -47,11 +54,20 @@ function item_post(&$a) {
 			);
 		}
 		elseif($parent_uri && local_user()) {
+			$_POST['type'] = 'net-comment';
 			// This is coming from an API source, we are logged in
+			// This query will find the immediate parent
 			$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc($parent_uri),
 				intval(local_user())
 			);
+			// now find the real parent of the conversation
+			if(count($r)) {
+				$parid = $r[0]['parent'];
+				$r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
+					intval($parid)
+				);
+			}
 		}
 
 		if(($r === false) || (! count($r))) {
@@ -62,6 +78,11 @@ function item_post(&$a) {
 		}
 		$parent_item = $r[0];
 		$parent = $r[0]['id'];
+
+		// multi-level threading - preserve the info but re-parent to our single level threading
+		if(($parid) && ($parid != $parent))
+			$thr_parent = $parent_uri;
+
 		if($parent_item['contact-id'] && $uid) {
 			$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($parent_item['contact-id']),
@@ -195,6 +216,8 @@ function item_post(&$a) {
 			$contact_record = $r[0];
 	}
 
+
+
 	$post_type = notags(trim($_POST['type']));
 
 	if($post_type === 'net-comment') {
@@ -458,6 +481,7 @@ function item_post(&$a) {
 	$datarray['private']       = $private;
 	$datarray['pubmail']       = $pubmail_enable;
 	$datarray['attach']        = $attachments;
+	$datarray['thr-parent']    = $thr_parent;
 
 	/**
 	 * These fields are for the convenience of plugins...
@@ -495,9 +519,9 @@ function item_post(&$a) {
 
 
 	$r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
-		`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `received`, `changed`, `uri`, `title`, `body`, `app`, `location`, `coord`, 
+		`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, 
 		`tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach` )
-		VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s' )",
+		VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s' )",
 		intval($datarray['uid']),
 		dbesc($datarray['type']),
 		intval($datarray['wall']),
@@ -514,6 +538,7 @@ function item_post(&$a) {
 		dbesc($datarray['received']),
 		dbesc($datarray['changed']),
 		dbesc($datarray['uri']),
+		dbesc($datarray['thr-parent']),
 		dbesc($datarray['title']),
 		dbesc($datarray['body']),
 		dbesc($datarray['app']),
-- 
cgit v1.2.3


From d0b7723bbcd4e9a4fd5c97370bd1c738fdcdab28 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 3 Aug 2011 16:29:25 -0700
Subject: re-parent api post item with parent_id and no parent_uri

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

(limited to 'mod/item.php')

diff --git a/mod/item.php b/mod/item.php
index 4b9f3d091..b71c35041 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -6,6 +6,8 @@
  * text stuff. This function handles status, wall-to-wall status, 
  * local comments, and remote coments - that are posted on this site 
  * (as opposed to being delivered in a feed).
+ * Also processed here are posts and comments coming through the 
+ * statusnet/twitter API. 
  * All of these become an "item" which is our basic unit of 
  * information.
  * Posts that originate externally or do not fall into the above 
@@ -33,6 +35,7 @@ function item_post(&$a) {
 
 	call_hooks('post_local_start', $_POST);
 
+	$api_source = ((x($_POST,'api_source')) ? true : false);
 
 	/**
 	 * Is this a reply to something?
@@ -48,22 +51,26 @@ function item_post(&$a) {
 	$r = false;
 
 	if($parent || $parent_uri) {
+
+		if(! x($_POST,'type'))
+			$_POST['type'] = 'net-comment';
+
 		if($parent) {
 			$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
 				intval($parent)
 			);
 		}
 		elseif($parent_uri && local_user()) {
-			$_POST['type'] = 'net-comment';
-			// This is coming from an API source, we are logged in
-			// This query will find the immediate parent
+			// This is coming from an API source, and we are logged in
 			$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc($parent_uri),
 				intval(local_user())
 			);
-			// now find the real parent of the conversation
-			if(count($r)) {
-				$parid = $r[0]['parent'];
+		}
+		// if this isn't the real parent of the conversation, find it
+		if($r !== false && count($r)) {
+			$parid = $r[0]['parent'];
+			if($r[0]['id'] != $r[0]['parent']) {
 				$r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
 					intval($parid)
 				);
@@ -771,12 +778,16 @@ function item_post(&$a) {
 	}
 
 	logger('post_complete');
+
+	// figure out how to return, depending on from whence we came
+
+	if($api_source)
+		return;
+
 	if((x($_POST,'return')) && strlen($_POST['return'])) {
 		logger('return: ' . $_POST['return']);
 		goaway($a->get_baseurl() . "/" . $_POST['return'] );
 	}
-	if($_POST['api_source'])
-		return;
 	$json = array('success' => 1);
 	if(x($_POST,'jsreload') && strlen($_POST['jsreload']))
 		$json['reload'] = $a->get_baseurl() . '/' . $_POST['jsreload'];
-- 
cgit v1.2.3


From ad1e827169d9f57c02746b51c5268bdbe2cd8ac9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 3 Aug 2011 19:18:58 -0700
Subject: several fixes for attachments

---
 mod/item.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'mod/item.php')

diff --git a/mod/item.php b/mod/item.php
index b71c35041..fd5d405ff 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -304,6 +304,10 @@ function item_post(&$a) {
 				if(count($r)) {
 					$r = q("UPDATE `attach` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
 						WHERE `uid` = %d AND `id` = %d LIMIT 1",
+						dbesc($str_contact_allow),
+						dbesc($str_group_allow),
+						dbesc($str_contact_deny),
+						dbesc($str_group_deny),
 						intval($profile_uid),
 						intval($attach)
 					);
@@ -436,7 +440,7 @@ function item_post(&$a) {
 			if(count($r)) {
 				if(strlen($attachments))
 					$attachments .= ',';
-				$attachments .= '[attach]href="' . $a->get_baseurl() . '/attach/' . $r[0]['id'] . '" size="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : ' ') . '"[/attach]'; 
+				$attachments .= '[attach]href="' . $a->get_baseurl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]'; 
 			}
 			$body = str_replace($match[1],'',$body);
 		}
-- 
cgit v1.2.3


From 8812b7f4caa99d01ae0e082c0b29a2ee24aed67d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 7 Aug 2011 17:29:26 -0700
Subject: item guids

---
 mod/item.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'mod/item.php')

diff --git a/mod/item.php b/mod/item.php
index fd5d405ff..884e730e6 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -506,6 +506,9 @@ function item_post(&$a) {
 
 	if($orig_post)
 		$datarray['edit']      = true;
+	else
+		$datarray['guid']      = get_guid();
+
 
 	call_hooks('post_local',$datarray);
 
@@ -529,11 +532,12 @@ function item_post(&$a) {
 		$post_id = 0;
 
 
-	$r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
+	$r = q("INSERT INTO `item` (`guid`, `uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
 		`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, 
 		`tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach` )
-		VALUES( %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s' )",
+		VALUES( '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s' )",
 		intval($datarray['uid']),
+		dbesc($datarray['guid']),
 		dbesc($datarray['type']),
 		intval($datarray['wall']),
 		intval($datarray['gravity']),
-- 
cgit v1.2.3


From 0745c00b16a6c6c63c0d49f61d7a09c2fabbf41f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 7 Aug 2011 17:33:13 -0700
Subject: guids on items

---
 mod/item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/item.php')

diff --git a/mod/item.php b/mod/item.php
index 884e730e6..62c1d4a87 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -536,8 +536,8 @@ function item_post(&$a) {
 		`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `received`, `changed`, `uri`, `thr-parent`, `title`, `body`, `app`, `location`, `coord`, 
 		`tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach` )
 		VALUES( '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s' )",
-		intval($datarray['uid']),
 		dbesc($datarray['guid']),
+		intval($datarray['uid']),
 		dbesc($datarray['type']),
 		intval($datarray['wall']),
 		intval($datarray['gravity']),
-- 
cgit v1.2.3


From bbd545b9caa278d61ad423725dc591b3eb0e61f7 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 14 Aug 2011 04:26:41 -0700
Subject: honour "post to xxx network by default" when using API

---
 mod/item.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'mod/item.php')

diff --git a/mod/item.php b/mod/item.php
index 62c1d4a87..cc4e1e1a8 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -178,6 +178,20 @@ function item_post(&$a) {
 	
 		$pubmail_enable    = ((x($_POST,'pubmail_enable') && intval($_POST['pubmail_enable']) && (! $private)) ? 1 : 0);
 
+		// if using the API, we won't see pubmail_enable - figure out if it should be set
+
+		if($api_source && $profile_uid && $profile_uid == local_user()) {
+			$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+			if(! $mail_disabled) {
+				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
+					intval(local_user())
+				);
+				if(count($r) && intval($r[0]['pubmail']))
+					$pubmail_enabled = true;
+			}
+		}
+
+
 		if(! strlen($body)) {
 			info( t('Empty post discarded.') . EOL );
 			if(x($_POST,'return')) 
-- 
cgit v1.2.3


From 240941237a32c9da6cafffdd0ff80ddc1a939f26 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 15 Aug 2011 18:29:49 -0700
Subject: privacy enforcement on pubmail_enable

---
 mod/item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/item.php')

diff --git a/mod/item.php b/mod/item.php
index cc4e1e1a8..54472e268 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -180,7 +180,7 @@ function item_post(&$a) {
 
 		// if using the API, we won't see pubmail_enable - figure out if it should be set
 
-		if($api_source && $profile_uid && $profile_uid == local_user()) {
+		if($api_source && $profile_uid && $profile_uid == local_user() && (! $private)) {
 			$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
 			if(! $mail_disabled) {
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
-- 
cgit v1.2.3


From 0eb06b3e2d9c5c65b6bad97639f032d5d0a1620f Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 15 Aug 2011 22:23:17 -0700
Subject: cronhooks broken

---
 mod/item.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/item.php')

diff --git a/mod/item.php b/mod/item.php
index 54472e268..ef0b232d5 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -35,7 +35,7 @@ function item_post(&$a) {
 
 	call_hooks('post_local_start', $_POST);
 
-	$api_source = ((x($_POST,'api_source')) ? true : false);
+	$api_source = ((x($_POST,'api_source') && $_POST['api_source']) ? true : false);
 
 	/**
 	 * Is this a reply to something?
-- 
cgit v1.2.3