From ba4685dfb1ed310a0cd5da4ee72f1f9dae646f80 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 1 Nov 2020 11:01:57 +0000
Subject: [PATCH] API: Support for reshared items

---
 src/Factory/Api/Mastodon/Status.php           | 11 ++++++++++-
 src/Module/Api/Mastodon/Accounts/Statuses.php |  9 +++++++--
 src/Object/Api/Mastodon/Status.php            |  8 ++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/Factory/Api/Mastodon/Status.php b/src/Factory/Api/Mastodon/Status.php
index 5aac0f80c2..cd468a5fbd 100644
--- a/src/Factory/Api/Mastodon/Status.php
+++ b/src/Factory/Api/Mastodon/Status.php
@@ -87,6 +87,15 @@ class Status extends BaseFactory
 
 		$attachments = DI::mstdnAttachment()->createFromUriId($uriId);
 
-		return new \Friendica\Object\Api\Mastodon\Status($item, $account, $counts, $userAttributes, $sensitive, $application, $mentions, $tags, $card, $attachments);
+		if ($item['vid'] == Verb::getID(Activity::ANNOUNCE)) {
+			$reshare = $this->createFromUriId($item['thr-parent-id'], $uid)->toArray();
+			$reshared_item = Item::selectFirst(['title', 'body'], ['uri-id' => $item['thr-parent-id'], 'uid' => $uid]);
+			$item['title'] = $reshared_item['title'] ?? $item['title'];
+			$item['body'] = $reshared_item['body'] ?? $item['body'];
+		} else {
+			$reshare = [];
+		}
+
+		return new \Friendica\Object\Api\Mastodon\Status($item, $account, $counts, $userAttributes, $sensitive, $application, $mentions, $tags, $card, $attachments, $reshare);
 	}
 }
diff --git a/src/Module/Api/Mastodon/Accounts/Statuses.php b/src/Module/Api/Mastodon/Accounts/Statuses.php
index 2959739a8c..9e29e5f24d 100644
--- a/src/Module/Api/Mastodon/Accounts/Statuses.php
+++ b/src/Module/Api/Mastodon/Accounts/Statuses.php
@@ -26,7 +26,9 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
+use Friendica\Model\Verb;
 use Friendica\Module\BaseApi;
+use Friendica\Protocol\Activity;
 
 /**
  * @see https://docs.joinmastodon.org/methods/accounts/
@@ -61,8 +63,11 @@ class Statuses extends BaseApi
 
 		$params = ['order' => ['uri-id' => true], 'limit' => $limit];
 
-		$condition = ['author-id' => $id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
-			'private' => Item::PUBLIC, 'uid' => 0, 'network' => Protocol::FEDERATED];
+		$condition = ['author-id' => $id, 'private' => [Item::PUBLIC, Item::UNLISTED],
+			'uid' => 0, 'network' => Protocol::FEDERATED];
+
+		$condition = DBA::mergeConditions($condition, ["(`gravity` IN (?, ?) OR (`gravity` = ? AND `vid` = ?))",
+			GRAVITY_PARENT, GRAVITY_COMMENT, GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE)]);
 
 		if (!empty($max_id)) {
 			$condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $max_id]);
diff --git a/src/Object/Api/Mastodon/Status.php b/src/Object/Api/Mastodon/Status.php
index 1b09a4f01a..d14eb4efa3 100644
--- a/src/Object/Api/Mastodon/Status.php
+++ b/src/Object/Api/Mastodon/Status.php
@@ -97,7 +97,7 @@ class Status extends BaseEntity
 	 * @param array   $item
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public function __construct(array $item, Account $account, Counts $counts, UserAttributes $userAttributes, bool $sensitive, Application $application, array $mentions, array $tags, Card $card, array $attachments)
+	public function __construct(array $item, Account $account, Counts $counts, UserAttributes $userAttributes, bool $sensitive, Application $application, array $mentions, array $tags, Card $card, array $attachments, array $reblog)
 	{
 		$this->id         = (string)$item['uri-id'];
 		$this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::ATOM);
@@ -127,7 +127,7 @@ class Status extends BaseEntity
 		$this->bookmarked = $userAttributes->bookmarked;
 		$this->pinned = $userAttributes->pinned;
 		$this->content = BBCode::convert($item['raw-body'] ?? $item['body'], false);
-		$this->reblog = null; /// @todo
+		$this->reblog = $reblog;
 		$this->application = $application->toArray();
 		$this->account = $account->toArray();
 		$this->media_attachments = $attachments;
@@ -155,6 +155,10 @@ class Status extends BaseEntity
 			unset($status['application']);
 		}
 
+		if (empty($status['reblog'])) {
+			$status['reblog'] = null;
+		}
+
 		return $status;
 	}
 }