keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Mastodon API Reshared statuses are a stub w/content in reblog field

Browse source
This commit is contained in:
Hank Grabowski 2023-05-26 21:37:08 -04:00 committed by Hypolite Petovan
parent f1da323b07
commit 8d9e0b4eae
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Object/Api/Mastodon/Status.php
View file

@ -109,6 +109,7 @@ class Status extends BaseDataTransferObject
*/ */
public function __construct(array $item, Account $account, Counts $counts, UserAttributes $userAttributes, bool $sensitive, Application $application, array $mentions, array $tags, Card $card, array $attachments, array $in_reply, array $reblog, FriendicaExtension $friendica, array $quote = null, array $poll = null) public function __construct(array $item, Account $account, Counts $counts, UserAttributes $userAttributes, bool $sensitive, Application $application, array $mentions, array $tags, Card $card, array $attachments, array $in_reply, array $reblog, FriendicaExtension $friendica, array $quote = null, array $poll = null)
{ {
$reblogged = !empty($reblog);
$this->id = (string)$item['uri-id']; $this->id = (string)$item['uri-id'];
$this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::JSON); $this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::JSON);
$this->edited_at = DateTimeFormat::utc($item['edited'], DateTimeFormat::JSON); $this->edited_at = DateTimeFormat::utc($item['edited'], DateTimeFormat::JSON);
@ -135,26 +136,26 @@ class Status extends BaseDataTransferObject
$this->uri = $item['uri']; $this->uri = $item['uri'];
$this->url = $item['plink'] ?? null; $this->url = $item['plink'] ?? null;
$this->replies_count = $counts->replies; $this->replies_count = $reblogged ? 0 : $counts->replies;
$this->reblogs_count = $counts->reblogs; $this->reblogs_count = $reblogged ? 0 : $counts->reblogs;
$this->favourites_count = $counts->favourites; $this->favourites_count = $reblogged ? 0 : $counts->favourites;
$this->favourited = $userAttributes->favourited; $this->favourited = $userAttributes->favourited;
$this->reblogged = $userAttributes->reblogged; $this->reblogged = $userAttributes->reblogged;
$this->muted = $userAttributes->muted; $this->muted = $userAttributes->muted;
$this->bookmarked = $userAttributes->bookmarked; $this->bookmarked = $userAttributes->bookmarked;
$this->pinned = $userAttributes->pinned; $this->pinned = $userAttributes->pinned;
$this->content = BBCode::convertForUriId($item['uri-id'], BBCode::setMentionsToNicknames($item['raw-body'] ?? $item['body']), BBCode::MASTODON_API); $this->content = $reblogged ? '' : BBCode::convertForUriId($item['uri-id'], BBCode::setMentionsToNicknames($item['raw-body'] ?? $item['body']), BBCode::MASTODON_API);
$this->reblog = $reblog; $this->reblog = $reblog;
$this->quote = $quote; $this->quote = $quote;
$this->application = $application->toArray(); $this->application = $application->toArray();
$this->account = $account->toArray(); $this->account = $account->toArray();
$this->media_attachments = $attachments; $this->media_attachments = $reblogged ? [] : $attachments;
$this->mentions = $mentions; $this->mentions = $reblogged ? [] : $mentions;
$this->tags = $tags; $this->tags = $reblogged ? [] : $tags;
$this->emojis = []; $this->emojis = $reblogged ? [] : [];
$this->card = $card->toArray() ?: null; $this->card = $reblogged ? null : ($card->toArray() ?: null);
$this->poll = $poll; $this->poll = $reblogged ? null : $poll;
$this->friendica = $friendica; $this->friendica = $reblogged ? null : $friendica;
} }
/** /**