Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-01-03 19:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14264 from HankG/mastodon-api-explicit-network-field

Browse source 
Add an explicit network field to the Mastodon API FriendicaExtension.php
This commit is contained in:
Michael Vogel 2024-07-03 04:35:08 +02:00 committed by GitHub
commit 7d2900c2e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Factory/Api/Mastodon/Status.php
View file

@ -213,7 +213,8 @@ class Status extends BaseFactory
); );
$sensitive = (bool)$item['sensitive']; $sensitive = (bool)$item['sensitive'];
$application = new \Friendica\Object\Api\Mastodon\Application($item['app'] ?: ContactSelector::networkToName($item['network'], $item['author-link'])); $network = ContactSelector::networkToName($item['network'], $item['author-link']);
$application = new \Friendica\Object\Api\Mastodon\Application($item['app'] ?: $network);
$mentions = $this->mstdnMentionFactory->createFromUriId($uriId)->getArrayCopy(); $mentions = $this->mstdnMentionFactory->createFromUriId($uriId)->getArrayCopy();
$tags = $this->mstdnTagFactory->createFromUriId($uriId); $tags = $this->mstdnTagFactory->createFromUriId($uriId);
@ -322,7 +323,7 @@ class Status extends BaseFactory
$delivery_data = $uid != $item['uid'] ? null : new FriendicaDeliveryData($item['delivery_queue_count'], $item['delivery_queue_done'], $item['delivery_queue_failed']); $delivery_data = $uid != $item['uid'] ? null : new FriendicaDeliveryData($item['delivery_queue_count'], $item['delivery_queue_done'], $item['delivery_queue_failed']);
$visibility_data = $uid != $item['uid'] ? null : new FriendicaVisibility($this->aclFormatter->expand($item['allow_cid']), $this->aclFormatter->expand($item['deny_cid']), $this->aclFormatter->expand($item['allow_gid']), $this->aclFormatter->expand($item['deny_gid'])); $visibility_data = $uid != $item['uid'] ? null : new FriendicaVisibility($this->aclFormatter->expand($item['allow_cid']), $this->aclFormatter->expand($item['deny_cid']), $this->aclFormatter->expand($item['allow_gid']), $this->aclFormatter->expand($item['deny_gid']));
$friendica = new FriendicaExtension($item['title'] ?? '', $item['changed'], $item['commented'], $item['received'], $counts->dislikes, $origin_dislike, $delivery_data, $visibility_data); $friendica = new FriendicaExtension($item['title'] ?? '', $item['changed'], $item['commented'], $item['received'], $counts->dislikes, $origin_dislike, $network, $delivery_data, $visibility_data);
return new \Friendica\Object\Api\Mastodon\Status($item, $account, $counts, $userAttributes, $sensitive, $application, $mentions, $tags, $card, $attachments, $in_reply, $reshare, $friendica, $quote, $poll, $emojis); return new \Friendica\Object\Api\Mastodon\Status($item, $account, $counts, $userAttributes, $sensitive, $application, $mentions, $tags, $card, $attachments, $in_reply, $reshare, $friendica, $quote, $poll, $emojis);
} }
@ -393,7 +394,7 @@ class Status extends BaseFactory
$attachments = []; $attachments = [];
$in_reply = []; $in_reply = [];
$reshare = []; $reshare = [];
$friendica = new FriendicaExtension('', null, null, null, 0, false, null, null); $friendica = new FriendicaExtension('', null, null, null, 0, false, null, null, null);
return new \Friendica\Object\Api\Mastodon\Status($item, $account, $counts, $userAttributes, $sensitive, $application, $mentions, $tags, $card, $attachments, $in_reply, $reshare, $friendica); return new \Friendica\Object\Api\Mastodon\Status($item, $account, $counts, $userAttributes, $sensitive, $application, $mentions, $tags, $card, $attachments, $in_reply, $reshare, $friendica);
} }

6
src/Object/Api/Mastodon/Status/FriendicaExtension.php
View file

@ -54,6 +54,9 @@ class FriendicaExtension extends BaseDataTransferObject
/** @var bool */ /** @var bool */
protected $disliked = false; protected $disliked = false;
/** @var string|null */
protected $network;
/** /**
* @var FriendicaVisibility|null * @var FriendicaVisibility|null
*/ */
@ -68,6 +71,7 @@ class FriendicaExtension extends BaseDataTransferObject
* @param ?string $received_at * @param ?string $received_at
* @param int $dislikes_count * @param int $dislikes_count
* @param bool $disliked * @param bool $disliked
* @param ?string $network
* @param ?FriendicaDeliveryData $delivery_data * @param ?FriendicaDeliveryData $delivery_data
* @param ?FriendicaVisibility $visibility * @param ?FriendicaVisibility $visibility
* @throws \Exception * @throws \Exception
@ -79,6 +83,7 @@ class FriendicaExtension extends BaseDataTransferObject
?string $received_at, ?string $received_at,
int $dislikes_count, int $dislikes_count,
bool $disliked, bool $disliked,
?string $network,
?FriendicaDeliveryData $delivery_data, ?FriendicaDeliveryData $delivery_data,
?FriendicaVisibility $visibility ?FriendicaVisibility $visibility
) { ) {
@ -89,6 +94,7 @@ class FriendicaExtension extends BaseDataTransferObject
$this->delivery_data = $delivery_data; $this->delivery_data = $delivery_data;
$this->dislikes_count = $dislikes_count; $this->dislikes_count = $dislikes_count;
$this->disliked = $disliked; $this->disliked = $disliked;
$this->network = $network;
$this->visibility = $visibility; $this->visibility = $visibility;
} }