friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-13 14:49:39 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

StdClass instead of arrays

Browse source
This commit is contained in:
Michael 2020-09-07 14:34:05 +00:00
parent 07ccfb212b
commit 1bca280eae
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,7 @@ use Friendica\Network\HTTPException;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Repository\ProfileField; use Friendica\Repository\ProfileField;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use stdClass;
class Status extends BaseFactory class Status extends BaseFactory
{ {
@ -62,9 +63,10 @@ class Status extends BaseFactory
$item = Item::selectFirst([], ['uri-id' => $uriId, 'uid' => $uid]); $item = Item::selectFirst([], ['uri-id' => $uriId, 'uid' => $uid]);
$account = DI::mstdnAccount()->createFromContactId($item['author-id']); $account = DI::mstdnAccount()->createFromContactId($item['author-id']);
$count['replies'] = DBA::count('item', ['thr-parent-id' => $uriId, 'uid' => $uid, 'gravity' => GRAVITY_COMMENT]); $count = new stdClass;
$count['reblogs'] = DBA::count('item', ['thr-parent-id' => $uriId, 'uid' => $uid, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::ANNOUNCE)]); $count->replies = DBA::count('item', ['thr-parent-id' => $uriId, 'uid' => $uid, 'gravity' => GRAVITY_COMMENT]);
$count['favourites'] = DBA::count('item', ['thr-parent-id' => $uriId, 'uid' => $uid, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::LIKE)]); $count->reblogs = DBA::count('item', ['thr-parent-id' => $uriId, 'uid' => $uid, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::ANNOUNCE)]);
$count->favourites = DBA::count('item', ['thr-parent-id' => $uriId, 'uid' => $uid, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::LIKE)]);
return new \Friendica\Object\Api\Mastodon\Status($item, $account, $count); return new \Friendica\Object\Api\Mastodon\Status($item, $account, $count);
} }

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

@ -24,6 +24,7 @@ namespace Friendica\Object\Api\Mastodon;
use Friendica\BaseEntity; use Friendica\BaseEntity;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use stdClass;
/** /**
* Class Status * Class Status
@ -95,7 +96,7 @@ class Status extends BaseEntity
* @param array $item * @param array $item
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public function __construct(array $item, Account $account, array $count) public function __construct(array $item, Account $account, stdClass $count)
{ {
$this->id = (string)$item['uri-id']; $this->id = (string)$item['uri-id'];
$this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::ATOM); $this->created_at = DateTimeFormat::utc($item['created'], DateTimeFormat::ATOM);
@ -114,9 +115,9 @@ class Status extends BaseEntity
$this->language = null; $this->language = null;
$this->uri = $item['uri']; $this->uri = $item['uri'];
$this->url = $item['plink'] ?? null; $this->url = $item['plink'] ?? null;
$this->replies_count = $count['replies']; $this->replies_count = $count->replies;
$this->reblogs_count = $count['reblogs']; $this->reblogs_count = $count->reblogs;
$this->favourites_count = $count['favourites']; $this->favourites_count = $count->favourites;
$this->favourited = false; $this->favourited = false;
$this->reblogged = false; $this->reblogged = false;
$this->muted = false; $this->muted = false;