Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 15:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12844 from HankG/mastodon-status-add-delivery-data

Browse source 
Add Delivery Information to Mastodon Status API Entity
This commit is contained in:
Philipp 2023-02-26 23:03:30 +01:00 • committed by GitHub
commit de53109a49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 82 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -105,7 +105,7 @@ class Status extends BaseDataTransferObject
* @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, array $in_reply, array $reblog, 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)
{
$this->id = (string)$item['uri-id'];
$this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::JSON);
@ -151,7 +151,7 @@ class Status extends BaseDataTransferObject
$this->emojis = [];
$this->card = $card->toArray() ?: null;
$this->poll = $poll;
$this->friendica = new FriendicaExtension($item['title'], $counts->dislikes);
$this->friendica = $friendica;
}
/**

55
src/Object/Api/Mastodon/Status/FriendicaDeliveryData.php Normal file
View file

@ -0,0 +1,55 @@
<?php
/**
* @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
namespace Friendica\Object\Api\Mastodon\Status;
use Friendica\BaseDataTransferObject;
/**
* Class FriendicaDeliveryData
*
* Additional fields on Mastodon Statuses for storing Friendica delivery data
*
* @see https://docs.joinmastodon.org/entities/status
*/
class FriendicaDeliveryData extends BaseDataTransferObject
{
/** @var int|null */
protected $delivery_queue_count;
/** @var int|null */
protected $delivery_queue_done;
/** @var int|null */
protected $delivery_queue_failed;
/**
* Creates a FriendicaDeliveryData object
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public function __construct(?int $delivery_queue_count, ?int $delivery_queue_done, ?int $delivery_queue_failed)
{
$this->delivery_queue_count = $delivery_queue_count;
$this->delivery_queue_done = $delivery_queue_done;
$this->delivery_queue_failed = $delivery_queue_failed;
}
}

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

@ -35,6 +35,8 @@ class FriendicaExtension extends BaseDataTransferObject
/** @var string */
protected $title;
/** @var FriendicaDeliveryData */
protected $delivery_data;
/** @var int */
protected $dislikes_count;
@ -42,11 +44,13 @@ class FriendicaExtension extends BaseDataTransferObject
* Creates a status count object
*
* @param string $title
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @param int $dislikes_count
* @param FriendicaDeliveryData $delivery_data
*/
public function __construct(string $title, int $dislikes_count)
public function __construct(string $title, int $dislikes_count, FriendicaDeliveryData $delivery_data)
{
$this->title = $title;
$this->delivery_data = $delivery_data;
$this->dislikes_count = $dislikes_count;
}
}