send "hidden" edit activities to networks which don't support edits themselves

2 files changed, 36 insertions, 3 deletions

diff --git a/include/conversation.php b/include/conversation.php
index 02c61b688..61d31fef4 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -414,8 +414,8 @@ function visible_activity($item) {
 		}
 	}
 
-//	if(is_edit_activity($item))
-//		return false;
+	if(is_edit_activity($item))
+		return false;
 
 	return true;
 }
@@ -1312,7 +1312,8 @@ function status_editor($a, $x, $popup = false) {
 		'$expiryModalOK' => t('OK'),
 		'$expiryModalCANCEL' => t('Cancel'),
 		'$expanded' => ((x($x, 'expanded')) ? $x['expanded'] : false),
-		'$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false)
+		'$bbcode' => ((x($x, 'bbcode')) ? $x['bbcode'] : false),
+		'$parent' => ((array_key_exists('parent',$x) && $x['parent']) ? $x['parent'] : 0)
 	));
 
 	if ($popup === true) {
diff --git a/include/items.php b/include/items.php
index bb78af930..2357384de 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4506,6 +4506,7 @@ function fix_attached_file_permissions($channel,$observer_hash,$body,
 
 
 function item_create_edit_activity($post) {
+
 	if((! $post) || (! $post['item']))
 		return;
 
@@ -4513,6 +4514,13 @@ function item_create_edit_activity($post) {
 
 	$new_item = $update_item;
 
+	$author = q("select * from xchan where xchan_hash = '%s' limit 1",
+		dbesc($new_item['author_xchan'])
+	);
+	if($author)
+		$item_author = $author[0];
+
+
 	$new_item['id'] = 0;
 	$new_item['parent'] = 0;
 	$new_item['mid'] = item_message_id();
@@ -4521,11 +4529,35 @@ function item_create_edit_activity($post) {
 
 	$new_item['body'] .= "\n\n";
 	$new_item['body'] .= $update_item['body'];
+	
+	$new_item['sig'] = '';
 
 	$new_item['verb'] = ACTIVITY_UPDATE;
 	$new_item['item_thread_top'] = 0;
 	$new_item['created'] = $new_item['edited'] = datetime_convert();
 
+	$new_item['obj'] = json_encode(array(
+		'type'    => (($update_item['item_thread_top']) ? ACTIVITY_OBJ_NOTE : ACTIVITY_OBJ_COMMENT),
+		'id'      => $update_item['mid'],
+		'parent'  => $update_item['parent_mid'],
+		'link'    => array(array('rel' => 'alternate','type' => 'text/html', 'href' => $update_item['plink'])),
+		'title'   => $update_item['title'],
+		'content' => $update_item['body'],
+		'created' => $update_item['created'],
+		'edited'  => $update_item['edited'],
+		'author'  => array(
+			'name'     => $item_author['xchan_name'],
+			'address'  => $item_author['xchan_addr'],
+			'guid'     => $item_author['xchan_guid'],
+			'guid_sig' => $item_author['xchan_guid_sig'],
+			'link'     => array(
+				array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item_author['xchan_url']),
+				array('rel' => 'photo', 'type' => $item_author['xchan_photo_mimetype'], 'href' => $item_author['xchan_photo_m'])),
+			),
+	));
+	
+
+
 	$x = post_activity_item($new_item);	
 
 	$post_id = $x['id'];