Merge pull request #7034 from annando/api-announce

API: Fix the displaying of reshared posts

include/api.php

@@ -2980,13 +2980,22 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
 		$status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $item['author-link']).')');
 	}
 
-	if ($item["id"] == $item["parent"]) {
+	$retweeted_item = [];
+
+	$announce = api_get_announce($item);
+	if (!empty($announce) && ($item['owner-id'] == $item['author-id'])) {
+		$retweeted_item = $item;
+		$item = $announce;
+		$status['friendica_owner'] = api_get_user($a, $announce['author-id']);
+	} elseif ($item["id"] == $item["parent"]) {
 		$retweeted_item = api_share_as_retweet($item);
-		if ($retweeted_item !== false) {
+	}
+
+	if (!empty($retweeted_item)) {
 		$retweeted_status = $status;
 		$status['user'] = $status['friendica_owner'];
 		try {
-				$retweeted_status["user"] = api_get_user($a, $retweeted_item["author-id"]);
+			$retweeted_status['friendica_author'] = $retweeted_status["user"] = api_get_user($a, $retweeted_item["author-id"]);
 		} catch (BadRequestException $e) {
 			// user not found. should be found?
 			/// @todo check if the user should be always found
@@ -2999,8 +3008,9 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
 		$retweeted_status['statusnet_html'] = $rt_converted["html"];
 		$retweeted_status['friendica_activities'] = api_format_items_activities($retweeted_item, $type);
 		$retweeted_status['created_at'] =  api_date($retweeted_item['created']);
+		$retweeted_status['friendica_owner'] = $retweeted_status['friendica_author'];
 		$status['retweeted_status'] = $retweeted_status;
-		$status['friendica_author'] = $retweeted_status['friendica_author'];}
+		$status['friendica_author'] = $retweeted_status['friendica_author'];
 	}
 
 	// "uid" and "self" are only needed for some internal stuff, so remove it from here
@@ -4978,6 +4988,40 @@ function api_friendica_remoteauth()
 }
 api_register_func('api/friendica/remoteauth', 'api_friendica_remoteauth', true);
 
+/**
+ * Return an item with announcer data if it had been announced
+ *
+ * @param array $item Item array
+ * @return array Item array with announce data
+ */
+function api_get_announce($item)
+{
+	// Quit if the item already has got a different owner and author
+	if ($item['owner-id'] != $item['author-id']) {
+		return [];
+	}
+
+	// Don't change original or Diaspora posts
+	if ($item['origin'] || in_array($item['network'], [Protocol::DIASPORA])) {
+		return [];
+	}
+
+	// Quit if we do now the original author and it had been a post from a native network
+	if (!empty($item['contact-uid']) && in_array($item['network'], Protocol::NATIVE_SUPPORT)) {
+		return [];
+	}
+
+	$fields = ['author-id', 'author-name', 'author-link', 'author-avatar'];
+	$activity = Item::activityToIndex(ACTIVITY2_ANNOUNCE);
+	$condition = ['parent-uri' => $item['uri'], 'gravity' => GRAVITY_ACTIVITY, 'uid' => [0, $item['uid']], 'activity' => $activity];
+	$announce = Item::selectFirstForUser($item['uid'], $fields, $condition, ['order' => ['created' => true]]);
+	if (!DBA::isResult($announce)) {
+		return [];
+	}
+
+	return array_merge($item, $announce);
+}
+
 /**
  * @brief Return the item shared, if the item contains only the [share] tag
  *

src/Model/Item.php

@@ -45,14 +45,14 @@ class Item extends BaseObject
 
 	// Field list that is used to display the items
 	const DISPLAY_FIELDLIST = [
-		'uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network',
+		'uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network', 'gravity',
 		'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
 		'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'language',
 		'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
 		'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id',
 		'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
 		'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network',
-		'contact-id', 'contact-link', 'contact-name', 'contact-avatar',
+		'contact-id', 'contact-uid', 'contact-link', 'contact-name', 'contact-avatar',
 		'writable', 'self', 'cid', 'alias',
 		'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
 		'event-summary', 'event-desc', 'event-location', 'event-type',